diff --git a/addons/account/account.py b/addons/account/account.py
index 1797563874a..9e86e8ddfa5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -129,9 +129,11 @@ class account_tax(osv.osv):
 account_tax()
 
 class account_account(osv.osv):
-    _order = "code"
+    _order = "parent_left"
+    _parent_order = "code"
     _name = "account.account"
     _description = "Account"
+    _parent_store = True
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
@@ -139,6 +141,9 @@ class account_account(osv.osv):
             context = {}
         pos = 0
         while pos<len(args):
+            if args[pos][0]=='code' and args[pos][1] in ('like','ilike'):
+                args[pos][1]='=like'
+                args[pos][2]=str(args[pos][2])+'%'
             if args[pos][0]=='journal_id':
                 if not args[pos][2]:
                     del args[pos]
@@ -155,89 +160,49 @@ class account_account(osv.osv):
         return super(account_account,self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
 
-    def _credit(self, cr, uid, ids, field_name, arg, context={}):
-        acc_set = ",".join(map(str, ids))
-        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
-        cr.execute(("SELECT a.id, " \
-                    "SUM(COALESCE(l.credit * a.sign, 0)) " \
-                "FROM account_account a " \
-                    "LEFT JOIN account_move_line l " \
-                    "ON (a.id = l.account_id) " \
-                "WHERE a.type != 'view' " \
-                    "AND a.id IN (%s) " \
-                    "AND " + query + " " \
-                    "AND a.active " \
-                "GROUP BY a.id") % (acc_set, ))
-        res2 = cr.fetchall()
-        res = {}
-        for id in ids:
-            res[id] = 0.0
-        for account_id, sum in res2:
-            res[account_id] += sum
-        return res
+#    def _credit(self, cr, uid, ids, field_name, arg, context={}):
+#        return self.__compute(cr, uid, ids, field_name, arg, context, 'COALESCE(SUM(l.credit), 0)')
+#
+#    def _debit(self, cr, uid, ids, field_name, arg, context={}):
+#        return self.__compute(cr, uid, ids, field_name, arg, context, 'COALESCE(SUM(l.debit), 0)')
+#
+#    def _balance(self, cr, uid, ids, field_name, arg, context={}):
+#        return self.__compute(cr, uid, ids, field_name, arg, context, 'COALESCE(SUM(l.debit) - SUM(l.credit), 0)')
 
-    def _debit(self, cr, uid, ids, field_name, arg, context={}):
-        acc_set = ",".join(map(str, ids))
-        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
-        cr.execute(("SELECT a.id, " \
-                    "SUM(COALESCE(l.debit * a.sign, 0)) " \
-                "FROM account_account a " \
-                    "LEFT JOIN account_move_line l " \
-                    "ON (a.id = l.account_id) " \
-                "WHERE a.type != 'view' " \
-                    "AND a.id IN (%s) " \
-                    "AND " + query + " " \
-                    "AND a.active " \
-                "GROUP BY a.id") % (acc_set, ))
-        res2 = cr.fetchall()
-        res = {}
-        for id in ids:
-            res[id] = 0.0
-        for account_id, sum in res2:
-            res[account_id] += sum
-        return res
-
-    def _balance(self, cr, uid, ids, field_name, arg, context={}):
+    def __compute(self, cr, uid, ids, field_names, arg, context={}, query=''):
+        mapping = {
+            'balance': "COALESCE(SUM(l.debit) - SUM(l.credit), 0) as balance ",
+            'debit': "COALESCE(SUM(l.debit), 0) as debit ",
+            'credit': "COALESCE(SUM(l.credit), 0) as credit "
+        }
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        ids2 = {}.fromkeys(ids + ids2).keys()
         acc_set = ",".join(map(str, ids2))
-        query = self.pool.get('account.move.line')._query_get(cr, uid,
-                context=context)
-        cr.execute(("SELECT a.id, " \
-                    "SUM((COALESCE(l.debit, 0) - COALESCE(l.credit, 0))) " \
-                "FROM account_account a " \
-                    "LEFT JOIN account_move_line l " \
-                    "ON (a.id=l.account_id) " \
-                "WHERE a.type != 'view' " \
-                    "AND a.id IN (%s) " \
-                    "AND " + query + " " \
-                    "AND a.active " \
-                "GROUP BY a.id") % (acc_set, ))
-        res = {}
-        for account_id, sum in cr.fetchall():
-            res[account_id] = round(sum,2)
-        cr.execute("SELECT a.id, a.company_id " \
-                "FROM account_account a " \
-                "WHERE id IN (%s)" % acc_set)
-        resc = dict(cr.fetchall())
-        cr.execute("SELECT id, currency_id FROM res_company")
-        rescur = dict(cr.fetchall())
+        accounts = {}
+        if ids2:
+            query = self.pool.get('account.move.line')._query_get(cr, uid,
+                    context=context)
+            cr.execute(("SELECT l.account_id, " +\
+                    ' , '.join(map(lambda x: mapping[x], field_names)) +
+                    "FROM " \
+                        "account_move_line l " \
+                    "WHERE " \
+                        "l.account_id IN (%s) " \
+                        "AND " + query + " " \
+                    "GROUP BY l.account_id") % (acc_set, ))
 
+            for res in cr.fetchall():
+                accounts[res[0]] = res[1:]
+
+        res = {}
         for id in ids:
-            ids3 = self.search(cr, uid, [('parent_id', 'child_of', [id])])
-            to_currency_id = rescur[resc[id]]
-            for idx in ids3:
-                if idx <> id:
-                    res.setdefault(id, 0.0)
-                    if resc[idx]<>resc[id] and resc[idx] and resc[id]:
-                        from_currency_id = rescur[resc[idx]]
-                        res[id] += self.pool.get('res.currency').compute(cr,
-                                uid, from_currency_id, to_currency_id,
-                                res.get(idx, 0.0), context=context)
-                    else:
-                        res[id] += res.get(idx, 0.0)
-        for id in ids:
-            res[id] = round(res.get(id,0.0), 2)
+            res[id] = map(lambda x: 0.0, field_names)
+            ids2 = self.search(cr, uid, [('parent_id', 'child_of', [id])])
+            for i in ids2:
+                for a in range(len(field_names)):
+                    res[id][a] += accounts.get(i, (0.0,0.0,0.0))[a]
+# TODO: if account.type is consolidation: compute all childs like before +
+# currency conversion
+
         return res
 
     def _get_company_currency(self, cr, uid, ids, field_name, arg, context={}):
@@ -267,15 +232,15 @@ class account_account(osv.osv):
         'code': fields.char('Code', size=64),
         'type': fields.selection(_code_get, 'Account Type', required=True),
 #        'parent_id': fields.many2many('account.account', 'account_account_rel', 'child_id', 'parent_id', 'Parents'),
-        'parent_id': fields.many2one('account.account','Parent'),
+        'parent_id': fields.many2one('account.account','Parent', ondelete='cascade'),
         'child_parent_ids':fields.one2many('account.account','parent_id','Children'),
         'child_consol_ids':fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children',domain=[('type','=','root'), ('type', '=', 'consolidation')]),
         'child_id': fields.function(_get_child_ids, method=True, type='many2many',relation="account.account",string="Children Accounts"),
 
 #        'child_id': fields.many2many('account.account', 'account_account_rel', 'parent_id', 'child_id', 'Children'),
-        'balance': fields.function(_balance, digits=(16,2), method=True, string='Balance'),
-        'credit': fields.function(_credit, digits=(16,2), method=True, string='Credit'),
-        'debit': fields.function(_debit, digits=(16,2), method=True, string='Debit'),
+        'balance': fields.function(__compute, digits=(16,2), method=True, string='Balance', multi='balance'),
+        'credit': fields.function(__compute, digits=(16,2), method=True, string='Credit', multi='balance'),
+        'debit': fields.function(__compute, digits=(16,2), method=True, string='Debit', multi='balance'),
         'reconcile': fields.boolean('Reconcile', help="Check this account if the user can make a reconciliation of the entries in this account."),
         'shortcut': fields.char('Shortcut', size=12),
         'close_method': fields.selection([('none','None'), ('balance','Balance'), ('detail','Detail'),('unreconciled','Unreconciled')], 'Deferral Method', required=True, help="Tell Tiny ERP how to process the entries of this account when you close a fiscal year. None removes all entries to start with an empty account for the new fiscal year. Balance creates only one entry to keep the balance for the new fiscal year. Detail keeps the detail of all entries of the preceeding years. Unreconciled keeps the detail of unreconciled entries only."),
@@ -285,6 +250,9 @@ class account_account(osv.osv):
         'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Company Currency'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'active': fields.boolean('Active', select=2),
+
+        'parent_left': fields.integer('Parent Left', select=1),
+        'parent_right': fields.integer('Parent Right', select=1),
     }
 
     def _default_company(self, cr, uid, context={}):
@@ -378,7 +346,7 @@ class account_account(osv.osv):
             res.append((record['id'],name ))
         return res
 
-    def copy(self, cr, uid, id, default=None, context={}):
+    def copy(self, cr, uid, id, default={}, context={}):
         account = self.browse(cr, uid, id, context=context)
         new_child_ids = []
         default['parent_id'] = False
@@ -455,6 +423,7 @@ class account_journal(osv.osv):
         'user_id': fields.many2one('res.users', 'User', help="The responsible user of this journal"),
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
+        'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want that new account moves pass through the \'draft\' state and goes direclty to the \'posted state\' without any manual validation.'),
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -494,7 +463,7 @@ class account_fiscalyear(osv.osv):
         'date_start': fields.date('Start date', required=True),
         'date_stop': fields.date('End date', required=True),
         'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
-        'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', redonly=True),
+        'state': fields.selection([('draft','Draft'), ('done','Done')], 'Status', redonly=True),
     }
 
     _defaults = {
@@ -541,7 +510,7 @@ class account_period(osv.osv):
         'date_start': fields.date('Start of period', required=True, states={'done':[('readonly',True)]}),
         'date_stop': fields.date('End of period', required=True, states={'done':[('readonly',True)]}),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
-        'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True)
+        'state': fields.selection([('draft','Draft'), ('done','Done')], 'Status', readonly=True)
     }
     _defaults = {
         'state': lambda *a: 'draft',
@@ -583,7 +552,7 @@ class account_journal_period(osv.osv):
         'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
         'icon': fields.function(_icon_get, method=True, string='Icon', type='string'),
         'active': fields.boolean('Active', required=True),
-        'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True)
+        'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True)
     }
 
     def _check(self, cr, uid, ids, context={}):
@@ -658,7 +627,7 @@ class account_move(osv.osv):
         'ref': fields.char('Ref', size=64),
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
-        'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'State', required=True, readonly=True),
+        'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'Status', required=True, readonly=True),
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
     }
     _defaults = {
@@ -747,6 +716,7 @@ class account_move(osv.osv):
                 vals['name'] = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
             else:
                 raise osv.except_osv(_('Error'), _('No sequence defined in the journal !'))
+        accnt_journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'])
         if 'line_id' in vals:
             c = context.copy()
             c['novalidate'] = True
@@ -1127,7 +1097,7 @@ class account_tax(osv.osv):
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usualy 1 or -1."),
         'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'description': fields.char('Internal Name', 32),
+        'description': fields.char('Internal Name',size=32),
     }
 
     def name_get(self, cr, uid, ids, context={}):
@@ -1477,7 +1447,7 @@ class account_subscription(osv.osv):
         'period_total': fields.integer('Number of period', required=True),
         'period_nbr': fields.integer('Period', required=True),
         'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
-        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
+        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True),
 
         'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
     }
@@ -1686,7 +1656,7 @@ class account_account_template(osv.osv):
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Force all moves for this account to have this secondary currency."),
         'code': fields.char('Code', size=64),
         'type': fields.selection(_code_get, 'Account Type', required=True),
-        'reconcile': fields.boolean('Reconcile', help="Check this option if the user can make a reconciliation of the entries in this account."),
+        'reconcile': fields.boolean('Allow Reconciliation', help="Check this option if the user can make a reconciliation of the entries in this account."),
         'shortcut': fields.char('Shortcut', size=12),
         'note': fields.text('Note'),
     }
@@ -1813,5 +1783,59 @@ class account_chart_template(osv.osv):
 
 account_chart_template()
 
+class wizard_account_chart_duplicate(osv.osv_memory):
+    """
+    Create a new account chart for a new company.
+    Wizards ask:
+        * an accuont chart (parent_id,=,False)
+        * a company
+    Then, the wizard:
+        * duplicates all accounts and assign to the right company
+        * duplicates all taxes, changing account assignations
+        * duplicate all accounting properties and assign correctly
+    """
+    _name = 'wizard.account.chart.duplicate'
+    _columns = {
+        'name':fields.char('Name',size=64),
+        'account_id':fields.many2one('account.account','Account Chart',required=True,domain=[('parent_id','=',False)]),
+        'company_id':fields.many2one('res.company','Company',required=True),
+
+    }
+
+    def action_create(self, cr, uid,ids, context=None):
+        res=self.read(cr,uid,ids)[0]
+        if res.get('account_id',False) and res.get('company_id',False):
+            account_obj=self.pool.get('account.account')
+            account_tax_obj=self.pool.get('account.tax')
+            property_obj=self.pool.get('ir.property')
+            # duplicate all accounts
+            account_obj.copy(cr,uid,res['account_id'],default={'company_id':res['company_id']})
+            # duplicate all taxes
+            tax_ids=account_tax_obj.search(cr,uid,[])
+            for tax in account_tax_obj.browse(cr,uid,tax_ids):
+                val={'company_id':res['company_id']}
+                if tax.account_collected_id:
+                    new_invoice_account_ids=account_obj.search(cr,uid,[('name','=',tax.account_collected_id.name),('company_id','=',res['company_id'])])
+                    val['account_collected_id']=len(new_invoice_account_ids) and new_invoice_account_ids[0] or False
+                if tax.account_paid_id:
+                    new_refund_account_ids=account_obj.search(cr,uid,[('name','=',tax.account_paid_id.name),('company_id','=',res['company_id'])])
+                    val['account_paid_id']=len(new_refund_account_ids) and new_refund_account_ids[0] or False
+                account_tax_obj.copy(cr,uid,tax.id,default=val)
+            # duplicate all accouting properties
+            property_ids=property_obj.search(cr,uid,[('value','=like','account.account,%')])
+            for property in property_obj.browse(cr,uid,property_ids):
+                account=account_obj.browse(cr,uid,property.value[1])
+                if account:
+                    new_account_ids=account_obj.search(cr,uid,[('name','=',account.name),('company_id','=',res['company_id'])])
+                    if len(new_account_ids):
+                        property_obj.copy(cr,uid,property.id,default={
+                                'value':'account.account,'+str(new_account_ids[0]),
+                                'company_id':res['company_id']
+                            })
+
+        return {'type':'ir.actions.act_window_close'}
+
+wizard_account_chart_duplicate()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 8e8a20e7260..68559fd48b1 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -46,9 +46,9 @@ class account_analytic_line(osv.osv):
         'product_uom_id' : fields.many2one('product.uom', 'UoM'),
         'product_id' : fields.many2one('product.product', 'Product'),
         'account_id' : fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True),
-        'general_account_id' : fields.many2one('account.account', 'General account', required=True, ondelete='cascade'),
-        'move_id' : fields.many2one('account.move.line', 'General entry', ondelete='cascade', select=True),
-        'journal_id' : fields.many2one('account.analytic.journal', 'Analytic journal', required=True, ondelete='cascade', select=True),
+        'general_account_id' : fields.many2one('account.account', 'General Account', required=True, ondelete='cascade'),
+        'move_id' : fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
+        'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
         'code' : fields.char('Code', size=8),
         'user_id' : fields.many2one('res.users', 'User',),
         'ref': fields.char('Ref.', size=32),
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 4b860a520c5..d6c4e6aa3ed 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -138,7 +138,7 @@ class account_bank_statement(osv.osv):
         'currency': fields.function(_currency, method=True, string='Currency',
             type='many2one', relation='res.currency'),
     }
-    
+
     _defaults = {
         'name': lambda self, cr, uid, context=None: \
                 self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement'),
@@ -289,6 +289,8 @@ class account_bank_statement(osv.osv):
                     except:
                         raise osv.except_osv(_('Error !'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount))
 
+                if st.journal_id.entry_posted:
+                    account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
             done.append(st.id)
         self.write(cr, uid, done, {'state':'confirm'}, context=context)
         return True
@@ -435,7 +437,7 @@ class account_bank_statement_reconcile(osv.osv):
                     td = 'P '
             else:
                 currency_id = company_currency_id
-            res.append((o.id, '%s[%.2f/%.2f]' % (td,
+            res.append((o.id, '%s[%.2f-%.2f]' % (td,
                 res_currency_obj.compute(cursor, user, company_currency_id,
                     currency_id, o.total_entry, context=context),
                 res_currency_obj.compute(cursor, user, company_currency_id,
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 57b06d2719c..f9a8151bf2e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -112,12 +112,12 @@
             <field name="priority">2</field>
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
-                    <notebook>
+                    <field domain="[('type', '=', 'purchase')]" name="journal_id" select="2"/>
+                    <field name="type" readonly="1" select="2"/>
+                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank)" select="1"/>
+                    <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                    <notebook colspan="4">
                         <page string="Invoice">
-                            <field domain="[('type', '=', 'purchase')]" name="journal_id" select="2"/>
-                            <field name="type" readonly="1" select="2"/>
-                            <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id"/>
                             <field name="date_due" select="1"/>
                             <field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)" select="2"/>
@@ -164,6 +164,7 @@
                                     <button name="invoice_open" states="draft,proforma" string="Validate"/>
                                     <button name="invoice_cancel" states="draft,proforma,sale,open" string="Cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                                    <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid'/>
                                 </group>
                             </group>
                         </page>
@@ -195,12 +196,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice">
-                    <notebook>
+                    <field name="journal_id" select="2"/>
+                    <field name="type" readonly="1" select="2"/>
+                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1"/>
+                    <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                    <notebook colspan="4">
                         <page string="Invoice">
-                            <field name="journal_id" select="2"/>
-                            <field name="type" readonly="1" select="2"/>
-                            <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id"/>
                             <field name="payment_term" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)"/>
                             <field name="name" select="2"/>
@@ -232,6 +233,7 @@
                                     <button name="invoice_open" states="draft,proforma" string="Create"/>
                                     <button name="invoice_cancel" states="draft,proforma,sale,open" string="Cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                                    <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid'/>
                                 </group>
                             </group>
                         </page>
@@ -405,10 +407,10 @@
         <menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1"/>
 
         <record id="action_invoice_tree7" model="ir.actions.act_window">
-            <field name="name">Open Customer Invoices</field>
+            <field name="name">Unpaid Customer Invoices</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
-            <field name="domain">[('state','=','open'),('type','=','out_invoice')]</field>
+            <field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
         </record>
         <record id="action_invoice_tree7_view1" model="ir.actions.act_window.view">
@@ -447,10 +449,10 @@
         <menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2"/>
 
         <record id="action_invoice_tree9" model="ir.actions.act_window">
-            <field name="name">Open Supplier Invoices</field>
+            <field name="name">Unpaid Supplier Invoices</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
-            <field name="domain">[('state','=','open'),('type','=','in_invoice')]</field>
+            <field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
         </record>
         <record id="action_invoice_tree9_view1" model="ir.actions.act_window.view">
@@ -489,10 +491,10 @@
         <menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3"/>
 
         <record id="action_invoice_tree11" model="ir.actions.act_window">
-            <field name="name">Open Customer Refunds</field>
+            <field name="name">Unpaid Customer Refunds</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
-            <field name="domain">[('state','=','open'),('type','=','out_refund')]</field>
+            <field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
         </record>
         <record id="action_invoice_tree11_view1" model="ir.actions.act_window.view">
@@ -531,10 +533,10 @@
         <menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4"/>
 
         <record id="action_invoice_tree13" model="ir.actions.act_window">
-            <field name="name">Open Supplier Refunds</field>
+            <field name="name">Unpaid Supplier Refunds</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
-            <field name="domain">[('state','=','open'),('type','=','in_refund')]</field>
+            <field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
         </record>
         <record id="action_invoice_tree13_view1" model="ir.actions.act_window.view">
@@ -551,9 +553,9 @@
 
         <menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4"/>
 
-        <act_window domain="[('partner_id', '=', active_id),('state', '=', 'open')]" id="act_res_partner_2_account_invoice_opened" name="Open invoices" res_model="account.invoice" src_model="res.partner"/>
+        <act_window domain="[('partner_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_res_partner_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="res.partner"/>
 
-        <act_window domain="[('journal_id', '=', active_id),('state', '=', 'open')]" id="act_account_journal_2_account_invoice_opened" name="Open invoices" res_model="account.invoice" src_model="account.journal"/>
+        <act_window domain="[('journal_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>
 
         <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
 
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index 3e1e8afd8b1..89a62ac3a0d 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -6,7 +6,7 @@
             <field name="osv">account.invoice</field>
             <field name="on_create">True</field>
         </record>
-        
+
         <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="flow_start">True</field>
@@ -31,10 +31,16 @@ action_number()
 write({'state':'open'})</field>
             <field name="kind">function</field>
         </record>
+        <record model="workflow.activity" id="act_open_test">
+        	<field name="wkf_id" ref="wkf"/>
+        	<field name="name">open</field>
+        	<field name="action">write({'state':'open'})</field>
+        	<field name="kind">function</field>
+       	</record>
         <record id="act_paid" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">paid</field>
-            <field name="flow_stop">True</field>
+            <!--<field name="flow_stop">True</field>-->
             <field name="action">write({'state':'paid'})</field>
             <field name="kind">function</field>
         </record>
@@ -46,14 +52,14 @@ write({'state':'open'})</field>
 write({'state':'cancel'})</field>
             <field name="kind">function</field>
         </record>
-        
+
         <!--
 		<record model="workflow.transition" id="t1">
 			<field name="act_from" ref="act_draft"/>
 			<field name="act_to" ref="act_confirm"/>
 		</record>
 		-->
-        
+
         <record id="t3" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_proforma"/>
@@ -98,5 +104,15 @@ write({'state':'cancel'})</field>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
+        <record id="t13" model="workflow.transition">
+	        <field name="act_from" ref="act_paid"/>
+	        <field name="act_to" ref="act_open_test"/>
+	        <field name="signal">open_test</field>
+	    </record>
+	    <record id="t14" model="workflow.transition">
+	    	<field name="act_from" ref="act_open_test"/>
+	    	<field name="act_to" ref="act_cancel"/>
+	    	<field name="signal">invoice_cancel</field>
+	    </record>
     </data>
 </terp>
\ No newline at end of file
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index b93afede487..0f7de933e3f 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -49,9 +49,9 @@ class account_move_line(osv.osv):
         if state:
             if state.lower() not in ['all']:
                 where_move_state= " AND "+obj+".move_id in (select id from account_move where account_move.state = '"+state+"')"
-        
+
         if context.get('periods', False):
-            ids = ','.join([str(x) for x in context['periods']])            
+            ids = ','.join([str(x) for x in context['periods']])
             return obj+".active AND "+obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s" % (fiscalyear_clause, ids,where_move_state)
         else:
             return obj+".active AND "+obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) %s)" % (fiscalyear_clause,where_move_state)
@@ -71,6 +71,7 @@ class account_move_line(osv.osv):
             return data
 
         period_obj = self.pool.get('account.period')
+        tax_obj=self.pool.get('account.tax')
 
         # Compute the current move
         move_id = False
@@ -86,6 +87,7 @@ class account_move_line(osv.osv):
                     (context['journal_id'], context['period_id'], uid, 'draft'))
                 res = cr.fetchone()
                 move_id = (res and res[0]) or False
+
                 if not move_id:
                     return data
                 else:
@@ -111,102 +113,39 @@ class account_move_line(osv.osv):
 
         total = 0
         ref_id = False
-        taxes = {}
         move = self.pool.get('account.move').browse(cr, uid, move_id, context)
+
         for l in move.line_id:
             partner_id = partner_id or l.partner_id.id
             ref_id = ref_id or l.ref
-            total += (l.debit - l.credit)
-            for tax in l.account_id.tax_ids:
-                if move.journal_id.type == 'sale':
-                    if l.debit:
-                        code = tax.ref_tax_code_id.id
-                        acc = tax.account_paid_id.id
-                    else:
-                        code = tax.tax_code_id.id
-                        acc = tax.account_collected_id.id
-                else:
-                    if l.debit:
-                        code = tax.tax_code_id.id
-                        acc = tax.account_collected_id.id
-                    else:
-                        code = tax.ref_tax_code_id.id
-                        acc = tax.account_paid_id.id
-                taxes.setdefault((acc, code), False)
-            taxes[(l.account_id.id, l.tax_code_id.id)] = True
+            total += (l.debit or 0.0) - (l.credit or 0.0)
             if 'name' in fields:
-                data.setdefault('name', l.name)
-
+               data.setdefault('name', l.name)
         if 'ref' in fields:
             data['ref'] = ref_id
         if 'partner_id' in fields:
             data['partner_id'] = partner_id
 
-        if move.journal_id.type in ('purchase', 'sale'):
-            for t in taxes:
-                if not taxes[t] and t[0]:
-                    s = 0
-                    tax_amount = 0
-                    for l in move.line_id:
-                        if move.journal_id.type == 'sale':
-                            if l.debit:
-                                field_base = 'ref_'
-                                key = 'account_paid_id'
-                            else:
-                                field_base = ''
-                                key = 'account_collected_id'
-                        else:
-                            if l.debit:
-                                field_base = ''
-                                key = 'account_collected_id'
-                            else:
-                                field_base = 'ref_'
-                                key = 'account_paid_id'
-                        for tax in self.pool.get('account.tax').compute(cr, uid,
-                                l.account_id.tax_ids, l.debit or l.credit, 1, False):
-                            if (tax[key] == t[0]) \
-                                    and (tax[field_base + 'tax_code_id'] == t[1]):
-                                if l.debit:
-                                    s += tax['amount']
-                                else:
-                                    s -= tax['amount']
-                                tax_amount += tax['amount'] * \
-                                        tax[field_base + 'tax_sign']
-                    if ('debit' in fields) or ('credit' in fields):
-                        data['debit'] = s>0  and s or 0.0
-                        data['credit'] = s<0  and -s or 0.0
-
-                    if 'tax_code_id' in fields:
-                        data['tax_code_id'] = t[1]
-                    if 'account_id' in fields:
-                        data['account_id'] = t[0]
-                    if 'tax_amount' in fields:
-                        data['tax_amount'] = tax_amount
-                    #
-                    # Compute line for tax T
-                    #
-                    return data
-
-        #
-        # Compute latest line
-        #
-        if ('debit' in fields) or ('credit' in fields):
-            data['credit'] = total>0 and total
-            data['debit'] = total<0 and -total
-        if 'account_id' in fields:
-            if total >= 0:
-                data['account_id'] = move.journal_id.default_credit_account_id.id or False
+        if move.journal_id.type == 'purchase':
+            if total>0:
+                account = move.journal_id.default_credit_account_id
             else:
-                data['account_id'] = move.journal_id.default_debit_account_id.id or False
-        if 'account_id' in fields and data['account_id']:
-            account = self.pool.get('account.account').browse(cr, uid, data['account_id'])
-            data['tax_code_id'] = self._default_get_tax(cr, uid, account )
-        return data
+                account = move.journal_id.default_debit_account_id
+        else:
+            if total>0:
+                account = move.journal_id.default_credit_account_id
+            else:
+                account = move.journal_id.default_debit_account_id
 
-    def _default_get_tax(self, cr, uid, account, debit=0, credit=0, context={}):
-        if account.tax_ids:
-            return account.tax_ids[0].base_code_id.id
-        return False
+        data['account_id'] = account.id
+        if account and account.tax_ids:
+            for tax in self.pool.get('account.tax').compute_inv(cr,uid,[account.tax_ids[0]],total,1.00):
+                total -= tax['amount']
+            data['account_tax_id'] = account.tax_ids[0].id
+        s = -total
+        data['debit'] = s>0  and s or 0.0
+        data['credit'] = s<0  and -s or 0.0
+        return data
 
     def _on_create_write(self, cr, uid, id, context={}):
         ml = self.browse(cr, uid, id, context)
@@ -307,7 +246,6 @@ class account_move_line(osv.osv):
         'debit': fields.float('Debit', digits=(16,2)),
         'credit': fields.float('Credit', digits=(16,2)),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
-
         'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", states={'valid':[('readonly',True)]}, help="The move of this entry line.", select=2),
 
         'ref': fields.char('Ref.', size=32),
@@ -317,8 +255,8 @@ class account_move_line(osv.osv):
         'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optionnal other currency if it is a multi-currency entry."),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optionnal other currency if it is a multi-currency entry."),
 
-        'period_id': fields.many2one('account.period', 'Period', required=True),
-        'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+        'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
         'blocked': fields.boolean('Litigation', help="You can check this box to mark the entry line as a litigation with the associated partner"),
 
         'partner_id': fields.many2one('res.partner', 'Partner Ref.'),
@@ -329,11 +267,15 @@ class account_move_line(osv.osv):
         'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
         'balance': fields.function(_balance, method=True, string='Balance'),
         'active': fields.boolean('Active'),
-        'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'State', readonly=True),
+        'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'Status', readonly=True),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account'),
         'tax_amount': fields.float('Tax/Base Amount', digits=(16,2), select=True),
         'invoice': fields.function(_invoice, method=True, string='Invoice',
             type='many2one', relation='account.invoice', fnct_search=_invoice_search),
+        'account_tax_id':fields.many2one('account.tax', 'Tax'),
+        'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
+#TODO: remove this
+        'amount_taxed':fields.float("Taxed Amount",digits=(16,2)),
     }
 
     def _get_date(self, cr, uid, context):
@@ -394,34 +336,22 @@ class account_move_line(osv.osv):
         (_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
     ]
 
+    #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
+
     def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, journal=False):
         if (not partner_id) or account_id:
             return {}
         part = self.pool.get('res.partner').browse(cr, uid, partner_id)
         id1 = part.property_account_payable.id
         id2 =  part.property_account_receivable.id
-        cr.execute('select sum(debit-credit) from account_move_line where (reconcile_id is null) and partner_id=%d and account_id=%d', (partner_id, id2))
-        balance = cr.fetchone()[0] or 0.0
         val = {}
-        if (not debit) and (not credit):
-            if abs(balance)>0.01:
-                val['credit'] = ((balance>0) and balance) or 0
-                val['debit'] = ((balance<0) and -balance) or 0
-                val['account_id'] = id2
-            else:
-                cr.execute('select sum(debit-credit) from account_move_line where (reconcile_id is null) and partner_id=%d and account_id=%d', (partner_id, id1))
-                balance = cr.fetchone()[0] or 0.0
-                val['credit'] = ((balance>0) and balance) or 0
-                val['debit'] = ((balance<0) and -balance) or 0
-                val['account_id'] = id1
-        else:
-            val['account_id'] =  (debit>0) and id2 or id1
         if journal:
             jt = self.pool.get('account.journal').browse(cr, uid, journal).type
             if jt=='sale':
                 val['account_id'] =  id2
             elif jt=='purchase':
                 val['account_id'] =  id1
+        # Compute Maturity Date in val !
         return {'value':val}
 
     #
@@ -474,7 +404,11 @@ class account_move_line(osv.osv):
             account_id = line['account_id']['id']
             partner_id = (line['partner_id'] and line['partner_id']['id']) or False
         writeoff = debit - credit
-        date = time.strftime('%Y-%m-%d')
+        # Ifdate_p in context => take this date
+        if context.has_key('date_p') and context['date_p']:
+            date=context['date_p']
+        else:
+            date = time.strftime('%Y-%m-%d')
 
         cr.execute('SELECT account_id, reconcile_id \
                 FROM account_move_line \
@@ -505,9 +439,15 @@ class account_move_line(osv.osv):
                 self_credit = 0.0
                 self_debit = -writeoff
 
+            # If comment exist in context, take it
+            if context['comment']:
+                libelle=context['comment']
+            else:
+                libelle='Write-Off'
+
             writeoff_lines = [
                 (0, 0, {
-                    'name':'Write-Off',
+                    'name':libelle,
                     'debit':self_debit,
                     'credit':self_credit,
                     'account_id':account_id,
@@ -517,7 +457,7 @@ class account_move_line(osv.osv):
                     'amount_currency': account.currency_id.id and -currency or 0.0
                 }),
                 (0, 0, {
-                    'name':'Write-Off',
+                    'name':libelle,
                     'debit':debit,
                     'credit':credit,
                     'account_id':writeoff_acc_id,
@@ -558,6 +498,11 @@ class account_move_line(osv.osv):
         return r_id
 
     def view_header_get(self, cr, user, view_id, view_type, context):
+        if context.get('account_id', False):
+            cr.execute('select code from account_account where id=%d', (context['account_id'],))
+            res = cr.fetchone()
+            res = _('Entries: ')+ (res[0] or '')
+            return res
         if (not context.get('journal_id', False)) or (not context.get('period_id', False)):
             return False
         cr.execute('select code from account_journal where id=%d', (context['journal_id'],))
@@ -565,8 +510,8 @@ class account_move_line(osv.osv):
         cr.execute('select code from account_period where id=%d', (context['period_id'],))
         p = cr.fetchone()[0] or ''
         if j or p:
-            return j+':'+p
-        return 'Journal'
+            return j+(p and (':'+p) or '')
+        return False
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False):
         result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context)
@@ -632,7 +577,19 @@ class account_move_line(osv.osv):
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         if not context:
             context={}
+        raise_ex=False
         account_obj = self.pool.get('account.account')
+        acc=account_obj.browse(cr,uid,ids)[0]
+
+        if ('debit' in vals and 'credit' in vals)  and not vals['debit'] and not vals['credit']:
+            raise_ex=True
+        if ('debit' in vals and 'credit' not in vals) and  not vals['debit'] and not acc.credit:
+            raise_ex=True
+        if ('credit' in vals and 'debit' not in vals) and  not vals['credit'] and not acc.debit:
+            raise_ex=True
+
+        if raise_ex:
+            raise osv.except_osv(_('Wrong Accounting Entry!'), _('Both Credit and Debit cannot be zero!'))
 
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
@@ -680,7 +637,9 @@ class account_move_line(osv.osv):
     def create(self, cr, uid, vals, context=None, check=True):
         if not context:
             context={}
+
         account_obj = self.pool.get('account.account')
+        tax_obj=self.pool.get('account.tax')
 
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
@@ -692,7 +651,9 @@ class account_move_line(osv.osv):
             m = self.pool.get('account.move').browse(cr, uid, vals['move_id'])
             context['journal_id'] = m.journal_id.id
             context['period_id'] = m.period_id.id
+
         self._update_journal_check(cr, uid, context['journal_id'], context['period_id'], context)
+
         move_id = vals.get('move_id', False)
         journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id'])
         if not move_id:
@@ -743,9 +704,50 @@ class account_move_line(osv.osv):
                 vals['amount_currency'] = cur_obj.compute(cr, uid, account.company_id.currency_id.id, account.currency_id.id, vals.get('debit', 0.0)-vals.get('credit', 0.0), context=ctx)
         if not ok:
             raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal !'))
+
         result = super(osv.osv, self).create(cr, uid, vals, context)
+        if 'analytic_account_id' in vals and vals['analytic_account_id']:
+            if journal.analytic_journal_id:
+                vals['analytic_lines'] = [(0,0, {
+                        'name': vals['name'],
+                        'date': vals['date'],
+                        'account_id': vals['analytic_account_id'],
+                        'unit_amount': vals['quantity'],
+                        'amount': vals['debit'] or vals['credit'],
+                        'general_account_id': vals['account_id'],
+                        'journal_id': journal.analytic_journal_id.id,
+                        'ref': vals['ref'],
+                    })]
+
+        # CREATE Taxes
+        if 'account_tax_id' in vals and vals['account_tax_id']:
+            tax_id=tax_obj.browse(cr,uid,vals['account_tax_id'])
+            total = vals['credit'] or (-vals['debit'])
+            for tax in tax_obj.compute(cr,uid,[tax_id],total,1.00):
+                self.write(cr, uid,[result], {
+                    'tax_code_id': tax['base_code_id'],
+                    'tax_amount': tax['base_sign'] * total
+                })
+                data = {
+                    'move_id': vals['move_id'],
+                    'journal_id': vals['journal_id'],
+                    'period_id': vals['period_id'],
+                    'name': vals['name']+' '+tax['name'],
+                    'date': vals['date'],
+                    'partner_id': vals.get('partner_id',False),
+                    'ref': vals.get('ref',False),
+                    'account_tax_id': False,
+                    'tax_code_id': tax['tax_code_id'],
+                    'tax_amount': tax['tax_sign'] * tax['amount'],
+                    'account_id': tax['account_paid_id'], # or collected ?
+                    'credit': tax['amount']>0 and tax['amount'] or 0.0,
+                    'debit': tax['amount']<0 and -tax['amount'] or 0.0,
+                }
+                self.create(cr, uid, data, context)
         if check:
-            self.pool.get('account.move').validate(cr, uid, [vals['move_id']], context)
+            tmp = self.pool.get('account.move').validate(cr, uid, [vals['move_id']], context)
+            if journal.entry_posted and tmp:
+                self.pool.get('account.move').write(cr,uid, [vals['move_id']],{'state':'posted'})
         return result
 account_move_line()
 
@@ -757,7 +759,5 @@ class account_bank_statement_reconcile(osv.osv):
     }
 account_bank_statement_reconcile()
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d1ce5bd3fbb..aa35d369107 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -111,22 +111,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account">
-                    <notebook>
+					<group col="6" colspan="4">
+					<field name="name" select="1"/>
+					<field name="code" select="1"/>
+					<field name="type" select="1"/>
+					<field name="company_id" select="2"/>
+					<field name="parent_id"/>
+					<field name="active"/>
+					</group>
+                    <notebook colspan="4">
                         <page string="General Information">
-                            <field colspan="4" name="name" select="1"/>
-                            <field name="company_id" select="2"/>
-                            <field name="active"/>
                             <newline/>
-                            <field name="type" select="1"/>
-                            <field name="code" select="1"/>
-                            <field name="shortcut"/>
                             <field name="sign"/>
 
                             <field name="currency_id" select="2"/>
                             <field name="close_method"/>
                             <field name="reconcile"/>
                             <newline/>
-                            <field name="parent_id"/>
                             <newline/>
                             <field name="child_consol_ids" colspan="4"/>
                             <field colspan="4" name="tax_ids"/>
@@ -172,27 +173,6 @@
         </record>
         <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>
 
-        <record id="view_account_list" model="ir.ui.view">
-            <field name="name">account.account.list</field>
-            <field name="model">account.account</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_id</field>
-            <field eval="6" name="priority"/>
-            <field name="arch" type="xml">
-                <tree string="Chart of Accounts">
-                    <field name="code"/>
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-        <record id="action_account_tree2" model="ir.actions.act_window">
-            <field name="name">Fast Chart of Accounts</field>
-            <field name="res_model">account.account</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_account_list"/>
-            <field name="domain">[('code','=','0')]</field>
-        </record>
-
         <!--
 	Journal
 
@@ -262,12 +242,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Journal">
-                    <notebook>
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="type"/>
+                    <notebook colspan="4">
                         <page string="General Information">
-                            <field name="name" select="1"/>
-                            <field name="active" select="1"/>
-                            <field name="code" select="1"/>
-                            <field name="type"/>
                             <field name="view_id"/>
                             <field name="sequence_id"/>
                             <field name="default_debit_account_id"/>
@@ -277,6 +257,7 @@
                             <newline/>
                             <field name="centralisation"/>
                             <field name="update_posted"/>
+                            <field name="entry_posted"/>
                         </page>
                         <page string="Entry Controls">
                             <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
@@ -332,7 +313,7 @@
                     <notebook colspan="4">
                         <page string="Entry encoding">
                             <field colspan="4" name="line_ids" nolabel="1">
-                                <tree colors="red:amount!=reconcile_amount and reconcile_id" editable="bottom" string="Statement lines">
+                                <tree editable="bottom" string="Statement lines">
                                     <field name="date"/>
                                     <field name="ref"/>
                                     <field name="name"/>
@@ -573,14 +554,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Tax">
-                    <notebook>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="company_id"/>
+                        <field name="description" select="1"/>
+                        <field name="active" select="2"/>
+                        <field name="tax_group" select="1"/>
+                        <field name="type"/>
+                    </group>
+                    <notebook colspan="4">
                         <page string="Tax Definition">
-                            <field name="name" select="1"/>
-                            <field name="company_id"/>
-                            <field name="description" select="1"/>
-                            <field name="tax_group" select="1"/>
-                            <field name="active" select="2"/>
-                            <field name="type"/>
                             <field name="applicable_type"/>
                             <field name="amount" select="2" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
                             <field groups="base.group_extended" name="include_base_amount"/>
@@ -674,6 +657,8 @@
                     <field name="journal_id"/>
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
+                    <field name="account_tax_id"/>
+                    <field name="analytic_account_id"/>
                     <field name="amount_currency"/>
                     <field name="currency_id"/>
                     <field name="state"/>
@@ -716,6 +701,9 @@
                             <newline/>
                             <field name="tax_code_id"/>
                             <field name="tax_amount"/>
+                            <newline/>
+                            <field name="account_tax_id"/>
+                            <field name="analytic_account_id"/>
 
                             <separator colspan="4" string="State"/>
                             <field name="journal_id" select="2"/>
@@ -764,6 +752,9 @@
                             <field name="date_created"/>
                             <field name="date_created"/>
                             <field name="blocked" select="3"/>
+                            <newline/>
+                            <field name="account_tax_id"/>
+                            <field name="analytic_account_id"/>
 
                             <separator colspan="4" string="State"/>
                             <newline/>
@@ -900,9 +891,8 @@
         <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"/>
-        <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Accounts Charts"/>
+        <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
         <menuitem action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
-        <menuitem action="action_account_tree2" id="menu_action_account_tree3" parent="account.menu_action_account_tree2"/>
 
 
 
@@ -1332,17 +1322,18 @@
         </record>
 
         <record id="action_move_line_tree1" model="ir.actions.act_window">
-            <field name="name">Move line select</field>
+            <field name="name">Entries</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('account_id','child_of', [active_id]),('state','&lt;&gt;','draft')]</field>
+            <field name="context">{'account_id':active_id}</field>
         </record>
         <wizard id="wizard_move_line_select" menu="False" model="account.move.line" name="account.move.line.select" string="Move line select"/>
         <record id="ir_open_account_account" model="ir.values">
             <field eval="'tree_but_open'" name="key2"/>
             <field eval="'account.account'" name="model"/>
-            <field name="name">Open all entries lines</field>
+            <field name="name">Account Entries</field>
             <field eval="'ir.actions.wizard,%d'%wizard_move_line_select" name="value"/>
             <field eval="True" name="object"/>
         </record>
@@ -1365,6 +1356,8 @@
                     <field name="tax_amount"/>
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
+                    <field name="account_tax_id"/>
+                    <field name="analytic_account_id"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -1525,14 +1518,14 @@
         <menuitem id="account_account_template_menu" name="Templates" parent="account.menu_finance_configuration"/>
         <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_account_template_menu"/>
 
-		<!-- Account Chart Templates -->
+		<!-- Chart of Accounts Templates -->
 
 		<record id="view_account_chart_template_form" model="ir.ui.view">
             <field name="name">account.chart.template.form</field>
             <field name="model">account.chart.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Chart Template">
+                <form string="Chart of Accounts Template">
                     <field colspan="4" name="name" select="1"/>
                     <newline/>
                     <field name="account_root_id" select="1"/>
@@ -1549,7 +1542,7 @@
             <field name="model">account.chart.template</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Account Chart Template">
+                <tree string="Chart of Accounts Template">
                     <field name="name"/>
                     <field name="account_root_id"/>
                     <field name="bank_account_view_id"/>
@@ -1557,7 +1550,7 @@
             </field>
         </record>
         <record id="action_account_chart_template_form" model="ir.actions.act_window">
-            <field name="name">Account Chart Templates</field>
+            <field name="name">Chart of Accounts Templates</field>
             <field name="res_model">account.chart.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -1603,5 +1596,33 @@
 
         <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_account_template_menu"/>
 
+		<!-- wizard account duplicate chart -->
+		<record id="view_wizard_account_duplicate_chart" model="ir.ui.view">
+			<field name="name">wizard.account.chart.duplicate.form</field>
+			<field name="model">wizard.account.chart.duplicate</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Duplicate Chart of Accounts">
+						<field name="account_id"/>
+						<field name="company_id"/>
+						<newline/>
+						<group colspan="4">
+							<button icon="gtk-cancel" special="cancel" type="object" string="Cancel"/>
+	                        <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
+						</group>
+				</form>
+			</field>
+		</record>
+
+		<record id="action_wizard_account_duplicate_chart_form" model="ir.actions.act_window">
+            <field name="name">Duplicate Chart of Accounts</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wizard.account.chart.duplicate</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem action="action_wizard_account_duplicate_chart_form" id="menu_action_wizard_account_duplicate_chart_form" parent="account_account_menu"/>
+
     </data>
 </terp>
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 9553ff26538..935d8eac3f7 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -77,5 +77,7 @@
         <wizard string="Use Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>
         <menuitem action="wizard_account_use_model" type="wizard" parent="account.menu_finance_periodical_processing" id="menu_account_use_model"/>
 
+		<!-- account.invoice -->
+	    <wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open"/>
     </data>
 </terp>
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index 0ec0e628018..28f240c4796 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        
+
         <!--
 		Payment term
-		-->	
+		-->
         <record id="account_payment_term" model="account.payment.term">
             <field name="name">30 Days Net</field>
         </record>
@@ -15,7 +15,7 @@
             <field name="condition">net days</field>
             <field eval="account_payment_term" name="payment_id"/>
         </record>
-        
+
         <!--
 		Account Journal View
 		-->
@@ -74,6 +74,18 @@
             <field name="field">credit</field>
             <field eval="11" name="sequence"/>
         </record>
+        <record id="bank_col11" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Tax</field>
+            <field name="field">account_tax_id</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="bank_col12" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="name">Analytic Account</field>
+            <field name="field">analytic_account_id</field>
+            <field eval="13" name="sequence"/>
+        </record>
         <record id="bank_col3" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Ref</field>
@@ -84,9 +96,9 @@
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">State</field>
             <field name="field">state</field>
-            <field eval="12" name="sequence"/>
+            <field eval="14" name="sequence"/>
         </record>
-        
+
         <record id="account_journal_bank_view_multi" model="account.journal.view">
             <field name="name">Multi-Currency Cash Journal View</field>
         </record>
@@ -142,17 +154,29 @@
             <field name="field">credit</field>
             <field eval="11" name="sequence"/>
         </record>
+        <record id="bank_col11_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Tax</field>
+            <field name="field">account_tax_id</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="bank_col12_multi" model="account.journal.column">
+            <field name="view_id" ref="account_journal_bank_view_multi"/>
+            <field name="name">Analytic Account</field>
+            <field name="field">analytic_account_id</field>
+            <field eval="13" name="sequence"/>
+        </record>
         <record id="bank_col17_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Currency Amt.</field>
             <field name="field">amount_currency</field>
-            <field eval="12" name="sequence"/>
+            <field eval="14" name="sequence"/>
         </record>
         <record id="bank_col18_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Currency</field>
             <field name="field">currency_id</field>
-            <field eval="13" name="sequence"/>
+            <field eval="15" name="sequence"/>
         </record>
         <record id="bank_col3_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
@@ -164,10 +188,10 @@
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">State</field>
             <field name="field">state</field>
-            <field eval="14" name="sequence"/>
+            <field eval="16" name="sequence"/>
         </record>
-        
-        
+
+
         <record id="account_journal_view" model="account.journal.view">
             <field name="name">Journal View</field>
         </record>
@@ -229,30 +253,42 @@
             <field name="field">credit</field>
             <field eval="9" name="sequence"/>
         </record>
+        <record id="journal_col10" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">account_tax_id</field>
+            <field eval="10" name="sequence"/>
+        </record>
+        <record id="journal_col11" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Analytic Account</field>
+            <field name="field">analytic_account_id</field>
+            <field eval="11" name="sequence"/>
+        </record>
         <record id="journal_col25" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Tax Acc.</field>
             <field name="field">tax_code_id</field>
-            <field eval="10" name="sequence"/>
+            <field eval="12" name="sequence"/>
         </record>
         <record id="journal_col26" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Tax</field>
             <field name="field">tax_amount</field>
-            <field eval="11" name="sequence"/>
+            <field eval="13" name="sequence"/>
         </record>
         <record id="journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">State</field>
             <field name="field">state</field>
-            <field eval="12" name="sequence"/>
+            <field eval="14" name="sequence"/>
         </record>
-        
-        
+
+
         <!--
 		Account Journal Sequences
 		-->
-        
+
         <record id="sequence_journal_type" model="ir.sequence.type">
             <field name="name">Account Journal</field>
             <field name="code">account.journal</field>
@@ -262,11 +298,11 @@
             <field name="code">account.journal</field>
             <field name="prefix"/>
         </record>
-        
+
         <!--
 		Account Statement Sequences
 		-->
-        
+
         <record id="sequence_reconcile" model="ir.sequence.type">
             <field name="name">Account reconcile sequence</field>
             <field name="code">account.reconcile</field>
@@ -278,8 +314,8 @@
             <field eval="1" name="number_next"/>
             <field eval="1" name="number_increment"/>
         </record>
-        
-        
+
+
         <record id="sequence_statement_type" model="ir.sequence.type">
             <field name="name">Bank Statement</field>
             <field name="code">account.bank.statement</field>
@@ -291,11 +327,11 @@
             <field eval="0" name="number_next"/>
             <field eval="1" name="number_increment"/>
         </record>
-        
+
         <!--
 		Account Journal
 		-->
-        
+
         <record id="sales_journal" model="account.journal">
             <field name="name">Sales Journal</field>
             <field name="code">SAJ</field>
@@ -316,7 +352,7 @@
             <field model="account.account" name="default_credit_account_id" search="[('type','=','payable')]"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
-        
+
         <record id="bank_journal" model="account.journal">
             <field name="name">Bank Journal</field>
             <field name="code">BNK</field>
@@ -327,7 +363,7 @@
             <field model="account.account" name="default_credit_account_id" search="[('type','=','cash')]"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
-        
+
         <record forcecreate="1" id="stock_journal" model="account.journal">
             <field name="name">Stock Journal</field>
             <field name="code">STJ</field>
@@ -336,6 +372,6 @@
             <field name="sequence_id" ref="sequence_journal"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
-        
+
     </data>
 </terp>
\ No newline at end of file
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 01239c0c9af..89e47a1ac43 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -122,7 +122,7 @@ class account_invoice(osv.osv):
             ('draft','Draft'),
             ('proforma','Pro-forma'),
             ('open','Open'),
-            ('paid','Paid'),
+            ('paid','Done'),
             ('cancel','Canceled')
         ],'State', select=True, readonly=True),
 
@@ -149,9 +149,9 @@ class account_invoice(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'check_total': fields.float('Total', digits=(16,2), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
-        'reconciled': fields.function(_reconciled, method=True, string='Reconciled', type='boolean'),
+        'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean'),
         'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
-            help='The bank account to pay or to be paid'),
+            help='The bank account to pay to or to be paid from'),
     }
     _defaults = {
         'type': _get_type,
@@ -499,14 +499,18 @@ class account_invoice(osv.osv):
                         _('Can not create invoice move on centralized journal'))
 
             move = {'name': name, 'line_id': line, 'journal_id': journal_id}
-            if inv.period_id:
-                move['period_id'] = inv.period_id.id
+            period_id=inv.period_id and inv.period_id.id or False
+            if not period_id:
+                period_ids= self.pool.get('account.period').search(cr,uid,[('date_start','<=',inv.date_invoice),('date_stop','>=',inv.date_invoice)])
+                if len(period_ids):
+                    period_id=period_ids[0]
+            if period_id:
+                move['period_id'] = period_id
                 for i in line:
-                    i[2]['period_id'] = inv.period_id.id
-
+                    i[2]['period_id'] = period_id
             move_id = self.pool.get('account.move').create(cr, uid, move)
             # make the invoice point to that move
-            self.write(cr, uid, [inv.id], {'move_id': move_id})
+            self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id})
             self.pool.get('account.move').post(cr, uid, [move_id])
         self._log_event(cr, uid, ids)
         return True
@@ -681,20 +685,30 @@ class account_invoice(osv.osv):
         invoice = self.browse(cr, uid, ids[0])
         src_account_id = invoice.account_id.id
         journal = self.pool.get('account.journal').browse(cr, uid, pay_journal_id)
-        if not name:
-            if journal.sequence_id:
-                name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
-            else:
-                raise osv.except_osv(_('No piece number !'), _('Can not create an automatic sequence for this piece !\n\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
+        if journal.sequence_id:
+            name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
+        else:
+            raise osv.except_osv(_('No piece number !'), _('Can not create an automatic sequence for this piece !\n\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
+        # Take the seq as name for move
+        if journal.sequence_id:
+            seq = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
+        else:
+            raise osv.except_osv('No piece number !', 'Can not create an automatic sequence for this piece !\n\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.')
         types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
         direction = types[invoice.type]
+        #take the choosen date
+        if context.has_key('date_p') and context['date_p']:
+            date=context['date_p']
+        else:
+            date=time.strftime('%Y-%m-%d')
         l1 = {
             'name': name,
             '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,
-            'date': time.strftime('%Y-%m-%d'),
+            'date': date,
+            'ref':invoice.number,
         }
         l2 = {
             'name':name,
@@ -702,11 +716,12 @@ 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,
-            'date': time.strftime('%Y-%m-%d'),
+            'date': date,
+            'ref':invoice.number,
         }
 
         lines = [(0, 0, l1), (0, 0, l2)]
-        move = {'name': name, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id}
+        move = {'name': seq, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id}
         move_id = self.pool.get('account.move').create(cr, uid, move)
 
         line_ids = []
@@ -790,9 +805,9 @@ class account_invoice_line(osv.osv):
         taxep=None
         if partner_id:
             lang=self.pool.get('res.partner').read(cr, uid, [partner_id])[0]['lang']
-            taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_tax
         tax_obj = self.pool.get('account.tax')
         if type in ('out_invoice', 'out_refund'):
+            taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_supplier_tax
             if not taxep or not taxep.id:
                 tax_id = map(lambda x: x.id, res.taxes_id)
             else:
@@ -801,6 +816,7 @@ class account_invoice_line(osv.osv):
                     if not t.tax_group==taxep.tax_group:
                         tax_id.append(t.id)
         else:
+            taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_tax
             if not taxep or not taxep.id:
                 tax_id = map(lambda x: x.id, res.supplier_taxes_id)
             else:
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 06df0ed0c57..db1179c7a54 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -35,20 +35,33 @@ class res_partner(osv.osv):
     _name = 'res.partner'
     _inherit = 'res.partner'
     _description = 'Partner'
-    def _credit_get(self, cr, uid, ids, name, arg, context):
-        res={}
+    def _credit_debit_get(self, cr, uid, ids, field_names, arg, context):
         query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
-        for id in ids:
-            cr.execute("select sum(debit-credit) from account_move_line as l where account_id in (select id from account_account where type = %s and active) and partner_id=%d and reconcile_id is null and "+query, ('receivable', id))
-            res[id]=cr.fetchone()[0] or 0.0
-        return res
-
-    def _debit_get(self, cr, uid, ids, name, arg, context):
-        res={}
-        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
-        for id in ids:
-            cr.execute("select sum(debit-credit) from account_move_line as l where account_id in (select id from account_account where type = %s and active) and partner_id=%d and reconcile_id is null and "+query, ('payable', id))
-            res[id]=cr.fetchone()[0] or 0.0
+        cr.execute(("""select
+                l.partner_id, a.type, sum(l.debit-l.credit) 
+            from
+                account_move_line l
+            left join
+                account_account a on (l.account_id=a.id)
+            where
+                a.type in ('receivable','payable') and
+                l.partner_id in (%s) and
+                l.reconcile_id is null and
+                """ % (','.join(map(str, ids)),))+query+"""
+            group by
+                l.partner_id, a.type
+            """)
+        tinvert = {
+            'credit': 'receivable',
+            'debit': 'payable'
+        }
+        maps = {}
+        for i in range(len(field_names)):
+            maps[{'credit': 'receivable', 'debit': 'payable' }[field_names[i]]] = i
+        res = {}.fromkeys(ids, map(lambda x: 0.0, field_names))
+        for pid,type,val in cr.fetchall():
+            if type in maps:
+                res[pid][maps[type]] = val
         return res
 
     def _credit_search(self, cr, uid, obj, name, args):
@@ -74,8 +87,8 @@ class res_partner(osv.osv):
         return [('id','in',map(lambda x:x[0], res))]
 
     _columns = {
-        'credit': fields.function(_credit_get, fnct_search=_credit_search, method=True, string='Total Receivable'),
-        'debit': fields.function(_debit_get, fnct_search=_debit_search, method=True, string='Total Payable'),
+        'credit': fields.function(_credit_debit_get, fnct_search=_credit_search, method=True, string='Total Receivable', multi='dc'),
+        'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, method=True, string='Total Payable', multi='dc'),
         'debit_limit': fields.float('Payable Limit'),
         'property_account_payable': fields.property(
             'account.account',
@@ -84,7 +97,6 @@ class res_partner(osv.osv):
             string="Account Payable",
             method=True,
             view_load=True,
-            group_name="Accounting Properties",
             domain="[('type', '=', 'payable')]",
             help="This account will be used, instead of the default one, as the payable account for the current partner",
             required=True),
@@ -95,10 +107,17 @@ class res_partner(osv.osv):
             string="Account Receivable",
             method=True,
             view_load=True,
-            group_name="Accounting Properties",
             domain="[('type', '=', 'receivable')]",
             help="This account will be used, instead of the default one, as the receivable account for the current partner",
             required=True),
+        'property_account_supplier_tax': fields.property(
+            'account.tax',
+            type='many2one',
+            relation='account.tax',
+            string="Default Supplier Tax",
+            method=True,
+            view_load=True,
+            help="This tax will be used, instead of the default one for supplier invoices."),
         'property_account_tax': fields.property(
             'account.tax',
             type='many2one',
@@ -106,8 +125,7 @@ class res_partner(osv.osv):
             string="Default Tax",
             method=True,
             view_load=True,
-            group_name="Accounting Properties",
-            help="This tax will be used, instead of the default one."),
+            help="This tax will be used, instead of the default one for customers."),
         'property_payment_term': fields.property(
             'account.payment.term',
             type='many2one',
@@ -115,7 +133,6 @@ class res_partner(osv.osv):
             string ='Payment Term',
             method=True,
             view_load=True,
-            group_name="Accounting Properties",
             help="This payment term will be used, instead of the default one, for the current partner"),
         'ref_companies': fields.one2many('res.company', 'partner_id',
             'Companies that refers to partner'),
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 88ea1d898f8..8e523c5bc4d 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -2,21 +2,68 @@
 <terp>
     <data>
         <!--
-		Partners Extension
-	-->
+        Partners Extension
+    -->
         
-        <record id="view_partner_form" model="ir.ui.view">
-            <field name="name">res.partner.form.inherit</field>
+        <record id="view_partner_property_form" model="ir.ui.view">
+            <field name="name">res.partner.property.form.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
+            <field name="priority">2</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <field name="credit_limit" position="after">
-                    <field name="credit" select="2"/>
-                    <field name="debit" select="2"/>
-                    <newline/>
-                </field>
+                <notebook>
+					<page string="Accounting" position="inside">
+					<group col="2" colspan="2">
+						<separator string="Customer Accounting Properties" colspan="2"/>
+						<field name="property_account_receivable"/>
+						<field name="property_account_tax"/>
+						<field name="property_payment_term"/>
+					</group>
+					<group col="2" colspan="2">
+						<separator string="Supplier Accounting Properties" colspan="2"/>
+						<field name="property_account_payable"/>
+						<field name="property_account_supplier_tax"/>
+					</group>
+					<group col="2" colspan="2">
+						<separator string="Customer Credit" colspan="2"/>
+						<field name="credit" select="2"/>
+						<field name="credit_limit" select="2"/>
+					</group>
+					<group col="2" colspan="2">
+						<separator string="Supplier Debit" colspan="2"/>
+						<field name="debit" select="2"/>
+					</group>
+					<field colspan="4" context="address=address" name="bank_ids" nolabel="1">
+						<form string="Bank account">
+							<field name="state" select="2"/>
+							<newline/>
+							<field name="acc_number" select="1"/>
+							<newline/>
+							<field name="bank"/>
+							<newline/>
+							<field name="sequence"/>
+							<field colspan="4" name="name" select="2"/>
+							<separator colspan="4" string="Bank account owner"/>
+							<field colspan="4" name="owner_name"/>
+							<field colspan="4" name="street"/>
+							<newline/>
+							<field name="zip"/>
+							<field name="city"/>
+							<newline/>
+							<field completion="1" name="country_id"/>
+							<field name="state_id"/>
+						</form>
+						<tree string="Bank Details">
+							<field name="state"/>
+							<field name="owner_name"/>
+							<field name="acc_number"/>
+						</tree>
+					</field>
+			</page>
+                </notebook>
             </field>
         </record>
+
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/account/product.py b/addons/account/product.py
index c7eca8e1253..ef1d11312bc 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -42,7 +42,6 @@ class product_category(osv.osv):
             string="Income Account",
             method=True,
             view_load=True,
-            group_name="Accounting Properties",
             help="This account will be used, instead of the default one, to value incoming stock for the current product category"),
         'property_account_expense_categ': fields.property(
             'account.account',
@@ -51,7 +50,6 @@ class product_category(osv.osv):
             string="Expense Account",
             method=True,
             view_load=True,
-            group_name="Accounting Properties",
             help="This account will be used, instead of the default one, to value outgoing stock for the current product category"),
     }
 product_category()
@@ -75,7 +73,6 @@ class product_template(osv.osv):
             string="Income Account",
             method=True,
             view_load=True,
-            group_name="Accounting Properties",
             help="This account will be used, instead of the default one, to value incoming stock for the current product"),
         'property_account_expense': fields.property(
             'account.account',
@@ -84,7 +81,6 @@ class product_template(osv.osv):
             string="Expense Account",
             method=True,
             view_load=True,
-            group_name="Accounting Properties",
             help="This account will be used, instead of the default one, to value outgoing stock for the current product"),
     }
 product_template()
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index d4ffd9ea9a5..3ca95e625b8 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -7,28 +7,58 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <field name="product_manager" position="after">
-                    <newline/>
-                    <field colspan="4" name="supplier_taxes_id"/>
-                    <field colspan="4" name="taxes_id"/>
-                    <newline/>
-                </field>
+                <notebook position="inside">
+                    <page string="Accounting">
+                        <separator string="Sales" colspan="2"/>
+                        <separator string="Purchases" colspan="2"/>
+                        <field name="property_account_income"/>
+                        <field name="property_account_expense"/>
+
+                        <separator string="Sale Taxes" colspan="2"/>
+                        <separator string="Purchase Taxes" colspan="2"/>
+                        <field name="taxes_id" nolabel="1" colspan="2"/>
+                        <field name="supplier_taxes_id" nolabel="1" colspan="2"/>
+                    </page>
+                </notebook>
             </field>
         </record>
-        
+
         <record id="product_template_form_view" model="ir.ui.view">
             <field name="name">product.template.product.form.inherit</field>
             <field name="model">product.template</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                <field name="cost_method" position="after">
-                    <newline/>
-                    <field colspan="4" name="supplier_taxes_id"/>
-                    <field colspan="4" name="taxes_id"/>
-                    <newline/>
-                </field>
+                <notebook position="inside">
+                    <page string="Accounting">
+                        <separator string="Sales" colspan="2"/>
+                        <separator string="Purchases" colspan="2"/>
+                        <field name="property_account_income"/>
+                        <field name="property_account_expense"/>
+                        <field name="supplier_taxes_id"/>
+                        <field name="taxes_id"/>
+                    </page>
+                </notebook>
+             </field>
+        </record>
+
+
+
+        <record id="view_category_property_form" model="ir.ui.view">
+            <field name="name">product.category.property.form.inherit</field>
+            <field name="model">product.category</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_category_form_view"/>
+            <field name="arch" type="xml">
+                <form position="inside">
+                    <group col="2" colspan="2">
+                        <separator string="Accounting Properties" colspan="2"/>
+                        <field name="property_account_income_categ"/>
+                        <field name="property_account_expense_categ"/>
+                    </group>
+                </form>
             </field>
         </record>
+
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index 972c4de2d64..8bab0577586 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -35,7 +35,7 @@ from osv import fields
 from osv import osv
 
 #
-# Model definition
+# Object definition
 #
 
 class account_analytic_account(osv.osv):
@@ -237,6 +237,14 @@ class account_analytic_journal(osv.osv):
     }
 account_analytic_journal()
 
+class account_journal(osv.osv):
+    _inherit="account.journal"
+
+    _columns = {
+        'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal'),
+    }
+account_journal()
+
 
 # ---------------------------------------------------------
 # Budgets
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 8cff25efd59..d338bc06c29 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        
+
         <record id="view_account_analytic_account_list" model="ir.ui.view">
             <field name="name">account.analytic.account.list</field>
             <field name="model">account.analytic.account</field>
@@ -17,7 +17,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_account_analytic_account_tree" model="ir.ui.view">
             <field name="name">account.analytic.account.tree</field>
             <field name="model">account.analytic.account</field>
@@ -37,22 +37,23 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_account_analytic_account_form" model="ir.ui.view">
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic account">
-                    <notebook>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="parent_id" on_change="on_change_parent(parent_id)"/>
+                        <field name="company_id" select="2"/>
+                        <field name="type" select="2"/>
+                        <field name="partner_id" select="1"/>
+                    </group>
+                    <notebook colspan="4">
                         <page string="Account Data">
-                            <field name="name" select="1"/>
-                            <field name="code" select="1"/>
-                            <field name="parent_id" on_change="on_change_parent(parent_id)"/>
-                            <field name="company_id" select="2"/>
-                            <field name="type" select="2"/>
-                            <field name="partner_id" select="1"/>
-                            <newline/>
                             <field name="date_start"/>
                             <field name="date" select="2"/>
                             <field name="active" select="2"/>
@@ -66,7 +67,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_account_analytic_account_form" model="ir.actions.act_window">
             <field name="name">Analytic Accounts</field>
             <field name="type">ir.actions.act_window</field>
@@ -75,10 +76,10 @@
             <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
         <menuitem id="next_id_39" name="Analytic Accounts" parent="account.menu_finance_configuration"/>
-		<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="next_id_39"/>
-        
+        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="next_id_39"/>
+
         <record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
-            <field name="name">Analytic Charts of Accounts</field>
+            <field name="name">Analytic Chart of Accounts</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
             <field name="domain">[('parent_id','=',False)]</field>
@@ -86,13 +87,13 @@
             <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
         <menuitem
-			action="action_account_analytic_account_tree2" 
-			id="account_analytic_def_chart" 
-			parent="account.next_id_39"/>
+            action="action_account_analytic_account_tree2"
+            id="account_analytic_def_chart"
+            parent="account.next_id_39"/>
         <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>
-        
+
         <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/><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">
             <field name="name">account.analytic.line.form</field>
             <field name="model">account.analytic.line</field>
@@ -141,8 +142,8 @@
             <field name="view_id" ref="view_account_analytic_line_tree"/>
         </record>
         <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/><menuitem action="action_account_analytic_line_form" id="account_entries_analytic_entries" parent="next_id_41"/>
-        
-        
+
+
         <record id="action_account_tree1" model="ir.actions.act_window">
             <field name="name">action.account.tree1</field>
             <field name="res_model">account.analytic.line</field>
@@ -157,7 +158,7 @@
             <field eval="'ir.actions.act_window,%d'%action_account_tree1" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
+
         <record id="account_analytic_line_extended_form" model="ir.ui.view">
             <field name="name">account.analytic.line.extended_form</field>
             <field name="model">account.analytic.line</field>
@@ -183,11 +184,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="account_analytic_line_extended_form"/>
         </record>
-        
+
         #
         # Analytic Journal
         #
-        
+
         <record id="view_account_analytic_journal_tree" model="ir.ui.view">
             <field name="name">account.analytic.journal.tree</field>
             <field name="model">account.analytic.journal</field>
@@ -200,7 +201,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_account_analytic_journal_form" model="ir.ui.view">
             <field name="name">account.analytic.journal.form</field>
             <field name="model">account.analytic.journal</field>
@@ -221,11 +222,11 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="account.next_id_25"/>
-        
+
         #
         # Open journal entries
         #
-        
+
         <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
             <field name="name">account.analytic.journal.open.form</field>
             <field name="res_model">account.analytic.line</field>
@@ -240,19 +241,19 @@
             <field eval="'ir.actions.act_window,%d'%action_account_analytic_journal_open_form" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
+
         #
         # Reporting
         #
-        
+
         <record id="action_account_analytic_journal_tree" model="ir.actions.act_window">
             <field name="name">Print Analytic Journals</field>
             <field name="res_model">account.analytic.journal</field>
             <field name="view_type">tree</field>
         </record>
         <menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
-        
-        
+
+
         <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">
             <field name="name">Analytic Entries by Journal</field>
             <field name="res_model">account.analytic.journal</field>
@@ -260,11 +261,11 @@
             <field name="view_id" ref="view_account_analytic_journal_tree"/>
         </record>
         <menuitem action="action_account_analytic_journal_tree2" id="account_analytic_journal_entries" parent="account.next_id_41"/>
-        
+
         #
         # Statistics
         #
-        
+
         <record id="report_hr_timesheet_invoice_journal_form" model="ir.ui.view">
             <field name="name">report.hr.timesheet.invoice.journal.form</field>
             <field name="model">report.hr.timesheet.invoice.journal</field>
@@ -277,8 +278,8 @@
                 </form>
             </field>
         </record>
-        
-        
+
+
         <record id="report_hr_timesheet_invoice_journal_tree" model="ir.ui.view">
             <field name="name">report.hr.timesheet.invoice.journal.tree</field>
             <field name="model">report.hr.timesheet.invoice.journal</field>
@@ -294,7 +295,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="report_hr_timesheet_invoice_journal_graph" model="ir.ui.view">
             <field name="name">report.hr.timesheet.invoice.journal.graph</field>
             <field name="model">report.hr.timesheet.invoice.journal</field>
@@ -308,7 +309,7 @@
                 </graph>
             </field>
         </record>
-        
+
         <record id="report_account_analytic_journal_tree" model="ir.actions.act_window">
             <field name="name">Account cost and revenue by journal</field>
             <field name="res_model">report.hr.timesheet.invoice.journal</field>
@@ -316,7 +317,7 @@
             <field name="view_mode">tree,graph</field>
         </record>
         <menuitem id="next_id_42" name="All Months" parent="account.next_id_40"/><menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="next_id_42"/>
-        
+
         <record id="report_account_analytic_journal_tree_month" model="ir.actions.act_window">
             <field name="name">Account cost and revenue by journal (This Month)</field>
             <field name="res_model">report.hr.timesheet.invoice.journal</field>
@@ -325,11 +326,23 @@
             <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
         <menuitem id="next_id_43" name="This Month" parent="account.next_id_40"/><menuitem action="report_account_analytic_journal_tree_month" id="report_account_analytic_journal_print_month" parent="next_id_43"/>
-        
+
         <act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal" name="All Analytic Entries" res_model="account.analytic.line" src_model="account.analytic.account" view_mode="tree,form" view_type="form"/>
-        
-        
+
+
         <act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal" name="Costs &amp; Revenues" res_model="report.hr.timesheet.invoice.journal" src_model="account.analytic.account" view_mode="graph,tree,form" view_type="form"/>
-        
+
+        <record id="view_account_journal_1" model="ir.ui.view">
+            <field name="name">account.journal.form.1</field>
+            <field name="model">account.journal</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="currency" position="after">
+                    <field name="analytic_journal_id"/>
+                </field>
+            </field>
+        </record>
+
     </data>
 </terp>
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 9e8dbf78088..08a8f142533 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -61,7 +61,11 @@ import wizard_account_chart
 import wizard_move_line_select
 
 import wizard_validate_account_move
-import wizard_use_model# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import wizard_use_model
+
+import wizard_state_open
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
index a36dda780e8..0ca375f6f6f 100644
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ b/addons/account/wizard/wizard_account_balance_report.py
@@ -42,7 +42,7 @@ dates_fields = {
     'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
         'help': 'Keep empty for all open fiscal year'},
     'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
-    'state':{'string':'State','type':'selection','selection': [('draft','Draft'), ('posted','Posted'),('all','All')],}
+    'state':{'string':'Target Moves','type':'selection','selection': [('all','All Entries'),('posted','All Posted Entries')]}
 }
 
 class wizard_report(wizard.interface):
diff --git a/addons/account/wizard/wizard_aged_trial_balance.py b/addons/account/wizard/wizard_aged_trial_balance.py
index ec00fabcaee..e0eb4f575e1 100644
--- a/addons/account/wizard/wizard_aged_trial_balance.py
+++ b/addons/account/wizard/wizard_aged_trial_balance.py
@@ -58,7 +58,7 @@ _aged_trial_fields = {
     'period_length': {'string': 'Period length (days)', 'type': 'integer', 'required': True, 'default': lambda *a:30},
     'sorting_on':{'string': 'Sorting On', 'type': 'selection', 'selection': [('partner','By Partner Name (asc)'), ('amount','By Amount (desc)')],'required': True, 'default': lambda *a:'partner'},
     'computation':{'string': 'Computational Method', 'type': 'selection', 'selection': [("\'receivable\'",'On Receivables Only'), ("\'payable\'",'On Payables Only'), ("\'receivable\',\'payable\'",'On Receivables & Payables')], 'required': True, 'default': lambda *a:"\'receivable\'"},
-    'state':{'string':'State','type':'selection','selection': [('draft','Draft'), ('posted','Posted'),('all','All')],}
+    'state':{'string':'Target Moves','type':'selection','selection': [('all','All Entries'),('posted','All Posted Entries')]}
 }
 
 def _calc_dates(self, cr, uid, data, context):
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
index 42bde367b84..84b17e905da 100644
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ b/addons/account/wizard/wizard_general_ledger_report.py
@@ -42,7 +42,7 @@ dates_fields = {
     'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
         'help': 'Keep empty for all open fiscal year'},
     'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
-    'state':{'string':'State','type':'selection','selection': [('draft','Draft'), ('posted','Posted'),('all','All')],}
+    'state':{'string':'Target Moves','type':'selection','selection': [('all','All Entries'),('posted','All Posted Entries')]}
 }
 
 class wizard_report(wizard.interface):
diff --git a/addons/account/wizard/wizard_move_line_select.py b/addons/account/wizard/wizard_move_line_select.py
index 86c677ffb6a..10c69f81468 100644
--- a/addons/account/wizard/wizard_move_line_select.py
+++ b/addons/account/wizard/wizard_move_line_select.py
@@ -52,7 +52,10 @@ class wizard_move_line_select(wizard.interface):
         result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_tree1')
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id])[0]
-        result['context'] = str({'fiscalyear': context.get('fiscalyear', False)})
+        result['context'] = {
+            'fiscalyear': context.get('fiscalyear', False),
+            'account_id': data['id']
+        }
         result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
         return result
 
diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py
index fea210cafa4..0e8dabf948d 100644
--- a/addons/account/wizard/wizard_partner_balance_report.py
+++ b/addons/account/wizard/wizard_partner_balance_report.py
@@ -50,7 +50,7 @@ dates_fields = {
         'help': 'Keep empty for all open fiscal year'},
     'date1': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
     'date2': {'string':'End of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-    'state':{'string':'State','type':'selection','selection': [('draft','Draft'), ('posted','Posted'),('all','All')],}
+    'state':{'string':'Target Moves','type':'selection','selection': [('all','All Entries'),('posted','All Posted Entries')]}
 }
 
 class wizard_report(wizard.interface):
diff --git a/addons/account/wizard/wizard_pay_invoice.py b/addons/account/wizard/wizard_pay_invoice.py
index c8f1197571e..44e4fdd065c 100644
--- a/addons/account/wizard/wizard_pay_invoice.py
+++ b/addons/account/wizard/wizard_pay_invoice.py
@@ -68,6 +68,13 @@ def _pay_and_reconcile(self, cr, uid, data, context):
         ctx = {'date':data['form']['date']}
         amount = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, amount, context=ctx)
 
+    
+    # Take the choosen date
+    if form.has_key('comment'):
+        context={'date_p':form['date'],'comment':form['comment']}
+    else:
+        context={'date_p':form['date'],'comment':False}
+
     acc_id = journal.default_credit_account_id and journal.default_credit_account_id.id
     if not acc_id:
         raise wizard.except_wizard(_('Error !'), _('Your journal must have a default credit and debit account.'))
@@ -80,7 +87,9 @@ def _wo_check(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
     journal = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context)
-    if invoice.company_id.currency_id.id<>journal.currency.id:
+    if invoice.company_id.currency_id.id <> invoice.currency_id.id:
+        return 'addendum'
+    if journal.currency and (journal.currency.id <> invoice.currency_id.id):
         return 'addendum'
     if pool.get('res.currency').is_zero(cr, uid, invoice.currency_id,
             (data['form']['amount'] - invoice.amount_total)):
@@ -92,11 +101,13 @@ _transaction_add_form = '''<?xml version="1.0"?>
     <separator string="Write-Off Move" colspan="4"/>
     <field name="writeoff_acc_id"/>
     <field name="writeoff_journal_id"/>
+    <field name="comment"/>
 </form>'''
 
 _transaction_add_fields = {
     'writeoff_acc_id': {'string':'Write-Off account', 'type':'many2one', 'relation':'account.account', 'required':True},
     'writeoff_journal_id': {'string': 'Write-Off journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
+    'comment': {'string': 'Entry Name', 'type':'char', 'size': 64, 'required':True},
 }
 
 def _get_value_addendum(self, cr, uid, data, context={}):
diff --git a/addons/account/wizard/wizard_state_open.py b/addons/account/wizard/wizard_state_open.py
new file mode 100644
index 00000000000..c8083ce338f
--- /dev/null
+++ b/addons/account/wizard/wizard_state_open.py
@@ -0,0 +1,64 @@
+##############################################################################
+#
+# Copyright (c) 2004-2008 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 pooler
+import netsvc
+
+form = '''<?xml version="1.0"?>
+<form string="Open Invoice">
+    <label string="Are you sure you want to open this invoice ?"/>
+    <newline/>
+    <label string="(Invoice should be unreconciled if you want to open it)"/>
+</form>'''
+
+fields = {
+}
+
+def _change_inv_state(self, cr, uid, data, context):
+    pool_obj = pooler.get_pool(cr.dbname)
+    data_inv = pool_obj.get('account.invoice').browse(cr, uid, data['ids'][0])
+    if data_inv.reconciled:
+        raise wizard.except_wizard('Warning', 'Invoice is already reconciled')
+    wf_service = netsvc.LocalService("workflow")
+    res = wf_service.trg_validate(uid, 'account.invoice', data['ids'][0], 'open_test', cr)
+    return {}
+
+class wiz_state_open(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('yes','Yes'),('end','No')]}
+        },
+        'yes': {
+            'actions': [_change_inv_state],
+            'result': {'type':'state', 'state':'end'}
+        }
+    }
+wiz_state_open('account.wizard_paid_open')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
index bcea02e7bda..0236da89bde 100644
--- a/addons/account/wizard/wizard_third_party_ledger.py
+++ b/addons/account/wizard/wizard_third_party_ledger.py
@@ -49,7 +49,7 @@ dates_fields = {
         'help': 'Keep empty for all open fiscal year'},
     'date1': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
     'date2': {'string':'End of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-    'state':{'string':'State','type':'selection','selection': [('draft','Draft'), ('posted','Posted'),('all','All')],}
+    'state':{'string':'Target Moves','type':'selection','selection': [('all','All Entries'),('posted','All Posted Entries')]}
 }
 
 class wizard_report(wizard.interface):
diff --git a/addons/multi_company/__terp__.py b/addons/account_analytic_plans/__init__.py
similarity index 77%
rename from addons/multi_company/__terp__.py
rename to addons/account_analytic_plans/__init__.py
index de76c0c457c..db5d5411fd6 100644
--- a/addons/multi_company/__terp__.py
+++ b/addons/account_analytic_plans/__init__.py
@@ -1,9 +1,8 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
-#
-# $Id$
+# 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
@@ -25,19 +24,11 @@
 # 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.
-###############################################################################
-{
-    "name" : "Multi company base module",
-    "version" : "0.1",
-    "author" : "Tiny",
-    "depends" : ["base"],
-    "category" : "Generic Modules/Base",
-    "init_xml" : [],
-    "demo_xml" : ["multi_company_demo.xml",],
-    "update_xml" : [],
-    "active": False,
-    "installable": True
-}
+#
+##############################################################################
 
+import account_analytic_plans
+import wizard
+import report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_analytic_plans/__terp__.py b/addons/account_analytic_plans/__terp__.py
new file mode 100644
index 00000000000..3fc3444e350
--- /dev/null
+++ b/addons/account_analytic_plans/__terp__.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Multiple-plans management in analytic accounting",
+    "version" : "1.0",
+    "depends" : ["account", "base","product_analytic_default"],
+    "author" : "Tiny",
+    "description": """The goal is to allow several analytic plans, according to the general journal,
+     so that multiple analytic lines are created when the invoice is confirmed.
+     Second goal is to allow creating automatic analytic entries when writing general entries manually
+     through: Finance > Entries > By Journal.
+
+     For example, the analytic structure:
+        Projects
+        »···Project 1
+        »···»···SubProj 1.1
+        »···»···SubProj 1.2
+        »···Project 2
+        Salesman
+        »···Eric
+        »···Fabien
+
+        Here, we have two plans: Projects and Salesman. An invoice line must
+        be able to write analytic entries in the 2 plans: SubProj 1.1 and
+        Fabien. The amount can also be splitted, example:
+
+        Plan1:
+                SubProject 1.1 : 50%
+                SubProject 1.2 : 50%
+        Plan2:
+                Eric: 100%
+
+        So when this line of invoice will be confirmed, It must generate 3
+        analytic lines.
+        """,
+    "website" : "http://tinyerp.com/module_account.html",
+    "category" : "Generic Modules/Accounting",
+    "init_xml" : [
+    ],
+    "demo_xml" : [
+    ],
+    "update_xml" : ["model_wizard.xml","account_analytic_plans_view.xml",
+    "account_analytic_plans_report.xml"],
+
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
new file mode 100644
index 00000000000..b9c14619382
--- /dev/null
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -0,0 +1,397 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+# 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.
+#
+##############################################################################
+from xml import dom
+
+from mx import DateTime
+from mx.DateTime import now
+import time
+
+import netsvc
+from osv import fields, osv,orm
+import ir
+
+import tools
+
+class one2many_mod2(fields.one2many):
+    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
+        if not context:
+            context = {}
+        res = {}
+        for id in ids:
+            res[id] = []
+        ids2 = None
+        if 'journal_id' in context:
+            journal = obj.pool.get('account.journal').browse(cr, user, context['journal_id'], context)
+            pnum = int(name[7]) -1
+            plan = journal.plan_id
+            if plan and len(plan.plan_ids)>pnum:
+                acc_id = plan.plan_ids[pnum].root_analytic_id.id
+                ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids),('analytic_account_id','child_of',[acc_id])], limit=self._limit)
+        if ids2 is None:
+            ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids)], limit=self._limit)
+        for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
+            res[r[self._fields_id]].append( r['id'] )
+        return res
+
+class account_analytic_plan(osv.osv):
+    _name = "account.analytic.plan"
+    _description = "Analytic Plans"
+    _columns = {
+        'name': fields.char('Analytic Plan', size=64, required=True, select=True,),
+        'plan_ids': fields.one2many('account.analytic.plan.line','plan_id','Analytic Plans'),
+    }
+account_analytic_plan()
+
+class account_analytic_plan_line(osv.osv):
+    _name = "account.analytic.plan.line"
+    _description = "Analytic Plan Lines"
+    _columns = {
+        'plan_id':fields.many2one('account.analytic.plan','Analytic Plan'),
+        'name': fields.char('Plan Name', size=64, required=True, select=True),
+        'sequence':fields.integer('Sequence'),
+        'root_analytic_id': fields.many2one('account.analytic.account','Root Account',help="Root account of this plan.",required=True),
+        'min_required': fields.float('Minimum Allowed (%)'),
+        'max_required': fields.float('Maximum Allowed (%)'),
+    }
+    _defaults = {
+        'min_required': lambda *args: 100.0,
+        'max_required': lambda *args: 100.0,
+    }
+    _order = "sequence,id"
+account_analytic_plan_line()
+
+class account_analytic_plan_instance(osv.osv):
+    _name='account.analytic.plan.instance'
+    _description = 'Object for create analytic entries from invoice lines'
+    _columns={
+        'name':fields.char('Analytic Distribution',size=64),
+        'code':fields.char('Distribution Code',size=16),
+        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True),
+        'account_ids':fields.one2many('account.analytic.plan.instance.line','plan_id','Account Id'),
+        'account1_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account1 Id'),
+        'account2_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account2 Id'),
+        'account3_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account3 Id'),
+        'account4_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account4 Id'),
+        'account5_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account5 Id'),
+        'account6_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account6 Id'),
+        'plan_id':fields.many2one('account.analytic.plan', "Model's Plan"),
+    }
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+            default.update({'account1_ids':False, 'account2_ids':False, 'account3_ids':False,
+                'account4_ids':False, 'account5_ids':False, 'account6_ids':False})
+        return super(account_analytic_plan_instance, self).copy(cr, uid, id, default, context)
+
+    _defaults = {
+        'plan_id': lambda *args: False,
+    }
+    def name_get(self, cr, uid, ids, context={}):
+        res = []
+        for inst in self.browse(cr, uid, ids, context):
+            name = inst.name or '/'
+            if name and inst.code:
+                name=name+' ('+inst.code+')'
+            res.append((inst.id, name))
+        return res
+
+    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=80):
+        args= args or []
+        if name:
+            ids = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context or {})
+            if not ids:
+                ids = self.search(cr, uid, [('name', operator, name)] + args, limit=limit, context=context or {})
+        else:
+            ids = self.search(cr, uid, args, limit=limit, context=context or {})
+        return self.name_get(cr, uid, ids, context or {})
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+        wiz_id = self.pool.get('ir.actions.wizard').search(cr, uid, [("wiz_name","=","create.model")])
+        res = super(account_analytic_plan_instance,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+        if (res['type']=='form'):
+            plan_id = False
+            if context.get('journal_id',False):
+                plan_id = self.pool.get('account.journal').browse(cr, uid, int(context['journal_id']), context).plan_id
+            elif context.get('plan_id',False):
+                plan_id = self.pool.get('account.analytic.plan').browse(cr, uid, int(context['plan_id']), context).plan_id
+            if plan_id:
+                i=1
+                res['arch'] = """<form string="%s">
+    <field name="name"/>
+    <field name="code"/>
+    <field name="journal_id"/>
+    <button name="%d" string="Save This Distribution as a Model" type="action" colspan="2"/>
+    """% (tools.to_xml(plan_id.name), wiz_id[0])
+                for line in plan_id.plan_ids:
+                    res['arch']+="""
+                    <field name="account%d_ids" string="%s" colspan="4">
+                    <tree string="%s" editable="bottom">
+                        <field name="rate"/>
+                        <field name="analytic_account_id" domain="[('parent_id','child_of',[%d])]"/>
+                    </tree>
+                </field>
+                <newline/>"""%(i,tools.to_xml(line.name),tools.to_xml(line.name),line.root_analytic_id and line.root_analytic_id.id or 0)
+                    i+=1
+                res['arch'] += "</form>"
+                doc = dom.minidom.parseString(res['arch'])
+                xarch, xfields = self._view_look_dom_arch(cr, uid, doc, context=context)
+                res['arch'] = xarch
+                res['fields'] = xfields
+            return res
+        else:
+            return res
+
+    def create(self, cr, uid, vals, context=None):
+        if context and 'journal_id' in context:
+            journal= self.pool.get('account.journal').browse(cr,uid,context['journal_id'])
+
+            pids = self.pool.get('account.analytic.plan.instance').search(cr, uid, [('name','=',vals['name']),('code','=',vals['code']),('plan_id','<>',False)])
+            if pids:
+                raise osv.except_osv('Error', 'A model having this name and code already exists !')
+
+            res = self.pool.get('account.analytic.plan.line').search(cr,uid,[('plan_id','=',journal.plan_id.id)])
+            for i in res:
+                total_per_plan = 0
+                item = self.pool.get('account.analytic.plan.line').browse(cr,uid,i)
+                temp_list=['account1_ids','account2_ids','account3_ids','account4_ids','account5_ids','account6_ids']
+                for l in temp_list:
+                    if vals.has_key(l):
+                        for tempo in vals[l]:
+                            if self.pool.get('account.analytic.account').search(cr,uid,[('parent_id','child_of',[item.root_analytic_id.id]),('id','=',tempo[2]['analytic_account_id'])]):
+                                total_per_plan += tempo[2]['rate']
+                if total_per_plan < item.min_required or total_per_plan > item.max_required:
+                    raise osv.except_osv("Value Error" ,"The Total Should be Between " + str(item.min_required) + " and " + str(item.max_required))
+
+        return super(account_analytic_plan_instance, self).create(cr, uid, vals, context)
+
+    def write(self, cr, uid, ids, vals, context={}, check=True, update_check=True):
+        this = self.browse(cr,uid,ids[0])
+        if this.plan_id and not vals.has_key('plan_id'):
+            #this instance is a model, so we have to create a new plan instance instead of modifying it
+            #copy the existing model
+            temp_id = self.copy(cr, uid, this.id, None, context)
+            #get the list of the invoice line that were linked to the model
+            list = self.pool.get('account.invoice.line').search(cr,uid,[('analytics_id','=',this.id)])
+            #make them link to the copy
+            self.pool.get('account.invoice.line').write(cr, uid, list, {'analytics_id':temp_id}, context)
+
+            #and finally modify the old model to be not a model anymore
+            vals['plan_id'] = False 
+            if not vals.has_key['name']:
+                vals['name'] = this.name+'*'
+            if not vals.has_key['code']:
+                vals['code'] = this.code+'*'
+            return self.write(cr, uid, [this.id],vals, context)        
+        else:
+            #this plan instance isn't a model, so a simple write is fine
+            return super(account_analytic_plan_instance, self).write(cr, uid, ids, vals, context)
+
+account_analytic_plan_instance()
+
+class account_analytic_plan_instance_line(osv.osv):
+    _name='account.analytic.plan.instance.line'
+    _description = 'Object for create analytic entries from invoice lines'
+    _columns={
+        'plan_id':fields.many2one('account.analytic.plan.instance','Plan Id'),
+        'analytic_account_id':fields.many2one('account.analytic.account','Analytic Account', required=True),
+        'rate':fields.float('Rate (%)', required=True),
+    }
+    def name_get(self, cr, uid, ids, context={}):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['analytic_account_id'], context)
+        res = []
+        for record in reads:
+            res.append((record['id'], record['analytic_account_id']))
+        return res
+
+account_analytic_plan_instance_line()
+
+class account_journal(osv.osv):
+    _inherit='account.journal'
+    _name='account.journal'
+    _columns = {
+        'plan_id':fields.many2one('account.analytic.plan','Analytic Plans'),
+    }
+account_journal()
+
+class account_invoice_line(osv.osv):
+    _inherit='account.invoice.line'
+    _name='account.invoice.line'
+    _columns = {
+        'analytics_id':fields.many2one('account.analytic.plan.instance','Analytic Distribution'),
+    }
+
+    def create(self, cr, uid, vals, context=None):
+        if 'analytics_id' in vals and isinstance(vals['analytics_id'],tuple):
+            vals['analytics_id'] = vals['analytics_id'][0]
+        return super(account_invoice_line, self).create(cr, uid, vals, context)
+
+    def move_line_get_item(self, cr, uid, line, context={}):
+        res= super(account_invoice_line,self).move_line_get_item(cr, uid, line, context={})
+        res ['analytics_id']=line.analytics_id and line.analytics_id.id or False
+        return res
+
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, 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, price_unit, address_invoice_id, context)
+        if product:
+            res = self.pool.get('product.product').browse(cr, uid, product, context=context)
+            res_prod['value'].update({'analytics_id':res.property_account_distribution.id})
+        return res_prod
+
+
+account_invoice_line()
+
+class account_move_line(osv.osv):
+    _inherit='account.move.line'
+    _name='account.move.line'
+    _columns = {
+        'analytics_id':fields.many2one('account.analytic.plan.instance','Analytic Distribution'),
+    }
+#   def _analytic_update(self, cr, uid, ids, context):
+#       for line in self.browse(cr, uid, ids, context):
+#           if line.analytics_id:
+#               print "line.analytics_id",line,"now",line.analytics_id
+#               toremove = self.pool.get('account.analytic.line').search(cr, uid, [('move_id','=',line.id)], context=context)
+#               print "toremove",toremove
+#               if toremove:
+#                   obj_line=self.pool.get('account.analytic.line')
+#                   self.pool.get('account.analytic.line').unlink(cr, uid, toremove, context=context)
+#               for line2 in line.analytics_id.account_ids:
+#                   val = (line.debit or 0.0) - (line.credit or  0.0)
+#                   amt=val * (line2.rate/100)
+#                   al_vals={
+#                       'name': line.name,
+#                       'date': line.date,
+#                       'unit_amount':1,
+#                       'product_id':12,
+#                       'account_id': line2.analytic_account_id.id,
+#                       'amount': amt,
+#                       'general_account_id': line.account_id.id,
+#                       'move_id': line.id,
+#                       'journal_id': line.analytics_id.journal_id.id,
+#                       'ref': line.ref,
+#                   }
+#                   ali_id=self.pool.get('account.analytic.line').create(cr,uid,al_vals)
+#       return True
+#
+#   def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+#       result = super(account_move_line, self).write(cr, uid, ids, vals, context, check, update_check)
+#       self._analytic_update(cr, uid, ids, context)
+#       return result
+#
+#   def create(self, cr, uid, vals, context=None, check=True):
+#       result = super(account_move_line, self).create(cr, uid, vals, context, check)
+#       self._analytic_update(cr, uid, [result], context)
+#       return result
+account_move_line()
+
+class account_invoice(osv.osv):
+    _name = "account.invoice"
+    _inherit="account.invoice"
+
+
+
+    def line_get_convert(self, cr, uid, x, part, date, context={}):
+        res=super(account_invoice,self).line_get_convert(cr, uid, x, part, date, context)
+        res['analytics_id']=x.get('analytics_id',False)
+        return res
+
+    def _get_analityc_lines(self, cr, uid, id):
+        inv = self.browse(cr, uid, [id])[0]
+        cur_obj = self.pool.get('res.currency')
+
+        company_currency = inv.company_id.currency_id.id
+        if inv.type in ('out_invoice', 'in_refund'):
+            sign = 1
+        else:
+            sign = -1
+
+        iml = self.pool.get('account.invoice.line').move_line_get(cr, uid, inv.id)
+
+        for il in iml:
+            if il['analytics_id']:
+
+                if inv.type in ('in_invoice', 'in_refund'):
+                    ref = inv.reference
+                else:
+                    ref = self._convert_ref(cr, uid, inv.number)
+                obj_move_line=self.pool.get('account.analytic.plan.instance').browse(cr,uid,il['analytics_id'])
+                amount_calc=cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, il['price'], context={'date': inv.date_invoice}) * sign
+                qty=il['quantity']
+                il['analytic_lines']=[]
+                for line2 in obj_move_line.account_ids:
+                    amt=amount_calc * (line2.rate/100)
+                    qtty=qty* (line2.rate/100)
+                    al_vals={
+                        'name': il['name'],
+                        'date': inv['date_invoice'],
+                        'unit_amount':qtty,
+                        'product_id':il['product_id'],
+                        'account_id': line2.analytic_account_id.id,
+                        'amount': amt,
+                        'product_uom_id': il['uos_id'],
+                        'general_account_id': il['account_id'],
+                        'journal_id': self._get_journal_analytic(cr, uid, inv.type),
+                        'ref': ref,
+                    }
+                    il['analytic_lines'].append((0,0,al_vals))
+        return iml
+
+account_invoice()
+
+class account_analytic_plan(osv.osv):
+    _inherit = "account.analytic.plan"
+    _columns = {
+        'default_instance_id': fields.many2one('account.analytic.plan.instance', 'Default Entries'),
+    }
+account_analytic_plan()
+
+class product_product(osv.osv):
+    _name = 'product.product'
+    _inherit = 'product.product'
+    _description = 'Product'
+
+    _columns = {
+        'property_account_distribution': fields.property(
+            'account.analytic.plan.instance',
+            type='many2one',
+            relation='account.analytic.plan.instance',
+            string="Analytic Distribution",
+            method=True,
+            view_load=True,
+            group_name="Accounting Properties",
+            help="This Analytic Distribution will be use in sale order line and invoice lines",
+            ),
+                }
+
+product_product()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_analytic_plans/account_analytic_plans_report.xml b/addons/account_analytic_plans/account_analytic_plans_report.xml
new file mode 100644
index 00000000000..d68ec3bd6ab
--- /dev/null
+++ b/addons/account_analytic_plans/account_analytic_plans_report.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+		<report
+			id="account_analytic_account_crossovered_analytic"
+			string="Crossovered Analytic"
+			model="account.analytic.account"
+			name="account.analytic.account.crossovered.analytic"
+			rml="account_analytic_plans/report/crossovered_analytic.rml"
+			auto="False"
+			menu="False"/>
+
+		<wizard
+			id="account_analytic_account_inverted_balance_report"
+			string="Crossovered Analytic"
+			model="account.analytic.account"
+			name="wizard.crossovered.analytic"
+			keyword="client_print_multi"/>
+
+	</data>
+</terp>
+
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
new file mode 100644
index 00000000000..2caa03382b9
--- /dev/null
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+<!-- Add plan_id after user_id in account.journal many2one with account.analytic.plan -->
+
+	<record model="ir.ui.view" id="view_account_journal_form_inherit">
+		<field name="name">account.journal.form.inherit</field>
+		<field name="model">account.journal</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="account.view_account_journal_form"/>
+		<field name="arch" type="xml">
+			<field name="centralisation" position="before">
+				<field name="plan_id" />
+			</field>
+		</field>
+	</record>
+
+
+	<record model="ir.ui.view" id="view_move_line_form_inherit">
+		<field name="name">account.move.line.form.inherit</field>
+		<field name="model">account.move.line</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="account.view_move_line_form"/>
+		<field name="arch" type="xml">
+			<field name="move_id" position="after">
+				<field name="analytics_id" />
+			</field>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_move_line_tree_inherit">
+		<field name="name">account.move.line.tree.inherit</field>
+		<field name="model">account.move.line</field>
+		<field name="type">tree</field>
+		<field name="inherit_id" ref="account.view_move_line_tree"/>
+		<field name="arch" type="xml">
+			<field name="move_id" position="after">
+				<field name="analytics_id" />
+			</field>
+		</field>
+	</record>
+
+<!-- Replace analytic_id with analytics_id in account.invoice.line -->
+
+	<record model="ir.ui.view" id="view_invoice_line_form_inherit">
+		<field name="name">account.invoice.line.form.inherit</field>
+		<field name="model">account.invoice.line</field>
+		<field name="inherit_id" ref="account.view_invoice_line_form"/>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<field name="account_analytic_id" position="replace">
+				<field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]"/>
+			</field>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="invoice_supplier_form_inherit">
+		<field name="name">account.invoice.supplier.form.inherit</field>
+		<field name="model">account.invoice</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="account.invoice_supplier_form"/>
+		<field name="priority">2</field>
+		<field name="arch" type="xml">
+			<field name="account_analytic_id" position="replace">
+				<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" />
+			</field>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="account_analytic_plan_instance_form">
+		<field name="name">account.analytic.plan.instance.form</field>
+		<field name="model">account.analytic.plan.instance</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Analytic Distribution">
+				<field name="name" select="1"/>
+				<field name="code" select="1"/>
+				<field name="plan_id" select="2" required="True"/>
+				<field name="journal_id" select="2"/>
+				<field name="account_ids" string="Analytic Distribution" colspan="4">
+					<tree string="Analytic Distribution" editable="bottom">
+						<field name="rate"/>
+						<field name="analytic_account_id"/>
+					</tree>
+				</field>
+			</form>
+		</field>
+	</record>
+
+
+	<record model="ir.ui.view" id="account_analytic_plan_instance_tree">
+		<field name="name">account.analytic.plan.instance.tree</field>
+		<field name="model">account.analytic.plan.instance</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Analytic Distribution">
+				<field name="name"/>
+				<field name="code"/>
+				<field name="plan_id"/>
+				<field name="journal_id"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="account_analytic_plan_instance_action">
+		<field name="name">Analytic Distribution's Models</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">account.analytic.plan.instance</field>
+		<field name="domain">[('plan_id','&lt;&gt;',False)]</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+
+	<act_window name="Distribution Models"
+		domain="[('plan_id', '=', active_id),('plan_id','&lt;&gt;',False)]"
+		context="{'plan_id': active_id}"
+		res_model="account.analytic.instance"
+		src_model="account.analytic.plan"
+		id="account_analytic_instance_model_open"/>
+
+	<menuitem
+		name="Analytic Distribution's models" parent="account.next_id_32"
+		id="menu_account_analytic_plan_instance_action"
+		action="account_analytic_plan_instance_action"/>
+
+	<record model="ir.ui.view" id="account_analytic_plan_instance_line_form">
+		<field name="name">account.analytic.plan.instance.line.form</field>
+		<field name="model">account.analytic.plan.instance.line</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Analytic Distribution Line">
+				<field name="plan_id"/>
+				<field name="analytic_account_id"/>
+				<field name="rate"/>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="account_analytic_plan_instance_line_tree">
+		<field name="name">account.analytic.plan.instance.line.tree</field>
+		<field name="model">account.analytic.plan.instance.line</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Analytic Distribution Lines">
+				<field name="plan_id" select="1"/>
+				<field name="analytic_account_id" select="1"/>
+				<field name="rate"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="account_analytic_plan_form">
+		<field name="name">account.analytic.plan.form</field>
+		<field name="model">account.analytic.plan</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Analytic Plan">
+				<field name="name" select="1"/>
+				<field name="default_instance_id"/>
+				<field name="plan_ids" colspan="4"/>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="account_analytic_plan_tree">
+		<field name="name">account.analytic.plan.tree</field>
+		<field name="model">account.analytic.plan</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Analytic Plans">
+				<field name="name"/>
+			</tree>
+		</field>
+	</record>
+
+
+	<record model="ir.actions.act_window" id="account_analytic_plan_form_action">
+		<field name="name">Analytic Plan</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">account.analytic.plan</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+
+	<menuitem
+		parent="account.next_id_39"
+		id="menu_account_analytic_plan_action"
+		action="account_analytic_plan_form_action"/>
+
+	<record model="ir.ui.view" id="account_analytic_plan_line_form">
+		<field name="name">account.analytic.plan.line.form</field>
+		<field name="model">account.analytic.plan.line</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Analytic Plan Line">
+				<field name="name"/>
+				<field name="sequence"/>
+				<field name="root_analytic_id"/>
+				<newline/>
+				<field name="min_required"/>
+				<field name="max_required"/>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="account_analytic_plan_line_tree">
+		<field name="name">account.analytic.plan.line.tree</field>
+		<field name="model">account.analytic.plan.line</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Analytic Plan Lines">
+				<field name="name" select="1"/>
+				<field name="sequence"/>
+				<field name="root_analytic_id" select="2"/>
+				<field name="min_required"/>
+				<field name="max_required"/>
+			</tree>
+		</field>
+	</record>
+
+	<!-- add property field on product -->
+
+	<record model="ir.ui.view" id="view_template_property_distribution_form">
+			<field name="name">product.template.property.distribution.form.inherit</field>
+			<field name="type">form</field>
+			<field name="model">product.template</field>
+			<field name="inherit_id" ref="product.product_template_form_view"/>
+			<field name="arch" type="xml">
+				<field name="property_account_analytic" position="replace">
+					<field name="property_account_distribution"/>
+				</field>
+			</field>
+		</record>
+	<record model="ir.ui.view" id="view_normal_property_distribution_form">
+			<field name="name">product.normal.property.distribution.form.inherit</field>
+			<field name="type">form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="product.product_normal_form_view"/>
+			<field name="arch" type="xml">
+				<field name="property_account_analytic" position="replace">
+					<field name="property_account_distribution"/>
+				</field>
+			</field>
+		</record>
+
+</data>
+</terp>
diff --git a/addons/account_analytic_plans/model_wizard.xml b/addons/account_analytic_plans/model_wizard.xml
new file mode 100644
index 00000000000..ac67a765147
--- /dev/null
+++ b/addons/account_analytic_plans/model_wizard.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+		<wizard
+			string="Create Model"
+			model="account.analytic.plan.instance"
+			name="create.model" id="create_model"
+			menu="False"/>
+	</data>
+</terp>
+
diff --git a/addons/account_analytic_plans/report/__init__.py b/addons/account_analytic_plans/report/__init__.py
new file mode 100644
index 00000000000..b2f6cab7450
--- /dev/null
+++ b/addons/account_analytic_plans/report/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import crossovered_analytic
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
new file mode 100644
index 00000000000..523350664e2
--- /dev/null
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -0,0 +1,183 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+class crossovered_analytic(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(crossovered_analytic, self).__init__(cr, uid, name, context)
+        self.localcontext.update( {
+            'time': time,
+            'lines': self._lines,
+            'ref_lines' : self._ref_lines,
+            'find_children':self.find_children,
+        })
+        self.base_amount=0.00
+
+    def find_children(self,ref_ids):
+        to_return_ids = []
+        final_list = []
+        parent_list = []
+        set_list = []
+        for id in ref_ids:
+            # to avoid duplicate entries
+            if id not in to_return_ids:
+                to_return_ids.append(self.pool.get('account.analytic.account').search(self.cr,self.uid,[('parent_id','child_of',[id])]))
+        data_accnt = self.pool.get('account.analytic.account').browse(self.cr,self.uid,to_return_ids[0])
+        for data in data_accnt:
+            if data.parent_id and data.parent_id.id == ref_ids[0]:
+                parent_list.append(data.id)
+        final_list.append(ref_ids[0])
+        set_list = self.set_account(parent_list)
+        final_list.extend(set_list)
+        return final_list #to_return_ids[0]
+
+    def set_account(self,cats):
+        lst = []
+        category = self.pool.get('account.analytic.account').read(self.cr,self.uid,cats)
+        for cat in category:
+            lst.append(cat['id'])
+            if cat['child_ids']:
+                lst.extend(self.set_account(cat['child_ids']))
+        return lst
+
+    def _ref_lines(self,form):
+        result = []
+        res = {}
+        acc_id = []
+        final = []
+        acc_pool = self.pool.get('account.analytic.account')
+        line_pool = self.pool.get('account.analytic.line')
+
+        self.dict_acc_ref = {}
+        if form['journal_ids'][0][2]:
+            journal = " in (" + ','.join(map(lambda x: str(x), form['journal_ids'][0][2])) + ")"
+        else:
+            journal = 'is not null'
+
+        query_general = "select id from account_analytic_line where (journal_id " + journal +") AND date>='"+ str(form['date1']) +"'"" AND date<='" + str(form['date2']) + "'"
+
+        self.cr.execute(query_general)
+        l_ids=self.cr.fetchall()
+        line_ids = [x[0] for x in l_ids]
+
+        obj_line = line_pool.browse(self.cr,self.uid,line_ids)
+
+        #this structure will be usefull for easily knowing the account_analytic_line that are related to the reference account. At this purpose, we save the move_id of analytic lines.
+        self.dict_acc_ref[form['ref']] = []
+        children_list = self.pool.get('account.analytic.account').search(self.cr,self.uid,[('parent_id','child_of',[form['ref']])])
+        for obj in obj_line:
+            if obj.account_id.id in children_list:
+                if obj.move_id and obj.move_id.id not in self.dict_acc_ref[form['ref']]:
+                    self.dict_acc_ref[form['ref']].append(obj.move_id.id)
+
+        res['ref_name'] = acc_pool.name_get(self.cr,self.uid,[form['ref']])[0][1]
+        res['ref_code'] = acc_pool.browse(self.cr,self.uid,form['ref']).code
+
+        self.final_list = children_list
+        selected_ids = line_pool.search(self.cr,self.uid,[('account_id','in',self.final_list)])
+
+        query="SELECT sum(aal.amount) AS amt, sum(aal.unit_amount) AS qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
+                WHERE aal.account_id=aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"
+
+        self.cr.execute(query)
+        info=self.cr.dictfetchall()
+
+        res['ref_qty']=info[0]['qty']
+        res['ref_amt']=info[0]['amt']
+        self.base_amount= info[0]['amt']
+
+        result.append(res)
+        return result
+
+    def _lines(self,form,ids={}):
+        if not ids:
+            ids = self.ids
+
+        if form['journal_ids'][0][2]:
+            journal=" in (" + ','.join(map(lambda x: str(x), form['journal_ids'][0][2])) + ")"
+        else:
+            journal= 'is not null'
+
+        acc_pool = self.pool.get('account.analytic.account')
+        line_pool=self.pool.get('account.analytic.line')
+        acc_id=[]
+        final=[]
+        child_ids=[]
+        self.list_ids=[]
+
+        self.final_list = self.find_children(ids)
+
+        for acc_id in self.final_list:
+            selected_ids = line_pool.search(self.cr,self.uid,[('account_id','=',acc_id),('move_id','in',self.dict_acc_ref[form['ref']])])
+            if selected_ids:
+                query="SELECT aaa.code as code , sum(aal.amount) AS amt, sum(aal.unit_amount) AS qty,aaa.name as acc_name,aal.account_id as id  FROM account_analytic_line AS aal, account_analytic_account AS aaa \
+                WHERE aal.account_id=aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"" GROUP BY aal.account_id,aaa.name,aaa.code ORDER BY aal.account_id"
+
+                self.cr.execute(query)
+                res = self.cr.dictfetchall()
+                if res:
+                    for element in res:
+                        if self.base_amount<>0.00:
+                            element['perc']= (element['amt'] / self.base_amount) * 100.00
+                        else:
+                            element['perc']=0.00
+                else:
+                    result={}
+                    res=[]
+                    result['id']=acc_id
+                    data_account = acc_pool.browse(self.cr,self.uid,acc_id)
+                    result['acc_name']=data_account.name
+                    result['code'] = data_account.code
+                    result['amt']=result['qty']=result['perc']=0.00
+                    if not form['empty_line']:
+                        res.append(result)
+            else:
+                result={}
+                res=[]
+                result['id']=acc_id
+                data_account = acc_pool.browse(self.cr,self.uid,acc_id)
+                result['acc_name']=data_account.name
+                result['code'] = data_account.code
+                result['amt']=result['qty']=result['perc']=0.00
+                if not form['empty_line']:
+                    res.append(result)
+
+            for item in res:
+                obj_acc=acc_pool.name_get(self.cr,self.uid,[item['id']])
+                item['acc_name']=obj_acc[0][1]
+                final.append(item)
+        return final
+
+report_sxw.report_sxw('report.account.analytic.account.crossovered.analytic', 'account.analytic.account', 'addons/account_analytic_plans/report/crossovered_analytic.rml',parser=crossovered_analytic, header=False)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml
new file mode 100644
index 00000000000..c10ce01edba
--- /dev/null
+++ b/addons/account_analytic_plans/report/crossovered_analytic.rml
@@ -0,0 +1,222 @@
+<?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="28.0" width="527" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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="0,1" stop="0,1"/>
+      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+      <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#cccccc" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#cccccc" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#cccccc" start="3,0" stop="3,0"/>
+      <blockBackground colorName="#cccccc" start="4,0" stop="4,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+      <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#cccccc" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#cccccc" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#cccccc" start="3,0" stop="3,0"/>
+      <blockBackground colorName="#cccccc" start="4,0" stop="4,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <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"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
+    <paraStyle name="P7" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Times-Bold" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P15" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P16" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P17" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <blockTable colWidths="176.0,176.0,176.0" repeatRows="1" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P7">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P8">Crossovered Analytic</para>
+        </td>
+        <td>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+          <para style="P10">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P7">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="P11">Period from [[ data['form']['date1'] ]]</para>
+          <para style="P11">to [[ data['form']['date2'] ]]</para>
+        </td>
+        <td>
+          <para style="P10">Currency: [[ company.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <para style="P6">Analytic Account Reference:</para>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="152.0,123.0,90.0,63.0,99.0" style="Table3">
+      <tr>
+        <td>
+          <para style="P13">Account Name</para>
+        </td>
+        <td>
+          <para style="P13">Code</para>
+        </td>
+        <td>
+          <para style="P13">Quantity</para>
+        </td>
+        <td>
+          <para style="P13">Amount</para>
+        </td>
+        <td>
+          <para style="P13">Percentage</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="152.0,123.0,90.0,63.0,100.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P14">[[ repeatIn(ref_lines(data['form']),'a') ]]<font face="Times-Roman" size="10.0">[[ a['ref_name'] ]]</font></para>
+        </td>
+        <td>
+          <para style="P12">[[ a['ref_code'] ]]</para>
+        </td>
+        <td>
+          <para style="P12">[[ '%.2f' % a['ref_qty'] ]]</para>
+        </td>
+        <td>
+          <para style="P12">[[ '%.2f' % a['ref_amt'] ]]</para>
+        </td>
+        <td>
+          <para style="P12">100.00%</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="152.0,123.0,89.0,64.0,99.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P13">Account Name</para>
+        </td>
+        <td>
+          <para style="P13">Code</para>
+        </td>
+        <td>
+          <para style="P13">Quantity</para>
+        </td>
+        <td>
+          <para style="P13">Amount</para>
+        </td>
+        <td>
+          <para style="P13">Percentage</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="152.0,123.0,89.0,64.0,99.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P15">[[ repeatIn(lines(data['form']),'a') ]] </para>
+          <para style="P15">[[a['acc_name'] ]]</para>
+       </td>
+        <td>
+          <para style="P12">[[ a['code'] ]]</para>
+        </td>
+        <td>
+          <para style="P12">[[ '%.2f' % a['qty'] ]]</para>
+        </td>
+        <td>
+          <para style="P12">[[ '%.2f' % a['amt'] ]]</para>
+        </td>
+        <td>
+          <para style="P12">[[ '%.2f' % a['perc'] ]]%</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/account_analytic_plans/wizard/__init__.py b/addons/account_analytic_plans/wizard/__init__.py
new file mode 100644
index 00000000000..0516517f36b
--- /dev/null
+++ b/addons/account_analytic_plans/wizard/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+import create_model
+import wizard_crossovered_analytic
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_analytic_plans/wizard/create_model.py b/addons/account_analytic_plans/wizard/create_model.py
new file mode 100644
index 00000000000..ffc6690c211
--- /dev/null
+++ b/addons/account_analytic_plans/wizard/create_model.py
@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+import wizard
+import time
+import netsvc
+import pooler
+
+info = '''<?xml version="1.0"?>
+<form string="Distribution Model Saved">
+    <label string="This distribution model has been saved.\nYou will be able to reuse it later."/>
+</form>'''
+
+def activate(self, cr, uid, data, context):
+    plan_obj = pooler.get_pool(cr.dbname).get('account.analytic.plan.instance')
+    if data['id']:
+        plan = plan_obj.browse(cr, uid, data['id'], context)
+        if (not plan.name) or (not plan.code):
+            raise wizard.except_wizard('Error', 'Please put a name and a code before saving the model !')
+        pids  =  pooler.get_pool(cr.dbname).get('account.analytic.plan').search(cr, uid, [], context=context)
+        if (not pids):
+            raise wizard.except_wizard('Error', 'No analytic plan defined !')
+        plan_obj.write(cr,uid,[data['id']],{'plan_id':pids[0]})
+        return 'info'
+    else:
+        return 'endit'
+
+
+class create_model(wizard.interface):
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'choice','next_state':activate}
+        },
+        'info': {
+            'actions': [],
+            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','OK')]}
+        },
+        'endit': {
+            'actions': [],
+            'result': {'type':'form', 'arch':'', 'fields':{}, 'state':'end'}
+        },
+    }
+create_model('create.model')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py b/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py
new file mode 100644
index 00000000000..0e05b0df33b
--- /dev/null
+++ b/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py
@@ -0,0 +1,59 @@
+# -*- encoding: utf-8 -*-
+import wizard
+import time
+import datetime
+import pooler
+
+form = """<?xml version="1.0"?>
+<form string="Select Information">
+    <field name="date1"/>
+    <field name="date2"/>
+    <field name="ref" colspan="4"/>
+    <field name="journal_ids" colspan="4"/>
+    <field name="empty_line"/>
+</form>"""
+
+fields = {
+    'date1': {'string':'Start Date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
+    'date2': {'string':'End Date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'journal_ids': {'string':'Analytic Journal', 'type':'many2many', 'relation':'account.analytic.journal'},
+    'ref' :{'string':'Analytic Account Ref.', 'type':'many2one', 'relation':'account.analytic.account','required':True},
+    'empty_line': {'string':'Dont show empty lines', 'type':'boolean', 'default': lambda *a:False},
+}
+
+class wizard_crossovered_analytic(wizard.interface):
+    def _checklines(self, cr, uid, data, context):
+        cr.execute('select account_id from account_analytic_line')
+        res=cr.fetchall()
+        acc_ids=[x[0] for x in res]
+
+        obj_acc = pooler.get_pool(cr.dbname).get('account.analytic.account').browse(cr,uid,data['form']['ref'])
+        name=obj_acc.name
+
+        account_ids = pooler.get_pool(cr.dbname).get('account.analytic.account').search(cr, uid, [('parent_id', 'child_of', [data['form']['ref']])])
+
+        flag = True
+        for acc in account_ids:
+            if acc in acc_ids:
+                flag = False
+                break
+
+        if flag:
+            raise wizard.except_wizard('User Error',"There are no Analytic lines related to Account '" + name +"'" )
+        return {}
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel'),('print','Print')]},
+        },
+        'print': {
+            'actions': [_checklines],
+            'result': {'type':'print', 'report':'account.analytic.account.crossovered.analytic', 'state':'end'},
+        },
+    }
+
+wizard_crossovered_analytic('wizard.crossovered.analytic')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_balance/__init__.py b/addons/account_balance/__init__.py
new file mode 100644
index 00000000000..069308c6961
--- /dev/null
+++ b/addons/account_balance/__init__.py
@@ -0,0 +1,7 @@
+# -*- encoding: utf-8 -*-
+import account
+import account_move_line
+import wizard
+import report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_balance/__terp__.py b/addons/account_balance/__terp__.py
new file mode 100644
index 00000000000..a75fec4bab0
--- /dev/null
+++ b/addons/account_balance/__terp__.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Accounting and financial management-Compare Accounts",
+    "version" : "1.1",
+    "depends" : ["account"],
+    "author" : "Tiny",
+    "description": """Account Balance Module is an added functionality to the Financial Management module.
+
+    This module gives you the various options for printing balance sheet.
+
+    1. You can compare the balance sheet for different years.
+
+    2. You can set the cash or percentage comparision between two years.
+
+    3. You can set the referencial account for the percentage comparision for particular years.
+
+    4. You can select periods as an actual date or periods as creation date.
+
+    5. You have an option to print the desired report in Landscape format.
+    """,
+    "website" : "http://tinyerp.com/account_balance.html",
+    "category" : "Generic Modules/Accounting",
+    "init_xml" : [
+    ],
+    "demo_xml" : [],
+    "update_xml" : ["account_report.xml","account_wizard.xml",],
+#    "translations" : {
+#        "fr": "i18n/french_fr.csv"
+#    },
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_balance/account_move_line.py b/addons/account_balance/account_move_line.py
new file mode 100644
index 00000000000..b5a4cab7960
--- /dev/null
+++ b/addons/account_balance/account_move_line.py
@@ -0,0 +1,93 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+# 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 netsvc
+from osv import fields, osv
+
+
+class account_move_line(osv.osv):
+    _name="account.move.line"
+    _inherit="account.move.line"
+    _description = "Entry lines"
+
+    def _query_get(self, cr, uid, obj='l', context={}):
+
+        if not 'fiscalyear' in context:
+            context['fiscalyear'] = self.pool.get('account.fiscalyear').find(cr, uid, exception=False)
+
+        strQuery = ""
+        if context.get('periods', False):
+            ids = ','.join([str(x) for x in context['periods']])
+
+            if not 'period_manner' in context:
+                strQuery = obj+".active AND "+obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id=%d)" % (context['fiscalyear'],)
+            else:
+                if context['period_manner']=='actual':
+
+                    strQuery = obj+".active AND "+obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id=%d AND id in (%s))" % (context['fiscalyear'], ids)
+                else:
+#                   p_id="in (SELECT id from account_period WHERE fiscalyear_id=%d AND id in (%s)))" % (context['fiscalyear'], ids)
+                    strQuery = obj+".active AND "+obj+".state<>'draft' AND("
+
+                    p_id=self.pool.get('account.period').search(cr,uid,[('fiscalyear_id','=',context['fiscalyear']),('id','in',context['periods'])])
+
+                    periods = self.pool.get('account.period').read(cr,uid,p_id,['date_start','date_stop'])
+
+                    count=1
+                    len_periods=len(p_id)
+
+
+                    for period in periods:
+                        strQuery += "("+obj+".create_date between to_date('" + period['date_start']  + "','yyyy-mm-dd') and to_date('" + period['date_stop']  + "','yyyy-mm-dd'))"
+                        if len_periods!=1 and count!=len_periods:
+                            strQuery+=" OR "
+                            count=count+1
+                    if p_id==[]:
+                        strQuery+=obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id=%d))" % (context['fiscalyear'],)
+                    else:
+                        strQuery+=")"
+        else:
+            strQuery = obj+".active AND "+obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id=%d)" % (context['fiscalyear'],)
+
+        return strQuery
+account_move_line()
+
+
+class account_bank_statement_reconcile(osv.osv):
+    _inherit = "account.bank.statement.reconcile"
+    _columns = {
+        'line_ids': fields.many2many('account.move.line', 'account_bank_statement_line_rel', 'statement_id', 'line_id', 'Entries'),
+    }
+account_bank_statement_reconcile()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_balance/account_report.xml b/addons/account_balance/account_report.xml
new file mode 100644
index 00000000000..5eae7b94e23
--- /dev/null
+++ b/addons/account_balance/account_report.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+		<report id="account_account_balance"
+			string="Account balance"
+			model="account.account"
+			name="account.balance.account.balance"
+			rml="account_balance/report/account_balance.rml"
+			auto="False"
+			menu="False"/>
+		<report id="account_account_balance_landscape"
+			string="Account balance"
+			model="account.account"
+			name="account.account.balance.landscape"
+			rml="account_balance/report/account_balance_landscape.rml"
+			auto="False"
+			menu="False"/>
+
+	</data>
+</terp>
diff --git a/addons/account_balance/account_wizard.xml b/addons/account_balance/account_wizard.xml
new file mode 100644
index 00000000000..1fc7f52ed0f
--- /dev/null
+++ b/addons/account_balance/account_wizard.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+		<menuitem parent="account.menu_finance" icon="terp-account"/>
+
+		<wizard
+			string="Account balance-Compare Years"
+			model="account.account"
+			name="account.balance.account.balance.report"
+			keyword="client_print_multi"
+			id="wizard_account_balance_report"/>
+
+		</data>
+</terp>
diff --git a/addons/account_balance/report/__init__.py b/addons/account_balance/report/__init__.py
new file mode 100644
index 00000000000..879d5fe51db
--- /dev/null
+++ b/addons/account_balance/report/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import account_balance
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_balance/report/account_balance.py b/addons/account_balance/report/account_balance.py
new file mode 100644
index 00000000000..85a548461f8
--- /dev/null
+++ b/addons/account_balance/report/account_balance.py
@@ -0,0 +1,598 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 time
+import locale
+from report import report_sxw
+
+#from addons.account.wizard import wizard_account_balance_report
+
+parents = {
+    'tr':1,
+    'li':1,
+    'story': 0,
+    'section': 0
+}
+
+class account_balance(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(account_balance, self).__init__(cr, uid, name, context)
+        self.flag=1
+        self.parent_bal=0
+        self.status=0
+        self.done_total=0
+        self.baldiv={}
+        self.empty_parent=0
+        self.result_total = {}
+        self.total_for_perc=[]
+        self.localcontext.update({
+            'time': time,
+            'lines': self.lines,
+            'linesForTotal': self.linesForTotal,
+            'linesForYear': self.linesForYear,
+            })
+        self.context = context
+
+    def repeatIn(self, lst, name, nodes_parent=False,td=False,width=[],value=[],type=[]):
+        self._node.data = ''
+        node = self._find_parent(self._node, nodes_parent or parents)
+        ns = node.nextSibling
+#start
+        if value==['Cash','%']:
+            if show==1:
+                if perc==1:
+                    if pattern=='none':
+                        value=['','Cash','%']
+                        type=['lable','lable','lable']
+                        width=[130,65,65]
+                    else:
+                        value=[' ','','Cash','%']
+                        type=['string','lable','lable','lable']
+                        width=[65,130,65,65]
+                else:
+                    if pattern=='none':
+                        value=['']
+                        type=['lable']
+                        width=[195]
+                    else:
+                        value=[' ','']
+                        type=['string','lable']
+                        width=[65,195]
+            else:
+                if perc==1:
+                    if pattern=='none':
+                        value=['Cash','%']
+                        type=['lable','lable']
+                        width=[65,65]
+                    else:
+                        value=[' ','Cash','%']
+                        type=['string','lable','lable']
+                        width=[65,65,65]
+                else:
+                    if pattern=='none':
+                        value=['']
+                        type=['lable']
+                        width=[65]
+                    else:
+                        value=[' ','']
+                        type=['string','lable']
+                        width=[65,65]
+
+
+        if value==['year']:
+            if show==1:
+                if perc==1:
+                    if pattern=='none':
+                        width=[260]
+                    else:
+                        value=[' ','year']
+                        type=['string','string']
+                        width=[65,260]
+                else:
+                    if pattern=='none':
+                        width=[195]
+                    else:
+                        value=[' ','year']
+                        type=['string','string']
+                        width=[65,195]
+            else:
+                if perc==1:
+                    if pattern=='none':
+                        width=[130]
+                    else:
+                        value=[' ','year']
+                        type=['string','string']
+                        width=[65,130]
+
+                else:
+                    if pattern=='none':
+                        width=[65]
+                    else:
+                        value=[' ','year']
+                        type=['string','string']
+                        width=[65,65]
+
+        if value==['Debit','Credit','Balance']:
+            if show==1:
+                if perc==1:
+                    if pattern=='none':
+                        width=[65,65,130]
+                    else:
+                        value=[' ','Debit','Credit','Balance']
+                        type=['string','lable','lable','lable']
+                        width=[65,65,65,130]
+                else:
+                    if pattern=='none':
+                        width=[65,65,65]
+                    else:
+                        value=[' ','Debit','Credit','Balance']
+                        type=['string','lable','lable','lable']
+                        width=[65,65,65,65]
+
+            else:
+                if perc==1:
+                    if pattern=='none':
+                        value=['Balance']
+                        type=['lable']
+                        width=[130]
+                    else:
+                        value=[' ','Balance']
+                        type=['string','lable']
+                        width=[65,130]
+                else:
+                    if pattern=='none':
+                        value=['Balance']
+                        type=['lable']
+                        width=[65]
+                    else:
+                        value=[' ','Balance']
+                        type=['string','lable']
+                        width=[65,65]
+
+        if value==['debit','credit','balance']:
+            if show==1:
+                if perc==1:
+                    if pattern=='none':
+                        value=['debit','credit','balance','balance_perc']
+                        type=['string','string','string','string']
+                        width=[65,65,65,65]
+                    else:
+                        value=[pattern,'debit','credit','balance','balance_perc']
+                        type=['string','string','string','string','string']
+                        width=[65,65,65,65,65]
+                else:
+                    if pattern=='none':
+                        value=['debit','credit','balance']
+                        type=['string','string','string']
+                        width=[65,65,65]
+                    else:
+                        value=[pattern,'debit','credit','balance']
+                        type=['string','string','string','string']
+                        width=[65,65,65,65]
+
+            else:
+                if perc==1:
+                    if pattern=='none':
+                        value=['balance','balance_perc']
+                        type=['string','string']
+                        width=[65,65]
+                    else:
+                        value=[pattern,'balance','balance_perc']
+                        type=['string','string','string']
+                        width=[65,65,65]
+                else:
+                    if pattern=='none':
+                        value=['balance']
+                        type=['string']
+                        width=[65]
+                    else:
+                        value=[pattern,'balance']
+                        type=['string','string']
+                        width=[65,65]
+
+        if value==['sum_debit','sum_credit','']:
+            if show==1:
+                if perc==1:
+                    if pattern=='none':
+                        width=[65,65,130]
+                    else:
+                        value=[' ','sum_debit','sum_credit','']
+                        type=['string','string','string','lable']
+                        width=[65,65,65,130]
+                else:
+                    if pattern=='none':
+                        width=[65,65,65]
+                    else:
+                        value=[' ','sum_debit','sum_credit','']
+                        type=['string','string','string','lable']
+                        width=[65,65,65,65]
+            else:
+                if perc==1:
+                    if pattern=='none':
+                        value=['']
+                        type=['lable']
+                        width=[130]
+                    else:
+                        value=[' ','']
+                        type=['string','lable']
+                        width=[65,130]
+                else:
+                    if pattern=='none':
+                        value=['']
+                        type=['lable']
+                        width=[65]
+                    else:
+                        value=[' ','']
+                        type=['string','lable']
+                        width=[65,65]
+
+        if not lst:
+            lst.append(1)
+        for ns in node.childNodes :
+            if ns and ns.nodeName!='#text' and ns.tagName=='blockTable' and td :
+                width_str = ns._attrs['colWidths'].nodeValue
+                ns.removeAttribute('colWidths')
+                total_td = td * len(value)
+
+                if not width:
+                    for v in value:
+                        width.append(30)
+                check1=0
+                for t in range(td):
+                    for v in range(len(value)):
+                        if type[v] in ('String','STRING','string'):
+                            if (value[v]==" " or value[0]==pattern):
+                                if check1==0:
+                                    check1=1
+                                    width_str +=',0.0'
+                                else:
+                                    width_str +=',%d'%width[v]
+                            else:
+                                width_str +=',%d'%width[v]
+                        else:
+                            width_str +=',%d'%width[v]
+                ns.setAttribute('colWidths',width_str)
+
+                child_list =  ns.childNodes
+
+                check=0
+                for child in child_list:
+                    if child.nodeName=='tr':
+                        lc = child.childNodes[1]
+                        for t in range(td):
+                            i=0
+                            for v in value:
+
+                                newnode = lc.cloneNode(1)
+                                temp2="%s['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]]"%(name)
+#
+                                if type[i] in ('String','STRING','string'):
+                                    if (v==" " or v==pattern) and i==0 and check==0:
+                                        check=1
+                                        newnode.childNodes[1].lastChild.data=""
+                                    else:
+                                        if v==" ":
+                                            newnode.childNodes[1].lastChild.data=""
+                                        else:
+                                            t1= "[[ %s['%s%d'] ]]"%(name,v,t)
+                                            if v=="year" or v=="sum_debit" or v=="sum_credit":
+                                                newnode.childNodes[1].lastChild.data = t1
+                                            else:
+                                                newnode.childNodes[1].lastChild.data = t1+"[["+temp2
+#                                   newnode.childNodes[1].lastChild.data=[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]]
+                                elif type[i] in ('Lable','LABLE','lable'):
+
+                                    newnode.childNodes[1].lastChild.data= v
+
+                                child.appendChild(newnode)
+
+                                newnode=False
+                                i+=1
+        return super(account_balance,self).repeatIn(lst, name, nodes_parent=False)
+#end
+    def linesForYear(self,form):
+        temp=0
+        years={}
+
+        global pattern
+        global show
+        global perc
+        global bal_zero
+        global ref_bal
+
+        pattern=form['compare_pattern']
+
+        if form['show_columns']!=1:
+            show=0
+        else:
+            show=form['show_columns']
+
+        if form['format_perc']!=1:
+            perc=0
+        else:
+            perc=form['format_perc']
+
+        if form['account_choice']=='bal_zero':
+            bal_zero=0
+        else:
+            bal_zero=1
+
+        ctx = self.context.copy()
+
+        if perc==1:
+            if form['select_account']!=False:
+                ref_ac=self.pool.get('account.account').browse(self.cr, self.uid,form['select_account'],ctx.copy())
+                if ref_ac.balance<>0.00:
+                    ref_bal=ref_ac.balance
+                else:
+                    ref_bal=1.00
+            else:
+                ref_bal='nothing'
+        else:
+            ref_bal='nothing'
+
+
+        total_for_perc=[]
+#       if perc==1:
+        self.done_total=1
+        self.total_for_perc=self.linesForTotal(form,ids={},doneAccount={},level=1)
+        self.done_total=0
+
+        for t1 in range(0,len(form['fiscalyear'][0][2])):
+            locale.setlocale(locale.LC_ALL, '')
+            self.result_total["sum_credit" + str(t1)]=locale.format("%.2f", self.result_total["sum_credit" + str(t1)], grouping=True)
+            self.result_total["sum_debit" + str(t1)]=locale.format("%.2f", self.result_total["sum_debit" + str(t1)], grouping=True)
+#           self.flag=1
+#           self.result_total = {}
+
+        for temp in range(0,len(form['fiscalyear'][0][2])):
+            fy=self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'][0][2][temp])
+            years["year"+str(temp)]=fy[0][1][12:16]
+
+        return [years]
+
+
+    def linesForTotal(self,form,ids={},doneAccount={},level=1):
+        if self.done_total==1:
+            self.done_total==1
+        else:
+            return [self.result_total]
+        accounts=[]
+        if not ids:
+            ids = self.ids
+        if not ids:
+            return []
+
+        ctx = self.context.copy()
+        result_total_parent=[]
+
+        for id in form['fiscalyear'][0][2]:
+            tmp=[]
+
+            ctx['fiscalyear'] = id
+            ctx['periods'] = form['periods'][0][2]
+            ctx['period_manner']=form['select_periods']
+            tmp = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy())
+
+            if len(tmp):
+                accounts.append(tmp)
+
+        merged_accounts=zip(*accounts)
+         # used to check for the frst record so all sum_credit and sum_debit r set to 0.00
+        if level==1:
+            doneAccount={}
+        for entry in merged_accounts:
+
+            if entry[0].id in doneAccount:
+                continue
+            doneAccount[entry[0].id] = 1
+
+            for k in range(0,len(entry)):
+                temp_credit=0.00
+                temp_debit=0.00
+
+                temp_credit+=entry[k].credit
+                temp_debit+=entry[k].debit
+
+                if self.flag==1:
+                    self.result_total["sum_credit" + str(k)]=0.00
+                    self.result_total["sum_debit" + str(k)]=0.00
+
+                if form['account_choice']=='bal_zero':
+                    if temp_credit<>temp_debit:
+                        self.result_total["sum_credit" + str(k)]+=temp_credit
+                        self.result_total["sum_debit" + str(k)]+=temp_debit
+                else:
+                    self.result_total["sum_credit" + str(k)]+=temp_credit
+                    self.result_total["sum_debit" + str(k)]+=temp_debit
+
+            self.flag=2
+
+            if entry[0].child_id:
+                ids2 = [(x.code,x.id) for x in entry[0].child_id]
+                ids2.sort()
+
+                result_total_parent = self.linesForTotal(form, [x[1] for x in ids2],doneAccount,level+1)
+
+        return [self.result_total]
+
+    def lines(self, form, ids={}, done={}, level=1):
+        accounts=[]
+        if not ids:
+            ids = self.ids
+        if not ids:
+            return []
+        result = []
+        ctx = self.context.copy()
+        tmp1=[]
+        for id in form['fiscalyear'][0][2]:
+
+            ctx['fiscalyear'] = id
+            ctx['periods'] = form['periods'][0][2]
+            ctx['period_manner']=form['select_periods']
+
+            tmp1 = self.pool.get('account.account').browse(self.cr, self.uid, ids,ctx.copy())
+
+            if len(tmp1):
+                accounts.append(tmp1)
+
+        if level==1:   #if parent is called,done is not empty when called again.
+            done={}
+
+        def cmp_code(x, y):
+            return cmp(x.code, y.code)
+        for n in range(0,len(accounts)):
+            accounts[n].sort(cmp_code)
+        common={}
+        merged_accounts=zip(*accounts)
+
+        for entry in merged_accounts:
+            j=0
+            checked=1
+
+            if form['account_choice']!='all':    #  if checked,include empty a/c;not otherwise
+                checked=0
+
+            if entry[0].id in done:
+                continue
+            done[entry[0].id] = 1
+
+            if entry[0].child_id:  # this is for parent account,dont check 0 for it
+                checked=4
+                self.status=1 # for displaying it Bold
+            else:
+                self.status=0
+            if checked==0:
+                i=0
+                for i in range(0,len(entry)):
+                    if bal_zero==0:
+                        if entry[i].balance<>0.0:
+                            checked=4
+                            break
+                        else:
+                            checked=3
+                            i=i+1
+                    else:
+                        if entry[i].credit <> 0.0 or entry[i].debit <> 0.0:
+                            checked=4
+                            break
+                        else:
+                            checked=3
+                            i=i+1
+
+            if checked==3:
+                # this is the point where we skip those accounts which are encountered as empty ones
+                continue
+                self.empty_parent=0
+            else:
+                self.empty_parent=1
+                res = {
+                    'code': entry[0].code,
+                    'name': entry[0].name,
+                    'level': level,
+                    'status': self.status,
+                    }
+
+                for j in range(0,len(entry)):
+
+                    locale.setlocale(locale.LC_ALL, '')
+                    res["debit"+str(j)]=locale.format("%.2f", entry[j].debit, grouping=True)
+                    res["credit"+str(j)]=locale.format("%.2f", entry[j].credit, grouping=True)
+                    res["balance"+str(j)]=locale.format("%.2f", entry[j].balance, grouping=True)
+
+
+                    if j==0:
+                        res["bal_cash"+str(j)]="0.00"
+                        res["bal_perc"+str(j)]="0.00%"
+                    else:
+                        temp_cash=entry[j].balance - entry[j-1].balance
+                        res["bal_cash"+str(j)]=locale.format("%.2f", temp_cash, grouping=True)
+                        if entry[j-1].balance<>0.00:
+                            temp_perc=(entry[j].balance - entry[j-1].balance )*100/entry[j-1].balance
+                        else:
+                            temp_perc=(entry[j].balance) *100
+
+                        res["bal_perc"+str(j)]=locale.format("%.2f", temp_perc) + "%"
+
+
+                    if ref_bal=='nothing':
+                        if level==1:
+                            self.parent_bal=1
+                        else:
+                            self.parent_bal=0
+
+                        if self.parent_bal==1:
+                            res["balance_perc"+str(j)]="/"
+                        else:
+                            if entry[j].balance==0.00:
+                                if self.baldiv["baldiv"+str(level-1)+str(j)]<>0.00:
+                                    res["balance_perc"+str(j)]="0.00%"
+                                else:
+                                    res["balance_perc"+str(j)]="/"
+                            else:
+                                if self.baldiv["baldiv"+str(level-1)+str(j)]<>0.00:
+                                    temp=self.baldiv["baldiv"+str(level-1)+str(j)]
+                                    temp1=(entry[j].balance * 100 )/ float(temp)
+                                    temp1=round(temp1,2)
+                                    res["balance_perc" + str(j)]=str(temp1)+"%"
+                                else:
+                                    res["balance_perc"+str(j)]="/"
+                    else:
+                        res["balance_perc"+str(j)]=str( (entry[j].balance * 100 )/ float(ref_bal)) + "%"
+
+            result.append(res)
+
+            if entry[0].child_id:
+
+                for q in range(0,len(form['fiscalyear'][0][2])):
+                    self.baldiv["baldiv"+str(level)+str(q)]=entry[q].balance
+
+                ids2 = [(x.code,x.id) for x in entry[0].child_id]
+                ids2.sort()
+                dir=[]
+                dir += self.lines(form, [x[1] for x in ids2], done, level+1)
+                if dir==[]:
+                    for w in range(0,len(form['fiscalyear'][0][2])):
+                        if entry[w].credit <> 0.0 or entry[w].debit <> 0.0 or entry[w].balance<>0.00:
+                            dont_pop=1
+                            break
+                        else:
+                            dont_pop=0
+                    if dont_pop==1:
+                        result +=dir
+                    else:
+                        result.pop(-1)   # here we pop up the parent having its children as emprty accounts
+                else:
+                    result +=dir
+
+        return result
+
+report_sxw.report_sxw('report.account.balance.account.balance', 'account.account', 'addons/account_balance/report/account_balance.rml', parser=account_balance, header=False)
+report_sxw.report_sxw('report.account.account.balance.landscape', 'account.account', 'addons/account_balance/report/account_balance_landscape.rml', parser=account_balance, header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_balance/report/account_balance.rml b/addons/account_balance/report/account_balance.rml
new file mode 100644
index 00000000000..c8ccaa1e139
--- /dev/null
+++ b/addons/account_balance/report/account_balance.rml
@@ -0,0 +1,179 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(635.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="15.0" y1="15.0" width="615" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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="0,1" stop="0,1"/>
+      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table61">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="red"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <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="12.0" leading="18" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" />
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="9.0" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Times-Roman" fontSize="9.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="1.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
+      <tr>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P1">Account balance</para>
+        </td>
+        <td>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="Table Contents">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">Currency: [[ company.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="P8">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
+     <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P13"> [[repeatIn(linesForYear(data['form']),'year_header',td=len(data['form']['fiscalyear'][0][2]),width=[126],value=['year'],type=['string']) ]]</para>
+      <blockTable colWidths="190.0" style="Table6">
+		 <tr>
+          <td>
+            <para style="P1">Account Information</para>
+          </td>
+         </tr>
+      </blockTable>
+    </section>
+    <section>
+      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['Debit','Credit','Balance'],type=['lable','lable','lable']) ]]</para>
+      <blockTable colWidths="30.0,160.0" style="Table6">
+        <tr>
+          <td>
+            <para style="P1">Code</para>
+          </td>
+          <td>
+            <para style="P1">Account Name</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <section>
+      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[84,42],value=['Cash','%'],type=['lable','lable']) ]]</para>
+      <blockTable colWidths="190.0" style="Table5">
+        <tr>
+          <td>
+            <para style="P4"> </para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P13">[[ repeatIn(lines(data['form']),'a',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['debit','credit','balance'],type=['string','string','string']) ]]</para>
+      <blockTable colWidths="0.0,28.0,162.0" style="Table5">
+        <tr>
+        <td>
+            <para style="P3"> </para>
+          </td>
+          <td>
+            <para style="P7">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['code'] ]]</para>
+          </td>
+          <td>
+          <para style="P2"><font>[['.....'*(a['level']-1) ]][[ setTag('font','font',{'color':'white'}) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Times-bold'})) ]][[ a['name'] ]]</font></para>
+         </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+     <para style="P13">[[ repeatIn(linesForTotal(data['form']),'total',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['sum_debit','sum_credit',''],type=['string','string','lable'] ) ]]</para>
+      <blockTable colWidths="190.0" style="Table6">
+        <tr>
+          <td>
+            <para style="P3">Total:[[ data['form']['show_columns']==0 and removeParentNode('section')]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/account_balance/report/account_balance_landscape.rml b/addons/account_balance/report/account_balance_landscape.rml
new file mode 100644
index 00000000000..de02427c410
--- /dev/null
+++ b/addons/account_balance/report/account_balance_landscape.rml
@@ -0,0 +1,179 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(1120.0,570.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="15.0" y1="15.0" width="1080" height="530"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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="0,1" stop="0,1"/>
+      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table61">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="red"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <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="12.0" leading="18" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="9.0" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Times-Roman" fontSize="9.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="1.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
+      <tr>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P1">Account balance</para>
+        </td>
+        <td>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="Table Contents">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">Currency: [[ company.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="P8">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
+     <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P13"> [[repeatIn(linesForYear(data['form']),'year_header',td=len(data['form']['fiscalyear'][0][2]),width=[126],value=['year'],type=['string']) ]]</para>
+      <blockTable colWidths="180.0" style="Table6">
+		 <tr>
+          <td>
+            <para style="P1">Account Information</para>
+          </td>
+         </tr>
+      </blockTable>
+    </section>
+    <section>
+      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['Debit','Credit','Balance'],type=['lable','lable','lable']) ]]</para>
+      <blockTable colWidths="30.0,150.0" style="Table6">
+        <tr>
+          <td>
+            <para style="P1">Code</para>
+          </td>
+          <td>
+            <para style="P1">Account Name</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <section>
+      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[84,42],value=['Cash','%'],type=['lable','lable']) ]]</para>
+      <blockTable colWidths="180.0" style="Table5">
+        <tr>
+          <td>
+            <para style="P4"> </para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P13">[[ repeatIn(lines(data['form']),'a',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['debit','credit','balance'],type=['string','string','string']) ]]</para>
+      <blockTable colWidths="0.0,28.0,152.0" style="Table5">
+        <tr>
+        <td>
+            <para style="P3"> </para>
+          </td>
+          <td>
+            <para style="P7">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['code'] ]]</para>
+          </td>
+          <td>
+          <para style="P2"><font>[['.....'*(a['level']-1) ]][[ setTag('font','font',{'color':'white'}) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Times-bold'})) ]][[ a['name'] ]]</font></para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+     <para style="P13">[[ repeatIn(linesForTotal(data['form']),'total',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['sum_debit','sum_credit',''],type=['string','string','lable'] ) ]]</para>
+      <blockTable colWidths="180.0" style="Table6">
+        <tr>
+          <td>
+            <para style="P3">Total:[[ data['form']['show_columns']==0 and removeParentNode('section')]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/account_balance/wizard/__init__.py b/addons/account_balance/wizard/__init__.py
new file mode 100644
index 00000000000..69177075b33
--- /dev/null
+++ b/addons/account_balance/wizard/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import wizard_account_balance_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_balance/wizard/wizard_account_balance_report.py b/addons/account_balance/wizard/wizard_account_balance_report.py
new file mode 100644
index 00000000000..dcde884afd1
--- /dev/null
+++ b/addons/account_balance/wizard/wizard_account_balance_report.py
@@ -0,0 +1,181 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 ir
+import pooler
+import time
+import netsvc
+from osv import fields, osv
+import mx.DateTime
+from mx.DateTime import RelativeDateTime
+
+from tools import config
+
+
+dates_form = '''<?xml version="1.0"?>
+<form string="Customize Report">
+    <notebook tabpos="up">
+        <page string="Report Options">
+            <separator string="Select Fiscal Year(s)(Maximum Three Years)" colspan="4"/>
+            <field name="fiscalyear" colspan="5" nolabel="1"/>
+            <field name="landscape" colspan="4"/>
+            <field name="show_columns" colspan="4"/>
+            <field name="format_perc" colspan="4"/>
+            <field name="select_account" colspan="4"/>
+            <field name="account_choice" colspan="4"/>
+            <field name="compare_pattern" colspan="4"/>
+
+        </page>
+
+        <page string="Select Period">
+            <field name="select_periods" colspan="4"/>
+            <separator string="Select Period(s)" colspan="4"/>
+            <field name="periods" colspan="4" nolabel="1"/>
+        </page>
+    </notebook>
+</form>'''
+
+dates_fields = {
+    'fiscalyear': {'string': 'Fiscal year', 'type': 'many2many', 'relation': 'account.fiscalyear'},
+    'select_account': {'string': 'Select Reference Account(for  % comparision)', 'type': 'many2one', 'relation': 'account.account','help': 'Keep empty for comparision to its parent'},
+    'account_choice': {'string': 'Show Accounts', 'type': 'selection','selection':[('all','All accounts'),('bal_zero','With balance is not equal to 0'),('moves','With movements')]},
+    'show_columns': {'string': 'Show Debit/Credit Information', 'type': 'boolean'},
+    'landscape': {'string': 'Show Report in Landscape Form', 'type': 'boolean'},
+    'format_perc': {'string': 'Show Comparision in %', 'type': 'boolean'},
+    'compare_pattern':{'string':"Compare Selected Years In Terms Of",'type':'selection','selection':[('bal_cash','Cash'),('bal_perc','Percentage'),('none','Don'+ "'" +'t Compare')]},
+    'select_periods':{'string':"Select Invoices Based on Their",'type':'selection','selection':[('actual','Actual Period (Duration)'),('created','Creation Date')]},
+    'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'}
+}
+
+back_form='''<?xml version="1.0"?>
+<form string="Notification">
+<separator string="You might have done following mistakes.Please correct them and try again." colspan="4"/>
+<separator string="1. You have selected more than 3 years in any case." colspan="4"/>
+<separator string="2. You have not selected 'Percentage' option,but you have selected more than 2 years." colspan="4"/>
+<label string="You can select maximum 3 years.Please check again." colspan="4"/>
+<separator string="3. You have selected 'Percentage' option with more than 2 years,but you have not selected landscape format." colspan="4"/>
+<label string="You have to select 'Landscape' option.Please Check it." colspan="4"/>
+</form>'''
+
+back_fields={
+}
+
+zero_form='''<?xml version="1.0"?>
+<form string="Notification">
+<separator string="You have to select atleast 1 Fiscal Year. Try again." colspan="4"/>
+<label string="You may have selected the compare opions with more than 1 years with credit/debit columns and % option.This can lead contents to be printed out of the paper.Please try again."/>
+</form>'''
+
+zero_fields={
+}
+
+def _check(self, cr, uid, data, context):
+
+        if (len(data['form']['fiscalyear'][0][2])==0) or (len(data['form']['fiscalyear'][0][2])>1 and (data['form']['compare_pattern']!='none') and (data['form']['format_perc']==1) and (data['form']['show_columns']==1) and (data['form']['landscape']!=1)):
+            return 'zero_years'
+
+        if ((len(data['form']['fiscalyear'][0][2])==3) and (data['form']['format_perc']!=1) and (data['form']['show_columns']!=1)):
+            if data['form']['landscape']==1:
+                return 'report_landscape'
+            else:
+                return 'report'
+
+
+        if data['form']['format_perc']==1:
+            if len(data['form']['fiscalyear'][0][2])<=2:
+                if data['form']['landscape']==1:
+                    return 'report_landscape'
+                else:
+                    return 'report'
+            else:
+                if len(data['form']['fiscalyear'][0][2])==3:
+                    if data['form']['landscape']==1:
+                        return 'report_landscape'
+                    else:
+                        return 'backtoinit'
+                else:
+                    return 'backtoinit'
+
+        else:
+            if len(data['form']['fiscalyear'][0][2])>2:
+                if data['form']['landscape']==1:
+                    return 'report_landscape'
+                else:
+                    return 'backtoinit'
+            else:
+                if data['form']['landscape']==1:
+                    return 'report_landscape'
+                else:
+                    return 'report'
+
+
+
+
+class wizard_report(wizard.interface):
+    def _get_defaults(self, cr, uid, data, context):
+        fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
+        data['form']['fiscalyear']=[fiscalyear_obj.find(cr, uid)]
+#       p_ids=pooler.get_pool(cr.dbname).get('account.period').search(cr,uid,[('fiscalyear_id','=',fiscalyear_obj.find(cr, uid))])
+#       data['form']['periods']=p_ids
+        data['form']['compare_pattern']='none'
+        data['form']['account_choice']='moves'
+        data['form']['select_periods']='actual'
+        return data['form']
+
+
+    states = {
+        'init': {
+            'actions': [_get_defaults],
+            'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('checkyear','Print')]}
+        },
+        'backtoinit': {
+            'actions': [],
+            'result': {'type':'form','arch':back_form,'fields':back_fields,'state':[('end','Ok')]}
+        },
+        'zero_years': {
+            'actions': [],
+            'result': {'type':'form','arch':zero_form,'fields':zero_fields,'state':[('end','Ok')]}
+        },
+        'checkyear': {
+            'actions': [],
+            'result': {'type':'choice','next_state':_check}
+        },
+        'report_landscape': {
+            'actions': [],
+            'result': {'type':'print', 'report':'account.account.balance.landscape', 'state':'end'}
+        },
+        'report': {
+            'actions': [],
+            'result': {'type':'print', 'report':'account.balance.account.balance', 'state':'end'}
+        }
+    }
+wizard_report('account.balance.account.balance.report')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_budget_crossover/__init__.py b/addons/account_budget_crossover/__init__.py
new file mode 100644
index 00000000000..1dda2ea0de1
--- /dev/null
+++ b/addons/account_budget_crossover/__init__.py
@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+import crossovered_budget
+import report
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_budget_crossover/__terp__.py b/addons/account_budget_crossover/__terp__.py
new file mode 100644
index 00000000000..39690790a06
--- /dev/null
+++ b/addons/account_budget_crossover/__terp__.py
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Crossovered Budget Management",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com/module_crossovered_budget.html",
+    "category" : "Generic Modules/Accounting",
+    "description": """This module allow accountants to manage analytic and crossovered budgets.
+
+    Once the Master Budgets and the Budgets defined (in Financial Management/Configuration/Budgets/), the Project Managers can set the planned amount on each Analytic Account. 
+
+    The accountant has the possibility to see the total of amount planned for each Budget and Master Budget in order to ensure the total planned is not greater/lower than what he planned for this Budget/Master Budget. Each list of record can also be switched to a graphical view of it.
+
+    Three reports are available:
+        1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts per Master Budgets.
+
+        2. The second is a summary of the previous one, it only gives the spreading, for the selected Budgets, of the Analytic Accounts.
+
+        3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts, of the Master Budgets per Budgets.
+
+""",
+    "depends" : ["account"],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ["crossovered_budget_view.xml","crossovered_budget_report.xml","crossovered_budget_workflow.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_budget_crossover/crossovered_budget.py b/addons/account_budget_crossover/crossovered_budget.py
new file mode 100644
index 00000000000..461bab436a5
--- /dev/null
+++ b/addons/account_budget_crossover/crossovered_budget.py
@@ -0,0 +1,196 @@
+# -*- encoding: utf-8 -*-
+from osv import osv,fields
+import tools
+import netsvc
+from mx import DateTime
+import time
+import datetime
+
+
+def strToDate(dt):
+        dt_date=datetime.date(int(dt[0:4]),int(dt[5:7]),int(dt[8:10]))
+        return dt_date
+
+class crossovered_budget(osv.osv):
+    _name = "crossovered.budget"
+    _description = "Crossovered Budget"
+
+    _columns = {
+        'name': fields.char('Name', size=50, required=True,states={'done':[('readonly',True)]}),
+        'code': fields.char('Code', size=20, required=True,states={'done':[('readonly',True)]}),
+        'creating_user_id': fields.many2one('res.users','Responsible User'),
+        'validating_user_id': fields.many2one('res.users','Validate User', readonly=True),
+        'date_from': fields.date('Start Date',required=True,states={'done':[('readonly',True)]}),
+        'date_to': fields.date('End Date',required=True,states={'done':[('readonly',True)]}),
+        'state' : fields.selection([('draft','Draft'),('confirm','Confirmed'),('validate','Validated'),('done','Done'),('cancel', 'Cancelled')], 'Status', select=True, required=True, readonly=True),
+        'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'crossovered_budget_id', 'Budget Lines',states={'done':[('readonly',True)]} ),
+    }
+
+    _defaults = {
+        'state': lambda *a: 'draft',
+        'creating_user_id': lambda self,cr,uid,context: uid,
+    }
+
+#   def action_set_to_draft(self, cr, uid, ids, *args):
+#       self.write(cr, uid, ids, {'state': 'draft'})
+#       wf_service = netsvc.LocalService('workflow')
+#       for id in ids:
+#           wf_service.trg_create(uid, self._name, id, cr)
+#       return True
+
+    def budget_confirm(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {
+            'state':'confirm'
+        })
+        return True
+
+    def budget_validate(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {
+            'state':'validate',
+            'validating_user_id': uid,
+        })
+        return True
+
+    def budget_cancel(self, cr, uid, ids, *args):
+
+        self.write(cr, uid, ids, {
+            'state':'cancel'
+        })
+        return True
+
+    def budget_done(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {
+            'state':'done'
+        })
+        return True
+
+crossovered_budget()
+
+class crossovered_budget_lines(osv.osv):
+
+    def _pra_amt(self, cr, uid, ids,name,args,context):
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            acc_ids = ','.join([str(x.id) for x in line.general_budget_id.account_ids])
+            if not acc_ids:
+                raise osv.except_osv('Error!',"The General Budget '" + str(line.general_budget_id.name) + "' has no Accounts!" )
+            date_to = line.date_to
+            date_from = line.date_from
+            if context.has_key('wizard_date_from'):
+                date_from = context['wizard_date_from']
+            if context.has_key('wizard_date_to'):
+                date_to = context['wizard_date_to']
+            cr.execute("select sum(amount) from account_analytic_line where account_id=%d and (date between to_date('%s','yyyy-mm-dd') and to_date('%s','yyyy-mm-dd')) and general_account_id in (%s)"%(line.analytic_account_id.id,date_from,date_to,acc_ids))
+            result=cr.fetchone()[0]
+            if result==None:
+                result=0.00
+            res[line.id]=result
+        return res
+
+    def _theo_amt(self, cr, uid, ids,name,args,context):
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            today=datetime.datetime.today()
+            date_to = today.strftime("%Y-%m-%d")
+            date_from = line.date_from
+            if context.has_key('wizard_date_from'):
+                date_from = context['wizard_date_from']
+            if context.has_key('wizard_date_to'):
+                date_to = context['wizard_date_to']
+
+            if line.paid_date:
+                if strToDate(date_to)<=strToDate(line.paid_date):
+                    theo_amt=0.00
+                else:
+                    theo_amt=line.planned_amount
+            else:
+                total=strToDate(line.date_to) - strToDate(line.date_from)
+                elapsed = min(strToDate(line.date_to),strToDate(date_to)) - max(strToDate(line.date_from),strToDate(date_from))
+                if strToDate(date_to) < strToDate(line.date_from):
+                    elapsed = strToDate(date_to) - strToDate(date_to)
+
+                theo_amt=float(elapsed.days/float(total.days))*line.planned_amount
+
+            res[line.id]=theo_amt
+        return res
+
+    def _perc(self, cr, uid, ids,name,args,context):
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            if line.theoritical_amount<>0.00:
+                res[line.id]=float(line.practical_amount / line.theoritical_amount)*100
+            else:
+                res[line.id]=0.00
+        return res
+    _name="crossovered.budget.lines"
+    _description = "Crossovered Budget Lines"
+    _columns = {
+        'crossovered_budget_id': fields.many2one('crossovered.budget', 'Budget Ref', ondelete='cascade', select=True, required=True),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account Ref',required=True),
+        'general_budget_id': fields.many2one('account.budget.post', 'Master Budget Ref',required=True),
+        'date_from': fields.date('Start Date',required=True),
+        'date_to': fields.date('End Date',required=True),
+        'paid_date': fields.date('Paid Date'),
+        'planned_amount':fields.float('Planned Amount',required=True),
+        'practical_amount':fields.function(_pra_amt,method=True, string='Practical Amount',type='float'),
+        'theoritical_amount':fields.function(_theo_amt,method=True, string='Theoritical Amount',type='float'),
+        'percentage':fields.function(_perc,method=True, string='Percentage',type='float'),
+    }
+crossovered_budget_lines()
+
+class account_budget_post(osv.osv):
+    _name = 'account.budget.post'
+    _inherit = 'account.budget.post'
+    _columns = {
+    'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'),
+    }
+account_budget_post()
+
+class account_budget_post_dotation(osv.osv):
+    _name = 'account.budget.post.dotation'
+    _inherit = 'account.budget.post.dotation'
+
+    def _tot_planned(self, cr, uid, ids,name,args,context):
+        res={}
+        for line in self.browse(cr, uid, ids):
+            if line.period_id:
+                obj_period=self.pool.get('account.period').browse(cr, uid,line.period_id.id)
+
+                total_days=strToDate(obj_period.date_stop) - strToDate(obj_period.date_start)
+                budget_id=line.post_id and line.post_id.id or False
+                query="select id from crossovered_budget_lines where  general_budget_id= '"+ str(budget_id) + "' AND (date_from  >='"  +obj_period.date_start +"'  and date_from <= '"+obj_period.date_stop + "') OR (date_to  >='"  +obj_period.date_start +"'  and date_to <= '"+obj_period.date_stop + "') OR (date_from  <'"  +obj_period.date_start +"'  and date_to > '"+obj_period.date_stop + "')"
+                cr.execute(query)
+                res1=cr.fetchall()
+
+                tot_planned=0.00
+                for record in res1:
+                    obj_lines = self.pool.get('crossovered.budget.lines').browse(cr, uid,record[0])
+                    count_days = min(strToDate(obj_period.date_stop),strToDate(obj_lines.date_to)) - max(strToDate(obj_period.date_start), strToDate(obj_lines.date_from))
+                    days_in_period = count_days.days +1
+                    count_days = strToDate(obj_lines.date_to) - strToDate(obj_lines.date_from)
+                    total_days_of_rec = count_days.days +1
+                    tot_planned += obj_lines.planned_amount/total_days_of_rec* days_in_period
+                res[line.id]=tot_planned
+            else:
+                res[line.id]=0.00
+        return res
+
+    _columns = {
+    'tot_planned':fields.function(_tot_planned,method=True, string='Total Planned Amount',type='float',store=True),
+    }
+
+account_budget_post_dotation()
+
+class account_analytic_account(osv.osv):
+    _name = 'account.analytic.account'
+    _inherit = 'account.analytic.account'
+
+    _columns = {
+    'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'analytic_account_id', 'Budget Lines'),
+    }
+
+account_analytic_account()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_budget_crossover/crossovered_budget_report.xml b/addons/account_budget_crossover/crossovered_budget_report.xml
new file mode 100644
index 00000000000..42f59110be4
--- /dev/null
+++ b/addons/account_budget_crossover/crossovered_budget_report.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+	<!-- Reports on crossovered.budget -->
+		<report id="report_crossovered_budget"
+				string="Print Budgets"
+				model="crossovered.budget"
+				name="crossovered.budget.report"
+				rml="account_budget_crossover/report/crossovered_budget_report.rml"
+				auto="False"
+				menu="False" />
+
+		<wizard
+			string="Print Budgets"
+			model="crossovered.budget"
+			name="wizard.crossovered.budget"
+			id="wizard_crossovered_budget_menu"
+			keyword="client_print_multi" />
+
+		<wizard
+			string="Print Summary of Budgets"
+			model="crossovered.budget"
+			name="wizard.crossovered.budget.summary"
+			id="wizard_crossovered_budget_menu_1"
+			keyword="client_print_multi" />
+
+	<!-- Reports on account.analytic.account -->
+		<wizard
+			id="account_analytic_account_budget_report"
+			string="Print Budgets"
+			model="account.analytic.account"
+			name="wizard.analytic.account.budget.report"
+			keyword="client_print_multi"/>
+
+		<report id="account_analytic_account_budget"
+			string="Print Budgets"
+			model="account.analytic.account"
+			name="account.analytic.account.budget"
+			rml="account_budget_crossover/report/analytic_account_budget_report.rml"
+			auto="False"
+			menu="False"/>
+	</data>
+</terp>
diff --git a/addons/account_budget_crossover/crossovered_budget_view.xml b/addons/account_budget_crossover/crossovered_budget_view.xml
new file mode 100644
index 00000000000..9959f41b558
--- /dev/null
+++ b/addons/account_budget_crossover/crossovered_budget_view.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+		<record model="ir.ui.view" id="crossovered_budget_view_form">
+			<field name="name">crossovered.budget.view.form</field>
+			<field name="model">crossovered.budget</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Budget">
+							<field name="name" colspan="1" select="1"/>
+							<field name="code" colspan="1" select="1" />
+							<field name="creating_user_id" />
+							<field name="validating_user_id" readonly="True"/>
+							<field name="date_from" select="2"/>
+							<field name="date_to" select="2"/>
+							<field name="crossovered_budget_line" colspan="4" nolabel="1">
+								<tree string="Budget Lines">
+									<field name="analytic_account_id"/>
+									<field name="general_budget_id"/>
+									<field name="date_from"/>
+									<field name="date_to"/>
+									<field name="paid_date"/>
+									<field name="planned_amount"/>
+									<field name="practical_amount"/>
+									<field name="theoritical_amount"/>
+									<field name="percentage"/>
+								</tree>
+								<form string="Budget Lines">
+									<field name="analytic_account_id" select="1"/>
+									<field name="general_budget_id" select="1"/>
+									<field name="date_from"/>
+									<field name="date_to"/>
+									<field name="paid_date" select="1"/>
+									<field name="planned_amount" select="1"/>
+								</form>
+							</field>
+							<field name="state" select="1"/>
+							<group col="4" colspan="2">
+								<button string="Confirm" name="confirm" states="draft" type="workflow" />
+								<button string="Validate" name="validate" states="confirm" type="workflow"/>
+								<button string="Done" name="done" states="validate" type="workflow"/>
+								<button string="Cancel" name="cancel" states="confirm,validate" type="workflow" />
+								<!--<button string="Set to Draft" name="action_set_to_draft" states="cancel" type="object"/>-->
+							</group>
+
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="crossovered_budget_view_tree">
+			<field name="name">crossovered.budget.view.tree</field>
+			<field name="model">crossovered.budget</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Budget">
+					<field name="name" colspan="1" select="1"/>
+					<field name="code" colspan="1" select="1" />
+					<field name="state"/>
+					<field name="date_from"/>
+					<field name="date_to"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="act_crossovered_budget_view">
+			<field name="name">Budget</field>
+			<field name="res_model">crossovered.budget</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="view_id" ref="crossovered_budget_view_tree"/>
+		</record>
+		<menuitem parent="account.next_id_31"
+			id="menu_act_crossovered_budget_view"
+			action="act_crossovered_budget_view" />
+
+		<record model="ir.ui.view" id="view_crossovered_budget_line_tree">
+			<field name="name">crossovered.budget.line.tree</field>
+			<field name="model">crossovered.budget.lines</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Budget Lines">
+					<field name="analytic_account_id"/>
+					<field name="general_budget_id"/>
+					<field name="date_from"/>
+					<field name="date_to"/>
+					<field name="paid_date"/>
+					<field name="planned_amount"/>
+					<field name="practical_amount" select="1"/>
+					<field name="theoritical_amount"/>
+					<field name="percentage"/>
+				</tree>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="view_crossovered_budget_line_form">
+			<field name="name">crossovered.budget.line.form</field>
+			<field name="model">crossovered.budget.lines</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Budget Lines">
+					<field name="crossovered_budget_id"/>
+					<field name="analytic_account_id" select="1"/>
+					<field name="general_budget_id" select="1"/>
+					<field name="date_from"/>
+					<field name="date_to"/>
+					<field name="paid_date" select="1"/>
+					<field name="planned_amount" select="1"/>
+					<field name="practical_amount" select="1"/>
+					<field name="theoritical_amount"/>
+					<field name="percentage"/>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="act_crossovered_budget_lines_view">
+			<field name="name">Budget Lines</field>
+			<field name="res_model">crossovered.budget.lines</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="view_id" ref="view_crossovered_budget_line_tree"/>
+		</record>
+
+		<menuitem name="Budgets" parent="account.menu_action_account_budget_post_tree"
+			id="menu_financial_reporting_budget_budget"/>
+		<menuitem name="Entries" parent="menu_financial_reporting_budget_budget"
+			id="menu_financial_reporting_budget_budget_entries"/>
+		<menuitem parent="menu_financial_reporting_budget_budget_entries"
+			id="menu_act_crossovered_budget_lines_view"
+			action="act_crossovered_budget_lines_view" />
+
+		<!--  Shortcuts -->
+		<act_window name="Budget Lines"
+			domain="[('analytic_account_id', '=', active_id)]"
+			res_model="crossovered.budget.lines"
+			src_model="account.analytic.account"
+			id="act_account_analytic_account_cb_lines"/>
+
+		<!--<record model="ir.ui.view" id="view_budget_post_dotation_form_inherit">
+			<field name="name">account.budget.post.dotation.form.inherit</field>
+			<field name="type">form</field>
+			<field name="model">account.budget.post.dotation</field>
+			<field name="inherit_id" ref="account.view_budget_post_dotation_form"/>
+			<field name="arch" type="xml">
+				<field name="period_id" position="after">
+					<field name="tot_planned" />
+				</field>
+			</field>
+		</record>-->
+
+		<record model="ir.ui.view" id="view_budget_post_dotation_tree_inherit">
+			<field name="name">account.budget.post.dotation.tree.inherit</field>
+			<field name="model">account.budget.post.dotation</field>
+			<field name="type">tree</field>
+			<field name="inherit_id" ref="account.view_budget_post_dotation_tree"/>
+			<field name="arch" type="xml">
+				<field name="amount" position="after">
+					<field name="tot_planned" />
+				</field>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="account.view_budget_post_form">
+			<field name="name">account.budget.post.form.inherit</field>
+			<field name="model">account.budget.post</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Master Budget">
+					<notebook>
+						<page string="Definition">
+							<field name="code" select="1"/>
+							<field name="name" select="1"/>
+						</page>
+						<page string="Dotations">
+							<button string="Spread" name="%(account.wizard_budget_spread)d" type="action"/>
+							<field name="dotation_ids" colspan="4" nolabel="1"/>
+						</page>
+						<page string="Accounts">
+							<field name="account_ids" colspan="4" nolabel="1"/>
+						</page>
+						<page string="Budget Lines">
+							<field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
+								<graph type="bar" string="Lines">
+									<field name="analytic_account_id" />
+									<field name="general_budget_id" operator="+" />
+									<field name="planned_amount" operator="+"/>
+									<field group="True" name="general_budget_id"/>
+								</graph>
+								<tree string="Budget Lines"  editable="top">
+									<field name="crossovered_budget_id"/>
+									<field name="analytic_account_id"/>
+									<field name="date_from"/>
+									<field name="date_to"/>
+									<field name="paid_date"/>
+									<field name="planned_amount"/>
+									<field name="practical_amount" select="1"/>
+									<field name="theoritical_amount"/>
+									<field name="percentage"/>
+								</tree>
+								<form string="Budget Lines">
+									<field name="crossovered_budget_id"/>
+									<field name="analytic_account_id"/>
+									<field name="date_from"/>
+									<field name="date_to"/>
+									<field name="paid_date"/>
+									<field name="planned_amount"/>
+									<field name="practical_amount" select="1"/>
+									<field name="theoritical_amount"/>
+									<field name="percentage"/>
+								</form>
+							</field>
+						</page>
+					</notebook>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_account_analytic_account_form_inherit_cci">
+			<field name="name">account.analytic.account.form.inherot.cci</field>
+			<field name="type">form</field>
+			<field name="model">account.analytic.account</field>
+			<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+			<field name="arch" type="xml">
+				<notebook position="inside">
+					<page string="Budget Lines">
+							<field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
+								<tree string="Budget Lines" editable="top">
+									<field name="crossovered_budget_id"/>
+									<field name="general_budget_id"/>
+									<field name="date_from"/>
+									<field name="date_to"/>
+									<field name="paid_date"/>
+									<field name="planned_amount"/>
+								</tree>
+								<form string="Budget Lines">
+									<field name="crossovered_budget_id"/>
+									<field name="general_budget_id"/>
+									<field name="date_from"/>
+									<field name="date_to"/>
+									<field name="paid_date"/>
+									<field name="planned_amount"/>
+								</form>
+								<graph type="bar" string="Lines">
+									<field name="general_budget_id" />
+									<field name="analytic_account_id" operator="+"/>
+									<field name="planned_amount" operator="+"/>
+									<field group="True" name="analytic_account_id"/>
+								</graph>
+							</field>
+					</page>
+				</notebook>
+			</field>
+		</record>
+
+	</data>
+</terp>
+
+
diff --git a/addons/account_budget_crossover/crossovered_budget_workflow.xml b/addons/account_budget_crossover/crossovered_budget_workflow.xml
new file mode 100644
index 00000000000..e271d131448
--- /dev/null
+++ b/addons/account_budget_crossover/crossovered_budget_workflow.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" ?>
+<terp>
+<data>
+
+	<record model="res.roles" id="crossovered_budget_role">
+			<field name="name">Crossovered Budget Validation</field>
+	</record>
+
+	<!-- Workflow definition -->
+
+	<record model="workflow" id="wkf_crossovered_budget">
+		<field name="name">wkf.crossovered.budget</field>
+		<field name="osv">crossovered.budget</field>
+		<field name="on_create">True</field>
+	</record>
+
+	<record model="workflow.activity" id="act_draft">
+		<field name="wkf_id" ref="wkf_crossovered_budget" />
+		<field name="flow_start">True</field>
+		<field name="name">draft</field>
+
+	</record>
+
+	<record model="workflow.activity" id="act_confirm">
+		<field name="wkf_id" ref="wkf_crossovered_budget" />
+		<field name="name">confirm</field>
+		<field name="kind">function</field>
+		<field name="action">budget_confirm()</field>
+		<field name="split_mode">OR</field>
+	</record>
+
+	<record model="workflow.activity" id="act_validate">
+		<field name="wkf_id" ref="wkf_crossovered_budget" />
+		<field name="name">validate</field>
+		<field name="kind">function</field>
+		<field name="action">budget_validate()</field>
+	</record>
+
+	<!--<record model="workflow.activity" id="act_set_to_draft">
+		<field name="wkf_id" ref="wkf_crossovered_budget" />
+		<field name="name">settodraft</field>
+		<field name="kind">function</field>
+		<field name="action">action_set_to_draft()</field>
+	</record>-->
+
+	<record model="workflow.activity" id="act_cancel">
+		<field name="wkf_id" ref="wkf_crossovered_budget" />
+		<field name="name">cancel</field>
+		<field name="kind">function</field>
+		<field name="action">budget_cancel()</field>
+
+	</record>
+	<record model="workflow.activity" id="act_done">
+		<field name="wkf_id" ref="wkf_crossovered_budget" />
+		<field name="name">done</field>
+		<field name="flow_stop">True</field>
+		<field name="kind">stopall</field>
+		<field name="action">budget_done()</field>
+		<field name="join_mode">XOR</field>
+
+	</record>
+
+	<record model="workflow.transition" id="t1">
+		<field name="act_from" ref="act_draft" />
+		<field name="act_to" ref="act_confirm" />
+		<field name="signal">confirm</field>
+	</record>
+
+	<record model="workflow.transition" id="t2">
+		<field name="act_from" ref="act_confirm" />
+		<field name="act_to" ref="act_validate" />
+		<field name="signal">validate</field>
+		<field name="role_id" ref="crossovered_budget_role"/>
+	</record>
+
+	<record model="workflow.transition" id="t3">
+		<field name="act_from" ref="act_confirm" />
+		<field name="act_to" ref="act_cancel" />
+		<field name="signal">cancel</field>
+		<field name="role_id" ref="crossovered_budget_role"/>
+	</record>
+
+	<record model="workflow.transition" id="t4">
+		<field name="act_from" ref="act_validate" />
+		<field name="act_to" ref="act_cancel" />
+		<field name="signal">cancel</field>
+		<field name="role_id" ref="crossovered_budget_role"/>
+	</record>
+
+	<record model="workflow.transition" id="t5">
+		<field name="act_from" ref="act_validate" />
+		<field name="act_to" ref="act_done" />
+		<field name="signal">done</field>
+		<field name="role_id" ref="crossovered_budget_role"/>
+	</record>
+
+	<!--<record model="workflow.transition" id="t7">
+		<field name="act_from" ref="act_cancel" />
+		<field name="act_to" ref="act_draft" />
+		<field name="signal">settodraft</field>
+		<field name="role_id" ref="crossovered_budget_role"/>
+	</record>-->
+</data>
+</terp>
diff --git a/addons/account_budget_crossover/report/__init__.py b/addons/account_budget_crossover/report/__init__.py
new file mode 100644
index 00000000000..29e13bf6c0e
--- /dev/null
+++ b/addons/account_budget_crossover/report/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+import crossovered_budget_report
+import analytic_account_budget_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_budget_crossover/report/analytic_account_budget_report.py b/addons/account_budget_crossover/report/analytic_account_budget_report.py
new file mode 100644
index 00000000000..3ccc59144e2
--- /dev/null
+++ b/addons/account_budget_crossover/report/analytic_account_budget_report.py
@@ -0,0 +1,177 @@
+# -*- encoding: utf-8 -*-
+import time
+import pooler
+from report import report_sxw
+import datetime
+
+class analytic_account_budget_report(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(analytic_account_budget_report, self).__init__(cr, uid, name, context)
+        self.localcontext.update( {
+            'funct': self.funct,
+            'funct_total': self.funct_total,
+            'time': time,
+        })
+        self.context=context
+
+
+    def funct(self,object,form,ids={}, done=None, level=1):
+
+        if not ids:
+            ids = self.ids
+#        if not ids:
+#            return []
+        if not done:
+            done={}
+
+        global tot
+        tot={
+            'theo':0.00,
+            'pln':0.00,
+            'prac':0.00,
+            'perc':0.00
+        }
+        result=[]
+        accounts = self.pool.get('account.analytic.account').browse(self.cr, self.uid, [object.id], self.context.copy())
+
+        for account_id in accounts:
+            res={}
+            budget_lines=[]
+            b_line_ids=[]
+
+            for line in account_id.crossovered_budget_line:
+                b_line_ids.append(line.id)
+
+            bd_lines_ids = ','.join([str(x) for x in b_line_ids])
+
+            d_from=form['date_from']
+            d_to=form['date_to']
+
+            query="select id from crossovered_budget_lines where id in ("+ str(bd_lines_ids) + ")"# AND '"+ str(d_from) +"'<=date_from AND date_from<date_to AND date_to<= '"+ str(d_to) +"'"
+
+            self.cr.execute(query)
+            budget_line_ids=self.cr.fetchall()
+
+            if not budget_line_ids:
+                return []
+
+            budget_lines=[x[0] for x in budget_line_ids]
+
+            bd_ids = ','.join([str(x) for x in budget_lines])
+
+            self.cr.execute('select distinct(crossovered_budget_id) from crossovered_budget_lines where id in (%s)'%(bd_lines_ids))
+            budget_ids=self.cr.fetchall()
+
+            for i in range(0,len(budget_ids)):
+
+                budget_name=self.pool.get('crossovered.budget').browse(self.cr, self.uid,[budget_ids[i][0]])
+                res={
+                     'b_id':'-1',
+                     'a_id':'-1',
+                     'name':budget_name[0].name,
+                     'status':1,
+                     'theo':0.00,
+                     'pln':0.00,
+                     'prac':0.00,
+                     'perc':0.00
+                }
+                result.append(res)
+
+                line_ids = self.pool.get('crossovered.budget.lines').search(self.cr, self.uid, [('id', 'in', b_line_ids),('crossovered_budget_id','=',budget_ids[i][0])])
+                line_id = self.pool.get('crossovered.budget.lines').browse(self.cr,self.uid,line_ids)
+                tot_theo=tot_pln=tot_prac=tot_perc=0
+
+                done_budget=[]
+                for line in line_id:
+
+                    if line.id in budget_lines:
+                        theo=pract=0.00
+                        theo=line._theo_amt(self.cr, self.uid, [line.id],"theoritical_amount",None,context={'wizard_date_from':d_from,'wizard_date_to':d_to})[line.id]
+                        pract=line._pra_amt(self.cr, self.uid, [line.id],"practical_amount",None,context={'wizard_date_from':d_from,'wizard_date_to':d_to})[line.id]
+
+                        if line.general_budget_id.id in done_budget:
+
+                            for record in result:
+                               if record['b_id']==line.general_budget_id.id  and record['a_id']==line.analytic_account_id.id:
+
+                                    record['theo'] +=theo
+                                    record['pln'] +=line.planned_amount
+                                    record['prac'] +=pract
+                                    record['perc'] +=line.percentage
+                                    tot_theo +=theo
+                                    tot_pln +=line.planned_amount
+                                    tot_prac +=pract
+                                    tot_perc +=line.percentage
+                        else:
+
+                            res1={
+                                 'b_id':line.general_budget_id.id,
+                                 'a_id':line.analytic_account_id.id,
+                                 'name':line.general_budget_id.name,
+                                 'status':2,
+                                 'theo':theo,
+                                 'pln':line.planned_amount,
+                                 'prac':pract,
+                                 'perc':line.percentage
+                            }
+
+                            tot_theo += theo
+                            tot_pln +=line.planned_amount
+                            tot_prac +=pract
+                            tot_perc +=line.percentage
+                            result.append(res1)
+                            done_budget.append(line.general_budget_id.id)
+                    else:
+                       if line.general_budget_id.id in done_budget:
+                            continue
+                       else:
+                            res1={
+                                    'b_id':line.general_budget_id.id,
+                                    'a_id':line.analytic_account_id.id,
+                                     'name':line.general_budget_id.name,
+                                     'status':2,
+                                     'theo':0.00,
+                                     'pln':0.00,
+                                     'prac':0.00,
+                                     'perc':0.00
+                            }
+
+                            result.append(res1)
+                            done_budget.append(line.general_budget_id.id)
+
+                if tot_theo==0.00:
+                    tot_perc=0.00
+                else:
+                    tot_perc=float(tot_prac /tot_theo)*100
+
+                result[-(len(done_budget) +1)]['theo']=tot_theo
+                tot['theo'] +=tot_theo
+                result[-(len(done_budget) +1)]['pln']=tot_pln
+                tot['pln'] +=tot_pln
+                result[-(len(done_budget) +1)]['prac']=tot_prac
+                tot['prac'] +=tot_prac
+                result[-(len(done_budget) +1)]['perc']=tot_perc
+
+            if tot['theo']==0.00:
+                tot['perc'] =0.00
+            else:
+                tot['perc']=float(tot['prac'] /tot['theo'])*100
+
+        return result
+
+    def funct_total(self,form):
+        result=[]
+        res={}
+        res={
+             'tot_theo':tot['theo'],
+             'tot_pln':tot['pln'],
+             'tot_prac':tot['prac'],
+             'tot_perc':tot['perc']
+        }
+        result.append(res)
+
+        return result
+
+report_sxw.report_sxw('report.account.analytic.account.budget', 'account.analytic.account', 'addons/account_budget_crossover/report/analytic_account_budget_report.rml',parser=analytic_account_budget_report,header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_budget_crossover/report/analytic_account_budget_report.rml b/addons/account_budget_crossover/report/analytic_account_budget_report.rml
new file mode 100644
index 00000000000..b7fa076ab35
--- /dev/null
+++ b/addons/account_budget_crossover/report/analytic_account_budget_report.rml
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+      <blockBackground colorName="#b3b3b3" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#b3b3b3" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#b3b3b3" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#b3b3b3" start="3,0" stop="3,0"/>
+      <blockBackground colorName="#b3b3b3" start="4,0" stop="4,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <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="10.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Times-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">[[ repeatIn(objects,'o') ]]</para>
+    <blockTable colWidths="499.0" repeatRows="1" style="Table1">
+      <tr>
+        <td>
+          <para style="P10">[[ company.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="250.0,250.0" repeatRows="1" style="Table6">
+      <tr>
+        <td>
+          <para style="P6">Currency: [[ company.currency_id.name ]]</para>
+        </td>
+        <td>
+          <para style="P7">Printed at: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S')]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="250.0,250.0" repeatRows="1" style="Table2">
+      <tr>
+        <td>
+          <para style="P6">Analysis from [[ data['form']['date_from'] ]] to [[ data['form']['date_to'] ]]</para>
+        </td>
+        <td>
+          <para style="P7">Analytic Account : [[ o.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="185.0,83.0,75.0,91.0,65.0" style="Table3">
+      <tr>
+        <td>
+          <para style="P4">Description</para>
+        </td>
+        <td>
+          <para style="P4">Theoretical Amount</para>
+        </td>
+        <td>
+          <para style="P4">Planned Amount</para>
+        </td>
+        <td>
+          <para style="P4">Practical Amount</para>
+        </td>
+        <td>
+          <para style="P4">%</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+    <para style="P2">[[ repeatIn(funct(o,data['form']),'a') ]]</para>
+    <blockTable colWidths="185.0,83.0,75.0,91.0,64.0" style="Table4">
+       <tr>
+        <td>
+          <para style="P1">
+           <font>[['.....'*(a['status']-1) ]][[ setTag('font','font',{'color':'white'}) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Times-bold'})) ]][[ a['name'] ]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ '%.2f' % a['theo'] ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ '%.2f' % a['pln'] ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ '%.2f' % a['prac'] ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ '%.2f' % a['perc'] ]]%</para>
+        </td>
+      </tr>
+    </blockTable>
+    </section>
+    <para style="Text body">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="185.0,83.0,75.0,91.0,64.0" style="Table5">
+      <tr>
+        <td>
+          <para style="P5">Total:</para>
+        </td>
+        <td>
+          <para style="P5">
+          [[ repeatIn(funct_total(data['form']),'b') ]] <font face="Times-Roman">[[ '%.2f' % b['tot_theo'] ]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">[[ '%.2f' % b['tot_pln'] ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ '%.2f' % b['tot_prac'] ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ '%.2f' % b['tot_perc'] ]]%</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
\ No newline at end of file
diff --git a/addons/account_budget_crossover/report/crossovered_budget_report.py b/addons/account_budget_crossover/report/crossovered_budget_report.py
new file mode 100644
index 00000000000..477ba605bf9
--- /dev/null
+++ b/addons/account_budget_crossover/report/crossovered_budget_report.py
@@ -0,0 +1,227 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+from report import report_sxw
+import datetime
+import operator
+import osv
+
+class budget_report(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(budget_report, self).__init__(cr, uid, name, context)
+        self.localcontext.update( {
+            'funct': self.funct,
+            'funct_total': self.funct_total,
+            'time': time,
+        })
+        self.context=context
+
+    def funct(self,object,form,ids={}, done=None, level=1):
+
+        if not ids:
+            ids = self.ids
+#       if not ids:
+#           return []
+        if not done:
+            done={}
+
+        global tot
+        tot={
+            'theo':0.00,
+            'pln':0.00,
+            'prac':0.00,
+            'perc':0.00
+        }
+        result=[]
+
+        budgets = self.pool.get('crossovered.budget').browse(self.cr, self.uid, [object.id], self.context.copy())
+
+        for budget_id in budgets:
+
+            res={}
+            budget_lines=[]
+            budget_ids=[]
+            d_from=form['date_from']
+            d_to=form['date_to']
+
+            for line in budget_id.crossovered_budget_line:
+                budget_ids.append(line.id)
+
+            b_line_ids=','.join([str(x) for x in budget_ids])
+
+            query="select id from crossovered_budget_lines where crossovered_budget_id = '"+ str(budget_id.id) + "'"# AND '"+ str(d_from) +"'<=date_from AND date_from<date_to AND date_to<= '"+ str(d_to) +"'"
+            self.cr.execute(query)
+            budget_line_ids=self.cr.fetchall()
+
+            if not budget_line_ids:
+                return []
+
+            budget_lines=[x[0] for x in budget_line_ids]
+
+            bd_ids = ','.join([str(x) for x in budget_lines])
+
+            self.cr.execute('select distinct(analytic_account_id) from crossovered_budget_lines where id in (%s)'%(b_line_ids))
+            an_ids=self.cr.fetchall()
+
+            for i in range(0,len(an_ids)):
+
+                analytic_name=self.pool.get('account.analytic.account').browse(self.cr, self.uid,[an_ids[i][0]])
+
+                res={
+                    'b_id':'-1',
+                    'a_id':'-1',
+                    'name':analytic_name[0].name,
+                    'status':1,
+                    'theo':0.00,
+                    'pln':0.00,
+                    'prac':0.00,
+                    'perc':0.00
+                }
+                result.append(res)
+
+                line_ids = self.pool.get('crossovered.budget.lines').search(self.cr, self.uid, [('id', 'in', budget_ids),('analytic_account_id','=',an_ids[i][0])])
+
+                line_id = self.pool.get('crossovered.budget.lines').browse(self.cr,self.uid,line_ids)
+                tot_theo=tot_pln=tot_prac=tot_perc=0.00
+
+                done_budget=[]
+                for line in line_id:
+
+                    if line.id in budget_lines:
+                        theo=pract=0.00
+                        theo=line._theo_amt(self.cr, self.uid, [line.id],"theoritical_amount",None,context={'wizard_date_from':d_from,'wizard_date_to':d_to})[line.id]
+                        pract=line._pra_amt(self.cr, self.uid, [line.id],"practical_amount",None,context={'wizard_date_from':d_from,'wizard_date_to':d_to})[line.id]
+
+                        if line.general_budget_id.id in done_budget:
+
+                            for record in result:
+                                if record['b_id']==line.general_budget_id.id  and record['a_id']==line.analytic_account_id.id:
+
+                                    record['theo'] +=theo
+                                    record['pln'] +=line.planned_amount
+                                    record['prac'] +=pract
+                                    if record['theo']<>0.00:
+                                        perc=(record['prac']/record['theo'])*100
+                                    else:
+                                        perc=0.00
+                                    record['perc'] =perc
+                                    tot_theo += theo
+                                    tot_pln +=line.planned_amount
+                                    tot_prac +=pract
+                                    tot_perc +=perc
+
+                        else:
+
+                            if theo<>0.00:
+                                perc=(pract/theo)*100
+                            else:
+                                perc=0.00
+                            res1={
+                                    'a_id':line.analytic_account_id.id,
+                                    'b_id':line.general_budget_id.id,
+                                    'name':line.general_budget_id.name,
+                                    'status':2,
+                                    'theo':theo,
+                                    'pln':line.planned_amount,
+                                    'prac':pract,
+                                    'perc':perc,
+                            }
+                            tot_theo += theo
+                            tot_pln +=line.planned_amount
+                            tot_prac +=pract
+                            tot_perc +=perc
+                            if form['report']=='analytic-full':
+                                result.append(res1)
+                                done_budget.append(line.general_budget_id.id)
+                    else:
+
+                        if line.general_budget_id.id in done_budget:
+                            continue
+                        else:
+                            res1={
+                                    'a_id':line.analytic_account_id.id,
+                                    'b_id':line.general_budget_id.id,
+                                    'name':line.general_budget_id.name,
+                                    'status':2,
+                                    'theo':0.00,
+                                    'pln':0.00,
+                                    'prac':0.00,
+                                    'perc':0.00
+                                }
+
+                            if form['report']=='analytic-full':
+                                result.append(res1)
+                                done_budget.append(line.general_budget_id.id)
+
+                if tot_theo==0.00:
+                    tot_perc=0.00
+                else:
+                    tot_perc=float(tot_prac /tot_theo)*100
+
+                if form['report']=='analytic-full':
+
+                    result[-(len(done_budget) +1)]['theo']=tot_theo
+                    tot['theo'] +=tot_theo
+                    result[-(len(done_budget) +1)]['pln']=tot_pln
+                    tot['pln'] +=tot_pln
+                    result[-(len(done_budget) +1)]['prac']=tot_prac
+                    tot['prac'] +=tot_prac
+                    result[-(len(done_budget) +1)]['perc']=tot_perc
+                else:
+                    result[-1]['theo']=tot_theo
+                    tot['theo'] +=tot_theo
+                    result[-1]['pln']=tot_pln
+                    tot['pln'] +=tot_pln
+                    result[-1]['prac']=tot_prac
+                    tot['prac'] +=tot_prac
+                    result[-1]['perc']=tot_perc
+            if tot['theo']==0.00:
+                tot['perc'] =0.00
+            else:
+                tot['perc']=float(tot['prac'] /tot['theo'])*100
+        return result
+
+    def funct_total(self,form):
+        result=[]
+        res={}
+
+        res={
+             'tot_theo':tot['theo'],
+             'tot_pln':tot['pln'],
+             'tot_prac':tot['prac'],
+             'tot_perc':tot['perc']
+        }
+        result.append(res)
+
+        return result
+
+report_sxw.report_sxw('report.crossovered.budget.report', 'crossovered.budget', 'addons/account_budget_crossover/report/crossovered_budget_report.rml',parser=budget_report,header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_budget_crossover/report/crossovered_budget_report.rml b/addons/account_budget_crossover/report/crossovered_budget_report.rml
new file mode 100644
index 00000000000..dfbc9416cd7
--- /dev/null
+++ b/addons/account_budget_crossover/report/crossovered_budget_report.rml
@@ -0,0 +1,176 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+      <blockBackground colorName="#b3b3b3" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#b3b3b3" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#b3b3b3" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#b3b3b3" start="3,0" stop="3,0"/>
+      <blockBackground colorName="#b3b3b3" start="4,0" stop="4,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <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="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">[[ repeatIn(objects,'o') ]]</para>
+    <blockTable colWidths="499.0" repeatRows="1" style="Table1">
+      <tr>
+        <td>
+          <para style="P2">
+            <font face="Times-Roman">[[ company.name ]]</font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="250.0,250.0" repeatRows="1" style="Table6">
+      <tr>
+        <td>
+          <para style="P7">
+            <font face="Times-Roman">Currency: [[ company.currency_id.name ]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="P8">Printed at: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S')]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="250.0,250.0" repeatRows="1" style="Table2">
+      <tr>
+        <td>
+          <para style="P7">Analysis from [[ data['form']['date_from'] ]] to [[ data['form']['date_to'] ]]</para>
+        </td>
+        <td>
+          <para style="P8">Budget : [[ o.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="185.0,83.0,75.0,91.0,64.0" style="Table3">
+      <tr>
+        <td>
+          <para style="P5">Description</para>
+        </td>
+        <td>
+          <para style="P5">Theoretical Amount</para>
+        </td>
+        <td>
+          <para style="P5">Planned Amount</para>
+        </td>
+        <td>
+          <para style="P5">Practical Amount</para>
+        </td>
+        <td>
+          <para style="P5">%</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+    <para style="P4">[[ repeatIn(funct(o,data['form']),'a') ]]</para>
+    <blockTable colWidths="185.0,83.0,75.0,91.0,64.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P3">
+           <font>[['.....'*(a['status']-1) ]][[ setTag('font','font',{'color':'white'}) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Times-bold'})) ]][[ a['name'] ]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="P6">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ '%.2f' % a['theo'] ]]</para>
+        </td>
+        <td>
+          <para style="P6">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ '%.2f' % a['pln'] ]]</para>
+        </td>
+        <td>
+          <para style="P6">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ '%.2f' % a['prac'] ]]</para>
+        </td>
+        <td>
+          <para style="P6">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ '%.2f' % a['perc'] ]]%</para>
+        </td>
+      </tr>
+    </blockTable>
+    </section>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="185.0,83.0,75.0,91.0,64.0" style="Table5">
+      <tr>
+        <td>
+          <para style="P10">Total:</para>
+        </td>
+        <td>
+          <para style="P6">[[ repeatIn(funct_total(data['form']),'b') ]] <font face="Times-Roman">[[ '%.2f' % b ['tot_theo'] ]]</font></para>
+        </td>
+        <td>
+          <para style="P6">[[ '%.2f' % b['tot_pln'] ]]</para>
+        </td>
+        <td>
+          <para style="P6">[[ '%.2f' % b['tot_prac'] ]]</para>
+        </td>
+        <td>
+          <para style="P6">[[ '%.2f' % b['tot_perc'] ]]%</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/account_budget_crossover/wizard/__init__.py b/addons/account_budget_crossover/wizard/__init__.py
new file mode 100644
index 00000000000..63a94c33df4
--- /dev/null
+++ b/addons/account_budget_crossover/wizard/__init__.py
@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+import wizard_crossovered_budget_report
+import wizard_analytic_account_budget
+import wizard_crossovered_budget_summary_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_budget_crossover/wizard/wizard_analytic_account_budget.py b/addons/account_budget_crossover/wizard/wizard_analytic_account_budget.py
new file mode 100644
index 00000000000..4066bf892fe
--- /dev/null
+++ b/addons/account_budget_crossover/wizard/wizard_analytic_account_budget.py
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+import time
+import wizard
+
+dates_form = '''<?xml version="1.0"?>
+<form string="Select Dates Period">
+    <field name="date_from"/>
+    <field name="date_to"/>
+</form>'''
+
+dates_fields = {
+    'date_from': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
+    'date_to': {'string':'End of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')}
+}
+
+class wizard_report(wizard.interface):
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
+        },
+        'report': {
+            'actions': [],
+            'result': {'type':'print', 'report':'account.analytic.account.budget', 'state':'end'}
+        }
+    }
+wizard_report('wizard.analytic.account.budget.report')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_budget_crossover/wizard/wizard_crossovered_budget_report.py b/addons/account_budget_crossover/wizard/wizard_crossovered_budget_report.py
new file mode 100644
index 00000000000..2a2d7a35c35
--- /dev/null
+++ b/addons/account_budget_crossover/wizard/wizard_crossovered_budget_report.py
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+import time
+import wizard
+
+dates_form = '''<?xml version="1.0"?>
+<form string="Select Options">
+    <field name="date_from"/>
+    <field name="date_to"/>
+</form>'''
+
+dates_fields = {
+    'date_from': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
+    'date_to': {'string':'End of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
+
+}
+
+class wizard_report(wizard.interface):
+
+    def _default(self, cr, uid, data, context):
+        data['form']['report']='analytic-full'
+        return data['form']
+
+    states = {
+        'init': {
+            'actions': [_default],
+            'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
+        },
+        'report': {
+            'actions': [],
+            'result': {'type':'print', 'report':'crossovered.budget.report', 'state':'end'}
+        }
+    }
+wizard_report('wizard.crossovered.budget')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_budget_crossover/wizard/wizard_crossovered_budget_summary_report.py b/addons/account_budget_crossover/wizard/wizard_crossovered_budget_summary_report.py
new file mode 100644
index 00000000000..6ed5f5870fa
--- /dev/null
+++ b/addons/account_budget_crossover/wizard/wizard_crossovered_budget_summary_report.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+import time
+import wizard
+
+dates_form = '''<?xml version="1.0"?>
+<form string="Select Options">
+    <field name="date_from"/>
+    <field name="date_to"/>
+</form>'''
+
+dates_fields = {
+    'date_from': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
+    'date_to': {'string':'End of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
+}
+
+class wizard_report_summary(wizard.interface):
+
+    def _default(self, cr, uid, data, context):
+        data['form']['report']='analytic-one'
+        return data['form']
+
+    states = {
+        'init': {
+            'actions': [_default],
+            'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
+        },
+        'report': {
+            'actions': [],
+            'result': {'type':'print', 'report':'crossovered.budget.report', 'state':'end'}
+        }
+    }
+wizard_report_summary('wizard.crossovered.budget.summary')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_date_check/__init__.py b/addons/account_date_check/__init__.py
new file mode 100644
index 00000000000..38a812f7fa8
--- /dev/null
+++ b/addons/account_date_check/__init__.py
@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+#----------------------------------------------------------
+# Init Sales
+#----------------------------------------------------------
+
+import account_date_check
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_date_check/__terp__.py b/addons/account_date_check/__terp__.py
new file mode 100644
index 00000000000..330c66a6b24
--- /dev/null
+++ b/addons/account_date_check/__terp__.py
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Account Date check",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com/module_sale.html",
+    "depends" : ["account"],
+    "category" : "Generic Modules/Accounting",
+    "init_xml" : [],
+    "demo_xml" : [],
+    "description": """
+    * Adds a field on journals: "Allows date not in the period"
+    * By default, this field is checked.
+
+If this field is not checked, the system control that the date is in the
+period when you create an account entry. Otherwise, it generates an
+error message: "The date of your account move is not in the defined
+period !"
+    """,
+    "update_xml" : [
+        "account_date_check_view.xml",
+    ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_date_check/account_date_check.py b/addons/account_date_check/account_date_check.py
new file mode 100644
index 00000000000..0a9449760ce
--- /dev/null
+++ b/addons/account_date_check/account_date_check.py
@@ -0,0 +1,88 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+# 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.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import time
+import netsvc
+
+import ir
+from mx import DateTime
+import pooler
+from tools import config
+
+class account_journal(osv.osv):
+    _inherit='account.journal'
+    _name='account.journal'
+    _columns = {
+        'allow_date':fields.boolean('Allows date not in the period'),
+    }
+    _defaults = {
+        'allow_date': lambda *a: 1,
+        }
+account_journal()
+
+class account_move_line(osv.osv):
+    _inherit='account.move.line'
+    _name='account.move.line'
+
+    def check_date(self, cr, uid, vals, context=None, check=True):
+        if 'date' in vals.keys():
+            if 'journal_id' in vals and 'journal_id' not in context:
+                journal_id = vals['journal_id']
+            if 'period_id' in vals and 'period_id' not in context:
+                period_id = vals['period_id']
+            elif 'journal_id' not in context and 'move_id' in vals:
+                m = self.pool.get('account.move').browse(cr, uid, vals['move_id'])
+                journal_id = m.journal_id.id
+                period_id = m.period_id.id
+            else:
+                journal_id = context['journal_id']
+                period_id = context['period_id']
+            journal=self.pool.get('account.journal').browse(cr,uid,[journal_id])[0]
+            if not journal.allow_date:
+                period=self.pool.get('account.period').browse(cr,uid,[period_id])[0]
+                if not time.strptime(vals['date'],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') and time.strptime(vals['date'],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'):
+                    raise osv.except_osv('Error','The date of your account move is not in the defined period !')
+        else:
+            return True
+
+    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        flag=self.check_date(cr, uid, vals, context, check)
+        result = super(account_move_line, self).write(cr, uid, ids, vals, context, check, update_check)
+        return result
+    def create(self, cr, uid, vals, context=None, check=True):
+        flag=self.check_date(cr, uid, vals, context, check)
+        result = super(account_move_line, self).create(cr, uid, vals, context, check)
+        return result
+account_move_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_date_check/account_date_check_view.xml b/addons/account_date_check/account_date_check_view.xml
new file mode 100644
index 00000000000..c14a85a0f31
--- /dev/null
+++ b/addons/account_date_check/account_date_check_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+	<record model="ir.ui.view" id="view_account_journal_form_inherit2">
+		<field name="name">account.journal.form.inherit2</field>
+		<field name="model">account.journal</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="account.view_account_journal_form"/>
+		<field name="arch" type="xml">
+			<field name="user_id" position="after">
+				<field name="allow_date" />
+			</field>
+		</field>
+	</record>
+
+</data>
+</terp>
diff --git a/addons/account_invoice_layout/.project b/addons/account_invoice_layout/.project
new file mode 100644
index 00000000000..9fcfcc5ebf0
--- /dev/null
+++ b/addons/account_invoice_layout/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>account_invoice_layout</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
diff --git a/addons/account_invoice_layout/.pydevproject b/addons/account_invoice_layout/.pydevproject
new file mode 100644
index 00000000000..b4c1448c08b
--- /dev/null
+++ b/addons/account_invoice_layout/.pydevproject
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.4</pydev_property>
+</pydev_project>
diff --git a/addons/account_invoice_layout/__init__.py b/addons/account_invoice_layout/__init__.py
new file mode 100644
index 00000000000..07e316b0c4d
--- /dev/null
+++ b/addons/account_invoice_layout/__init__.py
@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+import account_invoice_layout
+import report
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_invoice_layout/__terp__.py b/addons/account_invoice_layout/__terp__.py
new file mode 100644
index 00000000000..6d71a61fd44
--- /dev/null
+++ b/addons/account_invoice_layout/__terp__.py
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "account_invoice_layout",
+    "version" : "1.0",
+    "depends" : ["base", "account"],
+    "author" : "Tiny",
+    "description": """
+    This module provides some features to improve the layout of the invoices.
+
+    It gives you the possibility to
+        * order all the lines of an invoice
+        * add titles, comment lines, sub total lines
+        * draw horizontal lines and put page breaks
+    
+    Moreover, there is one option which allow you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions...
+
+    """,
+    "website" : "http://tinyerp.com/",
+    "category" : "Generic Modules/Project & Services",
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [
+                    "account_invoice_layout_view.xml",
+                    "account_invoice_layout_report.xml",
+                    ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
new file mode 100644
index 00000000000..33be86f2729
--- /dev/null
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -0,0 +1,192 @@
+# -*- encoding: utf-8 -*-
+from osv import fields,osv
+
+
+class notify_message(osv.osv):
+    _name = 'notify.message'
+    _description = 'Notify By Messages'
+    _columns = {
+        'name' :  fields.char('Title',size=64,required=True),
+        'msg' : fields.text('Special Message',size=125,required=True,help='This notification will appear at the bottom of the Invoices when printed.',translate=True)
+    }
+
+notify_message()
+
+class account_invoice_line(osv.osv):
+
+    def move_line_get_item(self, cr, uid, line, context={}):
+        if line.state != 'article':
+            return None
+        return super(account_invoice_line, self).move_line_get_item(cr, uid, line, context)
+
+    def fields_get(self, cr, uid, fields=None, context=None):
+        article = {
+            'article': [('readonly', False), ('invisible', False)],
+            'text': [('readonly', True), ('invisible', True), ('required', False)],
+            'subtotal': [('readonly', True), ('invisible', True), ('required', False)],
+            'title': [('readonly', True), ('invisible', True), ('required', False)],
+            'break': [('readonly', True), ('invisible', True), ('required', False)],
+            'line': [('readonly', True), ('invisible', True), ('required', False)],
+        }
+        states = {
+            'name': {
+                'break': [('readonly', True),('required', False),('invisible', True)],
+                'line': [('readonly', True),('required', False),('invisible', True)],
+                },
+            'product_id': article,
+            'account_id': article,
+            'quantity': article,
+            'uos_id': article,
+            'price_unit': article,
+            'discount': article,
+            'invoice_line_tax_id': article,
+            'account_analytic_id': article,
+        }
+        res = super(account_invoice_line, self).fields_get(cr, uid, fields, context)
+        for field in res:
+            if states.has_key(field):
+                for key,value in states[field].items():
+                    res[field].setdefault('states',{})
+                    res[field]['states'][key] = value
+        return res
+
+    def _onchange_invoice_line_view(self, cr, uid, id, type, context={}, *args):
+
+        if (not type):
+            return {}
+        if type != 'article':
+            temp = {'value': {
+                    'product_id': False,
+                    'uos_id': False,
+                    'account_id': False,
+                    'price_unit': False,
+                    'price_subtotal': False,
+                    'quantity': 0,
+                    'discount': False,
+                    'invoice_line_tax_id': False,
+                    'account_analytic_id': False,
+                    },
+                }
+            if type == 'line':
+                temp['value']['name'] = ' '
+            if type == 'break':
+                temp['value']['name'] = ' '
+            if type == 'subtotal':
+                temp['value']['name'] = 'Sub Total'
+            return temp
+        return {}
+
+    def create(self, cr, user, vals, context=None):
+        if vals.has_key('state'):
+            if vals['state'] == 'line':
+                vals['name'] = ' '
+            if vals['state'] == 'break':
+                vals['name'] = ' '
+            if vals['state'] != 'article':
+                vals['quantity']= 0
+                vals['account_id']= self._default_account(cr, user, None)
+        return super(account_invoice_line, self).create(cr, user, vals, context)
+
+    def write(self, cr, user, ids, vals, context=None):
+        if vals.has_key('state'):
+            if vals['state'] != 'article':
+                vals['product_id']= False
+                vals['uos_id']= False
+                vals['account_id']= self._default_account(cr, user, None)
+                vals['price_unit']= False
+                vals['price_subtotal']= False
+                vals['quantity']= 0
+                vals['discount']= False
+                vals['invoice_line_tax_id']= False
+                vals['account_analytic_id']= False
+            if vals['state'] == 'line':
+                vals['name'] = ' '
+            if vals['state'] == 'break':
+                vals['name'] = ' '
+        return super(account_invoice_line, self).write(cr, user, ids, vals, context)
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default['state'] = self.browse(cr, uid, id).state
+        return super(account_invoice_line, self).copy(cr, uid, id, default, context)
+
+    def _fnct(self, cr, uid, id, name, args, context):
+        res = {}
+        for m in self.browse(cr, uid, id):
+            if m.state != 'article':
+                if m.state == 'line':
+                    res[m.id] = '-----------------------------------------'
+                elif m.state == 'break':
+                    res[m.id] = 'PAGE BREAK'
+                else:
+                    res[m.id] = ' '
+            else:
+                [(temp)] = self.pool.get('account.account').name_get(cr, uid, [m.account_id.id], context=context)
+                res[m.id] = temp[1]
+        return res
+
+    _name = "account.invoice.line"
+    _order = "invoice_id, sequence asc"
+    _description = "Invoice Line"
+    _inherit = "account.invoice.line"
+    _columns = {
+        'state': fields.selection([
+                ('article','Product'),
+                ('title','Title'),
+                ('text','Note'),
+                ('subtotal','Sub Total'),
+                ('line','Separator Line'),
+                ('break','Page Break'),]
+            ,'Type', select=True, required=True),
+        'sequence': fields.integer('Sequence Number'),
+        'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, method=True, store=False, string="Source Account"),
+    }
+    def _default_account(self, cr, uid, context=None):
+        cr.execute("select id from account_account where code = 0 LIMIT 1")
+        res=cr.fetchone()
+        return res[0]
+    _defaults = {
+        'state': lambda *a: 'article',
+#       'account_id': _default_account
+    }
+account_invoice_line()
+
+
+class one2many_mod2(fields.one2many):
+    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
+        if not context:
+            context = {}
+        if not values:
+            values = {}
+        res = {}
+        for id in ids:
+            res[id] = []
+        ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids),('state','=','article')], limit=self._limit)
+        for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
+            res[r[self._fields_id]].append( r['id'] )
+        return res
+
+#   def copy(self, cr, uid, id, default=None, context=None):
+#       if default is None:
+#           default = {}
+#       default['line_ids'] = False
+#       return super(account_invoice, self).copy(cr, uid, id, default, context)
+
+
+class account_invoice(osv.osv):
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default['invoice_line'] = False
+        return super(account_invoice, self).copy(cr, uid, id, default, context)
+
+    _inherit = "account.invoice"
+    _columns = {
+        'abstract_line_ids': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines',readonly=True, states={'draft':[('readonly',False)]}),
+        'invoice_line': one2many_mod2('account.invoice.line', 'invoice_id', 'Invoice Lines',readonly=True, states={'draft':[('readonly',False)]}),
+    }
+account_invoice()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_invoice_layout/account_invoice_layout_report.xml b/addons/account_invoice_layout/account_invoice_layout_report.xml
new file mode 100644
index 00000000000..13ff08146b8
--- /dev/null
+++ b/addons/account_invoice_layout/account_invoice_layout_report.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+	<wizard	string="Formatted Inv. + Message"
+			model="account.invoice"
+			name="wizard.notify_message"
+			id="wizard_notify_message"
+			keyword="client_print_multi"
+			/>
+
+	<report id="account_invoices_1"
+			string="Formatted Inv."
+			model="account.invoice"
+			name="account.invoice.layout"
+			rml="account_invoice_layout/report/report_account_invoice_layout.rml"
+			auto="False"/>
+	</data>
+</terp>
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
new file mode 100644
index 00000000000..c9061926488
--- /dev/null
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+		<record model="ir.ui.view" id="view_invoice_line_form_inherit_1">
+			<field name="name">account.invoice.line.form.inherit_1</field>
+			<field name="model">account.invoice.line</field>
+			<field name="inherit_id" ref="account.view_invoice_line_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<xpath expr="/form/notebook/page/field[@name='name']" position="before">
+					<field name="state" select="1" on_change="_onchange_invoice_line_view(state)" />
+					<field name="sequence"/>
+				</xpath>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_invoice_line_tree_inherit_1">
+			<field name="name">account.invoice.line.tree.inherit_1</field>
+			<field name="model">account.invoice.line</field>
+			<field name="inherit_id" ref="account.view_invoice_line_tree"/>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<xpath expr="/tree/field[@name='name']" position="before">
+					<field name="sequence" string="Seq."/>
+				</xpath>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_invoice_line_tree_inherit_2">
+			<field name="name">account.invoice.line.tree.inherit_2</field>
+			<field name="model">account.invoice.line</field>
+			<field name="inherit_id" ref="view_invoice_line_tree_inherit_1"/>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<xpath expr="/tree/field[@name='account_id']" position="replace">
+					<field name="functional_field"/>
+				</xpath>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="account_invoice_form_inherit_1">
+			<field name="name">account.invoice.form.inherit_1</field>
+			<field name="model">account.invoice</field>
+			<field name="inherit_id" ref="account.invoice_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<xpath expr="/form/notebook/page/field[@name='invoice_line']" position="replace">
+					<field name="abstract_line_ids" colspan="4" nolabel="1"/>
+				</xpath>
+			</field>
+		</record>
+
+<!-- notification message views -->
+	<record model="ir.ui.view" id="view_notify_message_tree">
+		<field name="name">notify.message.tree</field>
+		<field name="model">notify.message</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Messages">
+				<field name="name"/>
+				<field name="msg"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_notify_message_form">
+		<field name="name">notify.message.form</field>
+		<field name="model">notify.message</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Messages">
+				<separator string="Write a notification or a wishful message." colspan="4"/>
+				<field name="name" select="1" colspan="2" />
+				<field name="msg" select="1" colspan="2"/>
+			</form>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="notify_mesage_tree_form">
+		<field name="name">Write Messages</field>
+		<field name="res_model">notify.message</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+	<menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/>
+	<menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
+
+
+
+	</data>
+</terp>
diff --git a/addons/account_invoice_layout/report/__init__.py b/addons/account_invoice_layout/report/__init__.py
new file mode 100644
index 00000000000..fd11a651bb5
--- /dev/null
+++ b/addons/account_invoice_layout/report/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+import report_account_invoice_layout
+import special_message_invoice
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.py b/addons/account_invoice_layout/report/report_account_invoice_layout.py
new file mode 100644
index 00000000000..7d8938638ff
--- /dev/null
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.py
@@ -0,0 +1,192 @@
+# -*- encoding: utf-8 -*-
+import time
+import pooler
+from report import report_sxw
+
+parents = {
+    'tr':1,
+    'li':1,
+    'story': 0,
+    'section': 0
+    }
+
+class account_invoice_1(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(account_invoice_1, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'invoice_lines': self.invoice_lines,
+            'repeat_In':self.repeat_In,
+        })
+        self.context = context
+
+    def repeat_In(self, lst, name, nodes_parent=False,td=False,width=[],value=[],type=[]):
+        self._node.data = ''
+        node = self._find_parent(self._node, nodes_parent or parents)
+        ns = node.nextSibling
+
+        value=['tax_types','quantity','uos','price_unit','discount','price_subtotal','currency']
+        type=['string','string','string','string','string','string','string']
+        width=[62,42,20,62,51,50,24]
+        td=7
+
+        tableFlag=0
+
+        if not lst:
+            lst.append(1)
+        for ns in node.childNodes :
+            if tableFlag==1:
+                break
+            if ns and ns.nodeName!='#text' and ns.tagName=='blockTable' and td :
+                tableFlag=1
+
+                width_str = ns._attrs['colWidths'].nodeValue
+                ns.removeAttribute('colWidths')
+                total_td = td * len(value)
+
+                if not width:
+                    for v in value:
+                        width.append(30)
+                for v in range(len(value)):
+                    width_str +=',%d'%width[v]
+
+                ns.setAttribute('colWidths',width_str)
+
+                child_list =  ns.childNodes
+
+                for child in child_list:
+                    if child.nodeName=='tr':
+                        lc = child.childNodes[1]
+#                        for t in range(td):
+                        i=0
+                        for v in value:
+                            t2="[[%s['type']=='text' and removeParentNode('tr')]]"%(name)
+                            t1= "[[ %s['%s'] ]]"%(name,v)
+                            t3="[[ %s['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]]"%name
+                            newnode = lc.cloneNode(1)
+
+                            newnode.childNodes[1].lastChild.data = t1 + t2 +t3
+#                           newnode.childNodes[1].lastChild.data=[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]]
+                            child.appendChild(newnode)
+                            newnode=False
+                            i+=1
+
+
+        return super(account_invoice_1,self).repeatIn(lst, name, nodes_parent=False)
+
+    def invoice_lines(self,invoice):
+
+        result =[]
+        sub_total={}
+        info=[]
+        invoice_list=[]
+        res={}
+        list_in_seq={}
+        ids = self.pool.get('account.invoice.line').search(self.cr, self.uid, [('invoice_id', '=', invoice.id)])
+        ids.sort()
+        for id in range(0,len(ids)):
+            info = self.pool.get('account.invoice.line').browse(self.cr, self.uid,ids[id], self.context.copy())
+            list_in_seq[info]=info.sequence
+#            invoice_list +=[info]
+        i=1
+        j=0
+        final=sorted(list_in_seq.items(), lambda x, y: cmp(x[1], y[1]))
+        invoice_list=[x[0] for x in final]
+        sum_flag={}
+        sum_flag[j]=-1
+        for entry in invoice_list:
+            res={}
+
+            if entry.state=='article':
+                self.cr.execute('select tax_id from account_invoice_line_tax where invoice_line_id=%d'%(entry.id))
+                tax_ids=self.cr.fetchall()
+
+                if tax_ids==[]:
+                    res['tax_types']=''
+                else:
+                    tax_names_dict={}
+                    for item in range(0,len(tax_ids))    :
+                        self.cr.execute('select name from account_tax where id=%d'%(tax_ids[item][0]))
+                        type=self.cr.fetchone()
+                        tax_names_dict[item] =type[0]
+                    tax_names = ','.join([tax_names_dict[x] for x in range(0,len(tax_names_dict))])
+                    res['tax_types']=tax_names
+                res['name']=entry.name
+                res['quantity']="%.2f"%(entry.quantity)
+                res['price_unit']="%.2f"%(entry.price_unit)
+                res['discount']="%.2f"%(entry.discount)
+                res['price_subtotal']="%.2f"%(entry.price_subtotal)
+                sub_total[i]=entry.price_subtotal
+                i=i+1
+                res['note']=entry.note
+                res['currency']=invoice.currency_id.code
+                res['type']=entry.state
+
+                if entry.uos_id.id==False:
+                    res['uos']=''
+                else:
+                    uos_name = self.pool.get('product.uom').read(self.cr,self.uid,entry.uos_id.id,['name'])
+                    res['uos']=uos_name['name']
+            else:
+
+                res['quantity']=''
+                res['price_unit']=''
+                res['discount']=''
+                res['tax_types']=''
+                res['type']=entry.state
+                res['note']=entry.note
+                res['uos']=''
+
+                if entry.state=='subtotal':
+                    res['name']=entry.name
+                    sum=0
+                    sum_id=0
+                    if sum_flag[j]==-1:
+                        temp=1
+                    else:
+                        temp=sum_flag[j]
+
+                    for sum_id in range(temp,len(sub_total)+1):
+                        sum+=sub_total[sum_id]
+                    sum_flag[j+1]= sum_id +1
+
+                    j=j+1
+                    res['price_subtotal']="%.2f"%(sum)
+                    res['currency']=invoice.currency_id.code
+                    res['quantity']=''
+                    res['price_unit']=''
+                    res['discount']=''
+                    res['tax_types']=''
+                    res['uos']=''
+                elif entry.state=='title':
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=''
+                elif entry.state=='text':
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=''
+                elif entry.state=='line':
+                    res['quantity']='____________'
+                    res['price_unit']='______________'
+                    res['discount']='____________'
+                    res['tax_types']='_________________'
+                    res['uos']='_____'
+                    res['name']='________________________________________'
+                    res['price_subtotal']='_______________________'
+                    res['currency']='_______'
+                elif entry.state=='break':
+                    res['type']=entry.state
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=''
+                else:
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=invoice.currency_id.code
+
+            result.append(res)
+        return result
+report_sxw.report_sxw('report.account.invoice.layout', 'account.invoice', 'addons/account_invoice_layout/report/report_account_invoice_layout.rml', parser=account_invoice_1)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
new file mode 100644
index 00000000000..9690d42236a
--- /dev/null
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -0,0 +1,297 @@
+<?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="28.0" width="527" height="786"/>
+</pageTemplate>
+</template>
+<stylesheet>
+<blockTableStyle id="Standard_Outline">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau2">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau6">
+<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"/>
+<blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
+<blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau7">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau8">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau3">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+<blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
+<blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
+<blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau4">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+<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"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau5">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<initialize>
+<paraStyle name="all" alignment="justify"/>
+</initialize>
+<paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P2" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P3" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P5" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P6" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P7" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P8" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="3.0" leading="8"/>
+<paraStyle name="P9" fontName="Times-Italic" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
+<paraStyle name="P10" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P11" fontName="Times-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P12" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P13" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P14" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="LEFT"/>
+<paraStyle name="P15" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="CENTER"/>
+<paraStyle name="P16" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/>
+<paraStyle name="P17" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+<paraStyle name="P18" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+<paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
+<paraStyle name="P20" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/>
+<paraStyle name="P21" fontName="Times-Bold" fontSize="8.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P22" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P23" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/>
+<paraStyle name="Standard" fontName="Times-Roman"/>
+<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="Table Contents" fontName="Times-Roman" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
+<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+<paraStyle name="Index" fontName="Times-Roman"/>
+</stylesheet>
+<images/>
+<story>
+<para style="P1">[[ repeatIn(objects,'o') ]]</para>
+<para style="P1">[[ setLang(o.partner_id.lang) ]]</para>
+<blockTable colWidths="295.0,232.0" style="Tableau2">
+<tr>
+<td>
+<para style="P2">
+<font color="white"> </font>
+</para>
+</td>
+<td>
+<para style="Standard">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+<para style="Standard">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
+<para style="Standard">[[ o.address_invoice_id.street ]]</para>
+<para style="Standard">[[ o.address_invoice_id.street2 or '' ]]</para>
+<para style="Standard">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
+<para style="Standard">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
+<para style="Standard">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
+<para style="Standard">
+<font color="white"> </font>
+</para>
+<para style="Standard">Tel.&#xA0;: [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
+<para style="Standard">Fax&#xA0;: [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
+<para style="Standard">VAT&#xA0;: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+</td>
+</tr>
+</blockTable>
+<para style="P14">
+<font color="white"> </font>
+</para>
+<para style="P23">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+<para style="P23">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
+<para style="P23">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+<para style="P23">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
+<para style="P23">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+<para style="P23">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+<para style="P16">
+<font face="Times-Roman">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]]</font>
+<font face="Times-Roman">[[ o.number ]]</font>
+</para>
+<para style="P15">
+<font color="white"> </font>
+</para>
+<para style="P17">
+<font face="Times-Roman">Document</font>
+<font face="Times-Roman">:</font>
+<font face="Times-Roman">[[o.name]]</font>
+</para>
+<para style="P17">
+<font face="Times-Roman">Invoice Date: </font>
+<font face="Times-Roman">[[o.date_invoice]]</font>
+</para>
+<para style="P18">
+<font face="Times-Roman">Customer Ref:</font> [[ o.address_invoice_id.partner_id.ref or '/' ]]</para>
+<para style="Standard">
+<font color="white"> </font>
+</para>
+<blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Tableau6">
+<tr>
+<td>
+<para style="P3">Description</para>
+</td>
+<td>
+<para style="P4">Taxes</para>
+</td>
+<td>
+<para style="P4">Quantity</para>
+</td>
+<td>
+<para style="P4">Unit Price</para>
+</td>
+<td>
+<para style="P4">Disc. (%)</para>
+</td>
+<td>
+<para style="P4">Price</para>
+</td>
+</tr>
+</blockTable>
+<section>
+<para style="P20">[[ repeat_In(invoice_lines(o), 'a') ]]</para>
+<blockTable colWidths="0.0,216.0" style="Tableau7">
+<tr>
+<td>
+<para style="P8">[[ a['type']=='text' and removeParentNode('tr')]]</para>
+</td>
+<td>
+<para style="Table Contents"><font>[[ a['type']=='title'  and ( setTag('font','font',{'size':'11.5'})) ]][[ (a['type']=='title' or a['type']=='subtotal')  and ( setTag('font','font',{'name':'Times-bold'})) ]][[ a['type']=='text' and removeParentNode('font') or a['name'] ]]</font></para>
+</td>
+</tr>
+</blockTable>
+<blockTable colWidths="453.0,74.0" style="Tableau8">
+<tr>
+<td>
+<para style="Table Contents">[[ a['type']=='text' and a['name'] or removeParentNode('table') ]]</para>
+</td>
+<td>
+<para style="P8">[[ a['type']=='text' and '' or removeParentNode('table') ]]</para>
+</td>
+</tr>
+</blockTable>
+<blockTable colWidths="28.0,499.0" style="Tableau8">
+<tr>
+<td>
+<para style="P21">[[ a['note']=='' and removeParentNode('table') ]][[ repeatIn(( a['note'] and a['note'].splitlines()) or [], 'note') ]]</para>
+</td>
+<td>
+<para style="P9">[[ note or removeParentNode('table') ]]</para>
+</td>
+</tr>
+</blockTable>
+<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+<blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Tableau6">
+<tr>
+<td>
+<para style="P3">Description [[ a['type']!='break' and removeParentNode('tr')]]</para>
+</td>
+<td>
+<para style="P4">Taxes</para>
+</td>
+<td>
+<para style="P4">Quantity</para>
+</td>
+<td>
+<para style="P4">Unit Price</para>
+</td>
+<td>
+<para style="P4">Disc. (%)</para>
+</td>
+<td>
+<para style="P4">Price</para>
+</td>
+</tr>
+</blockTable>
+</section>
+<para style="Standard">
+<font color="white"> </font>
+</para>
+<blockTable colWidths="215.0,313.0" style="Tableau3">
+<tr>
+<td>
+<blockTable colWidths="81.0,73.0,60.0" style="Tableau4">
+<tr>
+<td>
+<para style="P10">Tax</para>
+</td>
+<td>
+<para style="P8">Base</para>
+</td>
+<td>
+<para style="P8">Amount</para>
+</td>
+</tr>
+<tr>
+<td>
+<para style="P5">
+<font face="Times-Roman">[[ repeatIn(o.tax_line,'t') ]]</font> [[ t.name ]]</para>
+</td>
+<td>
+<para style="P11">[[ '%.2f' % t.base ]]</para>
+</td>
+<td>
+<para style="P11">[[ '%.2f' % t.amount]]</para>
+</td>
+</tr>
+</blockTable>
+</td>
+<td>
+<blockTable colWidths="214.0,95.0" style="Tableau5">
+<tr>
+<td>
+<para style="P7">Total (excl. taxes):</para>
+</td>
+<td>
+<para style="P12">[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</para>
+</td>
+</tr>
+<tr>
+<td>
+<para style="P7">Taxes:</para>
+</td>
+<td>
+<para style="P12">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para>
+</td>
+</tr>
+<tr>
+<td>
+<para style="P13">Total <font face="Times-Roman">(incl. taxes):</font>
+</para>
+</td>
+<td>
+<para style="P22">[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</para>
+</td>
+</tr>
+</blockTable>
+<para style="Table Contents">
+<font color="white"> </font>
+</para>
+</td>
+</tr>
+</blockTable>
+<para style="P19">[[ format(o.comment or '') ]]</para>
+<para style="P19">
+<font color="white"> </font>
+</para>
+<para style="P19">[[ format((o.payment_term and o.payment_term.note) or '') ]]</para>
+</story>
+</document>
+
diff --git a/addons/account_invoice_layout/report/special_message_invoice.py b/addons/account_invoice_layout/report/special_message_invoice.py
new file mode 100644
index 00000000000..60b6e148856
--- /dev/null
+++ b/addons/account_invoice_layout/report/special_message_invoice.py
@@ -0,0 +1,225 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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
+from report import report_sxw
+import pooler
+parents = {
+    'tr':1,
+    'li':1,
+    'story': 0,
+    'section': 0
+    }
+
+class account_invoice_with_message(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(account_invoice_with_message, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'spcl_msg': self.spcl_msg,
+            'invoice_lines': self.invoice_lines,
+            'repeat_In':self.repeat_In,
+
+        })
+        self.context = context
+
+    def repeat_In(self, lst, name, nodes_parent=False,td=False,width=[],value=[],type=[]):
+        self._node.data = ''
+        node = self._find_parent(self._node, nodes_parent or parents)
+        ns = node.nextSibling
+
+        value=['tax_types','quantity','uos','price_unit','discount','price_subtotal','currency']
+        type=['string','string','string','string','string','string','string']
+        width=[62,42,20,62,51,50,24]
+        td=7
+
+        tableFlag=0
+
+        if not lst:
+            lst.append(1)
+        for ns in node.childNodes :
+            if tableFlag==1:
+                break
+            if ns and ns.nodeName!='#text' and ns.tagName=='blockTable' and td :
+                tableFlag=1
+
+                width_str = ns._attrs['colWidths'].nodeValue
+                ns.removeAttribute('colWidths')
+                total_td = td * len(value)
+
+                if not width:
+                    for v in value:
+                        width.append(30)
+                for v in range(len(value)):
+                    width_str +=',%d'%width[v]
+
+                ns.setAttribute('colWidths',width_str)
+
+                child_list =  ns.childNodes
+
+                for child in child_list:
+                    if child.nodeName=='tr':
+                        lc = child.childNodes[1]
+        #                        for t in range(td):
+                        i=0
+                        for v in value:
+                            t2="[[%s['type']=='text' and removeParentNode('tr')]]"%(name)
+                            t1= "[[ %s['%s'] ]]"%(name,v)
+                            t3="[[ %s['type']=='subtotal' and ( setTag('para','para',{'fontName':'Times-bold'})) ]]"%name
+                            newnode = lc.cloneNode(1)
+
+                            newnode.childNodes[1].lastChild.data = t1 + t2 +t3
+        #                           newnode.childNodes[1].lastChild.data=[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]]
+                            child.appendChild(newnode)
+                            newnode=False
+                            i+=1
+
+        return super(account_invoice_with_message,self).repeatIn(lst, name, nodes_parent=False)
+
+    def spcl_msg(self, form):
+        account_msg_data = pooler.get_pool(self.cr.dbname).get('notify.message').browse(self.cr, self.uid, form['message'])
+        msg = account_msg_data.msg
+        return msg
+
+
+    def invoice_lines(self,invoice):
+        result =[]
+        sub_total={}
+        info=[]
+        invoice_list=[]
+        res={}
+        list_in_seq={}
+        ids = self.pool.get('account.invoice.line').search(self.cr, self.uid, [('invoice_id', '=', invoice.id)])
+        ids.sort()
+        for id in range(0,len(ids)):
+            info = self.pool.get('account.invoice.line').browse(self.cr, self.uid,ids[id], self.context.copy())
+            list_in_seq[info]=info.sequence
+        #            invoice_list +=[info]
+        i=1
+        j=0
+        final=sorted(list_in_seq.items(), lambda x, y: cmp(x[1], y[1]))
+        invoice_list=[x[0] for x in final]
+        sum_flag={}
+        sum_flag[j]=-1
+        for entry in invoice_list:
+            res={}
+
+            if entry.state=='article':
+                self.cr.execute('select tax_id from account_invoice_line_tax where invoice_line_id=%d'%(entry.id))
+                tax_ids=self.cr.fetchall()
+
+                if tax_ids==[]:
+                    res['tax_types']=''
+                else:
+                    tax_names_dict={}
+                    for item in range(0,len(tax_ids))    :
+                        self.cr.execute('select name from account_tax where id=%d'%(tax_ids[item][0]))
+                        type=self.cr.fetchone()
+                        tax_names_dict[item] =type[0]
+                    tax_names = ','.join([tax_names_dict[x] for x in range(0,len(tax_names_dict))])
+                    res['tax_types']=tax_names
+                res['name']=entry.name
+                res['quantity']="%.2f"%(entry.quantity)
+                res['price_unit']="%.2f"%(entry.price_unit)
+                res['discount']="%.2f"%(entry.discount)
+                res['price_subtotal']="%.2f"%(entry.price_subtotal)
+                sub_total[i]=entry.price_subtotal
+                i=i+1
+                res['note']=entry.note
+                res['currency']=invoice.currency_id.code
+                res['type']=entry.state
+
+                if entry.uos_id.id==False:
+                    res['uos']=''
+                else:
+                    uos_name = self.pool.get('product.uom').read(self.cr,self.uid,entry.uos_id.id,['name'])
+                    res['uos']=uos_name['name']
+            else:
+
+                res['quantity']=''
+                res['price_unit']=''
+                res['discount']=''
+                res['tax_types']=''
+                res['type']=entry.state
+                res['note']=entry.note
+                res['uos']=''
+
+                if entry.state=='subtotal':
+                    res['name']=entry.name
+                    sum=0
+                    sum_id=0
+                    if sum_flag[j]==-1:
+                        temp=1
+                    else:
+                        temp=sum_flag[j]
+
+                    for sum_id in range(temp,len(sub_total)+1):
+                        sum+=sub_total[sum_id]
+                    sum_flag[j+1]= sum_id +1
+
+                    j=j+1
+                    res['price_subtotal']="%.2f"%(sum)
+                    res['currency']=invoice.currency_id.code
+                    res['quantity']=''
+                    res['price_unit']=''
+                    res['discount']=''
+                    res['tax_types']=''
+                    res['uos']=''
+                elif entry.state=='title':
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=''
+                elif entry.state=='text':
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=''
+                elif entry.state=='line':
+                    res['quantity']='____________'
+                    res['price_unit']='______________'
+                    res['discount']='____________'
+                    res['tax_types']='_________________'
+                    res['uos']='_____'
+                    res['name']='________________________________________'
+                    res['price_subtotal']='_______________________'
+                    res['currency']='_______'
+                elif entry.state=='break':
+                    res['type']=entry.state
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=''
+                else:
+                    res['name']=entry.name
+                    res['price_subtotal']=''
+                    res['currency']=invoice.currency_id.code
+
+            result.append(res)
+        return result
+
+report_sxw.report_sxw('report.notify_account.invoice', 'account.invoice', 'addons/account_invoice_layout/report/special_message_invoice.rml', parser=account_invoice_with_message)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
new file mode 100644
index 00000000000..db215321006
--- /dev/null
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -0,0 +1,300 @@
+<?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="28.0" width="527" height="786"/>
+</pageTemplate>
+</template>
+<stylesheet>
+<blockTableStyle id="Standard_Outline">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau2">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau6">
+<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"/>
+<blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
+<blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau7">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau8">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau3">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+<blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
+<blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
+<blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau4">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+<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"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau5">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<initialize>
+<paraStyle name="all" alignment="justify"/>
+</initialize>
+<paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P2" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P3" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P5" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P6" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P7" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P8" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="3.0" leading="8"/>
+<paraStyle name="P9" fontName="Times-Italic" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
+<paraStyle name="P10" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P11" fontName="Times-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P12" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P13" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P14" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="LEFT"/>
+<paraStyle name="P15" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="CENTER"/>
+<paraStyle name="P16" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/>
+<paraStyle name="P17" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+<paraStyle name="P18" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+<paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
+<paraStyle name="P20" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/>
+<paraStyle name="P21" fontName="Times-Bold" fontSize="8.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P22" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="P23" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/>
+<paraStyle name="Standard" fontName="Times-Roman"/>
+<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="Table Contents" fontName="Times-Roman" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
+<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+<paraStyle name="Index" fontName="Times-Roman"/>
+</stylesheet>
+<images/>
+<story>
+<para style="P1">[[ repeatIn(objects,'o') ]]</para>
+<para style="P1">[[ setLang(o.partner_id.lang) ]]</para>
+<blockTable colWidths="295.0,232.0" style="Tableau2">
+<tr>
+<td>
+<para style="P2">
+<font color="white"> </font>
+</para>
+</td>
+<td>
+<para style="Standard">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+<para style="Standard">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
+<para style="Standard">[[ o.address_invoice_id.street ]]</para>
+<para style="Standard">[[ o.address_invoice_id.street2 or '' ]]</para>
+<para style="Standard">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
+<para style="Standard">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
+<para style="Standard">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
+<para style="Standard">
+<font color="white"> </font>
+</para>
+<para style="Standard">Tel.&#xA0;: [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
+<para style="Standard">Fax&#xA0;: [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
+<para style="Standard">VAT&#xA0;: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+</td>
+</tr>
+</blockTable>
+<para style="P14">
+<font color="white"> </font>
+</para>
+<para style="P23">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+<para style="P23">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
+<para style="P23">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+<para style="P23">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
+<para style="P23">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+<para style="P23">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+<para style="P16">
+<font face="Times-Roman">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]]</font>
+<font face="Times-Roman">[[ o.number ]]</font>
+</para>
+<para style="P15">
+<font color="white"> </font>
+</para>
+<para style="P17">
+<font face="Times-Roman">Document</font>
+<font face="Times-Roman">:</font>
+<font face="Times-Roman">[[o.name]]</font>
+</para>
+<para style="P17">
+<font face="Times-Roman">Invoice Date: </font>
+<font face="Times-Roman">[[o.date_invoice]]</font>
+</para>
+<para style="P18">
+<font face="Times-Roman">Customer Ref:</font> [[ o.address_invoice_id.partner_id.ref or '/' ]]</para>
+<para style="Standard">
+<font color="white"> </font>
+</para>
+<blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Tableau6">
+<tr>
+<td>
+<para style="P3">Description</para>
+</td>
+<td>
+<para style="P4">Taxes</para>
+</td>
+<td>
+<para style="P4">Quantity</para>
+</td>
+<td>
+<para style="P4">Unit Price</para>
+</td>
+<td>
+<para style="P4">Disc. (%)</para>
+</td>
+<td>
+<para style="P4">Price</para>
+</td>
+</tr>
+</blockTable>
+<section>
+<para style="P20">[[ repeat_In(invoice_lines(o), 'a') ]]</para>
+<blockTable colWidths="0.0,216.0" style="Tableau7">
+<tr>
+<td>
+<para style="P8">[[ a['type']=='text' and removeParentNode('tr')]]</para>
+</td>
+<td>
+<para style="Table Contents"><font>[[ a['type']=='title'  and ( setTag('font','font',{'size':'11.5'})) ]][[ (a['type']=='title' or a['type']=='subtotal')  and ( setTag('font','font',{'name':'Times-bold'})) ]][[ a['type']=='text' and removeParentNode('font') or a['name'] ]]</font></para>
+</td>
+</tr>
+</blockTable>
+<blockTable colWidths="453.0,74.0" style="Tableau8">
+<tr>
+<td>
+<para style="Table Contents">[[ a['type']=='text' and a['name'] or removeParentNode('table') ]]</para>
+</td>
+<td>
+<para style="P8">[[ a['type']=='text' and '' or removeParentNode('table') ]]</para>
+</td>
+</tr>
+</blockTable>
+<blockTable colWidths="28.0,499.0" style="Tableau8">
+<tr>
+<td>
+<para style="P21">[[ a['note']=='' and removeParentNode('table') ]][[ repeatIn(( a['note'] and a['note'].splitlines()) or [], 'note') ]]</para>
+</td>
+<td>
+<para style="P9">[[ note or removeParentNode('table') ]]</para>
+</td>
+</tr>
+</blockTable>
+<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+<blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Tableau6">
+<tr>
+<td>
+<para style="P3">Description [[ a['type']!='break' and removeParentNode('tr')]]</para>
+</td>
+<td>
+<para style="P4">Taxes</para>
+</td>
+<td>
+<para style="P4">Quantity</para>
+</td>
+<td>
+<para style="P4">Unit Price</para>
+</td>
+<td>
+<para style="P4">Disc. (%)</para>
+</td>
+<td>
+<para style="P4">Price</para>
+</td>
+</tr>
+</blockTable>
+</section>
+<para style="Standard">
+<font color="white"> </font>
+</para>
+<blockTable colWidths="215.0,313.0" style="Tableau3">
+<tr>
+<td>
+<blockTable colWidths="81.0,73.0,60.0" style="Tableau4">
+<tr>
+<td>
+<para style="P10">Tax</para>
+</td>
+<td>
+<para style="P8">Base</para>
+</td>
+<td>
+<para style="P8">Amount</para>
+</td>
+</tr>
+<tr>
+<td>
+<para style="P5">
+<font face="Times-Roman">[[ repeatIn(o.tax_line,'t') ]]</font> [[ t.name ]]</para>
+</td>
+<td>
+<para style="P11">[[ '%.2f' % t.base ]]</para>
+</td>
+<td>
+<para style="P11">[[ '%.2f' % t.amount]]</para>
+</td>
+</tr>
+</blockTable>
+</td>
+<td>
+<blockTable colWidths="214.0,95.0" style="Tableau5">
+<tr>
+<td>
+<para style="P7">Total (excl. taxes):</para>
+</td>
+<td>
+<para style="P12">[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</para>
+</td>
+</tr>
+<tr>
+<td>
+<para style="P7">Taxes:</para>
+</td>
+<td>
+<para style="P12">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para>
+</td>
+</tr>
+<tr>
+<td>
+<para style="P13">Total <font face="Times-Roman">(incl. taxes):</font>
+</para>
+</td>
+<td>
+<para style="P22">[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</para>
+</td>
+</tr>
+</blockTable>
+<para style="Table Contents">
+<font color="white"> </font>
+</para>
+</td>
+</tr>
+</blockTable>
+<para style="P19">[[ format(o.comment or '') ]]</para>
+<para style="P19">
+<font color="white"> </font>
+</para>
+<para style="P19">[[ format((o.payment_term and o.payment_term.note) or '') ]]</para>
+<para style="P19">[[ repeatIn((spcl_msg(data['form']) and spcl_msg(data['form']).splitlines()) or [], 'note') ]]</para>
+<para style="P19">[[ note or removeParentNode('table') ]]</para>
+
+</story>
+</document>
+
diff --git a/addons/account_invoice_layout/wizard/__init__.py b/addons/account_invoice_layout/wizard/__init__.py
new file mode 100644
index 00000000000..2d18a985d9d
--- /dev/null
+++ b/addons/account_invoice_layout/wizard/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import invoice_special_message
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_invoice_layout/wizard/invoice_special_message.py b/addons/account_invoice_layout/wizard/invoice_special_message.py
new file mode 100644
index 00000000000..c9563ae26d6
--- /dev/null
+++ b/addons/account_invoice_layout/wizard/invoice_special_message.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+import wizard
+import time
+import datetime
+import pooler
+
+invoice_form = """<?xml version="1.0"?>
+<form string="Select Message">
+    <field name="message"/>
+</form>"""
+
+invoice_fields = {
+    'message': {'string': 'Message', 'type': 'many2one', 'relation': 'notify.message', 'required': True},
+   }
+
+class wizard_report(wizard.interface):
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'form', 'arch':invoice_form, 'fields':invoice_fields, 'state':[('end','Cancel'),('print','Print')]},
+        },
+        'print': {
+            'actions': [],
+            'result': {'type':'print', 'report':'notify_account.invoice', 'state':'end'},
+        },
+    }
+
+wizard_report('wizard.notify_message')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_reporting/__init__.py b/addons/account_reporting/__init__.py
new file mode 100644
index 00000000000..a65045c2aa2
--- /dev/null
+++ b/addons/account_reporting/__init__.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 report
+import account
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_reporting/__terp__.py b/addons/account_reporting/__terp__.py
new file mode 100644
index 00000000000..b25f7a1c2fd
--- /dev/null
+++ b/addons/account_reporting/__terp__.py
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Reporting of Balancesheet for accounting",
+    "version" : "1.0",
+    "depends" : ["account"],
+    "author" : "Tiny",
+    "description": """Financial and accounting reporting""",
+    "category" : "Generic Modules/Accounting",
+    "init_xml" : [ ],
+    "demo_xml" : [ ],
+    "update_xml" : [
+                    "account_view.xml",
+                    "account_report.xml",
+                    "account_data.xml",
+                    ],
+#   "translations" : {
+#       "fr": "i18n/french_fr.csv"
+#   },
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py
new file mode 100644
index 00000000000..f5850284ab8
--- /dev/null
+++ b/addons/account_reporting/account.py
@@ -0,0 +1,134 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+# 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 netsvc
+from osv import fields, osv
+
+from tools.misc import currency
+
+import mx.DateTime
+from mx.DateTime import RelativeDateTime, now, DateTime, localtime
+
+
+class color_rml(osv.osv):
+    _name = "color.rml"
+    _description = "Rml Colors"
+    _columns = {
+        'name': fields.char('Name', size=64, required=True),
+        'code': fields.char('code',size=64,required=True),
+        }
+
+color_rml()
+
+class account_report_bs(osv.osv):
+    _name = "account.report.bs"
+    _description = "Account reporting for Balance Sheet"
+    _font = [
+             ('',''),
+             ('Courier','Courier'),
+             ('Courier-Bold','Courier-Bold'),
+             ('Courier-BoldOblique','Courier-BoldOblique'),
+             ('Courier-Oblique','Courier-Oblique'),
+             ('Helvetica','Helvetica'),
+             ('Helvetica-Bold','Helvetica-Bold'),
+             ('Helvetica-Oblique','Helvetica-Oblique'),
+             ('Times-Bold','Times-Bold'),
+             ('Times-BoldItalic','Times-BoldItalic'),
+             ('Times-Italic','Times-Italic'),
+             ('Times-Roman','Times-Roman'),
+            ]
+    _color = [
+            ('', ''),
+            ('green','Green'),
+            ('red','Red'),
+            ('pink','Pink'),
+            ('blue','Blue'),
+            ('yellow','Yellow'),
+            ('cyan','Cyan'),
+            ('lightblue','Light Blue'),
+            ('orange','Orange'),
+            ]
+    _style = [
+            ('', ''),
+            ('h1','Header 1'),
+            ('h2','Header 2'),
+            ('h3','Header 3'),
+            ]
+
+    def onchange_parent_id(self, cr, uid, ids, parent_id):
+        v={}
+        if parent_id:
+            acc=self.pool.get('account.report.report').browse(cr,uid,parent_id)
+            v['type']=acc.type
+            if int(acc.style) < 6:
+                v['style'] = str(int(acc.style)+1)
+        return {'value': v}
+
+    _columns = {
+        'name': fields.char('Name', size=64, required=True),
+        'sequence': fields.integer('Sequence'),
+        'code': fields.char('Code', size=64, required=True),
+        'account_id': fields.many2many('account.account', 'account_report_rel', 'report_id', 'account_id', 'Accounts'),
+        'note': fields.text('Note'),
+#       'style': fields.selection(_style, 'Style'),
+        'color_font' : fields.many2one('color.rml','Font Color'),
+        'color_back' : fields.many2one('color.rml','Back Color'),
+        'font_style' : fields.selection(_font, 'Font'),
+        'parent_id': fields.many2one('account.report.bs', 'Parent'),
+        'child_id': fields.one2many('account.report.bs', 'parent_id', 'Childs'),
+        'report_type' : fields.selection([('only_obj', 'Report Objects Only'),('with_account', 'Report Objects With Accounts'),('acc_with_child', 'Report Objects With Accounts and child of Accounts')],"Report Type")
+    }
+    _defaults = {
+        'report_type': lambda *a :'only_obj'
+    }
+
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if not args:
+            args=[]
+        if not context:
+            context={}
+        ids = []
+        if name:
+            ids = self.search(cr, user, [('code','=',name)]+ args, limit=limit, context=context)
+            if not ids:
+                ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
+        else:
+            ids = self.search(cr, user, args, limit=limit, context=context)
+        return self.name_get(cr, user, ids, context=context)
+
+    _sql_constraints = [
+        ('code_uniq', 'unique (code)', 'The code of the report entry must be unique !')
+    ]
+
+account_report_bs()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_reporting/account_data.xml b/addons/account_reporting/account_data.xml
new file mode 100644
index 00000000000..4fcb11a9768
--- /dev/null
+++ b/addons/account_reporting/account_data.xml
@@ -0,0 +1,491 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+	<record model="color.rml" id="c1">
+		<field name="name">aliceblue</field>
+		<field name="code">aliceblue</field>
+	</record>
+
+	<record model="color.rml" id="c2">
+		<field name="name">antiquewhite</field>
+		<field name="code">antiquewhite</field>
+	</record>
+
+	<record model="color.rml" id="c3">
+		<field name="name">aqua</field>
+		<field name="code">aqua</field>
+	</record>
+
+	<record model="color.rml" id="c4">
+		<field name="name">aquamarine</field>
+		<field name="code">aquamarine</field>
+	</record>
+
+	<record model="color.rml" id="c5">
+		<field name="name">azure</field>
+		<field name="code">azure</field>
+	</record>
+
+	<record model="color.rml" id="c6">
+		<field name="name">beige</field>
+		<field name="code">beige</field>
+	</record>
+
+	<record model="color.rml" id="c7">
+		<field name="name">bisque</field>
+		<field name="code">bisque</field>
+	</record>
+
+	<record model="color.rml" id="c8">
+		<field name="name">black</field>
+		<field name="code">black</field>
+	</record>
+
+	<record model="color.rml" id="c9">
+		<field name="name">blanchedalmond</field>
+		<field name="code">blanchedalmond</field>
+	</record>
+
+	<record model="color.rml" id="c10">
+		<field name="name">blue</field>
+		<field name="code">blue</field>
+	</record>
+
+	<record model="color.rml" id="c11">
+		<field name="name">blueviolet</field>
+		<field name="code">blueviolet</field>
+	</record>
+
+	<record model="color.rml" id="c12">
+		<field name="name">brown</field>
+		<field name="code">brown</field>
+	</record>
+
+	<record model="color.rml" id="c13">
+		<field name="name">burlywood</field>
+		<field name="code">burlywood</field>
+	</record>
+
+	<record model="color.rml" id="c14">
+		<field name="name">cadetblue</field>
+		<field name="code">cadetblue</field>
+	</record>
+
+	<record model="color.rml" id="c15">
+		<field name="name">chartreuse</field>
+		<field name="code">chartreuse</field>
+	</record>
+
+	<record model="color.rml" id="c16">
+		<field name="name">chocolate</field>
+		<field name="code">chocolate</field>
+	</record>
+
+	<record model="color.rml" id="c17">
+		<field name="name">coral</field>
+		<field name="code">coral</field>
+	</record>
+
+	<record model="color.rml" id="c18">
+		<field name="name">cornflower</field>
+		<field name="code">cornflower</field>
+	</record>
+
+	<record model="color.rml" id="c19">
+		<field name="name">cornsilk</field>
+		<field name="code">cornsilk</field>
+	</record>
+
+	<record model="color.rml" id="c20">
+		<field name="name">crimson</field>
+		<field name="code">crimson</field>
+	</record>
+
+	<record model="color.rml" id="c21">
+		<field name="name">cyan</field>
+		<field name="code">cyan</field>
+	</record>
+
+	<record model="color.rml" id="c22">
+		<field name="name">darkblue</field>
+		<field name="code">darkblue</field>
+	</record>
+
+	<record model="color.rml" id="c23">
+		<field name="name">darkcyan</field>
+		<field name="code">darkcyan</field>
+	</record>
+
+	<record model="color.rml" id="c24">
+		<field name="name">darkgoldenrod</field>
+		<field name="code">darkgoldenrod</field>
+	</record>
+
+	<record model="color.rml" id="c25">
+		<field name="name">darkgray</field>
+		<field name="code">darkgray</field>
+	</record>
+
+	<record model="color.rml" id="c26">
+		<field name="name">darkgreen</field>
+		<field name="code">darkgreen</field>
+	</record>
+
+	<record model="color.rml" id="c27">
+		<field name="name">darkkhaki</field>
+		<field name="code">darkkhaki</field>
+	</record>
+
+	<record model="color.rml" id="c28">
+		<field name="name">darkmagenta</field>
+		<field name="code">darkmagenta</field>
+	</record>
+
+	<record model="color.rml" id="c29">
+		<field name="name">darkolivegreen</field>
+		<field name="code">darkolivegreen</field>
+	</record>
+
+	<record model="color.rml" id="c30">
+		<field name="name">darkorange</field>
+		<field name="code">darkorange</field>
+	</record>
+
+	<record model="color.rml" id="c31">
+		<field name="name">darkorchid</field>
+		<field name="code">darkorchid</field>
+	</record>
+
+	<record model="color.rml" id="c32">
+		<field name="name">darkred</field>
+		<field name="code">darkred</field>
+	</record>
+
+	<record model="color.rml" id="c33">
+		<field name="name">darksalmon</field>
+		<field name="code">darksalmon</field>
+	</record>
+
+	<record model="color.rml" id="c34">
+		<field name="name">darkseagreen</field>
+		<field name="code">darkseagreen</field>
+	</record>
+
+	<record model="color.rml" id="c35">
+		<field name="name">darkslateblue</field>
+		<field name="code">darkslateblue</field>
+	</record>
+
+	<record model="color.rml" id="c36">
+		<field name="name">darkslategray</field>
+		<field name="code">darkslategray</field>
+	</record>
+
+	<record model="color.rml" id="c37">
+		<field name="name">darkturquoise</field>
+		<field name="code">darkturquoise</field>
+	</record>
+
+	<record model="color.rml" id="c38">
+		<field name="name">darkviolet</field>
+		<field name="code">darkviolet</field>
+	</record>
+
+	<record model="color.rml" id="c39">
+		<field name="name">deeppink</field>
+		<field name="code">deeppink</field>
+	</record>
+
+	<record model="color.rml" id="c40">
+		<field name="name">deepskyblue</field>
+		<field name="code">deepskyblue</field>
+	</record>
+
+	<record model="color.rml" id="c41">
+		<field name="name">dimgray</field>
+		<field name="code">dimgray</field>
+	</record>
+
+	<record model="color.rml" id="c42">
+		<field name="name">dodgerblue</field>
+		<field name="code">dodgerblue</field>
+	</record>
+
+	<record model="color.rml" id="c43">
+		<field name="name">firebrick</field>
+		<field name="code">firebrick</field>
+	</record>
+
+	<record model="color.rml" id="c44">
+		<field name="name">floralwhite</field>
+		<field name="code">floralwhite</field>
+	</record>
+
+	<record model="color.rml" id="c45">
+		<field name="name">forestgreen</field>
+		<field name="code">forestgreen</field>
+	</record>
+
+	<record model="color.rml" id="c46">
+		<field name="name">fuchsia</field>
+		<field name="code">fuchsia</field>
+	</record>
+
+	<record model="color.rml" id="c47">
+		<field name="name">gainsboro</field>
+		<field name="code">gainsboro</field>
+	</record>
+
+	<record model="color.rml" id="c48">
+		<field name="name">ghostwhite</field>
+		<field name="code">ghostwhite</field>
+	</record>
+
+	<record model="color.rml" id="c49">
+		<field name="name">gold</field>
+		<field name="code">gold</field>
+	</record>
+
+	<record model="color.rml" id="c50">
+		<field name="name">goldenrod</field>
+		<field name="code">goldenrod</field>
+	</record>
+
+	<record model="color.rml" id="c51">
+		<field name="name">gray</field>
+		<field name="code">gray</field>
+	</record>
+
+	<record model="color.rml" id="c52">
+		<field name="name">green</field>
+		<field name="code">green</field>
+	</record>
+
+	<record model="color.rml" id="c53">
+		<field name="name">greenyellow</field>
+		<field name="code">greenyellow</field>
+	</record>
+
+	<record model="color.rml" id="c54">
+		<field name="name">honeydew</field>
+		<field name="code">honeydew</field>
+	</record>
+
+	<record model="color.rml" id="c55">
+		<field name="name">hotpink</field>
+		<field name="code">hotpink</field>
+	</record>
+
+	<record model="color.rml" id="c56">
+		<field name="name">indianred</field>
+		<field name="code">indianred</field>
+	</record>
+
+	<record model="color.rml" id="c57">
+		<field name="name">indigo</field>
+		<field name="code">indigo</field>
+	</record>
+
+	<record model="color.rml" id="c58">
+		<field name="name">ivory</field>
+		<field name="code">ivory</field>
+	</record>
+
+	<record model="color.rml" id="c59">
+		<field name="name">khaki</field>
+		<field name="code">khaki</field>
+	</record>
+
+	<record model="color.rml" id="c60">
+		<field name="name">lavender</field>
+		<field name="code">lavender</field>
+	</record>
+
+	<record model="color.rml" id="c61">
+		<field name="name">lavenderblush</field>
+		<field name="code">lavenderblush</field>
+	</record>
+
+	<record model="color.rml" id="c62">
+		<field name="name">lawngreen</field>
+		<field name="code">lawngreen</field>
+	</record>
+
+	<record model="color.rml" id="c63">
+		<field name="name">lemonchiffon</field>
+		<field name="code">lemonchiffon</field>
+	</record>
+
+	<record model="color.rml" id="c64">
+		<field name="name">lightblue</field>
+		<field name="code">lightblue</field>
+	</record>
+
+	<record model="color.rml" id="c65">
+		<field name="name">lightcoral</field>
+		<field name="code">lightcoral</field>
+	</record>
+
+	<record model="color.rml" id="c66">
+		<field name="name">lightcyan</field>
+		<field name="code">lightcyan</field>
+	</record>
+
+	<record model="color.rml" id="c67">
+		<field name="name">lightgoldenrodyellow</field>
+		<field name="code">lightgoldenrodyellow</field>
+	</record>
+
+	<record model="color.rml" id="c68">
+		<field name="name">lightgreen</field>
+		<field name="code">lightgreen</field>
+	</record>
+
+	<record model="color.rml" id="c69">
+		<field name="name">lightpink</field>
+		<field name="code">lightpink</field>
+	</record>
+
+	<record model="color.rml" id="c70">
+		<field name="name">lightsalmon</field>
+		<field name="code">lightsalmon</field>
+	</record>
+
+	<record model="color.rml" id="c71">
+		<field name="name">lightseagreen</field>
+		<field name="code">lightseagreen</field>
+	</record>
+
+	<record model="color.rml" id="c72">
+		<field name="name">lightskyblue</field>
+		<field name="code">lightskyblue</field>
+	</record>
+
+	<record model="color.rml" id="c73">
+		<field name="name">lightslategray</field>
+		<field name="code">lightslategray</field>
+	</record>
+
+	<record model="color.rml" id="c74">
+		<field name="name">lightsteelblue</field>
+		<field name="code">lightsteelblue</field>
+	</record>
+
+	<record model="color.rml" id="c75">
+		<field name="name">lightyellow</field>
+		<field name="code">lightyellow</field>
+	</record>
+
+	<record model="color.rml" id="c76">
+		<field name="name">lime</field>
+		<field name="code">lime</field>
+	</record>
+
+	<record model="color.rml" id="c77">
+		<field name="name">limegreen</field>
+		<field name="code">limegreen</field>
+	</record>
+
+	<record model="color.rml" id="c78">
+		<field name="name">linen</field>
+		<field name="code">linen</field>
+	</record>
+
+	<record model="color.rml" id="c79">
+		<field name="name">magenta</field>
+		<field name="code">magenta</field>
+	</record>
+
+	<record model="color.rml" id="c80">
+		<field name="name">maroon</field>
+		<field name="code">maroon</field>
+	</record>
+
+	<record model="color.rml" id="c81">
+		<field name="name">mediumaquamarine</field>
+		<field name="code">mediumaquamarine</field>
+	</record>
+
+	<record model="color.rml" id="c82">
+		<field name="name">mediumblue</field>
+		<field name="code">mediumblue</field>
+	</record>
+
+	<record model="color.rml" id="c83">
+		<field name="name">mediumorchid</field>
+		<field name="code">mediumorchid</field>
+	</record>
+
+	<record model="color.rml" id="c84">
+		<field name="name">mediumpurple</field>
+		<field name="code">mediumpurple</field>
+	</record>
+
+	<record model="color.rml" id="c85">
+		<field name="name">mediumseagreen</field>
+		<field name="code">mediumseagreen</field>
+	</record>
+
+	<record model="color.rml" id="c86">
+		<field name="name">mediumslateblue</field>
+		<field name="code">mediumslateblue</field>
+	</record>
+
+	<record model="color.rml" id="c87">
+		<field name="name">mediumspringgreen</field>
+		<field name="code">mediumspringgreen</field>
+	</record>
+
+	<record model="color.rml" id="c88">
+		<field name="name">mediumturquoise</field>
+		<field name="code">mediumturquoise</field>
+	</record>
+
+	<record model="color.rml" id="c89">
+		<field name="name">mediumvioletred</field>
+		<field name="code">mediumvioletred</field>
+	</record>
+
+	<record model="color.rml" id="c90">
+		<field name="name">midnightblue</field>
+		<field name="code">midnightblue</field>
+	</record>
+
+	<record model="color.rml" id="c91">
+		<field name="name">mintcream</field>
+		<field name="code">mintcream</field>
+	</record>
+
+	<record model="color.rml" id="c92">
+		<field name="name">mistyrose</field>
+		<field name="code">mistyrose</field>
+	</record>
+
+	<record model="color.rml" id="c93">
+		<field name="name">moccasin</field>
+		<field name="code">moccasin</field>
+	</record>
+
+	<record model="color.rml" id="c94">
+		<field name="name">navajowhite</field>
+		<field name="code">navajowhite</field>
+	</record>
+
+	<record model="color.rml" id="c95">
+		<field name="name">navy</field>
+		<field name="code">navy</field>
+	</record>
+
+	<record model="color.rml" id="c96">
+		<field name="name">oldlace</field>
+		<field name="code">oldlace</field>
+	</record>
+
+	<record model="color.rml" id="c97">
+		<field name="name">olive</field>
+		<field name="code">olive</field>
+	</record>
+
+</data>
+</terp>
diff --git a/addons/account_reporting/account_report.xml b/addons/account_reporting/account_report.xml
new file mode 100644
index 00000000000..cd1ca195f20
--- /dev/null
+++ b/addons/account_reporting/account_report.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+<!--		<report id="balancesheet_report"
+			string="BalanceSheet Report"
+			model="account.report.bs"
+			name="account.report.bs"
+			rml="addons/account_report_bs/report/account_report_bs.rml"
+			auto="False"/>-->
+		<wizard
+			string="Account balance"
+			model="account.report.bs"
+			name="account.account.balancesheet.report"
+			keyword="client_print_multi"
+			id="wizard_balance_report"/>
+
+	</data>
+</terp>
\ No newline at end of file
diff --git a/addons/account_reporting/account_view.xml b/addons/account_reporting/account_view.xml
new file mode 100644
index 00000000000..bbbb2a9c70b
--- /dev/null
+++ b/addons/account_reporting/account_view.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+	<record model="ir.ui.view" id="view_account_report_bs_form">
+		<field name="name">account.report.bs.form</field>
+		<field name="model">account.report.bs</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Account reporting">
+				<notebook>
+				<page string="General">
+					<field name="name" select="1" colspan="3"/>
+					<field name="code" select="1"/>
+					<field name="parent_id" select = "1" />
+					<field name="sequence"/>
+					<field name="color_font"/>
+					<field name="color_back"/>
+					<field name="font_style" />
+					<field name="report_type" />
+					<newline/>
+					<separator string="Accounts" colspan="4"/>
+						<field name="account_id" colspan="4" nolable="1" domain="[('type','=','view')]"/>
+				</page><page string="Notes">
+					<field name="note" nolabel="1" colspan="4"/>
+				</page>
+				</notebook>
+			</form>
+		</field>
+	</record>
+
+		<record model="ir.ui.view" id="view_account_report_tree_bs">
+			<field name="name">account.report.report.tree.bs</field>
+			<field name="model">account.report.bs</field>
+			<field name="type">tree</field>
+			<field name="field_parent">child_id</field>
+			<field name="arch" type="xml">
+				<tree string="Account reporting">
+				<field name="code"/>
+				<field name="name"/>
+			</tree>
+			</field>
+		</record>
+		<record model="ir.actions.act_window" id="action_account_tree_bs">
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">account.report.bs</field>
+			<field name="domain">[('parent_id','=',False)]</field>
+			<field name="view_type">tree</field>
+			<field name="view_id" ref="view_account_report_tree_bs"/>
+		</record>
+		<menuitem name="Balance Sheet Report" id="menu_finan_config_BSheet" parent="account.menu_finance_configuration"/>
+		<menuitem name="Balance Sheet Report" id="action_account_report_bs_form" action="action_account_tree_bs" parent="menu_finan_config_BSheet"/>
+
+		<record model="ir.actions.act_window" id="acc_bs_report_action_form">
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">account.report.bs</field>
+			<field name="view_type">form</field>
+			<field name="view_id" ref="view_account_report_bs_form"/>
+		</record>
+		<menuitem name="Balance Sheet Rrport Form" id="bs_report_action_form" action="acc_bs_report_action_form" parent="menu_finan_config_BSheet"/>
+
+
+
+</data>
+</terp>
diff --git a/addons/account_reporting/report/__init__.py b/addons/account_reporting/report/__init__.py
new file mode 100644
index 00000000000..3e19e54febe
--- /dev/null
+++ b/addons/account_reporting/report/__init__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 account_report_bs
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py
new file mode 100644
index 00000000000..5c6466867db
--- /dev/null
+++ b/addons/account_reporting/report/account_report_bs.py
@@ -0,0 +1,149 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 time
+import pooler
+import locale
+from report import report_sxw
+
+#from addons.account.wizard import wizard_account_balance_report
+
+parents = {
+    'tr':1,
+    'li':1,
+    'story': 0,
+    'section': 0
+}
+
+class account_report_bs(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(account_report_bs, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'lines': self.lines,
+        })
+        self.context = context
+
+
+    def line_total(self,line_id,ctx):
+        _total = 0
+        bsline= self.pool.get('account.report.bs').browse(self.cr,self.uid,[line_id])[0]
+        bsline_accids = bsline.account_id
+        res =self.pool.get('account.report.bs').read(self.cr,self.uid,[line_id],['account_id','child_id'])[0]
+        for acc_id in res['account_id']:
+            acc = self.pool.get('account.account').browse(self.cr,self.uid,[acc_id],ctx)[0]
+            _total += acc.balance
+        bsline_reportbs = res['child_id']
+
+        for report in bsline_reportbs:
+            _total +=self.line_total(report,ctx)
+        return  _total
+
+    def lines(self, form, ids={}, done=None, level=1):
+        if not ids:
+            ids = self.ids
+        if not ids:
+            return []
+        if not done:
+            done={}
+        result = []
+        ctx = self.context.copy()
+        ctx['fiscalyear'] = form['fiscalyear']
+        ctx['periods'] = form['periods'][0][2]
+        report_objs = self.pool.get('account.report.bs').browse(self.cr, self.uid, ids)
+        title_name = False
+        if level==1:
+            title_name = report_objs[0].name
+        def cmp_code(x, y):
+            return cmp(x.code, y.code)
+        report_objs.sort(cmp_code)
+        
+        for report_obj in report_objs:
+            if report_obj.id in done:
+                continue
+            done[report_obj.id] = 1
+            color_font = ''
+            color_back = ''
+            if report_obj.color_font:
+                color_font = report_obj.color_font.name
+            if report_obj.color_back:
+                color_back = report_obj.color_back.name
+                
+            res = {
+                'code': report_obj.code,
+                'name': report_obj.name,
+                'level': level,
+                'balance': self.line_total(report_obj.id,ctx),
+                'color_font':color_font,
+                'color_back':color_back,
+                'font_style' : report_obj.font_style
+            }
+            result.append(res)
+            report_type = report_obj.report_type
+            if report_type != 'only_obj':
+                account_ids = self.pool.get('account.report.bs').read(self.cr,self.uid,[report_obj.id],['account_id'])[0]['account_id']
+                for account_id in account_ids:
+                    res1 = self.check_child_id(account_id,level,ctx,report_type)
+                    result += res1
+
+            if report_obj.child_id:
+                ids2 = [(x.code,x.id) for x in report_obj.child_id]
+                ids2.sort()
+                result += self.lines(form, [x[1] for x in ids2], done, level+1)
+
+        return result
+
+    def check_child_id(self,account_id,level,ctx,report_type):
+        account = self.pool.get('account.account').browse(self.cr,self.uid,[account_id],ctx)[0]
+        result = []
+        res = {
+            'code': account.code,
+            'name': account.name,
+            'level': level+1,
+            'balance': account.balance,
+            'color_font' : 'black',
+            'color_back' :'pink',
+            'font_style' : 'Helvetica-BoldOblique',
+            }
+        result.append(res)
+        if report_type != 'with_account':
+            acc_child_id  = self.pool.get('account.account').search(self.cr,self.uid,[('parent_id','=',[account_id]),('type','=','view')])
+            for child_id in acc_child_id :
+                result += self.check_child_id(child_id,level+1,ctx,report_type)
+        return result
+
+
+
+#   def _sum_credit(self):
+#       return self.sum_credit
+#
+#   def _sum_debit(self):
+#       return self.sum_debit
+report_sxw.report_sxw('report.account.report.bs', 'account.report.bs', 'addons/account_reporting/report/account_report_bs.rml', parser=account_report_bs)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_reporting/report/account_report_bs.rml b/addons/account_reporting/report/account_report_bs.rml
new file mode 100644
index 00000000000..b569924dba1
--- /dev/null
+++ b/addons/account_reporting/report/account_report_bs.rml
@@ -0,0 +1,133 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="15.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="8.0" leading="10"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P15" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P16" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P17" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P18" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P20" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
+      <tr>
+        <td>
+          <para style="Table Contents"><font color='blue'>[[ company.name ]]</font></para>
+        </td>
+        <td>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4"><font color='blue'>Currency: [[ company.currency_id.name ]]</font></para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P8"><font color='blue'>Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</font></para>
+    <para style="P7">[[repeatIn(objects,'o') ]]</para>
+    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table2">
+      <tr>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P1"><font>[[o.name]] [[o.font_style and (setTag('font','font',{'face':o.font_style} ) ) ]] [[ o.color_font and ( setTag('font','font',{'color':o.color_font.name})) ]] [[ o.color_back and ( setTag('para','para',{'backColor':o.color_back.name})) ]]</font></para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="70.0,341.0,131.0" style="Table7">
+      <tr>
+        <td>
+          <para style="P12" ><font color='blue'>Code</font></para>
+        </td>
+        <td>
+          <para style="P12"><font color='blue'>Account name</font></para>
+        </td>
+        <td>
+          <para style="P13"><font color='blue'>Balance</font></para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="75.0,341.0,131.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P10">[[ repeatIn(lines(data['form']), 'a') ]]<font> [[ a['code'] ]] [[ a['font_style'] and (setTag('font','font',{'face':a['font_style'] })) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]]</font></para>
+        </td>
+        <td>
+          <para style="P17"><font>[[ '..   .. '*(a['level']-1) ]] [[ a['name'] ]] [[ a['font_style'] and (setTag('font','font',{'face':a['font_style']})) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]]</font></para>
+        </td>
+        <td>
+          <para style="P18"><font>[[ '%.2f'% a['balance'] ]] [[ a['font_style'] and (setTag('font','font', {'face':a['font_style'] })) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]]</font></para>
+        </td>
+
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/account_reporting/wizard/__init__.py b/addons/account_reporting/wizard/__init__.py
new file mode 100644
index 00000000000..c88d9485468
--- /dev/null
+++ b/addons/account_reporting/wizard/__init__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard_account_balance_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_reporting/wizard/wizard_account_balance_report.py b/addons/account_reporting/wizard/wizard_account_balance_report.py
new file mode 100644
index 00000000000..9991931bb61
--- /dev/null
+++ b/addons/account_reporting/wizard/wizard_account_balance_report.py
@@ -0,0 +1,105 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 ir
+import pooler
+import time
+import netsvc
+from osv import fields, osv
+import mx.DateTime
+from mx.DateTime import RelativeDateTime
+
+from tools import config
+
+
+dates_form = '''<?xml version="1.0"?>
+<form string="Customize Report">
+    <field name="fiscalyear" colspan="4"/>
+    <field name="periods" colspan="4"/>
+</form>'''
+
+#   <field name="report_type" colspan="4"/>
+
+
+dates_fields = {
+    'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True},
+    'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
+#   'report_type': {'string': 'Report Type','type': 'selection','selection': [('only_obj', 'Report Objects Only'),('with_account', 'Report Objects With Accounts'),('acc_with_child', 'Report Objects With Accounts and child of Accounts'),],'required': True},
+}
+
+back_form='''<?xml version="1.0"?>
+<form string="Notification">
+<separator string="You might have done following mistakes.Please correct them and try again." colspan="4"/>
+<separator string="1. You have selected more than 3 years in any case." colspan="4"/>
+<separator string="2. You have not selected 'Percentage' option,but you have selected more than 2 years." colspan="4"/>
+<label string="You can select maximum 3 years.Please check again." colspan="4"/>
+</form>'''
+
+back_fields={
+}
+
+zero_form='''<?xml version="1.0"?>
+<form string="Notification">
+<label string="You have to select atleast 1 Fiscal Year. Try again."/>
+</form>'''
+
+zero_fields={
+}
+
+periods_form='''<?xml version="1.0"?>
+<form string="Set Periods">
+<separator string="Select Period(s) (All periods if empty)" colspan="4"/>
+            <field name="periods" colspan="4" nolabel="1"/>
+</form>'''
+
+periods_fields={
+    'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'}
+}
+
+class wizard_report(wizard.interface):
+    def _get_defaults(self, cr, uid, data, context):
+        fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
+        data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
+        data['form']['report_type'] = 'only_obj'
+        return data['form']
+
+    states = {
+        'init': {
+            'actions': [_get_defaults],
+            'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print BalanceSheet')]}
+        },
+        'report': {
+            'actions': [],
+            'result': {'type':'print', 'report':'account.report.bs', 'state':'end'}
+        }
+    }
+wizard_report('account.account.balancesheet.report')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/association_vertical/__init__.py b/addons/association_vertical/__init__.py
new file mode 100644
index 00000000000..cd9c7c0a27c
--- /dev/null
+++ b/addons/association_vertical/__init__.py
@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+#
+# Generated by the Tiny ERP module recorder !
+#
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/association_vertical/__terp__.py b/addons/association_vertical/__terp__.py
new file mode 100644
index 00000000000..060e60b01fa
--- /dev/null
+++ b/addons/association_vertical/__terp__.py
@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+{
+        "name" : "Association Verticalisation",
+        "version" : "Association Verticalisation",
+        "author" : "Tiny",
+        "website" : "http://tinyerp.com",
+        "category" : "Vertical Modules/Parametrization",
+        "description": """Simplification of the interface for associations.""",
+        "depends" : ["hr","crm_configuration","event"],
+        "init_xml" : [],
+        "demo_xml" : ["crm_fund_data.xml"],
+        "update_xml" : ["crm_fund_demo.xml",
+                        "aso_data.xml",
+                        "aso_vertical_view.xml",
+                       ],
+        "installable": True
+} 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/association_vertical/aso_data.xml b/addons/association_vertical/aso_data.xml
new file mode 100644
index 00000000000..74080c1f3eb
--- /dev/null
+++ b/addons/association_vertical/aso_data.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+		<record id="noone" model="res.groups">
+			<field name="name">No One</field>
+		</record>
+		<record id="hr.menu_hr_root" model="ir.ui.menu">
+			<field eval="[(6,0,[ref('noone')])]" name="groups_id"/>
+		</record>
+		<record id="crm.menu_crm" model="ir.ui.menu">
+			<field eval="[(6,0,[ref('noone')])]" name="groups_id"/>
+		</record>
+		<record id="product.menu_product_pricelist_main" model="ir.ui.menu">
+			<field eval="[(6,0,[ref('noone')])]" name="groups_id"/>
+		</record>
+		<record id="product.menu_product_price_type_action" model="ir.ui.menu">
+			<field eval="[(6,0,[ref('noone')])]" name="groups_id"/>
+		</record>
+		<record id="product.menu_product_pricelist_type_action" model="ir.ui.menu">
+			<field eval="[(6,0,[ref('noone')])]" name="groups_id"/>
+		</record>
+		<record id="product.menu_product_variant_action" model="ir.ui.menu">
+			<field eval="[(6,0,[ref('noone')])]" name="groups_id"/>
+		</record>
+		<record id="product.menu_product_template_action" model="ir.ui.menu">
+			<field eval="[(6,0,[ref('noone')])]" name="groups_id"/>
+		</record>
+
+	</data>
+</terp>
diff --git a/addons/association_vertical/aso_vertical_view.xml b/addons/association_vertical/aso_vertical_view.xml
new file mode 100644
index 00000000000..ae2f43a0fd9
--- /dev/null
+++ b/addons/association_vertical/aso_vertical_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+		<record id="crm_configuration.menu_crm_case_category_act_meetings" model="ir.ui.menu">
+			<field eval="&quot;Calendar of Meetings&quot;" name="name"/>
+			<field eval="&quot;terp-calendar&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+		<record id="association_vertical.menu_crm_case_fund_raise" model="ir.ui.menu">
+			<field eval="&quot;Fund Raising&quot;" name="name"/>
+			<field eval="&quot;terp-account&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>		
+		<record id="product.menu_main_product" model="ir.ui.menu">
+			<field model="ir.ui.menu" name="parent_id" search="[('name','=','Configuration'),('parent_id.name','=','Financial Management')]"/>
+		</record>
+		
+		<!-- For Shortcuts menu -->
+	
+		<record id="ir_ui_view_sc_mymeetings1" model="ir.ui.view_sc">
+			<field ref="crm_configuration.menu_crm_case_categ_meet_my" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;My Meetings&quot;" name="name"/>
+			<field name="user_id" ref="base.user_admin"/>
+		</record>
+		
+		<record id="ir_ui_view_sc_myopenprojects1" model="ir.ui.view_sc">
+			<field ref="project.menu_open_view_my_project_open" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;My Open Projects&quot;" name="name"/>
+			<field name="user_id" ref="base.user_admin"/>
+		</record>
+
+		<record id="ir_ui_view_sc_products0" model="ir.ui.view_sc">
+			<field ref="product.menu_products" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;Products&quot;" name="name"/>
+			<field name="user_id" ref="base.user_admin"/>
+		</record>
+		
+		<record id="ir_ui_view_sc_events0" model="ir.ui.view_sc">
+			<field ref="event.menu_event_event" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;Events&quot;" name="name"/>
+			<field name="user_id" ref="base.user_admin"/>
+		</record>
+
+	</data>
+</terp>
\ No newline at end of file
diff --git a/addons/association_vertical/crm_fund_data.xml b/addons/association_vertical/crm_fund_data.xml
new file mode 100644
index 00000000000..14db1c362f9
--- /dev/null
+++ b/addons/association_vertical/crm_fund_data.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" ?>
+<terp>
+	<data noupdate="1">
+		<record id="crm_case_helpingstreetchildren0" model="crm.case">
+			<field eval="0.5" name="probability"/>
+			<field name="partner_address_id" ref="base.res_partner_address_1"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="association_vertical.categ2_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="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
+			<field name="categ_id" ref="association_vertical.categ_fund1"/>
+			<field eval="&quot;Helping Street Children&quot;" name="name"/>
+			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_helpingearthquakevictims0" model="crm.case">
+			<field eval="0.8" name="probability"/>
+			<field name="partner_address_id" ref="base.main_address"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="association_vertical.categ2_fund4"/>
+			<field name="partner_id" ref="base.main_partner"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;draft&quot;" name="state"/>
+			<field eval="2000000.0" name="planned_cost"/>
+			<field name="section_id" ref="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-05 12:35:50')" name="date"/>
+			<field eval="8.0" name="duration"/>
+			<field name="categ_id" ref="association_vertical.categ_fund1"/>
+			<field eval="&quot;Helping earthquake victims&quot;" name="name"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_donatingbookstoschoollibraries0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="association_vertical.categ2_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_admin"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field eval="500000.0" name="planned_cost"/>
+			<field name="section_id" ref="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-07 13:50:50')" name="date"/>
+			<field name="categ_id" ref="association_vertical.categ_fund2"/>
+			<field eval="&quot;Donating books to school libraries&quot;" name="name"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_renovatinggovernmentschools0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_7"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="association_vertical.categ2_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="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-12 15:10:50')" name="date"/>
+			<field name="categ_id" ref="association_vertical.categ_fund2"/>
+			<field eval="4.3" name="duration"/>
+			<field eval="&quot;Renovating government schools&quot;" name="name"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_donatingambulancestohospitals0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_13"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="association_vertical.categ2_fund4"/>
+			<field name="partner_id" ref="base.res_partner_14"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field eval="5000000.0" name="planned_cost"/>
+			<field name="section_id" ref="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-17 19:00:15')" name="date"/>
+			<field eval="3" name="duration"/>
+			<field name="categ_id" ref="association_vertical.categ_fund3"/>
+			<field eval="&quot;Donating ambulances to hospitals&quot;" name="name"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_donatinghospitalequipments0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_2"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="association_vertical.categ2_fund3"/>
+			<field name="partner_id" ref="base.res_partner_10"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field eval="10000000.0" name="planned_cost"/>
+			<field name="section_id" ref="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-27 09:00:15')" name="date"/>
+			<field eval="12" name="duration"/>
+			<field name="categ_id" ref="association_vertical.categ_fund3"/>
+			<field eval="&quot;Donating hospital equipments&quot;" name="name"/>
+			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_encouragingarts0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_14"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="association_vertical.categ2_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="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-01 10:00:15')" name="date"/>
+			<field name="categ_id" ref="association_vertical.categ_fund4"/>
+			<field eval="&quot;Encouraging arts&quot;" name="name"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_promotingculturalprogramsandpreservingdyingartforms0" model="crm.case">
+			<field eval="1.0" name="probability"/>
+			<field name="partner_address_id" ref="base.res_partner_address_1"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="association_vertical.categ2_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_admin"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field eval="800000.0" name="planned_cost"/>
+			<field name="section_id" ref="association_vertical.section_support4"/>
+			<field eval="time.strftime('%Y-%m-24 22:00:15')" name="date"/>
+			<field name="categ_id" ref="association_vertical.categ_fund4"/>
+			<field eval="&quot;Promoting cultural programs and preserving dying art forms&quot;" name="name"/>
+			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+		</record>
+	</data>
+</terp>
\ No newline at end of file
diff --git a/addons/association_vertical/crm_fund_demo.xml b/addons/association_vertical/crm_fund_demo.xml
new file mode 100644
index 00000000000..43e1b8704d8
--- /dev/null
+++ b/addons/association_vertical/crm_fund_demo.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0"?>
+<terp>
+<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)		-->
+		
+	<record model="crm.case.categ" id="categ_fund1">
+		<field name="name">Social Rehabilitation And Rural Upliftment</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>
+	
+	<record model="crm.case.categ" id="categ_fund2">
+		<field name="name">Learning And Education</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>	
+	
+	<record model="crm.case.categ" id="categ_fund3">
+		<field name="name">Healthcare</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>		
+	
+	<record model="crm.case.categ" id="categ_fund4">
+		<field name="name">Arts And Culture</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>	
+
+		<!--	CASE CATEGORY2(category2_id)		-->
+		
+	<record model="crm.case.category2" id="categ2_fund1">
+		<field name="name">Cash</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>
+	
+	<record model="crm.case.category2" id="categ2_fund2">
+		<field name="name">Cheque</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>		
+
+	<record model="crm.case.category2" id="categ2_fund3">
+		<field name="name">Credit Card</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>
+	
+	<record model="crm.case.category2" id="categ2_fund4">
+		<field name="name">Demand Draft</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>	
+	
+	<!-- MENU -->	
+	<menuitem name="CRM &amp; SRM/Fund Raising" id="menu_crm_case_fund_raise"/>
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund1">
+		<field name="name">Funds</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund1"/>
+	</record>
+	<menuitem name="CRM &amp; SRM/Fund Raising/New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1"/>
+	
+	<!-- My Funds -->
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my1">
+		<field name="name">My Funds</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
+	</record>
+	<menuitem name="CRM &amp; SRM/Fund Raising/My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my2">
+		<field name="name">My Funds Waiting Validation</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
+	</record>
+	<menuitem name="CRM &amp; SRM/Fund Raising/My Funds/My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my3">
+		<field name="name">My Funds To Be Processed</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
+	</record>
+	<menuitem name="CRM &amp; SRM/Fund Raising/My Funds/My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3"/>
+
+	<!-- All Funds -->
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
+		<field name="name">All Funds</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
+	</record>
+	<menuitem name="CRM &amp; SRM/Fund Raising/All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all2">
+		<field name="name">All Funds Waiting Validation</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
+	</record>
+	<menuitem name="CRM &amp; SRM/Fund Raising/All Funds/All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all3">
+		<field name="name">All Funds To Be Processed</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
+	</record>
+	<menuitem name="CRM &amp; SRM/Fund Raising/All Funds/All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3"/>
+
+</data>
+</terp>
\ No newline at end of file
diff --git a/addons/auction/__init__.py b/addons/auction/__init__.py
new file mode 100644
index 00000000000..d2c2077fa57
--- /dev/null
+++ b/addons/auction/__init__.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 auction
+import wizard
+import report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
new file mode 100644
index 00000000000..e0c23b6a71c
--- /dev/null
+++ b/addons/auction/__terp__.py
@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Auction module",
+    "version" : "1.0",
+    "depends" : ["base","account","l10n_be","hr"],
+    "update_xml" : ["auction_view.xml", "auction_report.xml", "auction_wizard.xml"],
+    "demo_xml" : [
+        "auction_demo.xml"
+    ],
+    "init_xml" : ["auction_sequence.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/auction.png b/addons/auction/auction.png
new file mode 100644
index 00000000000..67ac78599b3
Binary files /dev/null and b/addons/auction/auction.png differ
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
new file mode 100644
index 00000000000..d01165954fb
--- /dev/null
+++ b/addons/auction/auction.py
@@ -0,0 +1,1414 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 time
+import netsvc
+from osv import fields, osv, orm
+import ir
+from mx import DateTime
+
+#----------------------------------------------------------
+# Auction Artists
+#----------------------------------------------------------
+class auction_artists(osv.osv):
+    _name = "auction.artists"
+    _columns = {
+        'name': fields.char('Artist/Author Name', size=64, required=True),
+        'pseudo': fields.char('Pseudo', size=64),
+        'birth_death_dates':fields.char('Birth / Death dates',size=64),
+        'biography': fields.text('Biography'),
+    }
+auction_artists()
+
+#----------------------------------------------------------
+# Auction Dates
+#----------------------------------------------------------
+class auction_dates(osv.osv):
+    _name = "auction.dates"
+
+    def _adjudication_get(self, cr, uid, ids, prop, unknow_none,unknow_dict):
+        tmp={}
+        for id in ids:
+            tmp[id]=0.0
+            cr.execute("select sum(obj_price) from auction_lots where auction_id=%d", (id,))
+            sum = cr.fetchone()
+            if sum:
+                tmp[id]=sum[0]
+        return tmp
+
+    def name_get(self, cr, uid, ids, context={}):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['name', 'auction1'], context)
+        name = [(r['id'],'['+r['auction1']+'] '+ r['name']) for r in reads]
+        return name
+
+    _columns = {
+        'name': fields.char('Auction date', size=64, required=True),
+        'expo1': fields.date('First Exposition Day', required=True),
+        'expo2': fields.date('Last Exposition Day', required=True),
+        'auction1': fields.date('First Auction Day', required=True),
+        'auction2': fields.date('Last Auction Day', required=True),
+        'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True),
+        'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True),
+        'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs'),
+        'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs'),
+        'acc_income': fields.many2one('account.account', 'Income Account', required=True),
+        'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
+        'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication',store=True),
+        'state': fields.selection((('draft','Draft'),('close','Closed')),'Status',select=1, readonly=True),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+
+    }
+    _defaults = {
+        'state': lambda *a: 'draft',
+    }
+    _order = "auction1 desc"
+
+    def close(self, cr, uid, ids, *args):
+        print "GGGGGGGGGGGGGGGggg"
+        """
+        Close an auction date.
+
+        Create invoices for all buyers and sellers.
+        STATE ='close'
+
+        RETURN: True
+        """
+        # objects vendus mais non factures
+        cr.execute('select count(*) as c from auction_lots where auction_id in ('+','.join(map(str,ids))+') and state=%s and obj_price>0', ('draft',))
+        nbr = cr.fetchone()[0]
+        ach_uids = {}
+        cr.execute('select id from auction_lots where auction_id in ('+','.join(map(str,ids))+') and state=%s and obj_price>0', ('draft',))
+        r=self.pool.get('auction.lots').lots_invoice(cr, uid, [x[0] for x in cr.fetchall()],{},None)
+        print "RRRRRRRRRRRRRRRRrrrr",r
+        cr.execute('select id from auction_lots where auction_id in ('+','.join(map(str,ids))+') and obj_price>0')
+        ids2 = [x[0] for x in cr.fetchall()]
+    #   for auction in auction_ids:
+        c=self.pool.get('auction.lots').seller_trans_create(cr, uid, ids2,{})
+        self.write(cr, uid, ids, {'state':'closed'}) #close the auction
+        print "jjjjjjjjjjjjjjjj"
+        return True
+auction_dates()
+
+
+#----------------------------------------------------------
+# Deposits
+#----------------------------------------------------------
+def _inv_uniq(cr, ids):
+    cr.execute('select name from auction_deposit where id in ('+','.join(map(lambda x: str(x), ids))+')')
+    for datas in cr.fetchall():
+        cr.execute('select count(*) from auction_deposit where name=%s', (datas[0],))
+        if cr.fetchone()[0]>1:
+            return False
+    return True
+
+class auction_deposit(osv.osv):
+    _name = "auction.deposit"
+    _description="Deposit Border"
+    _order = "id desc"
+    _columns = {
+        'transfer' : fields.boolean('Transfer'),
+        'name': fields.char('Depositer Inventory', size=64, required=True),
+        'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True),
+        'date_dep': fields.date('Deposit date', required=True),
+        'method': fields.selection((('keep','Keep until sold'),('decease','Decrease limit of 10%'),('contact','Contact the Seller')), 'Withdrawned method', required=True),
+        'tax_id': fields.many2one('account.tax', 'Expenses'),
+        'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
+        'info': fields.char('Description', size=64),
+        'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'),
+        'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'),
+        'total_neg': fields.boolean('Allow Negative Amount'),
+    }
+    _defaults = {
+#       'date_dep': lambda *a: time.strftime('%Y-%m-%d'),
+        'method': lambda *a: 'keep',
+        'total_neg': lambda *a: False,
+        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'),
+    }
+    _constraints = [
+    ]
+    def partner_id_change(self, cr, uid, ids, part):
+        return {}
+auction_deposit()
+
+#----------------------------------------------------------
+# (Specific) Deposit Costs
+#----------------------------------------------------------
+class auction_deposit_cost(osv.osv):
+    _name = 'auction.deposit.cost'
+    _columns = {
+        'name': fields.char('Cost Name', required=True, size=64),
+        'amount': fields.float('Amount'),
+        'account': fields.many2one('account.account', 'Destination Account', required=True),
+        'deposit_id': fields.many2one('auction.deposit', 'Deposit'),
+    }
+auction_deposit_cost()
+
+#----------------------------------------------------------
+# Lots Categories
+#----------------------------------------------------------
+class auction_lot_category(osv.osv):
+    _name = 'auction.lot.category'
+    _columns = {
+        'name': fields.char('Category Name', required=True, size=64),
+        'priority': fields.float('Priority'),
+        'active' : fields.boolean('Active'),
+        'aie_categ' : fields.selection([('41',"Unclassifieds"),
+            ('2',"Antiques"),
+            ('42',"Antique/African Arts"),
+            ('59',"Antique/Argenterie"),
+            ('45',"Antique/Art from the Ivory Coast"),
+            ('46',"Antique/Art from the Ivory Coast/African Arts"),
+            ('12',"Antique/Books, manuscripts, eso."),
+            ('11',"Antique/Carpet and textilles"),
+            ('14',"Antique/Cartoons"),
+            ('26',"Antique/Clocks and watches"),
+            ('31',"Antique/Collectible & art objects"),
+            ('33',"Antique/Engravings"),
+            ('10',"Antique/Furnitures"),
+            ('50',"Antique/Graphic Arts"),
+            ('37',"Antique/Jewelry"),
+            ('9',"Antique/Lightings"),
+            ('52',"Antique/Metal Ware"),
+            ('51',"Antique/Miniatures / Collections"),
+            ('53',"Antique/Musical Instruments"),
+            ('19',"Antique/Old weapons and militaria"),
+            ('43',"Antique/Oriental Arts"),
+            ('47',"Antique/Oriental Arts/Chineese furnitures"),
+            ('24',"Antique/Others"),
+            ('8',"Antique/Painting"),
+            ('25',"Antique/Porcelain, Ceramics, Glassmaking, ..."),
+            ('13',"Antique/Posters"),
+            ('56',"Antique/Religiosa"),
+            ('54',"Antique/Scientific Instruments"),
+            ('18',"Antique/Sculpture, bronze, eso."),
+            ('55',"Antique/Tin / Copper wares"),
+            ('16',"Antique/Toys"),
+            ('57',"Antique/Verreries"),
+            ('17',"Antique/Wine"),
+            ('1',"Contemporary Art"),
+            ('58',"Cont. Art/Arts"),
+            ('27',"Cont. Art/Curiosa"),
+            ('15',"Cont. Art/Jewelry"),
+            ('30',"Cont. Art/Other Media"),
+            ('3',"Cont. Art/Photo"),
+            ('4',"Cont. Art/Painting"),
+            ('5',"Cont. Art/Sculpture"),
+            ('48',"Cont. Art/Shows")],
+            'Aie Category'),
+    }
+    _defaults = {
+        'active' : lambda *a: 1,
+        'aie_categ' : lambda *a:1,
+    }
+auction_lot_category()
+
+def _type_get(self, cr, uid,ids):
+    cr.execute('select name, name from auction_lot_category order by name')
+    return cr.fetchall()
+
+#----------------------------------------------------------
+# Lots
+#----------------------------------------------------------
+def _inv_constraint(cr, ids):
+    cr.execute('select id, bord_vnd_id, lot_num from auction_lots where id in ('+','.join(map(lambda x: str(x), ids))+')')
+    for datas in cr.fetchall():
+        cr.execute('select count(*) from auction_lots where bord_vnd_id=%s and lot_num=%s', (datas[1],datas[2]))
+        if cr.fetchone()[0]>1:
+            return False
+    return True
+
+class auction_lots(osv.osv):
+    _name = "auction.lots"
+    _order = "obj_num,lot_num,id"
+    _description="Object"
+
+    def button_not_bought(self,cr,uid,ids,*a):
+        return self.write(cr,uid,ids, {'state':'unsold'})
+    def button_taken_away(self,cr,uid,ids,*a):
+        return self.write(cr,uid,ids, {'state':'taken_away'})
+
+    def button_unpaid(self,cr,uid,ids,*a):
+        return self.write(cr,uid,ids, {'state':'draft'})
+
+    def button_draft(self,cr,uid,ids,*a):
+        return self.write(cr,uid,ids, {'state':'draft'})
+
+    def button_bought(self,cr,uid,ids,*a):
+        return self.write(cr,uid,ids, {'state':'sold'})
+
+    def _buyerprice(self, cr, uid, ids, name, args, context):
+        res={}
+        lots=self.pool.get('auction.lots').browse(cr,uid,ids)
+        pt_tax=self.pool.get('account.tax')
+        for lot in lots:
+            amount_total=0.0
+    #       if ((lot.obj_price==0) and (lot.state=='draft')):
+    #           montant=lot.lot_est1
+    #       else:
+            montant=lot.obj_price or 0.0
+            taxes = []
+            if lot.author_right:
+                taxes.append(lot.author_right)
+            if lot.auction_id:
+                taxes += lot.auction_id.buyer_costs
+            tax=pt_tax.compute(cr,uid,taxes,montant,1)
+            for t in tax:
+                amount_total+=t['amount']
+            amount_total += montant
+            res[lot.id] = amount_total
+        return res
+
+
+    def _sellerprice(self, cr, uid, ids,*a):
+        res={}
+        lots=self.pool.get('auction.lots').browse(cr,uid,ids)
+        pt_tax=self.pool.get('account.tax')
+        for lot in lots:
+            amount_total=0.0
+        #   if ((lot.obj_price==0) and (lot.state=='draft')):
+        #       montant=lot.lot_est1
+        #   else:
+            montant=lot.obj_price
+            taxes = []
+            if lot.bord_vnd_id.tax_id:
+                taxes.append(lot.bord_vnd_id.tax_id)
+            elif lot.auction_id and lot.auction_id.seller_costs:
+                taxes += lot.auction_id.seller_costs
+            tax=pt_tax.compute(cr,uid,taxes,montant,1)
+            for t in tax:
+                amount_total+=t['amount']
+            res[lot.id] =  montant+amount_total
+        return res
+
+    def _grossprice(self, cr, uid, ids, name, args, context):
+        """gross revenue"""
+        res={}
+        auction_lots_obj = self.read(cr,uid,ids,['seller_price','buyer_price','auction_id'])
+        for auction_data in auction_lots_obj:
+            total_tax = 0.0
+            if auction_data['auction_id']:
+                total_tax += auction_data['buyer_price']-auction_data['seller_price']
+            res[auction_data['id']] = total_tax
+        return res
+
+
+    def _grossmargin(self, cr, uid, ids, name, args, context):
+        """
+        gross Margin : Gross revenue * 100 / Adjudication
+        (state==unsold or obj_ret_price>0): adj_price = 0 (=> gross margin = 0, net margin is negative)
+        """
+        res={}
+        for lot in self.browse(cr, uid, ids, context):
+            if ((lot.obj_price==0) and (lot.state=='draft')):
+                montant=lot.lot_est1
+            else:
+                montant=lot.obj_price
+            if lot.obj_price>0:
+                total=(lot.gross_revenue*100.0) /lot.obj_price
+            else:
+                total = 0.0
+            res[lot.id]=round(total,2)
+        return res
+
+    def onchange_obj_ret(self, cr, uid, ids, obj_ret, *args):
+        if obj_ret:
+            return {'value': {'obj_price': 0}}
+        return {}
+
+    def _costs(self,cr,uid,ids,context,*a):
+        """
+        costs: Total credit of analytic account
+        / # objects sold during this auction
+        (excluding analytic lines that are in the analytic journal of the auction date).
+        """
+        res={}
+        for lot in self.browse(cr,uid,ids):
+            som=0.0
+            if not lot.auction_id:
+                res[lot.id] = 0.0
+                continue
+            auct_id=lot.auction_id.id
+            cr.execute('select count(*) from auction_lots where auction_id=%d', (auct_id,))
+            nb = cr.fetchone()[0]
+            account_analytic_line_obj = self.pool.get('account.analytic.line')
+            line_ids = account_analytic_line_obj.search(cr, uid, [('account_id', '=', lot.auction_id.account_analytic_id.id),('journal_id', '<>', lot.auction_id.journal_id.id),('journal_id', '<>', lot.auction_id.journal_seller_id.id)])
+            #indir_cost=lot.bord_vnd_id.specific_cost_ids
+            #for r in lot.bord_vnd_id.specific_cost_ids:
+            #   som+=r.amount
+
+            for line in account_analytic_line_obj.browse(cr,uid,line_ids):
+                if line.amount:
+                    som-=line.amount
+            res[lot.id]=som/nb
+        return res
+
+    def _netprice(self, cr, uid, ids, name, args, context):
+        """This is the net revenue"""
+        res={}
+        auction_lots_obj = self.read(cr,uid,ids,['seller_price','buyer_price','auction_id','costs'])
+        for auction_data in auction_lots_obj:
+            total_tax = 0.0
+            if auction_data['auction_id']:
+                total_tax += auction_data['buyer_price']-auction_data['seller_price']-auction_data['costs']
+            res[auction_data['id']] = total_tax
+        return res
+
+    def _netmargin(self, cr, uid, ids, name, args, context):
+        res={}
+        total_tax = 0.0
+        total=0.0
+        montant=0.0
+        auction_lots_obj = self.read(cr,uid,ids,['net_revenue','auction_id','lot_est1','obj_price','state'])
+        for auction_data in auction_lots_obj:
+            if ((auction_data ['obj_price']==0) and (auction_data['state']=='draft')):
+                montant=auction_data['lot_est1']
+            else: montant=auction_data ['obj_price']
+            if montant>0:
+                total_tax += (auction_data['net_revenue']*100)/montant
+            else:
+                total_tax=0
+            res[auction_data['id']] =  total_tax
+        return res
+
+    def _is_paid_vnd(self,cr,uid,ids,*a):
+        res = {}
+        lots=self.browse(cr,uid,ids)
+        for lot in lots:
+            res[lot.id] = False
+            if lot.sel_inv_id:
+                if lot.sel_inv_id.state == 'paid':
+                    res[lot.id] = True
+        return res
+    def _is_paid_ach(self,cr,uid,ids,*a):
+        res = {}
+        lots=self.browse(cr,uid,ids)
+        for lot in lots:
+            res[lot.id] = False
+            if lot.ach_inv_id:
+                if lot.ach_inv_id.state == 'paid':
+                    res[lot.id] = True
+        return res
+    _columns = {
+        'bid_lines':fields.one2many('auction.bid_line','lot_id', 'Bids'),
+        'auction_id': fields.many2one('auction.dates', 'Auction Date', select=1),
+        'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True),
+        'name': fields.char('Short Description',size=64, required=True),
+        'name2': fields.char('Short Description (2)',size=64),
+        'lot_type': fields.selection(_type_get, 'Object category', size=64),
+        'author_right': fields.many2one('account.tax', 'Author rights'),
+        'lot_est1': fields.float('Minimum Estimation'),
+        'lot_est2': fields.float('Maximum Estimation'),
+        'lot_num': fields.integer('List Number', required=True, select=1 ),
+        'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
+        'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'),
+        'lot_local':fields.char('Location',size=64),
+        'artist_id':fields.many2one('auction.artists', 'Artist/Author'),
+        'artist2_id':fields.many2one('auction.artists', 'Artist/Author 2'),
+        'important':fields.boolean('To be Emphatized'),
+        'product_id':fields.many2one('product.product', 'Product', required=True),
+        'obj_desc': fields.text('Object Description'),
+        'obj_num': fields.integer('Catalog Number'),
+        'obj_ret': fields.float('Price retired'),
+        'obj_comm': fields.boolean('Commission'),
+        'obj_price': fields.float('Adjudication price'),
+        'ach_avance': fields.float('Buyer Advance'),
+        'ach_login': fields.char('Buyer Username',size=64),
+        'ach_uid': fields.many2one('res.partner', 'Buyer'),
+        'ach_emp': fields.boolean('Taken Away'),
+        'is_ok': fields.boolean('Buyer s payment'),
+        'ach_inv_id': fields.many2one('account.invoice','Buyer Invoice', readonly=True, states={'draft':[('readonly',False)]}),
+        'sel_inv_id': fields.many2one('account.invoice','Seller Invoice', readonly=True, states={'draft':[('readonly',False)]}),
+        'vnd_lim': fields.float('Seller limit'),
+        'vnd_lim_net': fields.boolean('Net limit ?',readonly=True),
+        'image': fields.binary('Image'),
+#       'paid_vnd':fields.function(_is_paid_vnd,string='Seller Paid',method=True,type='boolean',store=True),
+        'paid_vnd':fields.boolean('Seller Paid'),
+        'paid_ach':fields.function(_is_paid_ach,string='Buyer invoice reconciled',method=True, type='boolean',store=True),
+        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold'),('taken_away','Taken away')),'Status', required=True, readonly=True),
+        'buyer_price': fields.function(_buyerprice, method=True, string='Buyer price',store=True),
+        'seller_price': fields.function(_sellerprice, method=True, string='Seller price',store=True),
+        'gross_revenue':fields.function(_grossprice, method=True, string='Gross revenue',store=True),
+        'gross_margin':fields.function(_grossmargin, method=True, string='Gross Margin (%)',store=True),
+        'costs':fields.function(_costs,method=True,string='Indirect costs',store=True),
+        'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel','auction_id', 'statement','Payment'),
+        'net_revenue':fields.function(_netprice, method=True, string='Net revenue',store=True),
+        'net_margin':fields.function(_netmargin, method=True, string='Net Margin (%)',store=True),
+    }
+    _defaults = {
+        'state':lambda *a: 'draft',
+        'lot_num':lambda *a:1,
+        'is_ok': lambda *a: False
+    }
+    _constraints = [
+#       (_inv_constraint, 'Twice the same inventory number !', ['lot_num','bord_vnd_id'])
+    ]
+
+
+    def name_get(self, cr, user, ids, context={}):
+        if not len(ids):
+            return []
+        result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name','obj_num'])]
+        return result
+
+    def name_search(self, cr, user, name, args=[], operator='ilike', context={}):
+        try:
+            ids = self.search(cr, user, [('obj_num','=',int(name))]+ args)
+        except:
+            ids = []
+        if not ids:
+            ids = self.search(cr, user, [('name',operator,name)]+ args)
+        return self.name_get(cr, user, ids)
+
+    def _sum_taxes_by_type_and_id(self, taxes):
+        """
+        PARAMS: taxes: a list of dictionaries of the form {'id':id, 'amount':amount, ...}
+        RETURNS : a list of dictionaries of the form {'id':id, 'amount':amount, ...}; one dictionary per unique id.
+            The others fields in the dictionaries (other than id and amount) are those of the first tax with a particular id.
+        """
+        taxes_summed = {}
+        for tax in taxes:
+            key = (tax['type'], tax['id'])
+            if key in taxes_summed:
+                taxes_summed[key]['amount'] += tax['amount']
+            else:
+                taxes_summed[key] = tax
+        return taxes_summed.values()
+
+    def compute_buyer_costs(self, cr, uid, ids):
+        amount_total = {}
+        lots = self.browse(cr, uid, ids)
+##CHECKME: est-ce que ca vaudrait la peine de faire des groupes de lots qui ont les memes couts pour passer des listes de lots a compute?
+        taxes = []
+        amount=0.0
+    #   pt_tax=pool.get('account.tax')
+        for lot in lots:
+            taxes = lot.product_id.taxes_id
+            if lot.author_right:
+                taxes.append(lot.author_right)
+            elif lot.auction_id:
+                taxes += lot.auction_id.buyer_costs
+            tax=self.pool.get('account.tax').compute(cr,uid,taxes,lot.obj_price,1)
+            for t in tax:
+                amount+=t['amount']
+            #amount+=lot.obj_price*0.2
+            #amount+=lot.obj_price
+        amount_total['value']= amount
+        amount_total['amount']= amount
+        return amount_total
+
+
+
+#       for t in taxes_res:
+#           t.update({'type': 0})
+#       return self._sum_taxes_by_type_and_id(taxes_res)
+
+#   lots=self.browse(cr,uid,ids)
+#   amount=0.0
+#   for lot in lots:
+#       taxes=lot.product_id.taxe_id
+
+
+    def _compute_lot_seller_costs(self, cr, uid, lot, manual_only=False):
+        costs = []
+        tax_cost_ids=[]
+#       tax_cost_ids = [i.id for i in lot.auction_id.seller_costs]
+        # if there is a specific deposit cost for this depositer, add it
+        border_id = lot.bord_vnd_id
+        if border_id:
+            if border_id.tax_id:
+                tax_cost_ids.append(border_id.tax_id)
+            elif lot.auction_id and lot.auction_id.seller_costs:
+                tax_cost_ids += lot.auction_id.seller_costs
+        tax_costs = self.pool.get('account.tax').compute(cr, uid, tax_cost_ids, lot.obj_price, 1)
+        # delete useless keys from the costs computed by the tax object... this is useless but cleaner...
+        for cost in tax_costs:
+            del cost['account_paid_id']
+            del cost['account_collected_id']
+
+        if not manual_only:
+            costs.extend(tax_costs)
+            for c in costs:
+                c.update({'type': 0})
+######
+        if lot.vnd_lim_net<0 and lot.obj_price>0:
+#FIXME: la string 'remise lot' devrait passer par le systeme de traductions
+            obj_price_wh_costs = reduce(lambda x, y: x + y['amount'], tax_costs, lot.obj_price)
+            if obj_price_wh_costs < lot.vnd_lim:
+                costs.append({  'type': 1,
+                                'id': lot.obj_num,
+                                'name': 'Remise lot '+ str(lot.obj_num),
+                                'amount': lot.vnd_lim - obj_price_wh_costs}
+                                #'account_id': lot.auction_id.acc_refund.id
+                            )
+        return costs
+    def compute_seller_costs(self, cr, uid, ids, manual_only=False):
+        lots = self.browse(cr, uid, ids)
+        costs = []
+
+        # group objects (lots) by deposit id
+        # ie create a dictionary containing lists of objects
+        bord_lots = {}
+        for lot in lots:
+            key = lot.bord_vnd_id.id
+            if not key in bord_lots:
+                bord_lots[key] = []
+            bord_lots[key].append(lot)
+
+        # use each list of object in turn
+        for lots in bord_lots.values():
+            total_adj = 0
+            total_cost = 0
+            for lot in lots:
+                total_adj += lot.obj_price or 0.0
+                lot_costs = self._compute_lot_seller_costs(cr, uid, lot, manual_only)
+                for c in lot_costs:
+                    total_cost += c['amount']
+                costs.extend(lot_costs)
+            bord = lots[0].bord_vnd_id
+            if bord:
+                if bord.specific_cost_ids:
+                    bord_costs = [{'type':2, 'id':c.id, 'name':c.name, 'amount':c.amount, 'account_id':c.account} for c in bord.specific_cost_ids]
+                    for c in bord_costs:
+                        total_cost += c['amount']
+                    costs.extend(bord_costs)
+            if (total_adj+total_cost)<0:
+#FIXME: translate tax name
+                new_id = bord and bord.id or 0
+                c = {'type':3, 'id':new_id, 'amount':-total_cost-total_adj, 'name':'Ristourne'}#, 'account_id':lots[0].auction_id.acc_refund.id}
+                costs.append(c)
+        return self._sum_taxes_by_type_and_id(costs)
+
+    # sum remise limite net and ristourne
+    def compute_seller_costs_summed(self, cr, uid, ids): #ach_pay_id
+        taxes = self.compute_seller_costs(cr, uid, ids)
+        taxes_summed = {}
+        for tax in taxes:
+            if tax['type'] == 1:
+                tax['id'] = 0
+    #FIXME: translate tax names
+                tax['name'] = 'Remise limite nette'
+            elif tax['type'] == 2:
+                tax['id'] = 0
+                tax['name'] = 'Frais divers'
+            elif tax['type'] == 3:
+                tax['id'] = 0
+                tax['name'] = 'Rist.'
+            key = (tax['type'], tax['id'])
+            if key in taxes_summed:
+                taxes_summed[key]['amount'] += tax['amount']
+            else:
+                taxes_summed[key] = tax
+        return taxes_summed.values()
+
+    def buyer_proforma(self,cr,uid,ids,context):
+        invoices = {}
+        inv_ref=self.pool.get('account.invoice')
+#       acc_receiv=self.pool.get('account.account').search([cr,uid,[('code','=','4010')]])
+        for lot in self.browse(cr,uid,ids,context):
+            if not lot.obj_price>0:
+                continue
+            partner_r=self.pool.get('res.partner')
+            if not lot.ach_uid.id:
+                raise orm.except_orm('Missed buyer !', 'The object "%s" has no buyer assigned.' % (lot.name,))
+            else:
+                partner_ref =lot.ach_uid.id
+                lot_name = lot.obj_num
+                res = self.pool.get('res.partner').address_get(cr, uid, [partner_ref], ['contact', 'invoice'])
+                contact_addr_id = res['contact']
+                invoice_addr_id = res['invoice']
+                inv = {
+                    'name': 'Auction proforma:' +lot.name,
+                    'journal_id': lot.auction_id.journal_id.id,
+                    'partner_id': partner_ref,
+                    'type': 'out_invoice',
+                #   'state':'proforma',
+                }
+                inv.update(inv_ref.onchange_partner_id(cr,uid, [], 'out_invoice', partner_ref)['value'])
+                inv['account_id'] = inv['account_id'] and inv['account_id'][0]
+                inv_id = inv_ref.create(cr, uid, inv, context)
+                invoices[partner_ref] = inv_id
+                self.write(cr,uid,[lot.id],{'ach_inv_id':inv_id,'state':'sold'})
+
+                #calcul des taxes
+                taxes = map(lambda x: x.id, lot.product_id.taxes_id)
+                taxes+=map(lambda x:x.id, lot.auction_id.buyer_costs)
+                if lot.author_right:
+                    taxes.append(lot.author_right.id)
+
+                inv_line= {
+                    'invoice_id': inv_id,
+                    'quantity': 1,
+                    'product_id': lot.product_id.id,
+                    'name': 'proforma'+'['+str(lot.obj_num)+'] '+ lot.name,
+                    'invoice_line_tax_id': [(6,0,taxes)],
+                    'account_analytic_id': lot.auction_id.account_analytic_id.id,
+                    'account_id': lot.auction_id.acc_income.id,
+                    'price_unit': lot.obj_price,
+                }
+                self.pool.get('account.invoice.line').create(cr, uid, inv_line,context)
+            #   inv_ref.button_compute(cr, uid, [inv_id])
+            #   wf_service = netsvc.LocalService('workflow')
+            #   wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)
+            inv_ref.button_compute(cr, uid, invoice.values())
+            wf_service = netsvc.LocalService('workflow')
+            wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma', cr)
+        return invoices.values()
+
+
+    # creates the transactions between the auction company and the seller
+    # this is done by creating a new in_invoice for each
+    def seller_trans_create(self,cr, uid,ids,context):
+        """
+            Create a seller invoice for each bord_vnd_id, for selected ids.
+        """
+        # use each list of object in turn
+        invoices = {}
+        inv_ref=self.pool.get('account.invoice')
+        for lot in self.browse(cr,uid,ids,context):
+            partner_id = lot.bord_vnd_id.partner_id.id
+            if not lot.auction_id.id:
+                continue
+            lot_name = lot.obj_num
+            if lot.bord_vnd_id.id in invoices:
+                inv_id = invoices[lot.bord_vnd_id.id]
+            else:
+                res = self.pool.get('res.partner').address_get(cr, uid, [lot.bord_vnd_id.partner_id.id], ['contact', 'invoice'])
+                contact_addr_id = res['contact']
+                invoice_addr_id = res['invoice']
+                inv = {
+                    'name': 'Auction:' +lot.name,
+                    'journal_id': lot.auction_id.journal_seller_id.id,
+                    'partner_id': lot.bord_vnd_id.partner_id.id,
+                    'type': 'in_invoice',
+                }
+                inv.update(inv_ref.onchange_partner_id(cr,uid, [], 'in_invoice', lot.bord_vnd_id.partner_id.id)['value'])
+            #   inv['account_id'] = inv['account_id'] and inv['account_id'][0]
+                inv_id = inv_ref.create(cr, uid, inv, context)
+                invoices[lot.bord_vnd_id.id] = inv_id
+
+            self.write(cr,uid,[lot.id],{'sel_inv_id':inv_id,'state':'sold'})
+
+            taxes = map(lambda x: x.id, lot.product_id.taxes_id)
+            if lot.bord_vnd_id.tax_id:
+                taxes.append(lot.bord_vnd_id.tax_id.id)
+            else:
+                taxes += map(lambda x: x.id, lot.auction_id.seller_costs)
+
+            inv_line= {
+                'invoice_id': inv_id,
+                'quantity': 1,
+                'product_id': lot.product_id.id,
+                'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name,
+                'invoice_line_tax_id': [(6,0,taxes)],
+                'account_analytic_id': lot.auction_id.account_analytic_id.id,
+                'account_id': lot.auction_id.acc_expense.id,
+                'price_unit': lot.obj_price,
+            }
+            self.pool.get('account.invoice.line').create(cr, uid, inv_line,context)
+            inv_ref.button_compute(cr, uid, invoices.values())
+        for inv in inv_ref.browse(cr, uid, invoices.values(), context):
+            inv_ref.write(cr, uid, [inv.id], {
+                'check_total': inv.amount_total
+            })
+            wf_service = netsvc.LocalService('workflow')
+            wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_open', cr)
+        return invoices.values()
+
+    def lots_invoice(self, cr, uid, ids, context,invoice_number=False):
+        """(buyer invoice
+            Create an invoice for selected lots (IDS) to BUYER_ID.
+            Set created invoice to the ACTION state.
+            PRE:
+                ACTION:
+                    False: no action
+                    xxxxx: set the invoice state to ACTION
+
+            RETURN: id of generated invoice
+        """
+        dt = time.strftime('%Y-%m-%d')
+        inv_ref=self.pool.get('account.invoice')
+        invoices={}
+        print "KKKKKKKKKKKKKKKKK"
+        for lot in self.browse(cr, uid, ids,context):
+            print "LLLLLLLLLLLLLLLL"
+        #   partner_ref = lot.ach_uid.id
+            if not lot.auction_id.id:
+                continue
+            partner_r=self.pool.get('res.partner')
+            if not lot.ach_uid.id:
+                raise orm.except_orm('Missed buyer !', 'The object "%s" has no buyer assigned.' % (lot.name,))
+            if (lot.auction_id.id,lot.ach_uid.id) in invoices:
+                inv_id = invoices[(lot.auction_id.id,lot.ach_uid.id)]
+            else:
+                price = lot.obj_price or 0.0
+                lot_name =lot.obj_num
+                inv={
+                    'name':lot.auction_id.name or '',
+                    'reference': lot.ach_login,
+                    'journal_id': lot.auction_id.journal_id.id,
+                    'partner_id': lot.ach_uid.id,
+                    'type': 'out_invoice',
+                }
+                if invoice_number:
+                    inv['number'] = invoice_number
+                inv.update(inv_ref.onchange_partner_id(cr,uid, [], 'out_invoice', lot.ach_uid.id)['value'])
+                #inv['account_id'] = inv['account_id'] and inv['account_id'][0]
+                inv_id = inv_ref.create(cr, uid, inv, context)
+                print "IN>>>>>>>>>>>>ID",inv_id
+                invoices[(lot.auction_id.id,lot.ach_uid.id)] = inv_id
+            self.write(cr,uid,[lot.id],{'ach_inv_id':inv_id,'state':'sold'})
+            #calcul des taxes
+            taxes = map(lambda x: x.id, lot.product_id.taxes_id)
+            taxes+=map(lambda x:x.id, lot.auction_id.buyer_costs)
+            if lot.author_right:
+                taxes.append(lot.author_right.id)
+
+            inv_line= {
+                'invoice_id': inv_id,
+                'quantity': 1,
+                'product_id': lot.product_id.id,
+                'name': '['+str(lot.obj_num)+'] '+ lot.name,
+                'invoice_line_tax_id': [(6,0,taxes)],
+                'account_analytic_id': lot.auction_id.account_analytic_id.id,
+                'account_id': lot.auction_id.acc_income.id,
+                'price_unit': lot.obj_price,
+            }
+            self.pool.get('account.invoice.line').create(cr, uid, inv_line,context)
+    #   inv_ref.button_compute(cr, uid, [inpq tu dis cav_id])
+    #       inv_ref.button_compute(cr, uid, [inv_id])
+            inv_ref.button_compute(cr, uid, [inv_id])
+        for l in  inv_ref.browse(cr, uid, invoices.values(), context):
+            wf_service = netsvc.LocalService('workflow')
+        #   wf_service.trg_validate(uid, 'account.invoice',l.id, 'invoice_proforma', cr)
+            wf_service.trg_validate(uid, 'account.invoice',l.id, 'invoice_open', cr)
+        return invoices.values()
+
+
+    def numerotate(self, cr, uid, ids):
+        cr.execute('select auction_id from auction_lots where id=%d', (ids[0],))
+        auc_id = cr.fetchone()[0]
+        cr.execute('select max(obj_num) from auction_lots where auction_id=%d', (auc_id,))
+        try:
+            max = cr.fetchone()[0]
+        except:
+            max = 0
+        for id in ids:
+            max+=1
+            cr.execute('update auction_lots set obj_num=%d where id=%d', (max, id))
+        return []
+
+auction_lots()
+
+#----------------------------------------------------------
+# Auction Bids
+#----------------------------------------------------------
+class auction_bid(osv.osv):
+    _name = "auction.bid"
+    _description="Bid auctions"
+    _order = 'id desc'
+    _columns = {
+        'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True),
+        'contact_tel':fields.char('Contact',size=64),
+        'name': fields.char('Bid ID', size=64,required=True),
+        'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True),
+        'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'),
+    }
+    _defaults = {
+        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'),
+    }
+    def onchange_contact(self, cr, uid, ids, partner_id):
+        if not partner_id:
+            return {'value': {'contact_tel':False}}
+        contact = self.pool.get('res.partner').browse(cr, uid, partner_id)
+        v_contact=contact.address[0] and contact.address[0].phone or False
+        return {'value': {'contact_tel': v_contact}}
+
+auction_bid()
+
+class auction_lot_history(osv.osv):
+    _name = "auction.lot.history"
+    _description="Lot history"
+    _columns = {
+        'name': fields.date('Date',size=64),
+        'lot_id': fields.many2one('auction.lots','Object', required=True, ondelete='cascade'),
+        'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'),
+        'price': fields.float('Withdrawn price', digits=(16,2))
+    }
+    _defaults = {
+        'name': lambda *args: time.strftime('%Y-%m-%d')
+    }
+auction_lot_history()
+
+class auction_bid_lines(osv.osv):
+    _name = "auction.bid_line"
+    _description="Bid"
+
+#   def get_nom(self,cr,uid,ids,*a):
+#       res = {}
+#       lots=self.browse(cr,uid,ids)
+#       for lot in lots:
+#           res[lot.id] = lot.lot_id.auction_id.name
+#           print lot.lot_id.auction_id.name
+#       return res
+    _columns = {
+        'name': fields.char('Bid date',size=64),
+        'bid_id': fields.many2one('auction.bid','Bid ID', required=True, ondelete='cascade'),
+        'lot_id': fields.many2one('auction.lots','Object', required=True, ondelete='cascade'),
+        'call': fields.boolean('To be Called'),
+        'price': fields.float('Maximum Price'),
+        'auction': fields.char(string='Auction Name', size=64)
+    }
+    _defaults = {
+        'name': lambda *args: time.strftime('%Y-%m-%d')
+    }
+
+    def onchange_name(self, cr, uid, ids, lot_id):
+        if not lot_id:
+            return {'value': {'auction':False}}
+        auctions = self.pool.get('auction.lots').browse(cr, uid, lot_id)
+        v_auction=auctions.auction_id.name or False
+        return {'value': {'auction': v_auction}}
+
+
+auction_bid_lines()
+
+class report_buyer_auction(osv.osv):
+    _name = "report.buyer.auction"
+    _description = "Auction Reporting on buyer view"
+    _auto = False
+    _columns = {
+        'buyer_login': fields.char('Buyer Login',size=64, readonly=True, select=1),
+        'buyer':fields.many2one('res.partner', 'Buyer', readonly=True, select=2),
+        'object':fields.integer('No of objects',readonly=True, select=1),
+        'total_price':fields.float('Total Adj.', digits=(16,2), readonly=True, select=2),
+        'avg_price':fields.float('Avg Adj.', digits=(16,2), readonly=True, select=2),
+        'date': fields.date('Create Date',  select=1),
+        'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1),
+
+    }
+
+    def init(self, cr):
+        cr.execute('''
+        create or replace view report_buyer_auction  as (
+            select
+                min(al.id) as id,
+                al.ach_login as "buyer_login",
+                to_char(al.create_date, 'YYYY-MM-01') as date,
+                al.ach_uid as "buyer",
+                ad.id as auction,
+                count(al.id) as "object",
+                sum(al.obj_price) as "total_price",
+                (sum(al.obj_price)/count(al.id)) as "avg_price"
+            from
+                auction_lots al,
+                auction_dates ad
+            where
+                ad.id=al.auction_id
+            group by
+                to_char(al.create_date, 'YYYY-MM-01'),
+                al.ach_uid,
+                ad.id,
+                al.ach_login
+        )''')
+report_buyer_auction()
+
+class report_buyer_auction2(osv.osv):
+    _name = "report.buyer.auction2"
+    _description = "Auction Reporting on buyer view"
+    _auto = False
+    _columns = {
+        'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1),
+        'buyer_login': fields.char('Buyer Login',size=64, readonly=True, select=True),
+        'buyer':fields.many2one('res.partner', 'Buyer', readonly=True, select=2),
+        'sumadj':fields.float('Sum of adjustication',readonly=True),
+        'gross_revenue':fields.float('Gross Revenue', readonly=True),
+        'net_revenue':fields.float('Net Revenue', readonly=True),
+        'net_margin':fields.float('Net Margin', readonly=True),
+        'date': fields.date('Create Date',  required=True)
+    }
+    def init(self, cr):
+        cr.execute('''
+            create or replace view report_buyer_auction2  as (
+                select
+                    min(al.id) as id,
+                    to_char(al.create_date, 'YYYY-MM-01') as date,
+                    al.ach_login as "buyer_login",
+                    al.ach_uid as "buyer",
+                    sum(al.obj_price) as sumadj,
+                    ad.id as auction,
+                    sum(al.gross_revenue) as gross_revenue,
+                    sum(al.net_revenue) as net_revenue,
+                    avg(al.net_margin) as net_margin
+                from
+                    auction_lots al,
+                    auction_dates ad
+                where
+                    al.auction_id=ad.id
+                group by
+                    al.ach_uid,
+                    al.ach_login,
+                    ad.id,
+                    to_char(al.create_date, 'YYYY-MM-01')
+            )''')
+report_buyer_auction2()
+
+
+class report_seller_auction(osv.osv):
+    _name = "report.seller.auction"
+    _description = "Auction Reporting on seller view"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1),
+        'seller': fields.many2one('res.partner','Seller',readonly=True, select=1),
+        'object_number':fields.integer('No of Objects',readonly=True),
+        'total_price':fields.float('Total adjudication',readonly=True),
+        'avg_price':fields.float('Avg adjudication',readonly=True),
+        'avg_estimation':fields.float('Avg estimation',readonly=True),
+        'date': fields.date('Create Date',  required=True, select=1),
+        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('sold','Sold')),'Status',readonly=True, select=1)
+    }
+
+    def init(self, cr):
+        cr.execute('''
+            create or replace view report_seller_auction  as (
+                select
+                    adl.id as auction,
+                    min(al.id) as id,
+                    adl.auction1 as date,
+                    ad.partner_id as seller,
+                    count(al.id) as "object_number",
+                    SUM(al.obj_price) as "total_price",
+                    (SUM(al.obj_price)/count(al.id)) as avg_price,
+                    sum(al.lot_est1+al.lot_est2)/2 as avg_estimation,
+                    al.state
+                from
+                    auction_dates adl,
+                    auction_lots al,
+                    auction_deposit ad
+                where
+                    al.auction_id=adl.id and ad.id=al.bord_vnd_id
+                group by
+                    ad.partner_id,
+                    al.state,adl.auction1,adl.id
+                )''')
+report_seller_auction()
+
+class report_seller_auction2(osv.osv):
+    _name = "report.seller.auction2"
+    _description = "Auction Reporting on seller view2"
+    _auto = False
+    _columns = {
+        'seller': fields.many2one('res.partner','Seller',readonly=True, select=1),
+        'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1),
+        'sum_adj':fields.float('Sum Adjustication',readonly=True, select=2),
+        'gross_revenue':fields.float('Gross revenue',readonly=True, select=2),
+        'net_revenue':fields.float('Net revenue',readonly=True, select=2),
+        'net_margin':fields.float('Net margin', readonly=True, select=2),
+        'date': fields.date('Auction date',  required=1),
+    }
+
+    def init(self, cr):
+        cr.execute('''create or replace view report_seller_auction2  as
+            (select
+                min(al.id) as id,
+                adl.auction1 as date,
+                adl.id as auction,
+                ad.partner_id as seller,
+                sum(al.obj_price) as "sum_adj",
+                sum(al.gross_revenue) as "gross_revenue",
+                sum(al.net_revenue) as "net_revenue",
+                avg(al.net_margin) as "net_margin"
+            from
+                auction_lots al,auction_dates adl,auction_deposit ad
+            where
+                adl.id=al.auction_id and ad.id=al.bord_vnd_id
+            group by
+                al.ach_uid,adl.auction1,adl.id,ad.partner_id)
+             ''')
+
+report_seller_auction2()
+
+class report_auction_view2(osv.osv):
+    _name = "report.auction.view2"
+    _description = "Auction Reporting on  view2"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1),
+        'sum_adj':fields.float('Sum of adjudication',readonly=True),
+        'obj_number':fields.integer('# of Objects',readonly=True),
+        'gross_revenue':fields.float('Gross revenue',readonly=True),
+        'net_revenue':fields.float('Net revenue',readonly=True),
+        'obj_margin':fields.float('Avg margin', readonly=True),
+        'obj_margin_procent':fields.float('Net margin (%)', readonly=True),
+        'date': fields.date('Auction date',  required=True, select=1)
+    }
+    def init(self, cr):
+        cr.execute('''create or replace view report_auction_view2 as (
+            select
+                ad.id as id,
+                ad.auction1 as date,
+                ad.id as "auction",
+                count(al.id) as "obj_number",
+                SUM(al.obj_price) as "sum_adj",
+                SUM(al.gross_revenue) as "gross_revenue",
+                SUM(al.net_revenue) as "net_revenue",
+                avg(al.net_revenue) as "obj_margin",
+                SUM(al.net_revenue)*100/sum(al.obj_price) as "obj_margin_procent"
+            from
+                auction_dates ad
+            left join
+                auction_lots al on (al.auction_id = ad.id)
+            group by
+                ad.id, ad.auction1
+            having
+                sum(al.obj_price) <> 0
+            )''')
+report_auction_view2()
+
+class report_auction_view(osv.osv):
+    _name = "report.auction.view"
+    _description = "Auction Reporting on view1"
+    _auto = False
+    _rec_name = 'auction_id'
+    _columns = {
+        'auction_id': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1),
+        'nobjects':fields.float('No of objects',readonly=True),
+        'nbuyer':fields.float('No of buyers',readonly=True),
+        'nseller':fields.float('No of sellers',readonly=True),
+        'min_est':fields.float('Minimum Estimation', readonly=True, select=2),
+        'max_est':fields.float('Maximum Estimation', readonly=True, select=2),
+        'adj_price':fields.float('Adjudication price', readonly=True, select=2),
+        'obj_ret':fields.integer('# obj ret', readonly=True, select=2)
+    }
+
+    def init(self, cr):
+        cr.execute('''create or replace view report_auction_view  as
+            (select
+                min(al.id) as id,
+                al.auction_id as "auction_id",
+                count(al.id) as "nobjects",
+                count(al.ach_login) as "nbuyer",
+                count(al.bord_vnd_id) as "nseller",
+                sum(al.lot_est1) as "min_est",
+                sum(al.lot_est2) as "max_est",
+                (SELECT count(1) FROM auction_lots WHERE obj_ret>0) as obj_ret,
+                sum(al.obj_price) as "adj_price"
+            from
+                auction_lots al
+            group by
+                al.auction_id
+        )''')
+
+report_auction_view()
+
+class report_auction_object_date(osv.osv):
+    _name = "report.auction.object.date"
+    _description = "Objects per day"
+    _auto = False
+    _columns = {
+        'obj_num': fields.integer('# of Objects'),
+        'name': fields.date('Created date', select=2),
+        'month': fields.date('Month', select=1),
+        'user_id':fields.many2one('res.users', 'User',select=1),
+    }
+ #l.create_uid as user,
+
+    def init(self, cr):
+        cr.execute("""create or replace view report_auction_object_date as
+            (select
+               min(l.id) as id,
+               to_char(l.create_date, 'YYYY-MM-DD') as name,
+               to_char(l.create_date, 'YYYY-MM-01') as month,
+               count(l.obj_num) as obj_num,
+               l.create_uid as user_id
+            from
+                auction_lots l
+            group by
+                to_char(l.create_date, 'YYYY-MM-DD'),
+                to_char(l.create_date, 'YYYY-MM-01'),
+                l.create_uid
+            )
+        """)
+report_auction_object_date()
+
+class report_auction_estimation_adj_category(osv.osv):
+    _name = "report.auction.estimation.adj.category"
+    _description = "comparaison estimate/adjudication "
+    _auto = False
+    _rec_name='date'
+    _columns = {
+            'lot_est1': fields.float('Minimum Estimation',select=2),
+            'lot_est2': fields.float('Maximum Estimation',select=2),
+            'obj_price': fields.float('Adjudication price'),
+            'date': fields.date('Date', readonly=True,select=1),
+            'lot_type': fields.selection(_type_get, 'Object Type', size=64),
+            'adj_total': fields.float('Total Adjudication',select=2),
+            'user_id':fields.many2one('res.users', 'User', select=1)
+    }
+
+    def init(self, cr):
+        cr.execute("""
+            create or replace view report_auction_estimation_adj_category as (
+                select
+                   min(l.id) as id,
+                   to_char(l.create_date, 'YYYY-MM-01') as date,
+                   l.lot_type as lot_type,
+                   sum(l.lot_est1) as lot_est1,
+                   sum(l.lot_est2) as lot_est2,
+                   sum(l.obj_price) as adj_total,
+                   l.create_uid as user_id
+                from
+                    auction_lots l,auction_dates m
+                where
+                    l.auction_id=m.id and l.obj_price >0
+                group by
+                     to_char(l.create_date, 'YYYY-MM-01'),lot_type,l.create_uid
+            )
+        """)
+report_auction_estimation_adj_category()
+
+class report_auction_adjudication(osv.osv):
+    _name = "report.auction.adjudication"
+    _description = "report_auction_adjudication"
+    _auto = False
+    _columns = {
+            'name': fields.many2one('auction.dates','Auction date',readonly=True,select=1),
+            'state': fields.selection((('draft','Draft'),('close','Closed')),'Status', select=1),
+            'adj_total': fields.float('Total Adjudication'),
+            'date': fields.date('Date', readonly=True,select=1),
+            'user_id':fields.many2one('res.users', 'User',select=1)
+
+    }
+
+
+    def init(self, cr):
+        cr.execute("""
+            create or replace view report_auction_adjudication as (
+                select
+                    l.id as id,
+                    l.id as name,
+                    sum(m.obj_price) as adj_total,
+                    to_char(l.create_date, 'YYYY-MM-01') as date,
+                    l.create_uid as user_id,
+                    l.state
+                from
+                    auction_dates l ,auction_lots m
+                    where
+                        m.auction_id=l.id
+                    group by
+                        l.id,l.state,l.name,l.create_uid,to_char(l.create_date, 'YYYY-MM-01')
+
+            )
+        """)
+report_auction_adjudication()
+
+class report_attendance(osv.osv):
+    _name="report.attendance"
+    _description = "Report Sign In/Out"
+    _auto = False
+    #_rec_name='date'
+    _columns = {
+        'name': fields.date('Date', readonly=True,select=1),
+        'employee_id' : fields.many2one('hr.employee', 'Employee', select=1, readonly=True),
+        'total_attendance': fields.float('Total', readonly=True),
+}
+    def init(self, cr):
+        cr.execute("""CREATE OR REPLACE VIEW report_attendance AS
+            SELECT
+                id,
+                name,
+                employee_id,
+                CASE WHEN SUM(total_attendance) < 0
+                    THEN (SUM(total_attendance) +
+                        CASE WHEN current_date <> name
+                            THEN 1440
+                            ELSE (EXTRACT(hour FROM current_time) * 60) + EXTRACT(minute FROM current_time)
+                        END
+                        )
+                    ELSE SUM(total_attendance)
+                END /60  as total_attendance
+            FROM (
+                SELECT
+                    max(a.id) as id,
+                    a.name::date as name,
+                    a.employee_id,
+                    SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance
+                FROM hr_attendance a
+                where name > current_date + interval '-1 day'
+                GROUP BY a.name::date, a.employee_id
+            ) AS fs
+            GROUP BY name,fs.id,employee_id
+            """)
+
+report_attendance()
+
+
+class report_deposit_border(osv.osv):
+    _name="report.deposit.border"
+    _description = "Report deposit border"
+    _auto = False
+    _rec_name='bord'
+    _columns = {
+        'bord': fields.char('Depositer Inventory', size=64, required=True),
+        'seller': fields.many2one('res.partner','Seller',select=1),
+        'moy_est' : fields.float('Avg. Est', select=1, readonly=True),
+        'total_marge': fields.float('Total margin', readonly=True),
+        'nb_obj':fields.float('# of objects', readonly=True),
+}
+    def init(self, cr):
+        cr.execute("""CREATE OR REPLACE VIEW report_deposit_border AS
+            SELECT
+                min(al.id) as id,
+                ab.partner_id as seller,
+                ab.name as bord,
+                COUNT(al.id) as nb_obj,
+                SUM((al.lot_est1 + al.lot_est2)/2) as moy_est,
+                SUM(al.net_revenue)/(count(ad.id)) as total_marge
+
+            FROM
+                auction_lots al,auction_deposit ab,auction_dates ad
+            WHERE
+                ad.id=al.auction_id
+                and al.bord_vnd_id=ab.id
+            GROUP BY
+                ab.name,ab.partner_id""")
+report_deposit_border()
+
+class report_object_encoded(osv.osv):
+    _name = "report.object.encoded"
+    _description = "Object encoded"
+    _auto = False
+    _columns = {
+        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('invoiced','Invoiced')),'Status', required=True,select=1),
+        'user_id':fields.many2one('res.users', 'User', select=1),
+        'estimation': fields.float('Estimation',select=2),
+        'date': fields.date('Create Date',  required=True),
+        'gross_revenue':fields.float('Gross revenue',readonly=True, select=2),
+        'net_revenue':fields.float('Net revenue',readonly=True, select=2),
+        'obj_margin':fields.float('Net margin', readonly=True, select=2),
+        'obj_ret':fields.integer('# obj ret', readonly=True, select=2),
+        'adj':fields.integer('Adj.', readonly=True, select=2),
+        'obj_num':fields.integer('# of Encoded obj.', readonly=True, select=2),
+    }
+    def init(self, cr):
+        cr.execute('''create or replace view report_object_encoded  as
+            (select min(al.id) as id,
+                to_char(al.create_date, 'YYYY-MM-DD') as date,
+                al.state as state,
+                al.create_uid as user_id,
+                (SELECT count(1) FROM auction_lots WHERE obj_ret>0) as obj_ret,
+                sum((100* al.lot_est1)/al.obj_price) as estimation,
+                COUNT(al.product_id) as obj_num
+            from auction_lots al
+            where al.obj_price>0 and state='draft'
+            group by to_char(al.create_date, 'YYYY-MM-DD'), al.state, al.create_uid)
+             ''')
+report_object_encoded()
+
+
+class report_object_encoded_manager(osv.osv):
+    _name = "report.object.encoded.manager"
+    _description = "Object encoded"
+    _auto = False
+    _columns = {
+        'user_id':fields.many2one('res.users', 'User', select=True),
+        'estimation': fields.float('Estimation',select=True),
+        'date': fields.date('Create Date',  required=True),
+        'gross_revenue':fields.float('Gross revenue',readonly=True, select=True),
+        'net_revenue':fields.float('Net revenue',readonly=True, select=True),
+        'obj_margin':fields.float('Net margin', readonly=True, select=True),
+        'obj_ret':fields.integer('# obj ret', readonly=True, select=True),
+        'adj':fields.integer('Adj.', readonly=True, select=True),
+        'obj_num':fields.integer('# of Encoded obj.', readonly=True, select=True),
+    }
+    def init(self, cr):
+        cr.execute('''create or replace view report_object_encoded_manager  as
+            (select
+                min(al.id) as id,
+                to_char(al.create_date, 'YYYY-MM-DD') as date,
+                al.create_uid as user_id,
+                sum((100*lot_est1)/obj_price) as estimation,
+                (SELECT count(1) FROM auction_lots WHERE obj_ret>0) as obj_ret,
+                SUM(al.gross_revenue) as "gross_revenue",
+                SUM(al.net_revenue) as "net_revenue",
+                SUM(al.net_revenue)/count(al.id) as "obj_margin",
+                COUNT(al.product_id) as obj_num,
+                SUM(al.obj_price) as "adj"
+            from auction_lots al
+            where al.obj_price>0
+            group by to_char(al.create_date, 'YYYY-MM-DD'), al.create_uid)
+             ''')
+report_object_encoded_manager()
+
+class report_unclassified_objects(osv.osv):
+    _name = "report.unclassified.objects"
+    _description = "Unclassified objects "
+    _auto = False
+    _columns = {
+        'name': fields.char('Short Description',size=64, required=True),
+        'obj_num': fields.integer('Catalog Number'),
+        'obj_price': fields.float('Adjudication price'),
+        'lot_num': fields.integer('List Number', required=True, select=1 ),
+        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold')),'Status', required=True, readonly=True),
+        'obj_comm': fields.boolean('Commission'),
+        'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True),
+        'ach_login': fields.char('Buyer Username',size=64),
+        'lot_est1': fields.float('Minimum Estimation'),
+        'lot_est2': fields.float('Maximum Estimation'),
+        'lot_type': fields.selection(_type_get, 'Object category', size=64),
+        'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1),
+    }
+    def init(self, cr):
+        cr.execute("""create or replace view report_unclassified_objects as
+            (select
+                min(al.id) as id,
+                al.name as name,
+                al.obj_price as obj_price,
+                al.obj_num as obj_num,
+                al.lot_num as lot_num,
+                al.state as state,
+                al.obj_comm as obj_comm,
+                al.bord_vnd_id as bord_vnd_id,
+                al.ach_login as ach_login,
+                al.lot_est1 as lot_est1,
+                al.lot_est2 as lot_est2,
+                al.lot_type as lot_type,
+                al.auction_id as auction
+            from auction_lots al,auction_lot_category ac
+            where (al.lot_type=ac.name) AND (ac.aie_categ='41') AND (al.auction_id is null)
+group by al.obj_price,al.obj_num, al.lot_num, al.state, al.obj_comm,al.bord_vnd_id,al.ach_login,al.lot_est1,al.lot_est2,al.lot_type,al.auction_id,al.name)
+             """)
+report_unclassified_objects()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/auction_data.xml b/addons/auction/auction_data.xml
new file mode 100644
index 00000000000..2c3eb37148f
--- /dev/null
+++ b/addons/auction/auction_data.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+	<record model="account.account" id="auction_income_view">
+		<field name="name">Auction Adjudications</field>
+		<field name="code">0</field>
+		<field name="type">view</field>
+		<field name="currency_id" search="[('name','=','EUR')]"/>
+		<field name="parent_id" type="list">
+			<value search="[('type','=','view'),('code','=','7')]" model="account.account"/>
+		</field>
+	</record>
+
+	<record model="account.account" id="auction_expense_view">
+		<field name="name">Auction Adjudication Expenses</field>
+		<field name="code">0</field>
+		<field name="type">view</field>
+		<field name="currency_id" search="[('name','=','EUR')]"/>
+		<field name="parent_id" type="list">
+			<value search="[('type','=','view'),('code','=','6')]" model="account.account"/>
+		</field>
+	</record>
+
+	<record model="account.account" id="auction_income">
+		<field name="name">Auction Adjudications</field>
+		<field name="code">7x*</field>
+		<field name="type">income</field>
+		<field name="currency_id" search="[('name','=','EUR')]"/>
+		<field name="parent_id" eval="[auction_income_view]"/>
+	</record>
+	<record model="account.account" id="auction_expense">
+		<field name="name">Auction Adjudication Expenses</field>
+		<field name="code">6x*</field>
+		<field name="type">expense</field>
+		<field name="currency_id" search="[('name','=','EUR')]"/>
+		<field name="parent_id" eval="[auction_expense_view]"/>
+	</record>
+
+	<record model="account.account" id="auction_income_costs">
+		<field name="name">Auction Buyer Costs</field>
+		<field name="code">7x*</field>
+		<field name="type">tax</field>
+		<field name="currency_id" search="[('name','=','EUR')]"/>
+		<field name="parent_id" eval="[auction_income_view]"/>
+	</record>
+	<record model="account.account" id="auction_expense_costs">
+		<field name="name">Auction Seller Costs</field>
+		<field name="code">6x*</field>
+		<field name="type">tax</field>
+		<field name="currency_id" search="[('name','=','EUR')]"/>
+		<field name="parent_id" eval="[auction_expense_view]"/>
+	</record>
+
+	<record model="account.tax" id="tax_buyer_author">
+		<field name="name">Author rights (4%)</field>
+		<field name="type">percent</field>
+		<field name="applicable_type">code</field>
+		<field name="amount">0.04</field>
+		<field name="domain">sabam</field>
+		<field name="account_collected_id" ref="auction_income_costs"/>
+		<field name="account_paid_id" ref="auction_income_costs"/>
+		<field name="python_applicable">result = (price_unit&gt;=1250)</field>
+	</record>
+	<record model="account.tax" id="tax_buyer">
+		<field name="name">Buyer Costs (20%)</field>
+		<field name="type">percent</field>
+		<field name="amount">0.20</field>
+		<field name="domain">auction</field>
+		<field name="account_collected_id" ref="auction_income_costs"/>
+		<field name="account_paid_id" ref="auction_income_costs"/>
+	</record>
+	<record model="account.tax" id="tax_seller">
+		<field name="name">Seller Costs (12%)</field>
+		<field name="type">percent</field>
+		<field name="amount">-0.12</field>
+		<field name="domain">auction</field>
+		<field name="account_collected_id" ref="auction_expense_costs"/>
+		<field name="account_paid_id" ref="auction_expense_costs"/>
+	</record>
+
+	<ir_set>
+		<field name="keys" eval="[('meta','res.partner'),('name','auction.seller.costs')]"/>
+		<field name="args" eval="[]"/>
+		<field name="name">account.seller.costs</field>
+		<field name="value" eval="tax_seller"/>
+		<field name="meta" eval="{'type':'many2one', 'string':'Seller Costs', 'relation':'account.tax'}"/>
+	</ir_set>
+
+
+
+	<record id="product.product_product_pc2" model="product.product">
+		<field name="list_price">770.0</field>
+		<field name="standard_price">700.0</field>
+
+	</record>
+
+</data>
+</terp>
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
new file mode 100644
index 00000000000..1d1bcdc079a
--- /dev/null
+++ b/addons/auction/auction_demo.xml
@@ -0,0 +1,895 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+
+
+	<!--demo data for the partner-->
+
+	<record id="partner_record1" model="res.partner">
+		<field name="name">Unknown</field>
+	</record>
+
+	<record id="res_partner_unknown_address_1" model="res.partner.address">
+	<field name="city">Bruxelles1</field>
+	<field name="name">Benoit Mortie1r1</field>
+	<field name="zip">1030</field>
+	<field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
+
+	<field name="email">info@opensides.be</field>
+	<field name="phone">(+32)2 211 34 83</field>
+	<field name="street">Rue des Palais 44, bte 33</field>
+	<field name="type">default</field>
+	<field name="partner_id" ref="partner_record1"/>
+</record>
+<record id="res_partner_unknown_address_2" model="res.partner.address">
+	<field name="city">Avignon CEDEX 091</field>
+	<field name="name">Laurent Jacot1</field>
+	<field name="zip">84911</field>
+	<field name="country_id" model="res.country" search="[('name','=','France')]"/>
+	<field name="email">contact@tecsas.fr</field>
+	<field name="phone">(+33)4.32.74.10.57</field>
+	<field name="street">85 rue du traite de Rome</field>
+	<field name="type">default</field>
+	<field name="partner_id" ref="partner_record1"/>
+</record>
+<record id="res_partner_unknown_address_3" model="res.partner.address">
+	<field name="city">Louvain-la-Neuve</field>
+	<field name="name">Thomas Passot</field>
+	<field name="zip">1348</field>
+	<field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
+	<field name="email">info@mediapole.net</field>
+	<field name="phone">(+32).10.45.17.73</field>
+	<field name="street">Rue de l'Angelique, 1</field>
+	<field name="partner_id" ref="partner_record1"/>
+</record>
+
+		<!-- demo data for the auction_artist object-->
+	<record model="auction.artists" id="auction_art_1">
+		<field name="name">Philippe Lavilier</field>
+		<field name="birth_death_dates">1345-1450</field>
+	</record>
+	<record model="auction.artists" id="auction_art_2">
+		<field name="name">POREAU OSWALD</field>
+		<field name="birth_death_dates">1877-1955</field>
+	</record>
+
+
+
+
+		<!-- demo data for the account tax code-->
+
+		<record model="account.tax.code" id="account_tax_code_id1">
+		<field name="name">VAT 1%</field>
+		<field name="code">VAT01</field>
+		<field name="company_id" model="res.company"  search="[]"/>
+	</record>
+
+	<record model="account.tax.code" id="account_tax_code_id2">
+		<field name="name">VAT 20%</field>
+		<field name="code">VAT20</field>
+		<field name="company_id" model="res.company"  search="[]"/>
+	</record>
+
+
+	<record model="account.tax.code" id="account_tax_code_id3">
+		<field name="name">VAT 10%</field>
+		<field name="code">VAT10</field>
+		<field name="company_id" model="res.company"  search="[]"/>
+	</record>
+
+	<record model="account.tax.code" id="account_tax_code_id4">
+		<field name="name">VAT 12%</field>
+		<field name="code">VAT12</field>
+		<field name="company_id" model="res.company"  search="[]"/>
+	</record>
+
+	<record model="account.tax.code" id="account_tax_code_id5">
+		<field name="name">VAT 5%</field>
+		<field name="code">VAT5</field>
+		<field name="company_id" model="res.company"  search="[]"/>
+	</record>
+
+
+<!-- demo data for the auction taxes-->
+
+	<record id="auction_tax" model="account.tax">
+		<field name="name">Droit d'auteur</field>
+		<field name="amount">0.05</field>
+		<field name="domain">sabam</field>
+		<field name="base_code_id" ref="account_tax_code_id5"/>
+		<field name="tax_code_id" ref="account_tax_code_id5"/>
+
+	</record>
+	<record id="auction_tax1" model="account.tax">
+                <field name="name">TVA</field>
+                <field name="amount">0.12</field>
+				<field name="domain">auction</field>
+				<field name="base_code_id" ref="account_tax_code_id4"/>
+				<field name="tax_code_id" ref="account_tax_code_id4"/>
+    </record>
+
+
+	<record id="auction_tax2" model="account.tax">
+                <field name="name">TVA1</field>
+                <field name="amount">0.2</field>
+				<field name="domain">auction</field>
+				<field name="base_code_id" ref="account_tax_code_id2"/>
+				<field name="tax_code_id" ref="account_tax_code_id2"/>
+
+    </record>
+	<record id="auction_tax3" model="account.tax">
+                <field name="name">Buyer Costs</field>
+                <field name="amount">0.21</field>
+				<field name="domain">auction</field>
+				<field name="base_code_id" ref="account_tax_code_id1"/>
+				<field name="tax_code_id" ref="account_tax_code_id1"/>
+
+    </record>
+	<record id="auction_tax4" model="account.tax">
+                <field name="name">Seller Costs1</field>
+                <field name="amount">-0.10</field>
+				<field name="domain">auction</field>
+				<field name="base_code_id" ref="account_tax_code_id1"/>
+				<field name="tax_code_id" ref="account_tax_code_id1"/>
+
+    </record>
+	<record id="auction_tax5" model="account.tax">
+                <field name="name">Seller Costs</field>
+                <field name="amount">-0.10</field>
+				<field name="domain">auction</field>
+				<field name="base_code_id" ref="account_tax_code_id3"/>
+				<field name="tax_code_id" ref="account_tax_code_id3"/>
+    </record>
+
+
+<!--    	example for creating a demo data for the tax with basecode and tax code-->
+	<record id="auction_tax6" model="account.tax">
+                <field name="name">Frais de vente</field>
+                <field name="amount">-0.15</field>
+				<field name="domain">auction</field>
+				<field name="base_code_id" ref="account_tax_code_id1"/>
+				<field name="tax_code_id" ref="account_tax_code_id1"/>
+    </record>
+
+		<record id="auction_tax20" model="account.tax">
+                <field name="name">Frais de vente</field>
+                <field name="amount">0</field>
+				<field name="domain">auction</field>
+				<field name="base_code_id" ref="account_tax_code_id2"/>
+				<field name="tax_code_id" ref="account_tax_code_id2"/>
+    </record>
+	<record id="monproduit" model="product.product">
+		<field name="name">Oeuvres a 21%</field>
+		<field name="categ_id" ref="product.product_category_pc"/>
+	</record>
+
+
+
+
+
+<!--===========================================================================================-->
+		<!-- start == demo data for the auction_lot_Category object-->
+	<record model="auction.lot.category" id="auction_cat_1">
+		<field name="name">painting</field>
+		<field name="priority">1</field>
+		<field name="aie_categ">8</field>
+	</record>
+	<record model="auction.lot.category" id="auction_cat_2">
+		<field name="name">Furniture</field>
+		<field name="priority">2</field>
+		<field name="aie_categ">10</field>
+
+	</record>
+
+	<record model="auction.lot.category" id="auction_cat_3">
+		<field name="name">glass</field>
+		<field name="priority">2</field>
+		<field name="aie_categ">25</field>
+	</record>
+	<record model="auction.lot.category" id="auction_cat_4">
+		<field name="name">sculpture</field>
+		<field name="priority">10</field>
+		<field name="aie_categ">18</field>
+	</record>
+
+	<record model="auction.lot.category" id="auction_cat_5">
+		<field name="name">Jawellery</field>
+		<field name="priority">6</field>
+		<field name="aie_categ">15</field>
+	</record>
+
+<!-- end == demo data for the auction_lot_Category-->
+
+<!-- start== demo data for the auction_date-->
+
+	<record model="auction.dates" id="auction_date_1">
+		<field name="name">painting Exhibition</field>
+		<field name="expo1" eval="time.strftime('%Y-%m-01')" />
+		<field name="expo2" eval="time.strftime('%Y-%m-15')" />
+		<field name="auction1" eval="time.strftime('%Y-%m-20')" />
+		<field name="auction2" eval="time.strftime('%Y-%m-28')" />
+		<field name="buyer_costs" model="account.tax" search="[('name','=','Buyer Costs')]"></field>
+		<field name="seller_costs" model="account.tax" search="[('name','=','Seller Costs')]"></field>
+		<field name="acc_income" ref="account.a_sale"/>
+		<field name="acc_expense" ref="account.a_expense"/>
+
+		<field name="journal_id" ref="account.sales_journal"/>
+		<field name="journal_seller_id" ref="account.expenses_journal"/>
+		<field name="account_analytic_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+
+	</record>
+
+	<record model="auction.dates" id="auction_date_2">
+		<field name="name">Antique Items Exhibition</field>
+		<field name="expo1" eval="time.strftime('%Y-%m-01')" />
+		<field name="expo2" eval="time.strftime('%Y-%m-10')" />
+		<field name="buyer_costs" model="account.tax" search="[('name','=','Buyer Costs')]"></field>
+		<field name="seller_costs" model="account.tax" search="[('name','=','Seller Costs')]"></field>
+
+		<field name="auction1" eval="time.strftime('%Y-%m-14')" />
+		<field name="auction2" eval="time.strftime('%Y-%m-28')" />
+		<field name="acc_income" ref="account.a_sale"/>
+		<field name="acc_expense" ref="account.a_expense"/>
+
+		<field name="journal_id" ref="account.sales_journal"/>
+		<field name="journal_seller_id" ref="account.expenses_journal"/>
+		<field name="account_analytic_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+
+</record>
+
+
+<!-- end == demo data for the auction_dates-->
+
+
+	<!-- start == demo data for the auction_deposit-->
+
+
+	<record model="auction.deposit" id="auction_deposit_1">
+	<field name="date_dep" eval="time.strftime('%Y')+'-04-01'"/>
+	<field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
+	<field name="method">keep</field>
+	</record>
+
+	<record model="auction.deposit" id="auction_deposit_2">
+	<field name="date_dep" eval="time.strftime('%Y')+'-04-05'"/>
+	<field name="partner_id" model="res.partner" search="[('name','=','China Export')]"></field>
+	<field name="method">keep</field>
+	</record>
+
+	<record model="auction.deposit" id="auction_deposit_3">
+	<field name="date_dep" eval="time.strftime('%Y')+'-04-10'"/>
+	<field name="partner_id" model="res.partner" search="[('name','=','Agrolait')]"></field>
+	<field name="method">keep</field>
+	</record>
+
+	<record model="auction.deposit" id="auction_deposit_4">
+	<field name="date_dep" eval="time.strftime('%Y')+'-04-15'"/>
+	<field name="partner_id" model="res.partner" search="[('name','=','Bank Wealthy and sons')]"></field>
+	<field name="method">keep</field>
+	</record>
+
+	<record model="auction.deposit" id="auction_deposit_5">
+	<field name="date_dep" eval="time.strftime('%Y')+'-04-12'"/>
+	<field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
+	<field name="method">keep</field>
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_1_lot_1">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Aera Glasses</field>
+		<field name="lot_num">1</field>
+		<field name="lot_est1">500</field>
+		<field name="lot_est2">700</field>
+		<field name="obj_desc">show pices</field>
+		<field name="obj_ret">465.00</field>
+		<field name="obj_num">1</field>
+		<field name="obj_price">0.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_1" />
+		<field name="product_id" ref="monproduit"/>
+        <field name="author_right" ref="auction_tax"/>
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_1_lot_2">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">lake Photos</field>
+		<field name="lot_num">2</field>
+		<field name="lot_est1">1000</field>
+		<field name="lot_est2">1700</field>
+		<field name="obj_desc">show pices</field>
+		<field name="obj_ret">0.00</field>
+		<field name="obj_num">2</field>
+		<field name="obj_price">1500.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_1" />
+		<!--field name="product_id" ref="monproduit"/-->                                                                              |
+        <field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+		<!--<field name="tva" model="account.tax" search="[]"/>-->
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_2_lot_1">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">fancy mask</field>
+		<field name="lot_num">3</field>
+		<field name="lot_est1">500</field>
+		<field name="lot_est2">700</field>
+		<field name="obj_desc">show pices</field>
+		<field name="obj_ret">650</field>
+		<field name="obj_num">4</field>
+		<field name="obj_price">0.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_2" />
+		<!--field name="product_id" ref="monproduit"/-->                                                    |                            |
+        <field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+		<!--<field name="tva" model="account.tax" search="[]"/>-->
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_2_lot_2">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Dining Table</field>
+		<field name="lot_num">4</field>
+		<field name="lot_est1">200</field>
+		<field name="lot_est2">400</field>
+		<field name="obj_desc">show pices</field>
+		<field name="obj_ret">0.00</field>
+		<field name="obj_num">4</field>
+		<field name="obj_price">375</field>
+		<field name="bord_vnd_id" ref="auction_deposit_2" />
+		<!--field name="product_id" ref="monproduit"/-->                                                    |                            |
+        <field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+		<!--<field name="tva" model="account.tax" search="[]"/>-->
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_3_lot_1">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Plastic glass</field>
+		<field name="lot_num">5</field>
+		<!--field name="lot_type">glass</field-->
+		<field name="lot_est1">300</field>
+		<field name="lot_est2">500</field>
+		<field name="obj_desc">show pices</field>
+		<field name="obj_ret">0.00</field>
+		<field name="obj_num">5</field>
+		<field name="obj_price">460</field>
+		<field name="bord_vnd_id" ref="auction_deposit_3" />
+        <field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_3_lot_2">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Mountain photos</field>
+		<field name="lot_num">6</field>
+		<!--field name="lot_type">painting</field-->
+		<field name="lot_est1">50</field>
+		<field name="lot_est2">100</field>
+		<field name="obj_desc">show pices</field>
+		<field name="obj_ret">0.00</field>
+		<field name="obj_num">6</field>
+		<field name="obj_price">85</field>
+		<field name="bord_vnd_id" ref="auction_deposit_3" />
+        <field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_4_lot_1">
+		<field name="name"></field>
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">bresslet</field>
+		<field name="lot_num">7</field>
+		<!--field name="lot_type">Jewellery</field-->
+		<field name="lot_est1">150</field>
+		<field name="lot_est2">400</field>
+		<field name="obj_desc">show pices</field>
+		<field name="obj_ret">100</field>
+		<field name="obj_num">1</field>
+		<field name="obj_price">0</field>
+		<field name="bord_vnd_id" ref="auction_deposit_4" />
+        <field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_4_lot_2">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">gold chain</field>
+		<field name="lot_num">11</field>
+		<!--field name="lot_type">Jawellery</field-->
+		<field name="lot_est1">400</field>
+		<field name="lot_est2">700</field>
+		<field name="obj_desc">show pices</field>
+		<field name="obj_ret">0.00</field>
+		<field name="obj_num">11</field>
+		<field name="obj_price">550</field>
+		<field name="bord_vnd_id" ref="auction_deposit_4" />
+        <field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_5_lot_1">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">fiber glass</field>
+		<field name="lot_num">8</field>
+		<!--field name="lot_type">glass</field-->
+		<field name="lot_est1">300</field>
+		<field name="lot_est2">500</field>
+		<field name="obj_desc">show pices</field>
+		<field name="obj_ret">0.00</field>
+		<field name="obj_num">8</field>
+		<field name="obj_price">450</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+        <field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_5_lot_2">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">lake photos</field>
+		<field name="lot_num">9</field>
+		<!--field name="lot_type">painting</field-->
+		<field name="lot_est1">100</field>
+		<field name="lot_est2">200</field>
+		<field name="obj_desc">show pices</field>
+		<field name="obj_ret">150</field>
+		<field name="obj_num">9</field>
+		<field name="obj_price">0.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_6_lot_1">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">mobile photos</field>
+		<field name="lot_num">10</field>
+		<!--field name="lot_type">mobile</field-->
+		<field name="lot_est1">4500</field>
+		<field name="lot_est2">4700</field>
+		<field name="obj_desc">show models</field>
+		<field name="obj_ret">4650</field>
+		<field name="obj_num">10</field>
+		<field name="obj_price">4800.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_6_lot_2">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Antique photos</field>
+		<field name="lot_num">11</field>
+		<!--field name="lot_type">common</field-->
+		<field name="lot_est1">1600</field>
+		<field name="lot_est2">2200</field>
+		<field name="obj_desc">show map Items</field>
+		<field name="obj_ret">2150</field>
+		<field name="obj_num">11</field>
+		<field name="obj_price">2050.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+
+	</record>
+
+
+
+	<record model="auction.lots" id="auction_deposit_7_lot_1">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Hardware  photos</field>
+		<field name="lot_num">12</field>
+		<!--field name="lot_type">common</field-->
+		<field name="lot_est1">2600</field>
+		<field name="lot_est2">2800</field>
+		<field name="obj_desc">show map Items</field>
+		<field name="obj_ret">2550</field>
+		<field name="obj_num">12</field>
+		<field name="obj_price">2050.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+
+	</record>
+
+
+	<record model="auction.lots" id="auction_deposit_7_lot_2">
+			<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Home Appliance photos</field>
+		<field name="lot_num">12</field>
+		<!--field name="lot_type">common</field-->
+		<field name="lot_est1">1600</field>
+		<field name="lot_est2">2200</field>
+		<field name="obj_desc">show map Items</field>
+		<field name="obj_ret">2150</field>
+		<field name="obj_num">12</field>
+		<field name="obj_price">2050.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+
+	</record>
+
+
+	<record model="auction.lots" id="auction_deposit_8_lot_1">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">mobile accesories photos</field>
+		<field name="lot_num">13</field>
+		<!--field name="lot_type">common</field-->
+		<field name="lot_est1">1600</field>
+		<field name="lot_est2">2200</field>
+		<field name="obj_desc">show map Items</field>
+		<field name="obj_ret">2150</field>
+		<field name="obj_num">13</field>
+		<field name="obj_price">2050.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_8_lot_2">
+		<field name="auction_id" ref="auction_date_2" />
+		<field name="name"> piques-cierges</field>
+		<field name="lot_num">14</field>
+		<!--field name="lot_type">common</field-->
+		<field name="lot_est1">30</field>
+		<field name="lot_est2">50</field>
+		<field name="obj_desc">show map Items</field>
+		<field name="obj_ret">20</field>
+		<field name="obj_num">14</field>
+		<field name="obj_price">0</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+
+	</record>
+
+
+	<record model="auction.lots" id="auction_deposit_9_lot_1">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Service à café</field>
+		<field name="lot_num">15</field>
+		<!--field name="lot_type">common</field-->
+		<field name="lot_est1">10</field>
+		<field name="lot_est2">20</field>
+		<field name="obj_desc">show map Items</field>
+		<field name="obj_ret">0</field>
+		<field name="obj_num">15</field>
+		<field name="obj_price">25</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+
+	</record>
+
+
+
+
+
+	<record model="auction.lots" id="auction_deposit_9_lot_2">
+			<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Pendule</field>
+		<field name="lot_num">16</field>
+		<field name="lot_est1">100</field>
+		<field name="lot_est2">200</field>
+		<field name="obj_desc">show map Items</field>
+		<field name="obj_ret">0</field>
+		<field name="obj_num">16</field>
+		<field name="obj_price">150</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_10_lot_1">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Cassolettes en marbre</field>
+		<field name="lot_num">17</field>
+		<field name="lot_est1">400</field>
+		<field name="lot_est2">500</field>
+		<field name="obj_desc">marbre Saint Rémi</field>
+		<field name="obj_ret">150</field>
+		<field name="obj_num">17</field>
+		<field name="obj_price">0</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+
+	</record>
+
+	<record model="auction.lots" id="auction_deposit_10_lot_2">
+		<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Tableau</field>
+		<field name="lot_num">18</field>
+		<field name="lot_est1">1600</field>
+		<field name="lot_est2">2200</field>
+		<field name="obj_desc">show map Items</field>
+		<field name="obj_ret">2150</field>
+		<field name="obj_num">18</field>
+		<field name="obj_price">2050.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+
+	</record>
+
+
+
+
+
+
+
+
+	<record model="auction.lots" id="auction_deposit_11_lot_1">
+			<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Vase</field>
+		<field name="lot_num">19</field>
+		<field name="lot_est1">180</field>
+		<field name="lot_est2">220</field>
+		<field name="obj_desc">Rouge</field>
+		<field name="obj_ret">0</field>
+		<field name="obj_num">19</field>
+		<field name="obj_price">190.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+
+	</record>
+
+
+
+
+
+	<record model="auction.lots" id="auction_deposit_12_lot_2">
+			<field name="auction_id" ref="auction_date_1" />
+		<field name="name">Appareil à photos</field>
+		<field name="lot_num">20</field>
+		<field name="lot_est1">160</field>
+		<field name="lot_est2">340</field>
+		<field name="obj_desc">map Items</field>
+		<field name="obj_ret">0</field>
+		<field name="obj_num">20</field>
+		<field name="obj_price">150.00</field>
+		<field name="bord_vnd_id" ref="auction_deposit_5" />
+		<field name="author_right" ref="auction_tax"/>
+		<field name="product_id" model="product.product" search="[]"/>
+
+	</record>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	<record model="auction.bid" id="auction_date_1_bid_1">
+		<field name="name">bid1</field>
+		<field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"/>
+		<field name="auction_id" ref="auction_date_1" />
+	</record>
+
+	<record model="auction.bid_line" id="auction_date_1_bid_1_auction_bid_line1">
+		<field name="bid_id" ref="auction_date_1_bid_1" />
+		<field name="lot_id" ref="auction_deposit_1_lot_1" />
+	</record>
+
+	<record model="auction.bid" id="auction_date_1_bid_2">
+		<field name="name">bid2</field>
+		<field name="partner_id"  model="res.partner"  search="[('name','=','Unknown')]"/>
+		<field name="auction_id" ref="auction_date_1" />
+	</record>
+
+	<record model="auction.bid_line" id="auction_date_1_bid_2_auction_bid_line1">
+		<field name="bid_id" ref="auction_date_1_bid_2" />
+		<field name="lot_id" ref="auction_deposit_1_lot_2" />
+	</record>
+
+	<record model="auction.bid" id="auction_date_1_bid_3">
+		<field name="name">bid3</field>
+		<field name="partner_id" model="res.partner"   search="[('name','=','Unknown')]"/>
+		<field name="auction_id" ref="auction_date_1" />
+	</record>
+
+	<record model="auction.bid_line" id="auction_date_1_bid_3_bid_1_auction_bid_line1">
+		<field name="bid_id" ref="auction_date_1_bid_3" />
+		<field name="lot_id" ref="auction_deposit_2_lot_1" />
+	</record>
+
+	<record model="auction.bid" id="auction_date_1_bid_4">
+		<field name="name">bid4</field>
+		<field name="partner_id"   model="res.partner" search="[('name','=','Unknown')]"/>
+		<field name="auction_id" ref="auction_date_1" />
+	</record>
+
+	<record model="auction.bid_line" id="auction_date_1_bid_4_bid_1_auction_bid_line1">
+		<field name="bid_id" ref="auction_date_1_bid_4" />
+		<field name="lot_id" ref="auction_deposit_2_lot_2" />
+	</record>
+
+	<record model="auction.bid" id="auction_date_1_bid_5">
+		<field name="name">bid5</field>
+		<field name="partner_id" model="res.partner"  search="[('name','=','Unknown')]"/>
+		<field name="auction_id" ref="auction_date_1" />
+	</record>
+
+	<record model="auction.bid_line" id="auction_date_1_bid_5_auction_bid_line1">
+		<field name="bid_id" ref="auction_date_1_bid_5" />
+		<field name="lot_id" ref="auction_deposit_3_lot_1" />
+	</record>
+
+	<record model="auction.bid" id="auction_date_2_bid_1">
+		<field name="name">bid6</field>
+		<field name="partner_id" model="res.partner"  search="[('name','=','Unknown')]"/>
+		<field name="auction_id" ref="auction_date_2" />
+	</record>
+
+	<record model="auction.bid_line" id="auction_date_2_bid_1_auction_bid_line1">
+		<field name="bid_id" ref="auction_date_2_bid_1" />
+		<field name="lot_id" ref="auction_deposit_3_lot_2" />
+	</record>
+
+	<record model="auction.bid" id="auction_date_2_bid_2">
+		<field name="name">bid7</field>
+		<field name="partner_id" model="res.partner"  search="[('name','=','Unknown')]"/>
+		<field name="auction_id" ref="auction_date_2" />
+	</record>
+
+	<record model="auction.bid_line" id="auction_date_2_bid_2_auction_bid_line1">
+		<field name="bid_id" ref="auction_date_2_bid_2" />
+		<field name="lot_id" ref="auction_deposit_4_lot_1" />
+	</record>
+
+	<record model="auction.bid" id="auction_date_2_bid_3">
+		<field name="name">bid8</field>
+		<field name="partner_id" model="res.partner"  search="[('name','=','Unknown')]"/>
+		<field name="auction_id" ref="auction_date_2" />
+	</record>
+
+	<record model="auction.bid_line" id="auction_date_2_bid_3_auction_bid_line1">
+		<field name="bid_id" ref="auction_date_2_bid_3" />
+		<field name="lot_id" ref="auction_deposit_4_lot_2" />
+	</record>
+
+	<record model="auction.bid" id="auction_date_2_bid_4">
+		<field name="name">bid9</field>
+		<field name="partner_id" search="[('name','=','Unknown')]"/>
+		<field name="auction_id" ref="auction_date_2" />
+	</record>
+
+	<record model="auction.bid_line" id="auction_date_2_bid_4_auction_bid_line1">
+		<field name="bid_id" ref="auction_date_2_bid_4" />
+		<field name="lot_id" ref="auction_deposit_5_lot_1" />
+	</record>
+
+	<record model="auction.bid" id="auction_date_2_bid_5">
+		<field name="name">bid10</field>
+		<field name="partner_id" model="res.partner"  search="[('name','=','Unknown')]"/>
+		<field name="auction_id" ref="auction_date_2" />
+	</record>
+
+	<record model="auction.bid_line" id="auction_date_2_bid_5_auction_bid_line1">
+		<field name="bid_id" ref="auction_date_2_bid_5" />
+		<field name="lot_id" ref="auction_deposit_5_lot_2" />
+	</record>
+
+
+		<!--demo data for the hr_employee-->
+
+			<record model="hr.employee" id="employee2">
+			<field name="name">pritesh</field>
+			<field name="regime">45</field>
+			<field name="user_id" search="[('login','=','admin')]" model="res.users"/>
+			<field name="holiday_max">25</field>
+			<fields name="workgroups" ref="timesheet_group1" />
+			</record>
+
+
+
+	<!--demo data for the hr_attendence for employee1 -->
+
+
+		<record model="hr.attendance" id="unknown1_emp1">
+			<field name="name" eval="time.strftime('%Y-%m-25 08:21')"/>
+			<field name="action">sign_in</field>
+			<field name="employee_id" ref="hr.employee1" />
+		</record>
+		<record model="hr.attendance" id="unknown1_emp2">
+			<field name="name" eval="time.strftime('%Y-%m-25 9:21')"/>
+			<field name="action">sign_out</field>
+			<field name="employee_id" ref="hr.employee1" />
+		</record>
+		<record model="hr.attendance" id="unknown1_emp3">
+			<field name="name" eval="time.strftime('%Y-%m-25 09:25')"/>
+			<field name="action">sign_in</field>
+			<field name="employee_id" ref="hr.employee1" />
+		</record>
+		<record model="hr.attendance" id="unknown1_emp4">
+			<field name="name" eval="time.strftime('%Y-%m-25 11:54')"/>
+			<field name="action">sign_out</field>
+			<field name="employee_id" ref="hr.employee1" />
+		</record>
+		<record model="hr.attendance" id="unknown1_emp5">
+			<field name="name" eval="time.strftime('%Y-%m-25 11:59')"/>
+			<field name="action">sign_in</field>
+			<field name="employee_id" ref="hr.employee1" />
+		</record>
+		<record model="hr.attendance" id="unknown1_emp6">
+			<field name="name" eval="time.strftime('%Y-%m-25 13:31')"/>
+			<field name="action">sign_out</field>
+			<field name="employee_id" ref="hr.employee1"/>
+		</record>
+		<record model="hr.attendance" id="unknown1_emp7">
+			<field name="name" eval="time.strftime('%Y-%m-25 20:10')"/>
+			<field name="action">sign_in</field>
+			<field name="employee_id" ref="hr.employee1" />
+		</record>
+		<record model="hr.attendance" id="unknown1_emp8">
+			<field name="name" eval="time.strftime('%Y-%m-25 21:34')"/>
+			<field name="action">sign_out</field>
+			<field name="employee_id" ref="hr.employee1" />
+		</record>
+
+
+
+	<!--demo data for the hr_attendence for employee2-->
+
+			<record model="hr.attendance" id="unknown2_emp1">
+			<field name="name" eval="time.strftime('%Y-%m-26 08:21')"/>
+			<field name="action">sign_in</field>
+			<field name="employee_id" ref="employee2" />
+		</record>
+		<record model="hr.attendance" id="unknown2_emp2">
+			<field name="name" eval="time.strftime('%Y-%m-26 9:21')"/>
+			<field name="action">sign_out</field>
+			<field name="employee_id" ref="employee2" />
+		</record>
+		<record model="hr.attendance" id="unknown2_emp3">
+			<field name="name" eval="time.strftime('%Y-%m-26 10:21')"/>
+			<field name="action">sign_in</field>
+			<field name="employee_id" ref="employee2" />
+		</record>
+		-<record model="hr.attendance" id="unknown2_emp4">
+			<field name="name" eval="time.strftime('%Y-%m-26 12:54')"/>
+			<field name="action">sign_out</field>
+			<field name="employee_id" ref="employee2" />
+		</record>
+		<record model="hr.attendance" id="unknown2_emp5">
+			<field name="name" eval="time.strftime('%Y-%m-26 13:32')"/>
+			<field name="action">sign_in</field>
+			<field name="employee_id" ref="employee2" />
+		</record>
+		<record model="hr.attendance" id="unknown2_emp6">
+			<field name="name" eval="time.strftime('%Y-%m-26 16:31')"/>
+			<field name="action">sign_out</field>
+			<field name="employee_id" ref="employee2"/>
+		</record>
+		<record model="hr.attendance" id="unknown2_emp7">
+			<field name="name" eval="time.strftime('%Y-%m-26 17:10')"/>
+			<field name="action">sign_in</field>
+			<field name="employee_id" ref="employee2" />
+		</record>
+		<record model="hr.attendance" id="unknown2_emp8">
+			<field name="name" eval="time.strftime('%Y-%m-26 22:34')"/>
+			<field name="action">sign_out</field>
+			<field name="employee_id" ref="employee2" />
+		</record>
+
+
+
+
+
+
+
+
+
+
+
+
+</data>
+</terp>
diff --git a/addons/auction/auction_report.xml b/addons/auction/auction_report.xml
new file mode 100644
index 00000000000..16deddfa1ad
--- /dev/null
+++ b/addons/auction/auction_report.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+		<!--<delete model="ir.actions.report.xml" search="[('model','like','auction.')]"/>-->
+
+		<report string="Listing Huissiers"
+		model="auction.lots"
+		name="flagey.huissier"
+		xsl="auction/report/huissier.xsl"
+		auto="False"
+		id="v_huissier"
+		multi="1"
+		/>
+
+
+		<report string="Artists Biography"
+		 model="auction.artists"
+		 name="report.auction.artists"
+		 xml="auction/report/artists.xml"
+		 xsl="auction/report/artists.xsl"
+		 id="art2"
+		 multi="1"/>
+
+<!--		<report string="Artists Biography"
+
+		 model="auction.lots"
+		 name="auction.artists"
+		 rml="auction/report/auction_artists.rml"
+		 id="art_auction"
+		 multi="1"/>
+-->
+		<report string="Bids phones"
+		 model="auction.lots"
+		 name="bids.lots"
+		 rml="auction/report/bids_lots.rml"
+		 id="bid_phone"
+		 multi="1"/>
+
+		<report string="Bids"
+		 model="auction.bid"
+		 name="auction.bids"
+		 rml="auction/report/auction_bids.rml"
+		 id="bid_auction"
+		 multi="1"/>
+
+
+	<report
+		string="Code barres du lot"
+		model="auction.lots"
+		name="auction.code_bar_lot"
+		rml="auction/report/report_lot_bar_code.rml"
+		 multi="1"
+		id="v_report_barcode_lot"/>
+
+
+		<report string="Seller Labels"
+		 model="auction.lots"
+		 name="auction.seller_labels"
+		 auto="False"
+		 multi="1"/>
+
+<!--	<report string="Catalog with pictures"
+	   	model="auction.lots"
+		name="catelogwithpictures"
+		rml="auction/report/catelogwithpictures.rml"
+		auto="False"
+		multi="1"
+		id="1"/>
+-->
+	<report string="Catalog"
+	   	model="auction.lots"
+		name="auction.catelog"
+		rml="auction/report/auction_catelog.rml"
+		auto="False"
+		multi="1"/>
+
+	<!--<report string="Deposit Letter"
+	   	model="auction.lots"
+		name="deposit.seller"
+		rml="auction/report/deposit_seller.rml"
+		auto="False"
+		multi="1"/>-->
+
+	<report string="Lots List"
+	   	model="auction.lots"
+		name="lots.list"
+		rml="auction/report/lots_list.rml"
+		auto="False"
+		multi="1"/>
+
+
+
+		<report string="Lots List - Landscape"
+		 model="auction.lots"
+		 name="report.auction.lots.list.landscape"
+		 xml="auction/report/lots_list_landscape.xml"
+		 xsl="auction/report/lots_list_landscape.xsl"
+		id="lot_list_inv"
+		  multi="1"/>
+
+
+    <report string="Lots List Inventory"
+		 model="auction.lots"
+		 name="lots.list.inventory"
+		 rml="auction/report/lots_list_inventory.rml"
+		 multi="1"/>
+
+
+
+<report string="Lots List"
+	   	model="auction.lots"
+		name="report.auction.lots.list"
+		xml="auction/report/lots_list.xml"
+		xsl="auction/report/lots_list.xsl"
+		 multi="1"/>
+
+	<report string="Auction Totals with lists"
+	   	model="auction.lots"
+		name="auction.total.rml"
+		rml="auction/report/auction_total.rml"
+		auto="False"
+		id="total_result1"
+		multi="1"/>
+<!--		  <report string="Buyer Form"
+		  model="auction.lots"
+		  name="buyer_form_report"
+		  rml="auction/report/buyer_form_report.rml"
+		  auto="False"
+		  multi="1"/>
+-->
+<!--		  <report string="Seller form"
+		  model="auction.lots"
+		  name="seller_form_report"
+		  rml="auction/report/seller_form_report.rml"
+		  auto="False"
+		  multi="1"/>-->
+
+		<report string="Buyer Form"
+		id="buyer_form_id"
+		model="auction.lots"
+		name="report.auction.ach_bordereau"
+		xml="auction/report/ach_bordereau.xml"
+		xsl="auction/report/ach_bordereau.xsl"
+		multi="0"
+		/>
+
+		<report string="Deposits"
+		id="id_deposit"
+		model="auction.deposit"
+		name="report.auction.deposit"
+		xml="auction/report/deposit.xml"
+		xsl="auction/report/deposit.xsl"/>
+
+		<!--<report
+			id="report_auction_catalog"
+			string="Catalog flagey"
+			model="auction.lots"
+			name="auction.cat_flagy"
+			xsl="'auction/report/catalog2.xsl"/>-->
+
+		<report string="Seller Form"
+		id="seller_lots_3"
+		model="auction.lots"
+		name="report.auction.vnd_bordereau"
+		xml="auction/report/vnd_bordereau.xml"
+		xsl="auction/report/vnd_bordereau.xsl"
+		multi="1"/>
+
+		<report string="Seller List"
+		model="auction.lots"
+		multi="1"
+		id="seller_form_id"
+		name="report.auction.seller.list"
+		xml="auction/report/seller_list.xml"
+		xsl="auction/report/seller_list.xsl"/>
+
+
+		<report string="Buyer List"
+		model="auction.lots"
+		name="buyer.list"
+		id="buy_id_list"
+	    rml="auction/report/buyer_list.rml"
+	    auto = "False"
+	    multi="1"/>
+
+
+<!--		<report string="Seller List"
+		 model="auction.lots"
+		 name="report.auction.seller.list"
+		 xml="auction/report/seller_list.xml"
+		 xsl="auction/report/seller_list.xsl"
+		 menu="False"
+		 id="v_seller_list"
+		  multi="1"/>
+-->
+		<report string="Bids per lot (phone)"
+		 model="auction.lots"
+		 name="bids.phones.details"
+		 rml="auction/report/bids_phones_details.rml"
+		 id="details_bids_phones"
+		 multi="1"/>
+
+
+		<!--<report string="Bids per lot (phone)xsl"
+		 model="auction.lots"
+		 name="report.auction.lots.bids.phone"
+		 xml="auction/report/lots_bids_phone.xml"
+		 xsl="auction/report/lots_bids_phone.xsl"
+		 multi="1"/>-->
+
+		<report string="Auction's results"
+			model="auction.lots"
+			name="auction.result"
+		  	rml="auction/report/auction_result.rml"
+			multi="1"/>
+
+		<report string="Results with buyer"
+			model="auction.lots"
+			name="report.auction.buyer.result"
+			rml="auction/report/auction_buyer_result.rml"
+			multi="1"
+			id="res_w_buyer"/>
+
+
+		<!--	<wizard
+			id="auction_catalog_flagy"
+			string="Auction Catalog Flagy"
+			model="auction.lots"
+			name="auction.catalog.flagey"
+			keyword="client_print_multi"/>-->
+
+
+
+		</data>
+</terp>
+
diff --git a/addons/auction/auction_sequence.xml b/addons/auction/auction_sequence.xml
new file mode 100644
index 00000000000..293afccebb0
--- /dev/null
+++ b/addons/auction/auction_sequence.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+
+	#
+	# Sequences for sale.order
+	#
+
+	<record model="ir.sequence.type" id="seq_type_auction_deposit">
+		<field name="name">Auction deposit</field>
+		<field name="code">auction.deposit</field>
+	</record>
+	<record model="ir.sequence" id="seq_sale_order">
+		<field name="name">Auction deposit</field>
+		<field name="code">auction.deposit</field>
+		<field name="prefix">AD/</field>
+		<field name="padding">3</field>
+	</record>
+	<record model="ir.sequence.type" id="seq_type_bid">
+		<field name="name">Auction bid </field>
+		<field name="code">auction.bid</field>
+	</record>
+	<record model="ir.sequence" id="seq_auction_bid">
+		<field name="name">Auction bid</field>
+		<field name="code">auction.bid</field>
+		<field name="prefix">bid/</field>
+		<field name="padding">3</field>
+	</record>
+
+</data>
+</terp>
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
new file mode 100644
index 00000000000..4bb8a9f840c
--- /dev/null
+++ b/addons/auction/auction_view.xml
@@ -0,0 +1,1600 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+	<menuitem name="Auction Management" id="menu_root" icon="terp-purchase"/>
+	<menuitem name="Auction Management/Configuration" groups="base.group_admin"/>
+
+	=======================================================
+	Auction Management/Configuration/artist
+	=======================================================
+	<record model="ir.ui.view" id="view_auction_artist_tree">
+		<field name="name">auction.artists.tree</field>
+		<field name="model">auction.artists</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Artists">
+			<field name="name"/>
+				<field name="birth_death_dates"/>
+				<field name="biography"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_auction_artist_form">
+		<field name="name">auction.artists.form</field>
+		<field name="model">auction.artists</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Artists">
+				<field colspan="4" name="name" select="1"/>
+				<field colspan="4" name="pseudo" select="1"/>
+					<newline/>
+				<field colspan="4" name="birth_death_dates"/>
+					<newline/>
+				<field colspan="4" name="biography"/>
+			</form>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_auction_artist">
+		<field name="res_model">auction.artists</field>
+		<field name="view_type">form</field>
+		<field name="view_id" ref="view_auction_artist_tree"/>
+	</record>
+	<menuitem name="Auction Management/Configuration/Define Artists" action="action_auction_artist" id="menu_auction_artist"/>
+
+	=======================================================
+	Auction Management/Configuration/objectcategories
+	=======================================================
+	<record model="ir.ui.view" id="view_auction_object_categories_tree">
+		<field name="name">auction.lot.category.tree</field>
+		<field name="model">auction.lot.category</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+				<tree string="Lot Category">
+					<field name="name"/>
+				</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_auction_object_categories_form">
+		<field name="name">auction.lot.category.form</field>
+		<field name="model">auction.lot.category</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+				<form string="Lot Category">
+					<field name="name" colspan="4" select="1"/>
+					<newline/>
+					<field name="aie_categ" colspan="4"/>
+					<field name="priority"/>
+					<newline/>
+					<field name="active" select="2"/>
+				</form>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_auction_object_categories">
+		<field name="res_model">auction.lot.category</field>
+		<field name="view_type">form</field>
+		<field name="view_id" ref="view_auction_object_categories_tree"/>
+	</record>
+	<menuitem name="Auction Management/Configuration/Object Categories" action="action_auction_object_categories" id="menu_auction_object_cat"/>
+	=======================================================
+Auction Management/Auction Dates/New Auction Dates
+	=======================================================
+	<record model="ir.ui.view" id="view_auction_dates_tree">
+		<field name="name">Auction dates</field>
+		<field name="model">auction.dates</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Auction Dates">
+				<field name="auction1" string="Beginning of the auction"/>
+				<field name="auction2" string="End of auction"/>
+				<field name="name" string="Names"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_auction_dates_form">
+		<field name="name">Auction dates</field>
+		<field name="model">auction.dates</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Auctions">
+				<field name="name" colspan="2" select="1"/>
+				<separator string="Dates" colspan="4"/>
+				<field name="expo1"/>
+				<field name="expo2"/>
+				<field name="auction1" select="1"/>
+				<field name="auction2" select="1"/>
+				<separator string="Commissions" colspan="4"/>
+				<field name="seller_costs" domain="[('domain','=','auction')]"/>
+				<field name="buyer_costs" domain="[('domain','=','auction')]"/>
+				<separator string="Accounting" colspan="4"/>
+				<field name="acc_expense"/>
+				<field name="acc_income"/>
+				<separator string="Analytic" colspan="4"/>
+				<field name="journal_id"/>
+				<field name="journal_seller_id"/>
+				<field name="account_analytic_id"/>
+				<separator string="State" colspan="4"/>
+				<field name="state"/>
+				<button name="close" states="draft" string="Close + Create all invoices" type="object" colspan="2"/>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_auction_dates_next">
+		<field name="name">Next Auctions</field>
+		<field name="res_model">auction.dates</field>
+		<field name="view_type">form</field>
+		<field name="domain">[('state','=','draft')]</field>
+		<field name="view_id" eval="False"/>
+	</record>
+	<menuitem name="Auction Management/Auction Dates/Next Auction Dates" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
+	=======================================================
+	Auction Management/Auction Dates/Old Auction Dates
+	=======================================================
+	<record model="ir.actions.act_window" id="action_auction_dates_old">
+		<field name="name">Old Auctions</field>
+		<field name="res_model">auction.dates</field>
+		<field name="view_type">form</field>
+		<field name="domain">[('state','=','closed')]</field>
+		<field name="view_id" ref="view_auction_dates_tree"/>
+	</record>
+	<menuitem name="Auction Management/Auction Dates/Old Auction Dates" id="menu_auction_dates_old" action="action_auction_dates_old"/>
+
+	<record model="ir.actions.act_window" id="action_auction_dates1">
+		<field name="res_model">auction.dates</field>
+		<field name="view_type">form</field>
+		<field name="view_id" ref="view_auction_dates_form"/>
+	</record>
+	<menuitem name="Auction Management/Auction Dates"/>
+	<menuitem name="Auction Management/Auction Dates/New Auction Dates" id="menu_auction_dates_new"  action="action_auction_dates1"/>
+
+
+
+=======================================================
+Auction Management/Auction Dates/Reporting
+	=======================================================
+	<!-- tree1 form1 for NEW object in the deposit border -->
+	<record model="ir.ui.view" id="v5">
+		<field name="name">Auction lots</field>
+		<field name="model">auction.lots</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+				<tree string="Auction Objects">
+					<field name="lot_num"/>
+					<field name="obj_num"/>
+					<field name="name"/>
+					<field name="auction_id"/>
+					<field name="vnd_lim"/>
+					<field name="lot_est1"/>
+					<field name="lot_est2"/>
+					<field name="buyer_price"/>
+					<field name="is_ok"/>
+					<field name="seller_price"/>
+					<field name="gross_revenue"/>
+					<field name="net_revenue"/>
+					<field name="gross_margin"/>
+					<field name="net_margin"/>
+					<field name="costs"/>
+					<field name="obj_price_l"/>
+
+				</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="auction_lot_simplified">
+		<field name="name">Auction lots</field>
+		<field name="model">auction.lots</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Catalog">
+				<field name="auction_id"/>
+				<field name="obj_num"/>
+				<field name="bord_vnd_id"/>
+				<field name="lot_num"/>
+				<field name="buyer_price"/>
+				<field name="seller_price"/>
+				<field name="gross_revenue"/>
+				<field name="net_revenue"/>
+				<field name="gross_margin"/>
+				<field name="net_margin"/>
+				<field name="costs"/>
+				<newline/>
+				<field name="name"/>
+				<field name="lot_type" select="1"/>
+				<field name="name2"/>
+				<newline/>
+				<field name="artist_id"/>
+				<field name="artist2_id"/>
+				<field name="obj_desc" colspan="4"/>
+				<field name="vnd_lim"/>
+				<field name="vnd_lim_net"/>
+				<field name="lot_est1"/>
+				<field name="author_right" domain="[('domain','=','sabam')]"/>
+				<field name="lot_est2"/>
+				<field name="product_id"/>
+				<field name="state" readonly="1"/>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="auction_lot_graph">
+		<field name="name">Auction lots</field>
+		<field name="model">auction.lots</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Lots" type="bar">
+				<field name="lot_type"/>
+				<field name="lot_est1" operator="+"/>
+				<field name="lot_est2" operator="+"/>
+				<field name="obj_price" operator="+"/>
+			</graph>
+		</field>
+	</record>
+
+
+	<!-- tree2 form2 for Catalog, All object and Unclassified objects -->
+	<record model="ir.ui.view" id="v7">
+		<field name="name">Auction lots</field>
+		<field name="model">auction.lots</field>
+		<field name="type">tree</field>
+		<field name="priority" eval="1"/>
+		<field name="arch" type="xml">
+			<tree string="Catalog">
+				<field name="obj_num" string="Ref" select="1"/>
+				<field name="name" select="1"/>
+				<field name="ach_login"/>
+				<field name="obj_price" sum="Total Adj."/>
+				<field name="state" select="1"/>
+				<field name="obj_comm"/>
+				<field name="bord_vnd_id"/>
+				<field name="lot_num"/>
+				<field name="lot_est1"/>
+				<field name="lot_est2"/>
+				<field name="lot_type" select="1"/>
+				<field name="auction_id"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="auction_lot_detailed">
+		<field name="name">Auction lots</field>
+		<field name="model">auction.lots</field>
+		<field name="type">form</field>
+		<field name="priority" eval="8"/>
+		<field name="arch" type="xml">
+			<form string="Catalog">
+				<notebook>
+
+				<page string="Object">
+					<group colspan="2" col="2">
+						<field name="obj_num" select="1"/>
+						<field name="name" select="1"/>
+						<field name="name2" select="2"/>
+						<field name="artist_id" select="2"/>
+						<field name="artist2_id"/>
+						<field name="product_id"/>
+					</group>
+					<field widget="image" name="image" nolabel="1" colspan="2"/>
+					<field name="lot_est1" select="2"/>
+					<field name="lot_est2"/>
+					<field name="auction_id" colspan="2" select="1"/>
+					<field name="lot_type" select="2"/>
+					<field name="lot_local"/>
+
+					<field name="bord_vnd_id" select="1"/>
+					<field name="lot_num"/>
+
+					<separator string="Description" colspan="4"/>
+					<field name="obj_desc" colspan="4" nolabel="1" select="2"/>
+					<field name="state" colspan="1" select="2"/>
+				 	<group col="4" colspan="2">
+						<button name="button_bought" string="Sold" states="draft" type="object"/>
+						<button name="button_not_bought" string="Not sold" states="draft" type="object"/>
+						<button name="button_draft" string="Set to draft" states="sold,unsold" type="object"/>
+						<button name="button_unpaid" string="Set to draft" states="paid" type="object"/>
+						<button name="button_taken_away" string="Taken away" states="sold" type="object"/>
+
+					</group>
+				</page>
+
+				<page string="Seller">
+					<separator string="Seller information" colspan="4"/>
+
+					<field name="vnd_lim"/>
+					<field name="vnd_lim_net"/>
+					<field name="sel_inv_id"/>
+					<field name="paid_vnd"/>
+					<field name="history_ids" colspan="4" readonly="1">
+						<tree string="History">
+							<field name="name"/>
+							<field name="lot_id"/>
+							<field name="auction_id"/>
+							<field name="price"/>
+						</tree>
+					</field>
+					</page>
+				<page string="Buyer">
+					<separator string="Buyer information" colspan="4"/>
+					<field name="ach_uid"  select="2"/>
+					<field name="ach_login" select="1" />
+					<field name="obj_price" select="2"/>
+					<field name="obj_comm" select="2"/>
+					<field name="obj_ret"/>
+					<field name="ach_emp"/>
+					<field name="author_right" domain="[('domain','=','sabam')]"/>
+					<field name="buyer_price"/>
+					<field name="seller_price"/>
+					<field name="gross_revenue"/>
+					<field name="net_revenue"/>
+					<field name="gross_margin"/>
+					<field name="net_margin"/>
+					<field name="costs"/>
+					<newline/>
+					<field name="ach_inv_id"/>
+					<field name="paid_ach"/>
+					<field name="is_ok" select="2"/>
+					<field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
+						widget="one2many_list">
+						<tree string="Payment's history">
+							<field name="statement_id"/>
+							<field name="amount"/>
+							<field name="date"/>
+						</tree>
+					</field>
+
+				</page>
+			<page string="Bids">
+				<field name="bid_lines" colspan="4" nolabel="1" editable="top">
+						<tree string="Bids"  editable="top">
+							<field name="bid_id"/>
+							<field name="price"/>
+							<field name="call"/>
+						</tree>
+					</field>
+
+			</page>
+
+				</notebook>
+			</form>
+		</field>
+	</record>
+
+
+
+
+	<record model="ir.actions.act_window" id="action_all_objects_sold">
+		<field name="res_model">auction.lots</field>
+		<field name="view_type">form</field>
+		<field name="domain">[('state','=','sold')]</field>
+	</record>
+	<menuitem
+		name="Auction Management/Objects/All objects/Sold Objects"
+		action="action_all_objects_sold"
+		id="menu_all_objects_sold1"/>
+
+	<record model="ir.actions.act_window" id="action_all_objects_to_sell">
+		<field name="res_model">auction.lots</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','&lt;&gt;','sold')]</field>
+	</record>
+	<menuitem name="Auction Management/Objects/All objects/Objects to sell" action="action_all_objects_to_sell" id="menu_all_objects_to_sell"/>
+
+	<record model="ir.actions.act_window" id="action_all_objects_unplanned">
+		<field name="res_model">auction.lots</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('auction_id','=', False),('state','=','draft')]</field>
+	</record>
+	<menuitem name="Auction Management/Objects/All objects/Unplanned objects" action="action_all_objects_unplanned" id="menu_all_objects_unplanned1"/>
+
+
+	<record model="ir.actions.act_window" id="action_all_objects">
+		<field name="res_model">auction.lots</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+	<menuitem name="Auction Management/Objects/All objects"	action="action_all_objects" id="menu_auction_all_objects" menu="menu_action_all_objects"/>
+
+
+	<!--		for the sold object  start-->
+
+	<record model="ir.actions.act_window" id="action_all_objects_unsold">
+		<field name="name">Unsold objects</field>
+		<field name="res_model">auction.lots</field>
+		<field name="view_type">form</field>
+		<field name="domain">[('state','=','unsold')]</field>
+	</record>
+	<menuitem
+		name="Auction Management/Objects/All objects/Unsold Objects"
+		action="action_all_objects_unsold"
+		id="menu_all_objects_unsold"/>
+
+
+
+	<!-- form3: simplified form meant for during the sale (action button in dates) -->
+	<!--form par defaut-->
+	<record model="ir.ui.view" id="auction_lots_sell_form">
+		<field name="name">auction.lots.form3</field>
+		<field name="model">auction.lots</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Auction">
+				<notebook>
+				<page string="Auction">
+					<field name="obj_num" readonly="1" select="1"/>
+					<field name="auction_id" select="2"/>
+					<field name="obj_price" select="1"/>
+					<field name="ach_login" select="1" comparator="="/>
+					<field name="ach_emp"/>
+					<field name="obj_comm"/>
+					<field name="obj_ret" on_change="onchange_obj_ret(obj_ret)"/>
+					<newline/>
+					<field name="name" readonly="1" select="1"/>
+					<field name="name2" readonly="2" select="1"/>
+					<field name="artist_id" readonly="1"/>
+					<field name="author_right" domain="[('domain','=','sabam')]"/>
+					<newline/>
+					<field name="buyer_price"/>
+					<field name="is_ok" select="1"/>
+					<field name="obj_desc" readonly="1" colspan="4"/>
+					<field name="lot_est1" readonly="1"/>
+					<field name="lot_est2" readonly="1"/>
+					<field name="vnd_lim" readonly="1"/>
+					<field name="vnd_lim_net"/>
+					<field name="bid_lines" colspan="4" readonly="1">
+						<tree string="Bids">
+							<field name="name"/>
+							<field name="bid_id"/>
+							<field name="price"/>
+							<field name="call"/>
+						</tree>
+					</field>
+					<field name="state" readonly="1"/>
+					<group colspan="2" col="4">
+					<button name="button_bought" string="Sold" states="draft" type="object"/>
+					<button name="button_not_bought" string="Not sold" states="draft" type="object"/>
+					<button name="button_draft" string="Set to draft" states="sold,unsold" type="object"/>
+					<button name="button_taken_away" string="Taken away" states="sold" type="object"/>
+					</group>
+				</page>
+				<page string="Statements">
+					<field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
+						widget="one2many_list">
+						<tree string="Payment's history" editable="top">
+							<field name="name"/>
+							<field name="amount"/>
+							<field name="date"/>
+				</tree>
+					</field>
+				</page>
+			</notebook>
+			</form>
+		</field>
+	</record>
+
+
+	=======================================================
+	Auction Management/seller
+	=======================================================
+	<record model="ir.actions.act_window" id="action_unclassified_objects">
+		<field name="name">Unclassified objects</field>
+		<field name="res_model">report.unclassified.objects</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	 </record>
+	<menuitem name="Auction Management/Objects/All objects/Unclassified objects" action="action_unclassified_objects" id="menu_all_objects_unclassified"/>
+
+	<record model="ir.ui.view" id="v12">
+		<field name="name">Auction.deposit.tree</field>
+		<field name="model">auction.deposit</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Deposit Border">
+				<field name="name"/>
+				<field name="partner_id"/>
+				<field name="date_dep"/>
+			</tree>
+		</field>
+	</record>
+
+
+
+	<record model="ir.ui.view" id="view_deposit_border_form">
+		<field name="name">auction.deposit.form</field>
+		<field name="model">auction.deposit</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Deposit Border Form">
+				<notebook>
+					<page string="General Informations">
+						<field name="name" select="1"/>
+						<field name="date_dep" select="1"/>
+						<field name="partner_id" select="1" on_change="partner_id_change(partner_id)"/>
+						<field name="method"/>
+						<newline/>
+						<field name="tax_id" domain="[('domain','=','auction')]"/>
+						<field name="transfer"/>
+						<newline/>
+						<field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
+							<tree string="Objects">
+								<field name="lot_num"/>
+								<field name="obj_num"/>
+								<field name="auction_id"/>
+								<field name="name"/>
+								<field name="obj_price"/>
+								<field name="vnd_lim"/>
+								<field name="lot_est1"/>
+								<field name="lot_est2"/>
+							</tree>
+							<form string="Objects">
+								<notebook colspan="4">
+								<page string="Description">
+									<field name="auction_id" colspan="4"/>
+									<field name="lot_num"/>
+									<field name="obj_num"/>
+
+									<newline/>
+									<field name="name"/>
+									<field name="lot_type" select="1"/>
+									<field name="name2"/>
+
+									<newline/>
+									<field name="artist_id"/>
+									<field name="artist2_id"/>
+									<field name="obj_desc" colspan="4"/>
+									<field name="vnd_lim"/>
+									<field name="vnd_lim_net"/>
+									<field name="lot_est1"/>
+									<field name="lot_est2"/>
+
+									<field name="author_right" domain="[('domain','=','sabam')]"/>
+									<field name="product_id" domain="[('sale_ok','=',True)]"/>
+									<field name="state" readonly="1"/>
+								</page><page string="Photos">
+									<field name="image" colspan="4" widget="image"/>
+								</page>
+								</notebook>
+							</form>
+						</field>
+					</page>
+					<page string="Extra Costs">
+						<field name="specific_cost_ids" widget="one2many_list" nolabel="1" colspan="4">
+							<tree string="Deposit Costs" editable="top">
+								<field name="name"/>
+								<field name="amount"/>
+								<field name="account" domain="[('type','=','income')]"/>
+							</tree>
+							<form string="Deposit Costs">
+								<field name="name"/>
+								<field name="amount"/>
+								<field name="account"/>
+							</form>
+
+						</field>
+					</page>
+				</notebook>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_deposit_border_tree2">
+		<field name="name">Deposit border</field>
+		<field name="model">auction.deposit</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="">
+				<field name="name"/>
+				<field name="partner_id"/>
+				<field name="date_dep"/>
+				<field name="method"/>
+				<field name="tax_id"/>
+				<field name="info"/>
+
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_deposit_border">
+		<field name="name">Deposit border</field>
+		<field name="res_model">auction.deposit</field>
+		<field name="view_type">form</field>
+		<field name="view_id" ref="view_deposit_border_tree2"/>
+	</record>
+	<menuitem name="Auction Management/Sellers"/>
+	<menuitem name="Auction Management/Sellers/Deposit border" action="action_deposit_border" id="menu_auction_deposit_border"/>
+
+	=======================================================
+		"Auction Management/Buyers/Bids
+	=======================================================
+	<record model="ir.ui.view" id="view_bids_tree">
+		<field name="name">auction.bid_line.tree1</field>
+		<field name="model">auction.bid_line</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Bids">
+				<field name="bid_id"/>
+			<!--	<field name="lot_id"/>-->
+				<field name="price"/>
+				<field name="call"/>
+				<field name="auction"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_bids_form">
+		<field name="name">auction.bid_line.form1</field>
+		<field name="model">auction.bid_line</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Bids">
+				<field name="bid_id" select="1"/>
+				<field name="lot_id" domain="[('auction_id','=',parent['auction_id'])]" on_change="onchange_name(lot_id)" colspan="4"/>
+				<field name="call" colspan="4" select="1"/>
+				<field name="price"/>
+				<!--field name="auction"/-->
+
+			</form>
+		</field>
+	</record>
+
+
+	<record model="ir.actions.act_window" id="b11">
+		<field name="res_model">auction.bid</field>
+		<field name="view_type">form</field>
+	</record>
+		<!--<menuitem name="Auction Management/Buyers" groups="base.group_admin"/>-->
+		<!--menuitem name="Auction Management/Buyers/Bids Form"  action="b11"/>-->
+
+
+	=======================================================
+		"Auction Management/Buyers/Reporting
+	=======================================================
+
+	<record model="ir.ui.view" id="v19">
+		<field name="name">auction.bid.form</field>
+		<field name="model">auction.bid</field>
+		<field name="arch" type="xml">
+			<form string="Bids">
+				<separator string="Bid information" colspan="4"/>
+				<field name="name" select="1"/>
+				<newline/>
+				<field name="partner_id" select="1" on_change="onchange_contact(partner_id)"/>
+				<field  name="contact_tel" select="2"/>
+				<field name="auction_id" select="1"/>
+				<field name="bid_lines" colspan="4">
+					<tree string="Bids" editable="bottom">
+						<field name="lot_id" domain="[('auction_id','=',parent.auction_id)]"/>
+						<field name="price"/>
+						<field name="call"/>
+					</tree>
+					<form string="Bids" editable="top">
+						<field name="lot_id" domain="[('auction_id','=',parent.auction_id)]"/>
+						<field name="price"/>
+						<field name="call"/>
+					</form>
+
+				</field>
+			</form>
+		</field>
+	</record>
+
+
+
+	<record model="ir.ui.view" id="view_auction_bid_tree">
+		<field name="name">auction.bid.tree</field>
+		<field name="model">auction.bid</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Bids">
+				<field name="name"/>
+				<field name="auction_id"/>
+				<field name="partner_id"/>
+				<field name="contact_tel"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_bid_open">
+		<field name="res_model">auction.bid</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+	<menuitem name="Auction Management/Buyers/Bids" action="action_bid_open" id="menu_action_bid_open"/>
+
+
+	<record model="ir.actions.act_window" id="action_bids_form">
+		<field name="res_model">auction.bid_line</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+
+	<menuitem name="Auction Management/Buyers/Bids/Bids line" action="action_bids_form" id="menu_action_bids_form"/>
+
+
+<!--start : creating auction Reporting menu for the auction by pmo-->
+
+<record model="ir.ui.view" id="view_auction_reports_tree">
+		<field name="name">auction.reports.tree</field>
+		<field name="model">report.auction.view</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Auction results">
+				<field name="auction_id" />
+				<field name="nobjects" />
+				<field name="nbuyer" />
+				<field name="obj_ret" />
+				<field name="nseller" />
+				<field name="min_est" />
+				<field name="max_est" />
+				<field name="adj_price" />
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_auction_reports_form">
+		<field name="name">auction.reports.form</field>
+		<field name="model">report.auction.view</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Auctions results">
+				<field name="auction_id" />
+				<field name="nobjects" />
+				<field name="nbuyer" />
+				<field name="nseller" />
+				<field name="min_est" />
+				<field name="max_est" />
+				<field name="adj_price" />
+			</form>
+		</field>
+	</record>
+	<menuitem name="Auction Management/Reporting"/>
+
+
+<record model="ir.actions.act_window" id="action_auction_report_allmonth_view1">
+		<field name="name">Auction report</field>
+		<field name="res_model">report.auction.view</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+		<!--field name="domain">[('auction_id','=', active_id)]</field-->
+	</record>
+   <menuitem name="Auction Management/Reporting/Auction/Auction's summary" action="action_auction_report_allmonth_view1" id="menu_auction_allmonth_view1"/>
+
+
+
+	<!--start : auction reporting view 2-->
+
+<record model="ir.ui.view" id="view_auction_reports_tree2">
+		<field name="name">auction.reports.tree2</field>
+		<field name="model">report.auction.view2</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Auction Reporting tree view2">
+				<field name="date" />
+				<field name="auction" />
+				<field name="sum_adj" />
+				<field name="obj_number" />
+				<field name="gross_revenue" />
+				<field name="net_revenue" />
+				<field name="obj_margin" />
+				<field name="obj_margin_procent" />
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_auction_reports_form2">
+		<field name="name">Auction report</field>
+		<field name="model">report.auction.view2</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Auctions">
+				<field name="auction" />
+				<field name="sum_adj" />
+				<field name="gross_revenue" />
+				<field name="net_revenue" />
+				<field name="obj_margin" />
+				<field name="obj_margin_procent" />
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_auction_report_thismonth_view2">
+		<field name="name">Auction report</field>
+		<field name="res_model">report.auction.view2</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+	</record>
+<!--	<menuitem name="Auction Management/Reporting/Auction/This Month/Result of Auction" action="action_auction_report_thismonth_view2" id="menu_auction_thismonth_view2"/-->
+
+
+<record model="ir.actions.act_window" id="action_auction_report_allmonth_view2">
+		<field name="name">Auction report</field>
+		<field name="res_model">report.auction.view2</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+	</record>
+	<menuitem name="Auction Management/Reporting/Auction/Auction's revenues" action="action_auction_report_allmonth_view2" id="menu_auction_allmonth_view2"/>
+
+<!--start : creating seller Reporting menu for the selller by pmo-->
+
+<record model="ir.ui.view" id="view_auction_form">
+		<field name="name">Seller's auction</field>
+		<field name="model">report.seller.auction</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Auction reporting form view">
+				<field name="seller" select="1"/>
+				<field name="total_price"/>
+				<field name="avg_price"/>
+				<field name="state" select="1"/>
+			</form>
+		</field>
+	</record>
+
+
+	<record model="ir.ui.view" id="view_auction_tree">
+		<field name="name">Seller's auction</field>
+		<field name="model">report.seller.auction</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Auction reporting tree view">
+				<field name="auction" />
+				<!--field name="date" /-->
+				<field name="seller" select="1"/>
+				<field name="object_number" select="2"/>
+				<field name="total_price" select="2"/>
+				<field name="avg_price" select="2" />
+				<field name="avg_estimation" select="2" />
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_auction_graph">
+		<field name="name">Seller's auction</field>
+		<field name="model">report.seller.auction</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Auction reporting graph view" orientation="vertical" type="bar">
+				<field name="seller" />
+			<!--	<field name="object_sold"/>	-->
+				<field name="total_price" operator="+"/>
+				<field name="avg_price" operator="+" />
+				<field name="avg_estimation" operator="+" />
+
+			</graph>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_auction_reporting1">
+		<field name="name">Seller's auction</field>
+		<field name="res_model">report.seller.auction</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,graph</field>
+		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+	</record>
+		<!--menuitem name="Auction Management/Reporting/seller/This Month/Seller object details" action="action_auction_reporting1" id="menu_seller_thismonth_view1"/-->
+	<record model="ir.actions.act_window" id="action_auction_reporting_all1">
+		<field name="name">Seller's auction</field>
+		<field name="res_model">report.seller.auction</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,graph</field>
+	</record>
+	<menuitem name="Auction Management/Reporting/Seller/Seller's summary" action="action_auction_reporting_all1" id="menu_seller_allmonth_view1"/>
+<record model="ir.ui.view" id="view_auction_form2">
+		<field name="name">Seller's auction</field>
+		<field name="model">report.seller.auction2</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Auction reporting2 form view">
+				<field name="auction" select="1"/>
+				<field name="seller" select="1"/>
+				<field name="sum_adj" select="1"/>
+				<field name="gross_revenue" select="1"/>
+				<field name="net_revenue" select="1"/>
+				<field name="net_margin" select="1" />
+				<field name="date" select="1"/>
+
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_auction_tree2">
+		<field name="name">Seller's auction</field>
+		<field name="model">report.seller.auction2</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Auction reporting2 tree view">
+				<field name="auction" select="1"/>
+				<field name="seller" select="1"/>
+				<field name="sum_adj" select="1" sum="Sum adj"/>
+				<field name="gross_revenue" select="1"/>
+				<field name="net_revenue" select="1"/>
+				<field name="net_margin" select="1" sum="Sum net margin"/>
+				<field name="date" select="1"/>
+				</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_auction_graph2">
+		<field name="name">Seller's auction</field>
+		<field name="model">report.seller.auction2</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Auction seller reporting2 graph view" orientation="vertical" type="bar">
+				<field name="seller" />
+				<field name="net_revenue" operator="+"/>
+				<field name="gross_revenue" operator="+" />
+				<field name="net_margin" operator="+" />
+				</graph>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_auction_reporting_all2">
+		<field name="name">Seller's auction</field>
+		<field name="res_model">report.seller.auction2</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,graph</field>
+		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+	</record>
+	<menuitem name="Auction Management/Reporting/Seller/Seller's revenues" action="action_auction_reporting_all2" id="menu_seller_allmonth_view2"/>
+
+<record model="ir.ui.view" id="view_auction_buyer_form">
+		<field name="name">Buyer's auction</field>
+		<field name="model">report.buyer.auction</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Auction buyer reporting form view">
+				<field name="buyer_login" select="1"/>
+				<field name="buyer" select="1"/>
+				<field name="object"/>
+				<field name="total_price"/>
+				<field name="avg_price"/>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_auction_buyer_tree">
+		<field name="name">Buyer's auction</field>
+		<field name="model">report.buyer.auction</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Auction buyer reporting tree view">
+				<field name="auction" select="1"/>
+				<field name="buyer_login" select="1"/>
+				<field name="buyer" select="1"/>
+				<field name="object" select="1"/>
+				<field name="total_price" select="1"/>
+				<field name="avg_price" select="1"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_auction_buyer_reporting">
+		<field name="name">Buyer's auction</field>
+		<field name="res_model">report.buyer.auction</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+	</record>
+		<!--menuitem name="Auction Management/Reporting/Buyer/This Month/Buyer's details " action="action_auction_buyer_reporting" id="menu_buyer_thismonth_view1"/-->
+<record model="ir.ui.view" id="view_auction_buyer_form2">
+		<field name="name">Buyer's auction</field>
+		<field name="model">report.buyer.auction2</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Auction buyer reporting form view2">
+				<field name="buyer_login" select="1"/>
+				<field name="buyer" select="1"/>
+				<field name="sumadj" />
+				<field name="gross_revenue" />
+				<field name="net_revenue" />
+				<field name="net_margin" />
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_auction_buyer_tree2">
+		<field name="name">Buyer's auction</field>
+		<field name="model">report.buyer.auction2</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Auction buyer reporting tree view2">
+					<field name="auction" select="1"/>
+					<field name="buyer_login" select="1"/>
+					<field name="buyer" select="1"/>
+					<field name="sumadj" select="1" sum="Sum adj"/>
+					<field name="gross_revenue" select="1"/>
+					<field name="net_revenue" select="1"/>
+					<field name="net_margin" select="1" sum="Sum net margin"/>
+		</tree>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_auction_buyer_reporting2">
+		<field name="name">Buyer's auction</field>
+		<field name="res_model">report.buyer.auction2</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+	</record>
+		<!--menuitem name="Auction Management/Reporting/Buyer/This Month/Buyer's results " action="action_auction_buyer_reporting2" id="menu_buyer_thismonth_view2"/-->
+
+	<record model="ir.actions.act_window" id="action_auction_buyer_reporting_all1">
+		<field name="name">Buyer's auction</field>
+		<field name="res_model">report.buyer.auction</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+	</record>
+	<menuitem name="Auction Management/Reporting/Buyer/Buyer's summary" action="action_auction_buyer_reporting_all1" id="menu_buyer_allmonth_view1"/>
+	<record model="ir.actions.act_window" id="action_auction_buyer_reporting_all2">
+		<field name="name">Buyer's auction for all months</field>
+		<field name="res_model">report.buyer.auction2</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+	</record>
+<menuitem name="Auction Management/Reporting/Buyer/Buyer's revenues" action="action_auction_buyer_reporting_all2" id="menu_buyer_allmonth_view2"/>
+
+
+
+
+<!--end : creating buyer Reporting menu for the buyer by pmo-->
+
+		<record model="ir.ui.view" id="view_report_unplanned_object_tree">
+		<field name="name">Unplanned objects</field>
+		<field name="model">report.unplanned.object</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Unplanned Objects">
+				<field name="depos" select="1"/>
+				<field name="lot" select="1"/>
+				<field name="product_l" select="1"/>
+				<field name="lot_est1_l" select="2"/>
+				<field name="lot_est2_l" select="1"/>
+				<field name="artist_id_l" select="1"/>
+				<field name="name_l" select="1"/>
+				<field name="obj_desc_l" select="2"/>
+			</tree>
+		</field>
+	</record>
+		<record model="ir.ui.view" id="view_report_unplanned_object_form">
+			<field name="name">Unplanned objects</field>
+			<field name="model">report.unplanned.object</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+			<form string="Unplanned Objects">
+				<field name="depos" select="1"/>
+				<field name="lot" select="1"/>
+				<field name="product_l" select="1"/>
+				<field name="lot_est1_l" select="1"/>
+				<field name="lot_est2_l" select="1"/>
+				<field name="artist_id_l" select="1"/>
+				<field name="obj_desc_l" select="1"/>
+				<field name="name_l" select="1"/>
+			</form>
+		</field>
+	</record>
+
+=============================
+estimation.adj.category
+==============================
+	<record model="ir.ui.view" id="view_report_auction_estimation_adj_category_form">
+		<field name="name">report.auction.estimation.adj.category.form</field>
+		<field name="model">report.auction.estimation.adj.category</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Min est/Adj/Max est">
+				<!--field name="date" select="1"/-->
+				<field name="lot_type" select="1"/>
+				<field name="user_id" select="1"/>
+				<field name="lot_est1" select="2"/>
+				<field name="lot_est2" select="2"/>
+				<field name="adj_total" select="2"/>
+				<field name="date" select="1"/>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_report_auction_estimation_adj_category_tree">
+		<field name="name">report.auction.estimation.adj.category.tree</field>
+		<field name="model">report.auction.estimation.adj.category</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Min est/Adj/Max est">
+				<!--field name="date" select="1"/-->
+				<field name="user_id" select="1"/>
+				<field name="lot_type" select="1"/>
+				<field name="lot_est1" select="1"/>
+				<field name="lot_est2" select="1"/>
+				<field name="adj_total" select="1"/>
+				<field name="date" select="1"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_report_auction_estimation_adj_category_graph">
+		<field name="name">report.auction.estimation.adj.category.graph</field>
+		<field name="model">report.auction.estimation.adj.category</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Min est/Adj/Max est" orientation="vertical" type="bar">
+				<!--field name="date" operator="+"/-->
+				<field name="lot_type" select="1"/>
+				<field name="lot_est1" operator="+"/>
+				<field name="adj_total" operator="+"/>
+				<field name="lot_est2" operator="+"/>
+				<field name="user_id" group="True"/>
+			</graph>
+		</field>
+	</record>
+		<record model="ir.actions.act_window" id="action_report_auction_estimation_adj_category_manager_tree">
+		<field name="name">Min est/Adj/Max est</field>
+		<field name="res_model">report.auction.estimation.adj.category</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+		<field name="domain">[('date','like',time.strftime('%Y-%m'))]</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_report_auction_estimation_adj_category_member_tree">
+		<field name="name">Min est/Adj/Max est</field>
+		<field name="res_model">report.auction.estimation.adj.category</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+		<field name="domain">[('date','like',time.strftime('%Y-%m')),('user_id','=',uid)]</field>
+	</record>
+<menuitem name="Auction Management/Reporting/Employees/Comparison of estimations" action="action_report_auction_estimation_adj_category_member_tree" id="menu_report_auction_estimation_adj_category_member"/>
+	<menuitem name="Auction Management/Reporting/Manager/Comparison of estimations"  action="action_report_auction_estimation_adj_category_manager_tree" id="menu_report_auction_estimation_adj_category_manager"/>
+
+
+=<!--=============================
+sign in sign out report by user
+==============================
+
+	<record model="ir.ui.view" id="view_report_auction_sign_in_out_tree">
+		<field name="name">report.auction.user.pointing.tree</field>
+		<field name="model">report.auction.user.pointing</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Summary pointing by user ">
+				<field name="user_id" select="1"/>
+				<field name="total_timesheet" widget="float_time"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_report_auction_sign_in_out_graph">
+		<field name="name">report.auction.user.pointing.graph</field>
+		<field name="model">report.auction.user.pointing</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+
+			<graph string="Summary pointing by user " orientation="vertical" type="bar">
+				<field name="user_id" select="1"/>
+				<field name="total_timesheet" />
+			</graph>
+		</field>
+	</record>
+
+
+	<record model="ir.actions.act_window" id="action_report_auction_sign_in_out_member_tree">
+		<field name="res_model">report.auction.user.pointing</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,graph</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_report_auction_sign_in_out_manager_tree">
+		<field name="res_model">report.auction.user.pointing</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,graph</field>
+	</record>
+	<menuitem name="Auction Management/Reporting/Member/Summury of Sign_in Sign_out" action="action_report_auction_sign_in_out_member_tree" id="menu_report_auction_sign_in_out_member_tree"/>
+	<menuitem name="Auction Management/Reporting/Manager/Summury of Sign_in Sign_out"  action="action_report_auction_sign_in_out_manager_tree" id="menu_report_auction_sign_in_out_manager_tree"/>
+
+-->
+
+
+	<record model="ir.ui.view" id="view_report_auction_sign_in_out_tree1">
+		<field name="name">report attendance</field>
+		<field name="model">report.attendance</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="User's pointing">
+				<field name="employee_id" select="1"/>
+				<field name="name" select="1"/>
+				<field name="total_attendance" select="1"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_report_auction_sign_in_out_graph1">
+		<field name="name">Graph attendance</field>
+		<field name="model">report.attendance</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="User's pointing"  orientation="vertical" type="bar">
+				<field name="employee_id" select="1"/>
+				<field name="total_attendance" operator="+"/>
+				<field name="name" select="1"/>
+		</graph>
+
+		</field>
+	</record>
+
+
+	<record model="ir.actions.act_window" id="action_report_auction_sign_in_out_member_tree1">
+		<field name="res_model">report.attendance</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,graph</field>
+		<field name="domain"> [('name','ilike',time.strftime('%Y-%m-%d'))]</field>
+		<field name="domain"> [('employee_id','=',uid)]</field>
+		<!--<field name="domain"> [('name','ilike',time.strftime('%Y-%m'))]</field>-->
+	</record>
+	<menuitem name="Auction Management/Reporting/Employees/Attendance" action="action_report_auction_sign_in_out_member_tree1" id="menu_report_auction_sign_in_out_member_tree1"/>
+
+
+	<record model="ir.actions.act_window" id="action_report_auction_sign_in_out_manager_tree1">
+		<field name="res_model">report.attendance</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,graph</field>
+		<field name="domain"> [('name','ilike',time.strftime('%Y-%m-%d'))]</field>
+	</record>
+
+	<menuitem name="Auction Management/Reporting/Manager/Attendance"  action="action_report_auction_sign_in_out_manager_tree1" id="menu_report_auction_sign_in_out_manager_tree1"/>
+
+==============================
+My Latest Objects
+==============================
+	<record model="ir.actions.act_window" id="action_report_latest_objects_tree">
+		<field name="res_model">auction.lots</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('create_uid','=',uid)]</field>
+	</record>
+	<!--menuitem name="Auction Management/Reporting/Member/My Latest Objects" action="action_report_latest_objects_tree" id="menu_report_latest_objects_tree"/-->
+	<record model="ir.actions.act_window" id="action_report_latest_objects_manager_tree">
+		<field name="res_model">auction.lots</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="limit" eval="80"/>
+	</record>
+
+
+=============================
+My Latest Deposit
+==============================
+
+	<record model="ir.actions.act_window" id="action_report_latest_doposit_tree">
+		<field name="res_model">auction.deposit</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('create_uid','=',uid)]</field>
+	</record>
+	<menuitem name="Auction Management/Reporting/Employees/My Latest Deposits" action="action_report_latest_doposit_tree" id="menu_report_latest_doposit_tree"/>
+
+	<record model="ir.actions.act_window" id="action_report_latest_doposit_manager_tree">
+		<field name="res_model">auction.deposit</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+
+	<menuitem name="Auction Management/Reporting/Manager/Latest Deposits" action="action_report_latest_doposit_manager_tree" id="menu_report_latest_doposit_tree_manager"/>
+=============================
+Objects per Day
+==============================
+	<record model="ir.ui.view" id="view_report_auction_object_date_tree">
+	   <field name="name">Objects by date</field>
+	   <field name="model">report.auction.object.date</field>
+		<field name="type">tree</field>
+			<field name="arch" type="xml">
+			<tree string="Objects per Day">
+				<field name="month" select="1" />
+				<field name="user_id" select="1"/>
+				<field name="obj_num"/>
+				<field name="name" />
+			</tree>
+		</field>
+	 </record>
+
+	 <record model="ir.ui.view" id="view_report_auction_object_date_form">
+		<field name="name">Object date</field>
+		<field name="model">report.auction.object.date</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Objects per Day">
+				<field name="user_id" />
+				<field name="name" select="1"/>
+				<field name="obj_num" />
+				<field name="month" select="1"/>
+			 </form>
+		 </field>
+	 </record>
+
+	<record model="ir.ui.view" id="view_report_auction_object_date_graph">
+		<field name="name">report.auction.object.date.graph</field>
+		<field name="model">report.auction.object.date</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Objects per day"  type="bar">
+				<field name="name" select="1"/>
+				<field name="obj_num" operator="+"/>
+				<field name="user_id" group="True"/>
+			</graph>
+		</field>
+	</record>
+
+
+	<record model="ir.actions.act_window" id="action_report_auction_object_date_tree_my">
+		<field name="res_model">report.auction.object.date</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+		<field name="domain">[('user_id','=',uid),('month','=',time.strftime('%Y-%m-01'))]</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_report_auction_object_date_tree">
+		<field name="res_model">report.auction.object.date</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+		<field name="domain">[('month','=',time.strftime('%Y-%m-01'))]</field>
+	</record>
+	<menuitem
+		name="Auction Management/Reporting/Manager/Encoded Objects Per Day"
+		action="action_report_auction_object_date_tree"
+		id="menu_report_auction_object_date_tree"/>
+	<menuitem
+		name="Auction Management/Reporting/Employees/My Encoded Objects Per Day"
+		action="action_report_auction_object_date_tree_my"
+		id="menu_report_auction_object_date_tree1_my"/>
+
+
+	<record model="ir.actions.act_window" id="view_report_object_by_auction">
+		<field name="name">Detailed lots</field>
+		<field name="res_model">auction.lots</field>
+		<field name="view_type">form</field>
+		<field name="domain">[('auction_id','=', active_id)]</field>
+		<field name="limit" eval="2000"/>
+	</record>
+	<record model="ir.values" id="ir_open_auction_lots">
+		<field name="key2">tree_but_open</field>
+		<field name="model">auction.dates</field>
+		<field name="name">Open auction</field>
+		<field name="value" eval="'ir.actions.act_window,%d'%view_report_object_by_auction"/>
+		<field name="object" eval="True"/>
+	</record>
+
+	<record model="ir.actions.act_window" id="auction_lots_open">
+		<field name="name">Simplified lots for adjudication</field>
+		<field name="res_model">auction.lots</field>
+		<field name="view_type">form</field>
+		<field name="domain">[('auction_id','=',active_id)]</field>
+		<field name="limit" eval="2000"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_auction_lots_open_view1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="act_window_id" ref="auction_lots_open"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_auction_lots_open_view2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="act_window_id" ref="auction_lots_open"/>
+		<field name="view_id" ref="auction_lots_sell_form"/>
+	</record>
+
+	<record model="ir.values" id="ir_open_auction_lots_adj">
+		<field name="key2">tree_but_action</field>
+		<field name="model">auction.dates</field>
+		<field name="name">Open lots for adjudication</field>
+		<field name="value" eval="'ir.actions.act_window,%d'%auction_lots_open"/>
+		<field name="object" eval="True"/>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_report_object_by_auction">
+		<field name="name">Auction dates</field>
+		<field name="res_model">auction.dates</field>
+		<field name="view_type">tree</field>
+		<field name="domain">[('state','=', 'draft')]</field>
+	</record>
+	<menuitem name="Auction Management/Objects/Objects by Auction"
+		id="menu_auction_dates_next_by_auction"
+		action="action_report_object_by_auction"/>
+
+	<act_window name="Open lots"
+		domain="[('auction_id', '=', active_id)]"
+		res_model="auction.lots"
+		src_model="auction.dates"
+		id="act_auction_lot_line_open"/>
+
+=============================
+Auction adjudication
+==============================
+
+	<record model="ir.ui.view" id="view_report_auction_adjudication_tree">
+		<field name="name">report.auction.adjudication.tree</field>
+		<field name="model">report.auction.adjudication</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Total adjudication">
+				<field name="name" select="1"/>
+				<field name="adj_total" select="1"/>
+				<field name="state" select="1"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_report_auction_adjudication_graph">
+		<field name="name">report.auction.adjudication.graph</field>
+		<field name="model">report.auction.adjudication</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Total adjudication" type="bar">
+				<field name="name" select="1"/>
+				<field name="adj_total" select="1" />
+				<field name="user_id" group="True"/>
+
+			</graph>
+		</field>
+
+	</record>
+
+	<record model="ir.actions.act_window" id="action_report_auction_adjudication_tree">
+		<field name="res_model">report.auction.adjudication</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+	</record>
+	<menuitem name="Auction Management/Reporting/Manager/Adjudication by Auction" action="action_report_auction_adjudication_tree" id="menu_report_auction_adjudication_tree"/>
+
+	<!--menuitem name="Auction Management/Reporting/Member/Auction Adjudication" action="action_report_auction_adjudication_tree" id="menu_report_auction_adjudication_tree1"/-->
+
+	<record model="ir.ui.view" id="view_auction_deposit_tree">
+		<field name="name">Depositer's statistics</field>
+		<field name="model">report.deposit.border</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Depositer's statistics">
+				<field name="bord" select="1"/>
+				<field name="seller" select="1"/>
+				<field name="moy_est" select="1"/>
+				<field name="total_marge" select="1"/>
+				<field name="nb_obj" select="1"/>
+				</tree>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="menu_view_auction_deposit_tree">
+		<field name="res_model">report.deposit.border</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+	</record>
+	<menuitem name="Auction Management/Reporting/Manager/ Depositer's Statistics" action="menu_view_auction_deposit_tree" id="menu_report_deposit_tree_m"/>
+	<menuitem name="Auction Management/Reporting/Employees/ Depositer's Statistics" action="menu_view_auction_deposit_tree" id="menu_report_deposit_tree_member"/>
+=============================
+Object encoded
+==============================
+	<record model="ir.ui.view" id="view_report_object_encoded_form">
+		<field name="name">report.object.encoded.form</field>
+		<field name="model">report.object.encoded</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Objects statistics">
+				<field name="date" select="1"/>
+				<field name="state" select="1"/>
+				<field name="user_id" select="1"/>
+				<field name="estimation" select="2"/>
+				<field name="obj_ret" select="2"/>
+				<field name="obj_num" select="2" sum="# objects"/>
+			</form>
+		</field>
+	</record>
+
+<record model="ir.ui.view" id="view_report_object_encoded_tree">
+<field name="name">report.object.encoded.tree</field>
+<field name="model">report.object.encoded</field>
+<field name="type">tree</field>
+
+	<field name="arch" type="xml">
+
+	<tree string="Objects statistics">
+<field name="date" select="1"/>
+<field name="state" select="1"/>
+<field name="user_id" select="1"/>
+<field name="estimation"/>
+<field name="obj_ret"/>
+<field name="obj_num"/>
+</tree>
+</field>
+</record>
+<!--	<record model="ir.ui.view" id="view_report_object_encoded_tree">
+		<field name="name">report.object.encoded.tree</field>
+		<field name="model">report.object.encoded</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Objects statistics" >
+				<field name="date" select="1"/>
+				<field name="state" select="1"/>
+				<field name="user_id" select="1"/>
+				<field name="estimation" />
+				<field name="obj_ret" />
+				<field name="obj_num" />
+			</tree>
+		</field>
+	</record>
+-->
+	<record model="ir.ui.view" id="view_report_object_encoded_graph">
+		<field name="name">report.object.encoded.graph</field>
+		<field name="model">report.object.encoded</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Objects statistics" type="bar">
+				<field name="user_id" select="1"/>
+				<field name="estimation" operator="+" />
+				<field name="obj_ret"  operator="+" />
+				<field name="obj_num"  operator="+" />
+			</graph>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_report_object_encoded_member_tree">
+		<field name="res_model">report.object.encoded</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+		<field name="domain"> [('user_id','=',uid),('date','ilike',time.strftime('%Y-%m'))]</field>
+	</record>
+
+	<!--menuitem name="Auction Management/Reporting/Member/Objects Statistics" action="action_report_object_encoded_member_tree" id="menu_report_objects_tree_member"/-->
+
+
+	<record model="ir.ui.view" id="view_report_object_encoded_manager_tree">
+		<field name="name">report.object.encoded.tree</field>
+		<field name="model">report.object.encoded.manager</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Objects statistics">
+				<field name="user_id" select="1"/>
+				<field name="estimation" />
+				<field name="obj_ret" />
+				<field name="obj_num" sum="# objects" select="1"/>
+				<field name="adj" sum="Total adj."/>
+				<field name="obj_margin" />
+				<field name="net_revenue"  sum="Total net rev."/>
+				<field name="gross_revenue"  sum="Total gross rev."/>
+				<field name="date" select="1"/>
+
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_report_object_encoded_manager_graph">
+		<field name="name">report.object.encoded.graph</field>
+		<field name="model">report.object.encoded.manager</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Object statistic" type="bar">
+				<field name="user_id" select="1"/>
+				<field name="obj_ret"  operator="+" />
+				<field name="obj_num"  operator="+" />
+				<field name="obj_margin"  operator="+" />
+				<field name="net_revenue" operator="+" />
+				<field name="gross_revenue" operator="+" />
+			</graph>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_report_object_encoded_manager_tree">
+		<field name="res_model">report.object.encoded.manager</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+	</record>
+
+	<!--menuitem name="Auction Management/Reporting/Manager/Objects Statistics" action="action_report_object_encoded_manager_tree" id="menu_report_objects_tree_manager"/-->
+	<record model="ir.ui.view" id="view_report_unclassified_objects">
+		<field name="name">report.unclassified.objects</field>
+		<field name="model">report.unclassified.objects</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Unclassified objects">
+				<field name="obj_num" string="Ref" select="1"/>
+				<field name="name" select="1"/>
+				<field name="ach_login"/>
+				<field name="obj_price"/>
+				<field name="state" select="1"/>
+				<field name="obj_comm"/>
+				<field name="bord_vnd_id"/>
+				<field name="lot_num"/>
+				<field name="lot_est1"/>
+				<field name="lot_est2"/>
+				<field name="lot_type" select="1"/>
+				<field name="auction"/>
+			</tree>
+		</field>
+	</record>
+
+	<act_window name="Bordereau de dépôt"
+		domain="[('partner_id', '=', active_id)]"
+		res_model="auction.deposit"
+		src_model="res.partner"
+		id="act_auction_lot_open_deposit"/>
+
+</data>
+</terp>
diff --git a/addons/auction/auction_wizard.xml b/addons/auction/auction_wizard.xml
new file mode 100644
index 00000000000..28ed52b4563
--- /dev/null
+++ b/addons/auction/auction_wizard.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+	    <!--<delete model="ir.actions.wizard" search="[('wiz_name','like','auction.lots.')]"/>-->
+
+		<wizard string="Send to website"
+			model="auction.lots"
+			name="auction.lots.send.aie"
+			id="wizard_send"/>
+
+		<wizard string="Send results to Auction-in-europe.com"
+		model="auction.lots"
+		name="auction.lots.send.aie.results"
+		multi="1"
+		id="wizard_results"/>
+
+		<wizard string="Map buyer username to Partners"
+		model="auction.lots"
+		name="auction.lots.buyer_map"
+		multi="1"
+		id="wizard_map_user"/>
+
+		<wizard string="Change Auction Date"
+		 model="auction.lots"
+		 name="auction.lots.auction_move"
+		multi="1"
+		 id="wizard_change_auction"/>
+
+		<!--wizard string="Pay objects of the seller"
+		model="auction.lots"
+		name="auction.pay.sel"
+		id="wizard_lots_pay"/-->
+		<wizard string="Pay objects of the buyer"
+		model="auction.lots"
+		name="auction.pay.buy"
+		id="wizard_pay"/>
+
+		<wizard 
+			string="Gestion emporte" 
+			model="auction.dates" 
+			name="auction.taken"
+			multi="1"
+			id="wizard_emporte"/>
+	<menuitem name="Auction Management/Outils Bar Codes/Gestion des livraisons" 
+		action="wizard_emporte" 
+		type="wizard"
+		id="menu_wizard_emporte"
+		/>
+
+		<!--wizard string="Cancel payment"
+		model="auction.lots"
+		name="auction.lots.cancel"
+		multi="1"
+		id="wizard_cancel_pay"/-->
+
+		<wizard string="Numerotation (per lot)"
+		model="auction.lots"
+		name="auction.lots.numerotate"
+		multi="1"
+		id="wizard_numerotate_lot"/>
+
+		<wizard string="Numerotation (automatic)"
+		 model="auction.lots"
+		 name="auction.lots.numerotate_cont"
+		 multi="1"
+		id="wizard_numerotate_automatic"/>
+
+		<wizard string="SMS Send"
+		 model="auction.lots"
+		 name="auction.lots.sms_send"
+		multi="1"
+ 		id="wizard_sms"/>
+
+		 <!--wizard string="Invoice"
+		 model="auction.lots"
+		 name="auction.lots.invoice"
+		 multi="1"
+		 id="wizard_invoicing"/-->
+
+
+		<wizard string="Invoice Seller objects"
+			model="auction.lots"
+			name="auction.lots.make_invoice"
+		multi="1"
+			id="wizard_invoice"/>
+
+		<wizard string="Invoice Buyer objects"
+			model="auction.lots"
+			name="auction.lots.make_invoice_buyer"
+			id="wizard_invoice_buyer1"/>
+
+		<wizard string="Unmark as taken away"
+			model="auction.lots"
+			name="auction.lots.enable"
+			multi="1"
+			id="auction_wizard_enable_taken"/>
+
+		<wizard string="Mark as taken away"
+			model="auction.lots"
+			name="auction.lots.able"
+			multi="1"
+			id="auction_wizard_able_taken"/>
+
+			<wizard
+			id="auction_catalog_flagy"
+			string="Auction Catalog Flagey"
+			model="auction.dates"
+			name="auction.catalog.flagey"
+			keyword="client_print_multi"/>
+
+<wizard string="Mark as paid for seller"
+			model="auction.lots"
+			name="auction.payer.sel"
+			multi="1"
+			id="auction_wizard_payer_sel"/>
+
+
+
+	</data>
+</terp>
+
diff --git a/addons/auction/barcode/__init__.py b/addons/auction/barcode/__init__.py
new file mode 100644
index 00000000000..a96948744f1
--- /dev/null
+++ b/addons/auction/barcode/__init__.py
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 1996-2000 Tyler C. Sarna <tsarna@sarna.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed by Tyler C. Sarna.
+# 4. Neither the name of the author nor the names of contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+__version__ = '0.9'
diff --git a/addons/auction/barcode/code128.py b/addons/auction/barcode/code128.py
new file mode 100644
index 00000000000..1b580d22b8d
--- /dev/null
+++ b/addons/auction/barcode/code128.py
@@ -0,0 +1,321 @@
+#
+# Copyright (c) 2000 Tyler C. Sarna <tsarna@sarna.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed by Tyler C. Sarna.
+# 4. Neither the name of the author nor the names of contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+from reportlab.lib.units import inch
+from common import MultiWidthBarcode
+from string import digits
+
+_patterns = {
+    0   :   'BaBbBb',    1   :   'BbBaBb',    2   :   'BbBbBa',
+    3   :   'AbAbBc',    4   :   'AbAcBb',    5   :   'AcAbBb',
+    6   :   'AbBbAc',    7   :   'AbBcAb',    8   :   'AcBbAb',
+    9   :   'BbAbAc',    10  :   'BbAcAb',    11  :   'BcAbAb',
+    12  :   'AaBbCb',    13  :   'AbBaCb',    14  :   'AbBbCa',
+    15  :   'AaCbBb',    16  :   'AbCaBb',    17  :   'AbCbBa',
+    18  :   'BbCbAa',    19  :   'BbAaCb',    20  :   'BbAbCa',
+    21  :   'BaCbAb',    22  :   'BbCaAb',    23  :   'CaBaCa',
+    24  :   'CaAbBb',    25  :   'CbAaBb',    26  :   'CbAbBa',
+    27  :   'CaBbAb',    28  :   'CbBaAb',    29  :   'CbBbAa',
+    30  :   'BaBaBc',    31  :   'BaBcBa',    32  :   'BcBaBa',
+    33  :   'AaAcBc',    34  :   'AcAaBc',    35  :   'AcAcBa',
+    36  :   'AaBcAc',    37  :   'AcBaAc',    38  :   'AcBcAa',
+    39  :   'BaAcAc',    40  :   'BcAaAc',    41  :   'BcAcAa',
+    42  :   'AaBaCc',    43  :   'AaBcCa',    44  :   'AcBaCa',
+    45  :   'AaCaBc',    46  :   'AaCcBa',    47  :   'AcCaBa',
+    48  :   'CaCaBa',    49  :   'BaAcCa',    50  :   'BcAaCa',
+    51  :   'BaCaAc',    52  :   'BaCcAa',    53  :   'BaCaCa',
+    54  :   'CaAaBc',    55  :   'CaAcBa',    56  :   'CcAaBa',
+    57  :   'CaBaAc',    58  :   'CaBcAa',    59  :   'CcBaAa',
+    60  :   'CaDaAa',    61  :   'BbAdAa',    62  :   'DcAaAa',
+    63  :   'AaAbBd',    64  :   'AaAdBb',    65  :   'AbAaBd',
+    66  :   'AbAdBa',    67  :   'AdAaBb',    68  :   'AdAbBa',
+    69  :   'AaBbAd',    70  :   'AaBdAb',    71  :   'AbBaAd',
+    72  :   'AbBdAa',    73  :   'AdBaAb',    74  :   'AdBbAa',
+    75  :   'BdAbAa',    76  :   'BbAaAd',    77  :   'DaCaAa',
+    78  :   'BdAaAb',    79  :   'AcDaAa',    80  :   'AaAbDb',
+    81  :   'AbAaDb',    82  :   'AbAbDa',    83  :   'AaDbAb',
+    84  :   'AbDaAb',    85  :   'AbDbAa',    86  :   'DaAbAb',
+    87  :   'DbAaAb',    88  :   'DbAbAa',    89  :   'BaBaDa',
+    90  :   'BaDaBa',    91  :   'DaBaBa',    92  :   'AaAaDc',
+    93  :   'AaAcDa',    94  :   'AcAaDa',    95  :   'AaDaAc',
+    96  :   'AaDcAa',    97  :   'DaAaAc',    98  :   'DaAcAa',
+    99  :   'AaCaDa',    100 :   'AaDaCa',    101 :   'CaAaDa',
+    102 :   'DaAaCa',    103 :   'BaAdAb',    104 :   'BaAbAd',
+    105 :   'BaAbCb',    106 :   'BcCaAaB'
+}
+
+starta, startb, startc, stop = 103, 104, 105, 106
+
+seta = {
+        ' ' :   0,        '!' :   1,        '"' :   2,        '#' :   3,
+        '$' :   4,        '%' :   5,        '&' :   6,       '\'' :   7,
+        '(' :   8,        ')' :   9,        '*' :  10,        '+' :  11,
+        ',' :  12,        '-' :  13,        '.' :  14,        '/' :  15,
+        '0' :  16,        '1' :  17,        '2' :  18,        '3' :  19,
+        '4' :  20,        '5' :  21,        '6' :  22,        '7' :  23,
+        '8' :  24,        '9' :  25,        ':' :  26,        ';' :  27,
+        '<' :  28,        '=' :  29,        '>' :  30,        '?' :  31,
+        '@' :  32,        'A' :  33,        'B' :  34,        'C' :  35,
+        'D' :  36,        'E' :  37,        'F' :  38,        'G' :  39,
+        'H' :  40,        'I' :  41,        'J' :  42,        'K' :  43,
+        'L' :  44,        'M' :  45,        'N' :  46,        'O' :  47,
+        'P' :  48,        'Q' :  49,        'R' :  50,        'S' :  51,
+        'T' :  52,        'U' :  53,        'V' :  54,        'W' :  55,
+        'X' :  56,        'Y' :  57,        'Z' :  58,        '[' :  59,
+       '\\' :  60,        ']' :  61,        '^' :  62,        '_' :  63,
+     '\x00' :  64,     '\x01' :  65,     '\x02' :  66,     '\x03' :  67,
+     '\x04' :  68,     '\x05' :  69,     '\x06' :  70,     '\x07' :  71,
+     '\x08' :  72,     '\x09' :  73,     '\x0a' :  74,     '\x0b' :  75,
+     '\x0c' :  76,     '\x0d' :  77,     '\x0e' :  78,     '\x0f' :  79,
+     '\x10' :  80,     '\x11' :  81,     '\x12' :  82,     '\x13' :  83,
+     '\x14' :  84,     '\x15' :  85,     '\x16' :  86,     '\x17' :  87,
+     '\x18' :  88,     '\x19' :  89,     '\x1a' :  90,     '\x1b' :  91,
+     '\x1c' :  92,     '\x1d' :  93,     '\x1e' :  94,     '\x1f' :  95,
+     '\xf3' :  96,     '\xf2' :  97,    'SHIFT' :  98,     'TO_C' :  99,
+     'TO_B' : 100,     '\xf4' : 101,     '\xf1' : 102
+}
+
+setb = {
+        ' ' :   0,        '!' :   1,        '"' :   2,        '#' :   3,
+        '$' :   4,        '%' :   5,        '&' :   6,       '\'' :   7,
+        '(' :   8,        ')' :   9,        '*' :  10,        '+' :  11,
+        ',' :  12,        '-' :  13,        '.' :  14,        '/' :  15,
+        '0' :  16,        '1' :  17,        '2' :  18,        '3' :  19,
+        '4' :  20,        '5' :  21,        '6' :  22,        '7' :  23,
+        '8' :  24,        '9' :  25,        ':' :  26,        ';' :  27,
+        '<' :  28,        '=' :  29,        '>' :  30,        '?' :  31,
+        '@' :  32,        'A' :  33,        'B' :  34,        'C' :  35,
+        'D' :  36,        'E' :  37,        'F' :  38,        'G' :  39,
+        'H' :  40,        'I' :  41,        'J' :  42,        'K' :  43,
+        'L' :  44,        'M' :  45,        'N' :  46,        'O' :  47,
+        'P' :  48,        'Q' :  49,        'R' :  50,        'S' :  51,
+        'T' :  52,        'U' :  53,        'V' :  54,        'W' :  55,
+        'X' :  56,        'Y' :  57,        'Z' :  58,        '[' :  59,
+       '\\' :  60,        ']' :  61,        '^' :  62,        '_' :  63,
+        '`' :  64,        'a' :  65,        'b' :  66,        'c' :  67,
+        'd' :  68,        'e' :  69,        'f' :  70,        'g' :  71,
+        'h' :  72,        'i' :  73,        'j' :  74,        'k' :  75,
+        'l' :  76,        'm' :  77,        'n' :  78,        'o' :  79,
+        'p' :  80,        'q' :  81,        'r' :  82,        's' :  83,
+        't' :  84,        'u' :  85,        'v' :  86,        'w' :  87,
+        'x' :  88,        'y' :  89,        'z' :  90,        '{' :  91,
+        '|' :  92,        '}' :  93,        '~' :  94,     '\x7f' :  95,
+     '\xf3' :  96,     '\xf2' :  97,    'SHIFT' :  98,     'TO_C' :  99,
+     '\xf4' : 100,     'TO_A' : 101,     '\xf1' : 102
+}
+
+setc = {
+    '00': 0, '01': 1, '02': 2, '03': 3, '04': 4,
+    '05': 5, '06': 6, '07': 7, '08': 8, '09': 9,
+    '10':10, '11':11, '12':12, '13':13, '14':14,
+    '15':15, '16':16, '17':17, '18':18, '19':19,
+    '20':20, '21':21, '22':22, '23':23, '24':24,
+    '25':25, '26':26, '27':27, '28':28, '29':29,
+    '30':30, '31':31, '32':32, '33':33, '34':34,
+    '35':35, '36':36, '37':37, '38':38, '39':39,
+    '40':40, '41':41, '42':42, '43':43, '44':44,
+    '45':45, '46':46, '47':47, '48':48, '49':49,
+    '50':50, '51':51, '52':52, '53':53, '54':54,
+    '55':55, '56':56, '57':57, '58':58, '59':59,
+    '60':60, '61':61, '62':62, '63':63, '64':64,
+    '65':65, '66':66, '67':67, '68':68, '69':69,
+    '70':70, '71':71, '72':72, '73':73, '74':74,
+    '75':75, '76':76, '77':77, '78':78, '79':79,
+    '80':80, '81':81, '82':82, '83':83, '84':84,
+    '85':85, '86':86, '87':87, '88':88, '89':89,
+    '90':90, '91':91, '92':92, '93':93, '94':94,
+    '95':95, '96':96, '97':97, '98':98, '99':99,
+
+    'TO_B' : 100,    'TO_A' : 101,    '\xf1' : 102
+}
+
+setmap = {
+    'TO_A' : (seta, setb),
+    'TO_B' : (setb, seta),
+    'TO_C' : (setc, None),
+    'START_A' : (starta, seta, setb),
+    'START_B' : (startb, setb, seta),
+    'START_C' : (startc, setc, None),
+}
+tos = setmap.keys()
+
+class Code128(MultiWidthBarcode):
+    """
+    Code 128 is a very compact symbology that can encode the entire
+    128 character ASCII set, plus 4 special control codes,
+    (FNC1-FNC4, expressed in the input string as \xf1 to \xf4).
+    Code 128 can also encode digits at double density (2 per byte)
+    and has a mandatory checksum.  Code 128 is well supported and
+    commonly used -- for example, by UPS for tracking labels.
+    
+    Because of these qualities, Code 128 is probably the best choice
+    for a linear symbology today (assuming you have a choice).
+
+    Options that may be passed to constructor:
+
+        value (int, or numeric string. required.):
+            The value to encode.
+   
+        xdim (float, default .0075):
+            X-Dimension, or width of the smallest element
+            Minumum is .0075 inch (7.5 mils).
+            
+        height (float, see default below):
+            Height of the symbol.  Default is the height of the two
+            bearer bars (if they exist) plus the greater of .25 inch
+            or .15 times the symbol's length.
+
+        quiet (bool, default 1):
+            Wether to include quiet zones in the symbol.
+            
+        lquiet (float, see default below):
+            Quiet zone size to left of code, if quiet is true.
+            Default is the greater of .25 inch, or 10 xdim
+            
+        rquiet (float, defaults as above):
+            Quiet zone size to right left of code, if quiet is true.
+            
+    Sources of Information on Code 128:
+
+    http://www.semiconductor.agilent.com/barcode/sg/Misc/code_128.html
+    http://www.adams1.com/pub/russadam/128code.html
+    http://www.barcodeman.com/c128.html
+
+    Official Spec, "ANSI/AIM BC4-1999, ISS" is available for US$45 from
+    http://www.aimglobal.org/aimstore/
+    """
+    def __init__(self, value='', **args):
+        self.xdim = inch * 0.0075
+        self.lquiet = None
+        self.rquiet = None
+        self.quiet = 1
+        self.height = None
+
+        if type(value) is type(1):
+            value = str(value)
+            
+        for (k, v) in args.items():
+            setattr(self, k, v)
+
+        if self.quiet:
+            if self.lquiet is None:
+                self.lquiet = max(inch * 0.25, self.xdim * 10.0)
+                self.rquiet = max(inch * 0.25, self.xdim * 10.0)
+        else:
+            self.lquiet = self.rquiet = 0.0
+
+        MultiWidthBarcode.__init__(self, value)
+
+    def validate(self):
+        vval = ""
+        self.valid = 1
+        for c in self.value:
+            if ord(c) > 127 and c not in '\xf1\xf2\xf3\xf4':
+                self.valid = 0
+                continue
+            vval = vval + c
+        self.validated = vval
+        return vval
+
+    def _trailingDigitsToC(self, l):
+        # Optimization: trailing digits -> set C double-digits
+        c = 1
+        savings = -1 # the TO_C costs one character
+        rl = ['STOP']
+        while c < len(l):
+            i = (-c - 1)
+            if l[i] == '\xf1':
+                c = c + 1
+                rl.insert(0, '\xf1')
+                continue
+            elif len(l[i]) == 1 and l[i] in digits \
+             and len(l[i-1]) == 1 and l[i-1] in digits:
+                c = c + 2
+                savings = savings + 1
+                rl.insert(0, l[i-1] + l[i])
+                continue
+            else:
+                break
+        if savings > 0:
+            return l[:-c] + ['TO_C'] + rl
+        else:
+            return l
+
+    def encode(self):
+        # First, encode using only B
+        s = self.validated
+        l = ['START_B']
+        for c in s:
+            if not setb.has_key(c):
+                l = l + ['TO_A', c, 'TO_B']
+            else:
+                l.append(c)
+        l.append('STOP')
+
+        l = self._trailingDigitsToC(l)
+
+        # Finally, replace START_X,TO_Y with START_Y
+        if l[1] in tos:
+            l[:2] = ['START_' + l[1][-1]]
+
+#        print `l`
+
+        # encode into numbers
+        start, set, shset = setmap[l[0]]
+        e = [start]
+        
+        l = l[1:-1]
+        while l:
+            c = l[0]
+            if c == 'SHIFT':
+                e = e + [set[c], shset[l[1]]]
+                l = l[2:]
+            elif c in tos:
+                e.append(set[c])
+                set, shset = setmap[c]
+                l = l[1:]
+            else:
+                e.append(set[c])
+                l = l[1:]
+
+        c = e[0]
+        for i in range(1, len(e)):
+            c = c + i * e[i]
+        self.encoded = e + [c % 103, stop]
+        return self.encoded
+
+    def decompose(self):
+        dval = ''
+        for c in self.encoded:
+            dval = dval + _patterns[c]
+        self.decomposed = dval
+        return self.decomposed
diff --git a/addons/auction/barcode/code39.py b/addons/auction/barcode/code39.py
new file mode 100644
index 00000000000..08e0c9d4b5d
--- /dev/null
+++ b/addons/auction/barcode/code39.py
@@ -0,0 +1,255 @@
+#
+# Copyright (c) 1996-2000 Tyler C. Sarna <tsarna@sarna.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed by Tyler C. Sarna.
+# 4. Neither the name of the author nor the names of contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+from reportlab.lib.units import inch
+from common import Barcode
+import string
+
+_patterns = {
+    '0':    ("bsbSBsBsb", 0),       '1': ("BsbSbsbsB", 1),
+    '2':    ("bsBSbsbsB", 2),       '3': ("BsBSbsbsb", 3),
+    '4':    ("bsbSBsbsB", 4),       '5': ("BsbSBsbsb", 5),
+    '6':    ("bsBSBsbsb", 6),       '7': ("bsbSbsBsB", 7),
+    '8':    ("BsbSbsBsb", 8),       '9': ("bsBSbsBsb", 9),
+    'A':    ("BsbsbSbsB", 10),      'B': ("bsBsbSbsB", 11),
+    'C':    ("BsBsbSbsb", 12),      'D': ("bsbsBSbsB", 13),
+    'E':    ("BsbsBSbsb", 14),      'F': ("bsBsBSbsb", 15),
+    'G':    ("bsbsbSBsB", 16),      'H': ("BsbsbSBsb", 17),
+    'I':    ("bsBsbSBsb", 18),      'J': ("bsbsBSBsb", 19),
+    'K':    ("BsbsbsbSB", 20),      'L': ("bsBsbsbSB", 21),
+    'M':    ("BsBsbsbSb", 22),      'N': ("bsbsBsbSB", 23),
+    'O':    ("BsbsBsbSb", 24),      'P': ("bsBsBsbSb", 25),
+    'Q':    ("bsbsbsBSB", 26),      'R': ("BsbsbsBSb", 27),
+    'S':    ("bsBsbsBSb", 28),      'T': ("bsbsBsBSb", 29),
+    'U':    ("BSbsbsbsB", 30),      'V': ("bSBsbsbsB", 31),
+    'W':    ("BSBsbsbsb", 32),      'X': ("bSbsBsbsB", 33),
+    'Y':    ("BSbsBsbsb", 34),      'Z': ("bSBsBsbsb", 35),
+    '-':    ("bSbsbsBsB", 36),      '.': ("BSbsbsBsb", 37),
+    ' ':    ("bSBsbsBsb", 38),      '*': ("bSbsBsBsb", 39),
+    '$':    ("bSbSbSbsb", 40),      '/': ("bSbSbsbSb", 41),
+    '+':    ("bSbsbSbSb", 42),      '%': ("bsbSbSbSb", 43)
+}
+
+_valchars = [
+    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A',
+    'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+    'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+    'X', 'Y', 'Z', '-', '.', ' ', '*', '$', '/', '+', '%'
+]
+
+_extended = {
+    '\0':   "%U",    '\01':  "$A",    '\02':  "$B",    '\03':  "$C",
+    '\04':  "$D",    '\05':  "$E",    '\06':  "$F",    '\07':  "$G",
+    '\010': "$H",    '\011': "$I",    '\012': "$J",    '\013': "$K",
+    '\014': "$L",    '\015': "$M",    '\016': "$N",    '\017': "$O",
+    '\020': "$P",    '\021': "$Q",    '\022': "$R",    '\023': "$S",
+    '\024': "$T",    '\025': "$U",    '\026': "$V",    '\027': "$W",
+    '\030': "$X",    '\031': "$Y",    '\032': "$Z",    '\033': "%A",
+    '\034': "%B",    '\035': "%C",    '\036': "%D",    '\037': "%E",
+    '!':    "/A",    '"':    "/B",    '#':    "/C",    '$':    "/D",
+    '%':    "/E",    '&':    "/F",    '\'':   "/G",    '(':    "/H",
+    ')':    "/I",    '*':    "/J",    '+':    "/K",    ',':    "/L",
+    '/':    "/O",    ':':    "/Z",    ';':    "%F",    '<':    "%G",
+    '=':    "%H",    '>':    "%I",    '?':    "%J",    '@':    "%V",
+    '[':    "%K",    '\\':   "%L",    ']':    "%M",    '^':    "%N",
+    '_':    "%O",    '`':    "%W",    'a':    "+A",    'b':    "+B",
+    'c':    "+C",    'd':    "+D",    'e':    "+E",    'f':    "+F",
+    'g':    "+G",    'h':    "+H",    'i':    "+I",    'j':    "+J",
+    'k':    "+K",    'l':    "+L",    'm':    "+M",    'n':    "+N",
+    'o':    "+O",    'p':    "+P",    'q':    "+Q",    'r':    "+R",
+    's':    "+S",    't':    "+T",    'u':    "+U",    'v':    "+V",
+    'w':    "+W",    'x':    "+X",    'y':    "+Y",    'z':    "+Z",
+    '{':    "%P",    '|':    "%Q",    '}':    "%R",    '~':    "%S",
+    '\177': "%T"
+}
+
+
+_stdchrs = string.digits + string.uppercase + "-. *$/+%"
+_extchrs = _stdchrs + string.lowercase + \
+    "\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017" + \
+    "\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" + \
+    "!'#&\"(),:;<=>?@[\\]^_`{|}~\177"
+
+
+def _encode39(str, cksum):
+    newval = "*"
+    v = 0
+    for c in str:
+        v = v + _patterns[c][1]
+        newval = newval + c
+    v = v % 43
+    if cksum:
+        newval = newval + _valchars[v]
+    return newval + '*'
+
+        
+class _Code39Base(Barcode):
+    def __init__(self, value = "", **args):
+        self.xdim = inch * 0.0075
+        self.lquiet = None
+        self.rquiet = None
+        self.quiet = 1
+        self.gap = None
+        self.height = None
+        self.ratio = 2.2
+        self.checksum = 0
+        self.bearers = 0.0
+
+        for (k, v) in args.items():
+            setattr(self, k, v)
+            
+        if self.quiet:
+            if self.lquiet is None:
+                self.lquiet = max(inch * 0.25, self.xdim * 10.0)
+                self.rquiet = max(inch * 0.25, self.xdim * 10.0)
+        else:
+            self.lquiet = self.rquiet = 0.0
+                                                         
+        Barcode.__init__(self, value)
+
+    def decompose(self):
+        dval = ""
+        for c in self.encoded:
+            dval = dval + _patterns[c][0] + 'i'
+        self.decomposed = dval[:-1]
+        return self.decomposed
+
+
+class Standard39(_Code39Base):
+    """
+    Interleaved 2 of 5 is a numeric-only barcode.  It encodes an even
+    number of digits; if an odd number is given, a 0 is prepended.
+
+    Options that may be passed to constructor:
+
+        value (int, or numeric string. required.):
+            The value to encode.
+   
+        xdim (float, default .0075):
+            X-Dimension, or width of the smallest element
+            Minumum is .0075 inch (7.5 mils).
+            
+        ratio (float, default 2.2):
+            The ratio of wide elements to narrow elements.
+            Must be between 2.0 and 3.0 (or 2.2 and 3.0 if the
+            xdim is greater than 20 mils (.02 inch))
+            
+        gap (float or None, default None):
+            width of intercharacter gap. None means "use xdim".
+        
+        height (float, see default below):
+            Height of the symbol.  Default is the height of the two
+            bearer bars (if they exist) plus the greater of .25 inch
+            or .15 times the symbol's length.
+
+        checksum (bool, default 0):
+            Wether to compute and include the check digit
+            
+        bearers (float, in units of xdim. default 0):
+            Height of bearer bars (horizontal bars along the top and
+            bottom of the barcode). Default is 0 (no bearers).
+            
+        quiet (bool, default 1):
+            Wether to include quiet zones in the symbol.
+            
+        lquiet (float, see default below):
+            Quiet zone size to left of code, if quiet is true.
+            Default is the greater of .25 inch, or .15 times the symbol's
+            length.
+            
+        rquiet (float, defaults as above):
+            Quiet zone size to right left of code, if quiet is true.
+
+    Sources of Information on Code 39:
+    
+    http://www.semiconductor.agilent.com/barcode/sg/Misc/code_39.html
+    http://www.adams1.com/pub/russadam/39code.html
+    http://www.barcodeman.com/c39_1.html
+
+    Official Spec, "ANSI/AIM BC1-1995, USS" is available for US$45 from
+    http://www.aimglobal.org/aimstore/
+    """
+
+    def validate(self):
+        vval = ""
+        self.valid = 1
+        for c in self.value:
+            if c in string.lowercase:
+                c = string.upper(c)
+            if c not in _stdchrs:
+                self.valid = 0
+                continue
+            vval = vval + c
+        self.validated = vval
+        return vval
+
+    def encode(self):
+        self.encoded = _encode39(self.validated, self.checksum)
+        return self.encoded
+
+
+class Extended39(_Code39Base):
+    """
+    Extended Code 39 is a convention for encoding additional characters
+    not present in stanmdard Code 39 by using pairs of characters to
+    represent the characters missing in Standard Code 39.
+    
+    See Standard39 for arguments.
+
+    Sources of Information on Extended Code 39:
+    
+    http://www.semiconductor.agilent.com/barcode/sg/Misc/xcode_39.html
+    http://www.barcodeman.com/c39_ext.html
+    """
+
+    def validate(self):
+        vval = ""
+        self.valid = 1
+        for c in self.value:
+            if c not in _extchrs:
+                self.valid = 0
+                continue
+            vval = vval + c
+        self.validated = vval
+        return vval
+
+    def encode(self):
+        self.encoded = ""
+        for c in self.validated:
+            if _extended.has_key(c):
+                self.encoded = self.encoded + _extended[c]
+            elif c in _stdchrs:
+                self.encoded = self.encoded + c
+            else:
+                raise ValueError
+        self.encoded = _encode39(self.encoded, self.checksum)
+        return self.encoded
diff --git a/addons/auction/barcode/code93.py b/addons/auction/barcode/code93.py
new file mode 100644
index 00000000000..fc19ee3ee98
--- /dev/null
+++ b/addons/auction/barcode/code93.py
@@ -0,0 +1,232 @@
+#
+# Copyright (c) 2000 Tyler C. Sarna <tsarna@sarna.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed by Tyler C. Sarna.
+# 4. Neither the name of the author nor the names of contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+from reportlab.lib.units import inch
+from common import MultiWidthBarcode
+import string
+
+_patterns = {
+  '0' : ('AcAaAb', 0),  '1' : ('AaAbAc', 1),  '2' : ('AaAcAb', 2),
+  '3' : ('AaAdAa', 3),  '4' : ('AbAaAc', 4),  '5' : ('AbAbAb', 5),
+  '6' : ('AbAcAa', 6),  '7' : ('AaAaAd', 7),  '8' : ('AcAbAa', 8),
+  '9' : ('AdAaAa', 9),  'A' : ('BaAaAc', 10), 'B' : ('BaAbAb', 11),
+  'C' : ('BaAcAa', 12), 'D' : ('BbAaAb', 13), 'E' : ('BbAbAa', 14),
+  'F' : ('BcAaAa', 15), 'G' : ('AaBaAc', 16), 'H' : ('AaBbAb', 17),
+  'I' : ('AaBcAa', 18), 'J' : ('AbBaAb', 19), 'K' : ('AcBaAa', 20),
+  'L' : ('AaAaBc', 21), 'M' : ('AaAbBb', 22), 'N' : ('AaAcBa', 23),
+  'O' : ('AbAaBb', 24), 'P' : ('AcAaBa', 25), 'Q' : ('BaBaAb', 26),
+  'R' : ('BaBbAa', 27), 'S' : ('BaAaBb', 28), 'T' : ('BaAbBa', 29),
+  'U' : ('BbAaBa', 30), 'V' : ('BbBaAa', 31), 'W' : ('AaBaBb', 32),
+  'X' : ('AaBbBa', 33), 'Y' : ('AbBaBa', 34), 'Z' : ('AbCaAa', 35),
+  '-' : ('AbAaCa', 36), '.' : ('CaAaAb', 37), ' ' : ('CaAbAa', 38),
+  '$' : ('CbAaAa', 39), '/' : ('AaBaCa', 40), '+' : ('AaCaBa', 41),
+  '%' : ('BaAaCa', 42), '#' : ('AbAbBa', 43), '!' : ('CaBaAa', 44),
+  '=' : ('CaAaBa', 45), '&' : ('AbBbAa', 46),
+  'start' : ('AaAaDa', -1),  'stop' : ('AaAaDaA', -2)
+}
+
+_charsbyval = {}
+for k, v in _patterns.items():
+    _charsbyval[v[1]] = k
+
+_extended = {
+    '\x00' : '!U',    '\x01' : '#A',    '\x02' : '#B',    '\x03' : '#C',
+    '\x04' : '#D',    '\x05' : '#E',    '\x06' : '#F',    '\x07' : '#G',
+    '\x08' : '#H',    '\x09' : '#I',    '\x0a' : '#J',    '\x0b' : '#K',
+    '\x0c' : '#L',    '\x0d' : '#M',    '\x0e' : '#N',    '\x0f' : '#O',
+    '\x10' : '#P',    '\x11' : '#Q',    '\x12' : '#R',    '\x13' : '#S',
+    '\x14' : '#T',    '\x15' : '#U',    '\x16' : '#V',    '\x17' : '#W',
+    '\x18' : '#X',    '\x19' : '#Y',    '\x1a' : '#Z',    '\x1b' : '!A',
+    '\x1c' : '!B',    '\x1d' : '!C',    '\x1e' : '!D',    '\x1f' : '!E',
+    '!'    : '=A',    '"'    : '=B',    '#'    : '=C',    '$'    : '=D',
+    '%'    : '=E',    '&'    : '=F',    '\''   : '=G',    '('    : '=H',
+    ')'    : '=I',    '*'    : '=J',    '+'    : '=K',    ','    : '=L',
+    '/'    : '=O',    ':'    : '=Z',    ';'    : '!F',    '<'    : '!G',
+    '='    : '!H',    '>'    : '!I',    '?'    : '!J',    '@'    : '!V',
+    '['    : '!K',    '\\'   : '!L',    ']'    : '!M',    '^'    : '!N',
+    '_'    : '!O',    '`'    : '!W',    'a'    : '&A',    'b'    : '&B',
+    'c'    : '&C',    'd'    : '&D',    'e'    : '&E',    'f'    : '&F',
+    'g'    : '&G',    'h'    : '&H',    'i'    : '&I',    'j'    : '&J',
+    'k'    : '&K',    'l'    : '&L',    'm'    : '&M',    'n'    : '&N',
+    'o'    : '&O',    'p'    : '&P',    'q'    : '&Q',    'r'    : '&R',
+    's'    : '&S',    't'    : '&T',    'u'    : '&U',    'v'    : '&V',
+    'w'    : '&W',    'x'    : '&X',    'y'    : '&Y',    'z'    : '&Z',
+    '{'    : '!P',    '|'    : '!Q',    '}'    : '!R',    '~'    : '!S',
+    '\x7f' : '!T'
+}
+
+
+def _encode93(str):
+    s = map(None, str)
+    s.reverse()
+
+    # compute 'C' checksum
+    i = 0; v = 1; c = 0
+    while i < len(s):
+        c = c + v * _patterns[s[i]][1]
+        i = i + 1; v = v + 1
+        if v > 20:
+            v = 1
+    s.insert(0, _charsbyval[c % 47])
+
+    # compute 'K' checksum
+    i = 0; v = 1; c = 0
+    while i < len(s):
+        c = c + v * _patterns[s[i]][1]
+        i = i + 1; v = v + 1
+        if v > 15:
+            v = 1
+    s.insert(0, _charsbyval[c % 47])
+
+    s.reverse()
+
+    return string.join(s, '')
+
+
+class _Code93Base(MultiWidthBarcode):
+    def __init__(self, value='', **args):
+        self.xdim = inch * 0.0075
+        self.lquiet = None
+        self.rquiet = None
+        self.quiet = 1
+        self.height = None
+
+        if type(value) is type(1):
+            value = str(value)
+            
+        for (k, v) in args.items():
+            setattr(self, k, v)
+
+        if self.quiet:
+            if self.lquiet is None:
+                self.lquiet = max(inch * 0.25, self.xdim * 10.0)
+                self.rquiet = max(inch * 0.25, self.xdim * 10.0)
+        else:
+            self.lquiet = self.rquiet = 0.0
+
+        MultiWidthBarcode.__init__(self, value)
+
+    def decompose(self):
+        dval = _patterns['start'][0]
+        for c in self.encoded:
+            dval = dval + _patterns[c][0]
+        self.decomposed = dval + _patterns['stop'][0]
+        return self.decomposed
+
+
+class Standard93(_Code93Base):
+    """
+    Code 93 is a Uppercase alphanumeric symbology with some punctuation.
+    See Extended Code 93 for a variant that can represent the entire
+    128 characrter ASCII set.
+    
+    Options that may be passed to constructor:
+
+        value (int, or numeric string. required.):
+            The value to encode.
+   
+        xdim (float, default .0075):
+            X-Dimension, or width of the smallest element
+            Minumum is .0075 inch (7.5 mils).
+            
+        height (float, see default below):
+            Height of the symbol.  Default is the height of the two
+            bearer bars (if they exist) plus the greater of .25 inch
+            or .15 times the symbol's length.
+
+        quiet (bool, default 1):
+            Wether to include quiet zones in the symbol.
+            
+        lquiet (float, see default below):
+            Quiet zone size to left of code, if quiet is true.
+            Default is the greater of .25 inch, or 10 xdim
+            
+        rquiet (float, defaults as above):
+            Quiet zone size to right left of code, if quiet is true.
+
+    Sources of Information on Code 93:
+
+    http://www.semiconductor.agilent.com/barcode/sg/Misc/code_93.html
+
+    Official Spec, "NSI/AIM BC5-1995, USS" is available for US$45 from
+    http://www.aimglobal.org/aimstore/
+    """
+
+    def validate(self):
+        vval = ""
+        self.valid = 1
+        for c in self.value:
+            if c in string.lowercase:
+                c = string.upper(c)
+            if not _patterns.has_key(c):
+                self.valid = 0
+                continue
+            vval = vval + c
+        self.validated = vval
+        return vval
+
+    def encode(self):
+        self.encoded = _encode93(self.validated)
+        return self.encoded
+
+
+class Extended93(_Code93Base):
+    """
+    Extended Code 93 is a convention for encoding the entire 128 character
+    set using pairs of characters to represent the characters missing in
+    Standard Code 93. It is very much like Extended Code 39 in that way.
+    
+    See Standard93 for arguments.
+    """    
+
+    def validate(self):
+        vval = ""
+        self.valid = 1
+        for c in self.value:
+            if not _patterns.has_key(c) and not _extended.has_key(c):
+                self.valid = 0
+                continue
+            vval = vval + c
+        self.validated = vval
+        return vval
+
+    def encode(self):
+        self.encoded = ""
+        for c in self.validated:
+            if _patterns.has_key(c):
+                self.encoded = self.encoded + c
+            elif _extended.has_key(c):
+                self.encoded = self.encoded + _extended[c]
+            else:
+                raise ValueError
+        self.encoded = _encode93(self.encoded)
+        return self.encoded
diff --git a/addons/auction/barcode/common.py b/addons/auction/barcode/common.py
new file mode 100644
index 00000000000..a73ed7d73f5
--- /dev/null
+++ b/addons/auction/barcode/common.py
@@ -0,0 +1,705 @@
+#
+# Copyright (c) 1996-2000 Tyler C. Sarna <tsarna@sarna.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed by Tyler C. Sarna.
+# 4. Neither the name of the author nor the names of contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+from reportlab.platypus.flowables import Flowable
+from reportlab.lib.units import inch
+import string
+
+class Barcode(Flowable):
+    """Abstract Base for barcodes. Includes implementations of
+    some methods suitable for the more primitive barcode types"""
+    
+    def __init__(self, value = ''):
+        self.value = value
+        
+        if not hasattr(self, 'gap'):
+            self.gap = None
+            
+        self.validate()
+        self.encode()
+        #print self.encoded
+        self.decompose()
+        #print self.decomposed
+        self.computeSize()
+
+    def validate(self):
+        self.valid = 1
+        self.validated = self.value
+
+    def encode(self):
+        self.encoded = self.validated
+
+    def decompose(self):
+        self.decomposed = self.encoded
+
+    def computeSize(self, *args):
+        xdim = self.xdim
+        wx = xdim * self.ratio
+
+        if self.gap == None:
+            self.gap = xdim
+            
+        w = 0.0
+        
+        for c in self.decomposed:
+            if c in 'sb':
+                w = w + xdim
+            elif c in 'SB':
+                w = w + wx
+            else: # 'i'
+                w = w + self.gap
+    
+        if self.height is None:
+            self.height = w * 0.15
+            self.height = max(0.25 * inch, self.height)
+            if self.bearers:
+                self.height = self.height + self.bearers * 2.0 * xdim
+
+        if self.quiet:
+            w = w + self.lquiet + self.rquiet
+            self.xo = self.lquiet
+        else:
+            self.xo = 0.0
+            
+        self.width = w
+
+    def draw(self):
+        xdim = self.xdim
+        wx = xdim * self.ratio
+    
+        left = self.xo
+        b = self.bearers * xdim
+        bb = b * 0.5
+        tb = self.height - (b * 1.5)
+
+        for c in self.decomposed:
+            if c == 'i':
+                left = left + self.gap
+            elif c == 's':
+                left = left + xdim
+            elif c == 'S':
+                left = left + wx
+            elif c == 'b':
+                self.rect(left, bb, xdim, tb)
+                left = left + xdim
+            elif c == 'B':
+                self.rect(left, bb, wx, tb)
+                left = left + wx
+                
+        if self.bearers:
+            self.rect(self.lquiet, 0.0, \
+                self.width - (self.lquiet + self.rquiet), b)
+            self.rect(self.lquiet, self.height - b, \
+                self.width - (self.lquiet + self.rquiet), b)
+
+    def rect(self, x, y, w, h):
+        self.canv.rect(x, y, w, h, stroke=0, fill=1)
+
+
+class MultiWidthBarcode(Barcode):
+    """Base for variable-bar-width codes like Code93 and Code128"""
+    
+    def computeSize(self, *args):
+        xdim = self.xdim
+        oa, oA = ord('a') - 1, ord('A') - 1
+
+        w = 0.0
+        
+        for c in self.decomposed:
+            oc = ord(c)
+            if c in string.lowercase:
+                w = w + xdim * (oc - oa)
+            elif c in string.uppercase:
+                w = w + xdim * (oc - oA)
+    
+        if self.height is None:
+            self.height = w * 0.15
+            self.height = max(0.25 * inch, self.height)
+
+        if self.quiet:
+            w = w + self.lquiet + self.rquiet
+            self.xo = self.lquiet
+        else:
+            self.xo = 0.0
+            
+        self.width = w
+
+    def draw(self):
+        oa, oA = ord('a') - 1, ord('A') - 1
+        xdim = self.xdim
+        left = self.xo
+
+        for c in self.decomposed:
+            oc = ord(c)
+            if c in string.lowercase:
+                left = left + (oc - oa) * xdim
+            elif c in string.uppercase:
+                w = (oc - oA) * xdim
+                self.rect(left, 0.0, w, self.height)
+                left = left + w
+
+
+class I2of5(Barcode):
+    """
+    Interleaved 2 of 5 is a numeric-only barcode.  It encodes an even
+    number of digits; if an odd number is given, a 0 is prepended.
+
+    Options that may be passed to constructor:
+
+        value (int, or numeric string. required.):
+            The value to encode.
+   
+        xdim (float, default .0075):
+            X-Dimension, or width of the smallest element
+            Minumum is .0075 inch (7.5 mils).
+            
+        ratio (float, default 2.2):
+            The ratio of wide elements to narrow elements.
+            Must be between 2.0 and 3.0 (or 2.2 and 3.0 if the
+            xdim is greater than 20 mils (.02 inch))
+            
+        gap (float or None, default None):
+            width of intercharacter gap. None means "use xdim".
+        
+        height (float, see default below):
+            Height of the symbol.  Default is the height of the two
+            bearer bars (if they exist) plus the greater of .25 inch
+            or .15 times the symbol's length.
+
+        checksum (bool, default 1):
+            Wether to compute and include the check digit
+            
+        bearers (float, in units of xdim. default 3.0):
+            Height of bearer bars (horizontal bars along the top and
+            bottom of the barcode). Default is 3 x-dimensions.
+            Set to zero for no bearer bars. (Bearer bars help detect
+            misscans, so it is suggested to leave them on).
+            
+        quiet (bool, default 1):
+            Wether to include quiet zones in the symbol.
+            
+        lquiet (float, see default below):
+            Quiet zone size to left of code, if quiet is true.
+            Default is the greater of .25 inch, or .15 times the symbol's
+            length.
+            
+        rquiet (float, defaults as above):
+            Quiet zone size to right left of code, if quiet is true.
+            
+    Sources of Information on Interleaved 2 of 5:
+
+    http://www.semiconductor.agilent.com/barcode/sg/Misc/i_25.html
+    http://www.adams1.com/pub/russadam/i25code.html
+
+    Official Spec, "ANSI/AIM BC2-1995, USS" is available for US$45 from
+    http://www.aimglobal.org/aimstore/
+    """
+
+    patterns = {
+        'start' : 'bsbs',
+        'stop' : 'Bsb',
+
+        'B0' : 'bbBBb',     'S0' : 'ssSSs',
+        'B1' : 'BbbbB',     'S1' : 'SsssS',
+        'B2' : 'bBbbB',     'S2' : 'sSssS',
+        'B3' : 'BBbbb',     'S3' : 'SSsss',
+        'B4' : 'bbBbB',     'S4' : 'ssSsS',
+        'B5' : 'BbBbb',     'S5' : 'SsSss',
+        'B6' : 'bBBbb',     'S6' : 'sSSss',
+        'B7' : 'bbbBB',     'S7' : 'sssSS',
+        'B8' : 'BbbBb',     'S8' : 'SssSs',
+        'B9' : 'bBbBb',     'S9' : 'sSsSs'
+    }
+
+    def __init__(self, value='', **args):
+        self.height = None
+        self.xdim = inch * 0.0075
+        self.ratio = 2.2
+        self.checksum = 1
+        self.bearers = 3.0
+        self.quiet = 1
+        self.lquiet = self.rquiet = None
+
+        if type(value) == type(1):
+            value = str(value)
+
+        for (k, v) in args.items():
+            setattr(self, k, v)
+
+        if self.quiet:
+            if self.lquiet is None:
+                self.lquiet = min(inch * 0.25, self.xdim * 10.0)
+                self.rquiet = min(inch * 0.25, self.xdim * 10.0)
+        else:
+            self.lquiet = self.rquiet = 0.0
+
+        Barcode.__init__(self, value)
+
+    def validate(self):
+        vval = ""
+        self.valid = 1
+        for c in string.strip(self.value):
+            if c not in string.digits:
+                self.valid = 0
+                continue
+            vval = vval + c
+        self.validated = vval
+        return vval
+
+    def encode(self):
+        s = self.validated
+
+        # make sure result will be a multiple of 2 digits long,
+        # checksum included
+        if ((len(self.validated) % 2 == 0) and self.checksum) \
+        or ((len(self.validated) % 2 == 1) and not self.checksum):
+            s = '0' + s
+
+        if self.checksum:
+            c = 0
+            cm = 3
+
+            for d in s:
+                c = c + cm * int(d)
+                if cm == 3:
+                    cm = 1
+                else:
+                    cm = 3
+
+            d = 10 - (int(d) % 10)
+            s = s + `d`
+
+        self.encoded = s
+
+    def decompose(self):
+        dval = self.patterns['start']
+
+        for i in range(0, len(self.encoded), 2):
+            b = self.patterns['B' + self.encoded[i]]
+            s = self.patterns['S' + self.encoded[i+1]]
+
+            for i in range(0, len(b)):
+                dval = dval + b[i] + s[i]
+
+        self.decomposed = dval + self.patterns['stop']
+        return self.decomposed
+
+
+
+class MSI(Barcode):
+    """
+    MSI is a numeric-only barcode.
+
+    Options that may be passed to constructor:
+
+        value (int, or numeric string. required.):
+            The value to encode.
+   
+        xdim (float, default .0075):
+            X-Dimension, or width of the smallest element
+            
+        ratio (float, default 2.2):
+            The ratio of wide elements to narrow elements.
+            
+        gap (float or None, default None):
+            width of intercharacter gap. None means "use xdim".
+        
+        height (float, see default below):
+            Height of the symbol.  Default is the height of the two
+            bearer bars (if they exist) plus the greater of .25 inch
+            or .15 times the symbol's length.
+
+        checksum (bool, default 1):
+            Wether to compute and include the check digit
+            
+        bearers (float, in units of xdim. default 0):
+            Height of bearer bars (horizontal bars along the top and
+            bottom of the barcode). Default is 0 (no bearers).
+            
+        lquiet (float, see default below):
+            Quiet zone size to left of code, if quiet is true.
+            Default is the greater of .25 inch, or 10 xdims.
+            
+        rquiet (float, defaults as above):
+            Quiet zone size to right left of code, if quiet is true.
+            
+    Sources of Information on MSI Bar Code:
+
+    http://www.semiconductor.agilent.com/barcode/sg/Misc/msi_code.html
+    http://www.adams1.com/pub/russadam/plessy.html
+    """
+
+    patterns = {
+        'start' : 'Bs',          'stop' : 'bSb',
+
+        '0' : 'bSbSbSbS',        '1' : 'bSbSbSBs',
+        '2' : 'bSbSBsbS',        '3' : 'bSbSBsBs',
+        '4' : 'bSBsbSbS',        '5' : 'bSBsbSBs',
+        '6' : 'bSBsBsbS',        '7' : 'bSBsBsBs',
+        '8' : 'BsbSbSbS',        '9' : 'BsbSbSBs'
+    }
+
+    def __init__(self, value="", **args):
+        self.height = None
+        self.xdim = inch * 0.0075
+        self.ratio = 2.2
+        self.checksum = 1
+        self.bearers = 0.0
+        self.quiet = 1
+        self.lquiet = self.rquiet = None
+
+        if type(value) == type(1):
+            value = str(value)
+
+        for (k, v) in args.items():
+            setattr(self, k, v)
+
+        if self.quiet:
+            if self.lquiet is None:
+                self.lquiet = max(inch * 0.25, self.xdim * 10.0)
+                self.rquiet = max(inch * 0.25, self.xdim * 10.0)
+        else:
+            self.lquiet = self.rquiet = 0.0
+
+        Barcode.__init__(self, value)
+
+    def validate(self):
+        vval = ""
+        self.valid = 1
+        for c in string.strip(self.value):
+            if c not in string.digits:
+                self.valid = 0
+                continue
+            vval = vval + c
+        self.validated = vval
+        return vval
+
+    def encode(self):
+        s = self.validated
+
+        if self.checksum:
+            c = ''
+            for i in range(1, len(s), 2):
+                c = c + s[i]
+            d = str(int(c) * 2)
+            t = 0
+            for c in d:
+                t = t + int(c)
+            for i in range(0, len(s), 2):
+                t = t + int(s[i])
+            c = 10 - (t % 10)
+
+            s = s + str(c)
+
+        self.encoded = s
+
+    def decompose(self):
+        dval = self.patterns['start']
+
+        for c in self.encoded:
+            dval = dval + self.patterns[c]
+
+        self.decomposed = dval + self.patterns['stop']
+        return self.decomposed
+
+
+
+class Codabar(Barcode):
+    """
+    Codabar is a numeric plus some puntuation ("-$:/.+") barcode
+    with four start/stop characters (A, B, C, and D).
+
+    Options that may be passed to constructor:
+
+        value (string. required.):
+            The value to encode.
+   
+        xdim (float, default .0065):
+            X-Dimension, or width of the smallest element
+            minimum is 6.5 mils (.0065 inch)
+            
+        ratio (float, default 2.0):
+            The ratio of wide elements to narrow elements.
+            
+        gap (float or None, default None):
+            width of intercharacter gap. None means "use xdim".
+        
+        height (float, see default below):
+            Height of the symbol.  Default is the height of the two
+            bearer bars (if they exist) plus the greater of .25 inch
+            or .15 times the symbol's length.
+
+        checksum (bool, default 0):
+            Wether to compute and include the check digit
+            
+        bearers (float, in units of xdim. default 0):
+            Height of bearer bars (horizontal bars along the top and
+            bottom of the barcode). Default is 0 (no bearers).
+            
+        quiet (bool, default 1):
+            Wether to include quiet zones in the symbol.
+            
+        lquiet (float, see default below):
+            Quiet zone size to left of code, if quiet is true.
+            Default is the greater of .25 inch, or 10 xdim
+            
+        rquiet (float, defaults as above):
+            Quiet zone size to right left of code, if quiet is true.
+            
+    Sources of Information on Codabar
+
+    http://www.semiconductor.agilent.com/barcode/sg/Misc/codabar.html
+    http://www.barcodeman.com/codabar.html
+
+    Official Spec, "ANSI/AIM BC3-1995, USS" is available for US$45 from
+    http://www.aimglobal.org/aimstore/
+    """
+
+    patterns = {
+        '0':    'bsbsbSB',        '1':    'bsbsBSb',        '2':    'bsbSbsB',
+        '3':    'BSbsbsb',        '4':    'bsBsbSb',        '5':    'BsbsbSb',
+        '6':    'bSbsbsB',        '7':    'bSbsBsb',        '8':    'bSBsbsb',
+        '9':    'BsbSbsb',        '-':    'bsbSBsb',        '$':    'bsBSbsb',
+        ':':    'BsbsBsB',        '/':    'BsBsbsB',        '.':    'BsBsBsb',
+        '+':    'bsBsBsB',        'A':    'bsBSbSb',        'B':    'bSbSbsB',
+        'C':    'bsbSbSB',        'D':    'bsbSBSb'
+    }
+
+    values = {
+        '0' : 0,    '1' : 1,    '2' : 2,    '3' : 3,    '4' : 4,
+        '5' : 5,    '6' : 6,    '7' : 7,    '8' : 8,    '9' : 9,
+        '-' : 10,   '$' : 11,   ':' : 12,   '/' : 13,   '.' : 14,
+        '+' : 15,   'A' : 16,   'B' : 17,   'C' : 18,   'D' : 19
+    }
+
+    chars = string.digits + "-$:/.+"
+
+    def __init__(self, value='', **args):
+        self.height = None
+        self.xdim = inch * 0.0065
+        self.ratio = 2.0 # XXX ?
+        self.checksum = 0
+        self.bearers = 0.0
+        self.quiet = 1
+        self.lquiet = self.rquiet = None
+
+        if type(value) == type(1):
+            value = str(value)
+
+        for (k, v) in args.items():
+            setattr(self, k, v)
+
+        if self.quiet:
+            if self.lquiet is None:
+                self.lquiet = min(inch * 0.25, self.xdim * 10.0)
+                self.rquiet = min(inch * 0.25, self.xdim * 10.0)
+        else:
+            self.lquiet = self.rquiet = 0.0
+
+        Barcode.__init__(self, value)
+
+    def validate(self):
+        vval = ""
+        self.valid = 1
+        s = string.strip(self.value)
+        for i in range(0, len(s)):
+            c = s[i]
+            if c not in self.chars:
+                if ((i != 0) and (i != len(s) - 1)) or (c not in 'ABCD'):
+                    self.Valid = 0
+                    continue
+            vval = vval + c
+
+        if vval[0] not in 'ABCD':
+            vval = 'A' + vval
+        if vval[-1] not in 'ABCD':
+            vval = vval + vval[0]
+
+        self.validated = vval
+        return vval
+
+    def encode(self):
+        s = self.validated
+
+        if self.checksum:
+            v = 0
+            for c in s:
+                v = v + self.values[v]
+            v = 16 - (v % 16)
+            s = s + self.chars[v]
+
+        self.encoded = s
+
+    def decompose(self):
+        dval = ""
+        for c in self.encoded:
+            dval = dval + self.patterns[c] + 'i'
+        self.decomposed = dval[:-1]            
+        return self.decomposed
+
+
+
+class Code11(Barcode):
+    """
+    Code 11 is an almost-numeric barcode. It encodes the digits 0-9 plus
+    dash ("-"). 11 characters total, hence the name.
+    
+        value (int or string. required.):
+            The value to encode.
+   
+        xdim (float, default .0075):
+            X-Dimension, or width of the smallest element
+            
+        ratio (float, default 2.2):
+            The ratio of wide elements to narrow elements.
+            
+        gap (float or None, default None):
+            width of intercharacter gap. None means "use xdim".
+        
+        height (float, see default below):
+            Height of the symbol.  Default is the height of the two
+            bearer bars (if they exist) plus the greater of .25 inch
+            or .15 times the symbol's length.
+
+        checksum (0 none, 1 1-digit, 2 2-digit, -1 auto, default -1):
+            How many checksum digits to include. -1 ("auto") means
+            1 if the number of digits is 10 or less, else 2.
+            
+        bearers (float, in units of xdim. default 0):
+            Height of bearer bars (horizontal bars along the top and
+            bottom of the barcode). Default is 0 (no bearers).
+            
+        quiet (bool, default 1):
+            Wether to include quiet zones in the symbol.
+            
+        lquiet (float, see default below):
+            Quiet zone size to left of code, if quiet is true.
+            Default is the greater of .25 inch, or 10 xdim
+            
+        rquiet (float, defaults as above):
+            Quiet zone size to right left of code, if quiet is true.
+            
+    Sources of Information on Code 11:
+
+    http://www.cwi.nl/people/dik/english/codes/barcodes.html
+    """
+    
+    chars = string.digits + '-'
+    
+    patterns = {
+        '0' : 'bsbsB',        '1' : 'BsbsB',        '2' : 'bSbsB',
+        '3' : 'BSbsb',        '4' : 'bsBsB',        '5' : 'BsBsb',
+        '6' : 'bSBsb',        '7' : 'bsbSB',        '8' : 'BsbSb',
+        '9' : 'Bsbsb',        '-' : 'bsBsb',        'S' : 'bsBSb' # Start/Stop
+    }
+
+    values = {
+        '0' : 0,    '1' : 1,    '2' : 2,    '3' : 3,    '4' : 4,
+        '5' : 5,    '6' : 6,    '7' : 7,    '8' : 8,    '9' : 9,
+        '-' : 10,
+    }
+
+    def __init__(self, value='', **args):
+        self.height = None
+        self.xdim = inch * 0.0075
+        self.ratio = 2.2 # XXX ?
+        self.checksum = -1 # Auto 
+        self.bearers = 0.0
+        self.quiet = 1
+        self.lquiet = self.rquiet = None
+
+        if type(value) == type(1):
+            value = str(value)
+
+        for (k, v) in args.items():
+            setattr(self, k, v)
+
+        if self.quiet:
+            if self.lquiet is None:
+                self.lquiet = min(inch * 0.25, self.xdim * 10.0)
+                self.rquiet = min(inch * 0.25, self.xdim * 10.0)
+        else:
+            self.lquiet = self.rquiet = 0.0
+
+        Barcode.__init__(self, value)
+
+    def validate(self):
+        vval = ""
+        self.valid = 1
+        s = string.strip(self.value)
+        for i in range(0, len(s)):
+            c = s[i]
+            if c not in self.chars:
+                self.Valid = 0
+                continue
+            vval = vval + c
+
+        self.validated = vval
+        return vval
+
+    def encode(self):
+        s = self.validated
+
+        if self.checksum == -1:
+            if len(s) <= 10:
+                self.checksum = 1
+            else:
+                self.checksum = 2
+
+        if self.checksum > 0:
+            # compute first checksum
+            i = 0; v = 1; c = 0
+            while i < len(s):
+                c = c + v * string.index(self.chars, s[-(i+1)])
+                i = i + 1; v = v + 1
+                if v > 10:
+                    v = 1
+            s = s + self.chars[c % 11]
+
+        if self.checksum > 1:
+            # compute second checksum
+            i = 0; v = 1; c = 0
+            while i < len(s):
+                c = c + v * string.index(self.chars, s[-(i+1)])
+                i = i + 1; v = v + 1
+                if v > 9:
+                    v = 1
+            s = s + self.chars[c % 10]
+
+        self.encoded = 'S' + s + 'S'
+
+    def decompose(self):
+        dval = ""
+        for c in self.encoded:
+            dval = dval + self.patterns[c] + 'i'
+        self.decomposed = dval[:-1]            
+        return self.decomposed
diff --git a/addons/auction/barcode/fourstate.py b/addons/auction/barcode/fourstate.py
new file mode 100644
index 00000000000..0751fba5c92
--- /dev/null
+++ b/addons/auction/barcode/fourstate.py
@@ -0,0 +1,81 @@
+#
+# Copyright (c) 2000 Tyler C. Sarna <tsarna@sarna.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed by Tyler C. Sarna.
+# 4. Neither the name of the author nor the names of contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+from reportlab.lib.units import inch
+from common import Barcode
+import string
+
+# . 3 T Tracker
+# , 2 D Descender
+# ' 1 A Ascender
+# | 0 H Ascender/Descender
+
+_rm_patterns = {
+    "0" : "--||",   "1" : "-',|",   "2" : "-'|,",   "3" : "'-,|",
+    "4" : "'-|,",   "5" : "'',,",   "6" : "-,'|",   "7" : "-|-|",
+    "8" : "-|',",   "9" : "',-|",   "A" : "',',",   "B" : "'|-,",
+    "C" : "-,|'",   "D" : "-|,'",   "E" : "-||-",   "F" : "',,'",
+    "G" : "',|-",   "H" : "'|,-",   "I" : ",-'|",   "J" : ",'-|",
+    "K" : ",'',",   "L" : "|--|",   "M" : "|-',",   "N" : "|'-,",
+    "O" : ",-|'",   "P" : ",','",   "Q" : ",'|-",   "R" : "|-,'",
+    "S" : "|-|-",   "T" : "|',-",   "U" : ",,''",   "V" : ",|-'",
+    "W" : ",|'-",   "X" : "|,-'",   "Y" : "|,'-",   "Z" : "||--",
+
+    # start, stop
+    "(" : "'-,'",   ")" : "'|,|"
+}
+
+_ozN_patterns = {
+    "0" : "||",    "1" : "|'",    "2" : "|,",    "3" : "'|",    "4" : "''",
+    "5" : "',",    "6" : ",|",    "7" : ",'",    "8" : ",,",    "9" : ".|"
+}
+
+_ozC_patterns = {
+    "A" : "|||",    "B" : "||'",    "C" : "||,",    "D" : "|'|",
+    "E" : "|''",    "F" : "|',",    "G" : "|,|",    "H" : "|,'",
+    "I" : "|,,",    "J" : "'||",    "K" : "'|'",    "L" : "'|,",
+    "M" : "''|",    "N" : "'''",    "O" : "'',",    "P" : "',|",
+    "Q" : "','",    "R" : "',,",    "S" : ",||",    "T" : ",|'",
+    "U" : ",|,",    "V" : ",'|",    "W" : ",''",    "X" : ",',",
+    "Y" : ",,|",    "Z" : ",,'",    "a" : "|,.",    "b" : "|.|",
+    "c" : "|.'",    "d" : "|.,",    "e" : "|..",    "f" : "'|.",
+    "g" : "''.",    "h" : "',.",    "i" : "'.|",    "j" : "'.'",
+    "k" : "'.,",    "l" : "'..",    "m" : ",|.",    "n" : ",'.",
+    "o" : ",,.",    "p" : ",.|",    "q" : ",.'",    "r" : ",.,",
+    "s" : ",..",    "t" : ".|.",    "u" : ".'.",    "v" : ".,.",
+    "w" : "..|",    "x" : "..'",    "y" : "..,",    "z" : "...",
+    "0" : ",,,",    "1" : ".||",    "2" : ".|'",    "3" : ".|,",
+    "4" : ".'|",    "5" : ".''",    "6" : ".',",    "7" : ".,|",
+    "8" : ".,'",    "9" : ".,,",    " " : "||.",    "#" : "|'.",
+}
+
+#http://www.auspost.com.au/futurepost/
diff --git a/addons/auction/barcode/out.pdf b/addons/auction/barcode/out.pdf
new file mode 100644
index 00000000000..52fafaae499
Binary files /dev/null and b/addons/auction/barcode/out.pdf differ
diff --git a/addons/auction/barcode/test.py b/addons/auction/barcode/test.py
new file mode 100644
index 00000000000..5bbd508184d
--- /dev/null
+++ b/addons/auction/barcode/test.py
@@ -0,0 +1,55 @@
+#!/usr/pkg/bin/python
+from common import *
+from code39 import *
+from code93 import *
+from code128 import *
+from usps import *
+
+from reportlab.pdfgen.canvas import Canvas
+from reportlab.lib.styles import getSampleStyleSheet
+from reportlab.platypus import Paragraph, Frame
+from reportlab.platypus.flowables import XBox
+def run():
+    styles = getSampleStyleSheet()
+    styleN = styles['Normal']
+    styleH = styles['Heading1']
+    story = []
+
+    story.append(Paragraph('I2of5', styleN))
+    story.append(I2of5(1234, xdim = inch*0.02, checksum=0))
+    story.append(Paragraph('MSI', styleN))
+    story.append(MSI(1234, xdim = inch*0.02))
+    story.append(Paragraph('Codabar', styleN))
+    story.append(Codabar("A012345B", xdim = inch*0.02))
+    story.append(Paragraph('Code 11', styleN))
+    story.append(Code11("01234545634563"))
+    story.append(Paragraph('Code 39', styleN))
+    story.append(Standard39("A012345B%R"))
+    story.append(Paragraph('Extended Code 39', styleN))
+    story.append(Extended39("A012345B}"))
+    story.append(Paragraph('Code93', styleN))
+    story.append(Standard93("CODE 93"))
+    story.append(Paragraph('Extended Code93', styleN))
+    story.append(Extended93("L@@K! Code 93 :-)")) #, xdim=0.005 * inch))
+    story.append(Paragraph('Code 128', styleN))
+    c=Code128("AB-12345678") #, xdim=0.005 * inch)
+    #print 'WIDTH =', (c.width / inch), 'XDIM =', (c.xdim / inch)
+    #print 'LQ =', (c.lquiet / inch), 'RQ =', (c.rquiet / inch)
+    story.append(c)
+    story.append(Paragraph('USPS FIM', styleN))
+    story.append(FIM("A"))
+    story.append(Paragraph('USPS POSTNET', styleN))
+    story.append(POSTNET('78247-1043'))
+    story.append(Paragraph('Label Size', styleN))
+    story.append(XBox((2.0 + 5.0/8.0)*inch, 1 * inch, '1x2-5/8"'))
+    story.append(Paragraph('Label Size', styleN))
+    story.append(XBox((1.75)*inch, .5 * inch, '1/2x1-3/4"'))
+    c = Canvas('out.pdf')
+    f = Frame(inch, inch, 6*inch, 9*inch, showBoundary=1)
+    f.addFromList(story, c)
+    c.save()
+
+if __name__=='__main__':
+    run()
+
+    
\ No newline at end of file
diff --git a/addons/auction/barcode/usps.py b/addons/auction/barcode/usps.py
new file mode 100644
index 00000000000..193e22f68c9
--- /dev/null
+++ b/addons/auction/barcode/usps.py
@@ -0,0 +1,231 @@
+#
+# Copyright (c) 1996-2000 Tyler C. Sarna <tsarna@sarna.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed by Tyler C. Sarna.
+# 4. Neither the name of the author nor the names of contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+from reportlab.lib.units import inch
+from common import Barcode
+import string
+
+_fim_patterns = {
+    'A' : "||  |  ||",
+    'B' : "| || || |",
+    'C' : "|| | | ||",
+    'D' : "||| | |||",
+    # XXX There is an E.
+    # The below has been seen, but dunno if it is E or not:
+    # 'E' : '|||| ||||'
+}
+
+_postnet_patterns = {
+    '1' : "...||",    '2' : "..|.|",    '3' : "..||.",    '4' : ".|..|",
+    '5' : ".|.|.",    '6' : ".||..",    '7' : "|...|",    '8' : "|..|.",
+    '9' : "|.|..",    '0' : "||...",    'S' : "|",        
+}
+
+
+class FIM(Barcode):
+    """"
+    FIM (Facing ID Marks) encode only one letter.
+    There are currently four defined:
+
+    A   Courtesy reply mail with pre-printed POSTNET
+    B   Business reply mail without pre-printed POSTNET
+    C   Business reply mail with pre-printed POSTNET
+    D   OCR Readable mail without pre-printed POSTNET
+
+    Interleaved 2 of 5 is a numeric-only barcode.  It encodes an even
+    number of digits; if an odd number is given, a 0 is prepended.
+
+    Options that may be passed to constructor:
+
+        value (single character string from the set A - D. required.):
+            The value to encode.
+   
+        quiet (bool, default 1):
+            Wether to include quiet zones in the symbol.
+            
+    The following may also be passed, but doing so will generate nonstandard
+    symbols which should not be used. This is mainly documented here to
+    show the defaults:
+    
+        height (float, default 5/8 inch):
+            Height of the code. This might legitimately be overriden to make
+            a taller symbol that will 'bleed' off the edge of the paper,
+            leaving 5/8 inch remaining.
+            
+        lquiet (float, default 1/4 inch):
+            Quiet zone size to left of code, if quiet is true.
+            Default is the greater of .25 inch, or .15 times the symbol's
+            length.
+            
+        rquiet (float, default 15/32 inch):
+            Quiet zone size to right left of code, if quiet is true.
+
+    Sources of information on FIM:
+    
+    USPS Publication 25, A Guide to Business Mail Preparation
+    http://new.usps.com/cpim/ftp/pubs/pub25.pdf
+    """
+    
+    def __init__(self, value='', **args):
+        self.barwidth = inch * (1.0/32.0)
+        self.barspace = inch * (1.0/16.0)
+        self.height = inch * (5.0/8.0)
+        self.rquiet = inch * (0.25)
+        self.lquiet = inch * (15.0/32.0)
+        self.quiet = 0
+
+        for (k, v) in args.items():
+            setattr(self, k, v)
+
+        Barcode.__init__(self, value)
+
+    def validate(self):
+        self.valid = 1
+        self.validated = ''
+        for c in self.value:
+            if c in string.whitespace:
+                continue
+            elif c in "abcdABCD":
+                self.validated = self.validated + string.upper(c)
+            else:
+                self.valid = 0
+
+        if len(self.validated) != 1:
+            raise ValueError, "Input must be exactly one character"
+
+        return self.validated
+
+    def decompose(self):
+        self.decomposed = ''
+        for c in self.encoded:
+            self.decomposed = self.decomposed + _fim_patterns[c]
+
+        return self.decomposed
+
+    def computeSize(self):
+        self.width = (len(self.decomposed) - 1) * self.barspace + self.barwidth
+        if self.quiet:
+            self.xo = self.lquiet
+            self.width = self.lquiet + self.width + self.rquiet
+        else:
+            self.xo = 0.0
+
+    def draw(self):
+        left = self.xo
+        for c in self.decomposed:
+            if c == '|':
+                self.rect(left, 0.0, self.barwidth, self.height)
+            left = left + self.barspace
+
+
+class POSTNET(Barcode):
+    """"
+    POSTNET is used in the US to encode "zip codes" (postal codes) on
+    mail. It can encode 5, 9, or 11 digit codes. I've read that it's
+    pointless to do 5 digits, since USPS will just have to re-print
+    them with 9 or 11 digits.
+    
+    Sources of information on POSTNET:
+    
+    USPS Publication 25, A Guide to Business Mail Preparation
+    http://new.usps.com/cpim/ftp/pubs/pub25.pdf
+    """
+    
+    def __init__(self, value='', **args):
+        self.sbarheight = inch * 0.050
+        self.fbarheight = inch * 0.125
+        self.barwide = inch * 0.018
+        self.spacewide = inch * 0.0275
+       
+        for (k, v) in args.items():
+            setattr(self, k, v)
+
+        Barcode.__init__(self, value)
+
+    def validate(self):
+        self.validated = ''
+        self.valid = 1
+        count = 0
+        for c in self.value:
+            if c in (string.whitespace + '-'):
+                pass
+            elif c in string.digits:
+                count = count + 1
+                if count == 6:
+                    self.validated = self.validated + '-'
+                self.validated = self.validated + c
+            else:
+                self.valid = 0
+
+        if len(self.validated) not in [5, 10, 12]:
+            self.valid = 0
+
+        return self.validated
+
+    def encode(self):
+        self.encoded = "S"
+        check = 0
+        for c in self.validated:
+            if c in string.digits:
+                self.encoded = self.encoded + c
+                check = check + string.atoi(c)
+            elif c == '-':
+                pass
+            else:
+                raise ValueError, "Invalid character in input"
+        check = (10 - (check % 10)) % 10
+        self.encoded = self.encoded + `check` + 'S'
+        return self.encoded
+        
+    def decompose(self):
+        self.decomposed = ''
+        for c in self.encoded:
+            self.decomposed = self.decomposed + _postnet_patterns[c]
+        return self.decomposed
+
+    def computeSize(self):
+        self.width = len(self.decomposed) * self.barwide 
+        self.width = self.width + (len(self.decomposed) - 1) * self.spacewide
+        self.height = self.fbarheight
+        self.xo = 0.0
+
+    def draw(self):
+        sdown = self.fbarheight - self.sbarheight
+        left = self.xo
+        
+        for c in self.decomposed:
+            if c == '.':
+                h = self.sbarheight
+            else:
+                h = self.fbarheight
+            self.rect(left, 0.0, self.barwide, h)
+            left = left + self.barwide + self.spacewide
diff --git a/addons/auction/fr_FR.csv b/addons/auction/fr_FR.csv
new file mode 100644
index 00000000000..0321985db7a
--- /dev/null
+++ b/addons/auction/fr_FR.csv
@@ -0,0 +1,5141 @@
+type,name,res_id,src,value
+field,"account.account,close_method",0,Deferral Method,Report à nouveau
+field,"account.account,company_currency_id",0,Company Currency,Devise société
+field,"account.account,code",0,Code,N° de compte
+field,"account.account,tax_ids",0,Default Taxes,Taxes par défaut
+field,"account.account,name",0,Name,Nom
+model,"account.account,name",1,Minimal account chart,
+model,"account.account,name",7,PLAN COMPTABLE MINIMUM NORMALISE,
+model,"account.account,name",8,CLASSE 1,
+model,"account.account,name",9,CAPITAL,
+model,"account.account,name",10,Capital souscrit ou capital personnel,
+model,"account.account,name",11,Capital non amorti,
+model,"account.account,name",12,Capital amorti,
+model,"account.account,name",13,Capital non appelé,
+model,"account.account,name",14,Compte de l'exploitant,
+model,"account.account,name",15,Opérations courantes,
+model,"account.account,name",16,Impôts personnels,
+model,"account.account,name",17,Rémunérations et autres avantages,
+model,"account.account,name",18,PRIMES D'EMISSION,
+model,"account.account,name",19,PLUS-VALUES DE REEVALUATION,
+model,"account.account,name",20,Plus-values de réévaluation sur immobilisations incorporelles,
+model,"account.account,name",21,Plus-values de réévaluation,
+model,"account.account,name",22,Reprises de réductions de valeur,
+model,"account.account,name",23,Plus-values de réévaluation sur immobilisations corporelles,
+model,"account.account,name",24,Plus-values de réévaluation,
+model,"account.account,name",25,Reprises de réductions de valeur,
+model,"account.account,name",26,Plus-values de réévaluation sur immobilisations financières,
+model,"account.account,name",27,Plus-values de réévaluation,
+model,"account.account,name",28,Reprises de réductions de valeur,
+model,"account.account,name",29,Plus-values de réévaluation sur stocks,
+model,"account.account,name",30,Reprises de réductions de valeur sur placements de trésorerie,
+model,"account.account,name",31,RESERVES,
+model,"account.account,name",32,Réserve légale,
+model,"account.account,name",33,Réserves indisponibles,
+model,"account.account,name",34,Réserve pour actions propres,
+model,"account.account,name",35,Autres réserves indisponibles,
+model,"account.account,name",36,Réserves immunisées,
+model,"account.account,name",37,Réserves disponibles,
+model,"account.account,name",38,Réserve pour régularisation de dividendes,
+model,"account.account,name",39,Réserve pour renouvellement des immobilisations,
+model,"account.account,name",40,Réserve pour installations en faveur du personnel  1333 Réserves libres,
+model,"account.account,name",41,BENEFICE REPORTE,
+model,"account.account,name",42,SUBSIDES EN CAPITAL,
+model,"account.account,name",43,Montants obtenus,
+model,"account.account,name",44,Montants transférés aux résultats,
+model,"account.account,name",45,PROVISIONS POUR RISQUES ET CHARGES,
+model,"account.account,name",46,Provisions pour pensions et obligations similaires,
+model,"account.account,name",47,Provisions pour charges fiscales,
+model,"account.account,name",48,Provisions pour grosses réparations et gros entretiens,
+model,"account.account,name",49,à 169 Provisions pour autres risques et charges,
+model,"account.account,name",50,Provisions pour sûretés personnelles ou réelles constituées à l'appui de dettes et d'engagements de tiers,
+model,"account.account,name",51,Provisions pour engagements relatifs à l'acquisition ou à la cession d'immobilisations,
+model,"account.account,name",52,Provisions pour exécution de commandes passées ou reçues,
+model,"account.account,name",53,Provisions pour positions et marchés à terme en devises ou positions et marchés à terme en marchandises,
+model,"account.account,name",54,Provisions pour garanties techniques attachées aux ventes et prestations déjà effectuées par l'entreprise,
+model,"account.account,name",55,Provisions pour autres risques et charges,
+model,"account.account,name",56,Pour litiges en cours,
+model,"account.account,name",57,"Pour amendes, doubles droits, pénalités",
+model,"account.account,name",58,Pour propre assureur,
+model,"account.account,name",59,Pour risques inhérents aux opérations de crédits à moyen ou long terme,
+model,"account.account,name",60,Provision pour charge de liquidation,
+model,"account.account,name",61,Provision pour départ de personnel,
+model,"account.account,name",62,Pour risques divers ,
+model,"account.account,name",63,DETTES A PLUS D'UN AN,
+model,"account.account,name",64,Emprunts subordonnés,
+model,"account.account,name",65,Convertibles,
+model,"account.account,name",66,Non convertibles,
+model,"account.account,name",67,Emprunts obligataires non subordonnés,
+model,"account.account,name",68,Convertibles,
+model,"account.account,name",69,Non convertibles,
+model,"account.account,name",70,Dettes de location-financement et assimilés,
+model,"account.account,name",71,Dettes de location-financement de biens immobiliers,
+model,"account.account,name",72,Dettes de location-financement de biens mobiliers,
+model,"account.account,name",73,Dettes sur droits réels sur immeubles,
+model,"account.account,name",74,Etablissements de crédit,
+model,"account.account,name",75,Dettes en compte,
+model,"account.account,name",76,Banque A,
+model,"account.account,name",77,Banque B,
+model,"account.account,name",78,Promesses,
+model,"account.account,name",79,Banque A,
+model,"account.account,name",80,Banque B,
+model,"account.account,name",81,Crédits d'acceptation,
+model,"account.account,name",82,Banque A,
+model,"account.account,name",83,Banque B,
+model,"account.account,name",84,Autres emprunts,
+model,"account.account,name",85,Dettes commerciales,
+model,"account.account,name",86,Fournisseurs : dettes en compte,
+model,"account.account,name",87,Entreprises apparentées,
+model,"account.account,name",88,Entreprises liées,
+model,"account.account,name",89,Entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",90,Fournisseurs ordinaires,
+model,"account.account,name",91,Fournisseurs belges,
+model,"account.account,name",92,Fournisseurs C.E.E.,
+model,"account.account,name",93,Fournisseurs importation,
+model,"account.account,name",94,Effets à payer,
+model,"account.account,name",95,Entreprises apparentées,
+model,"account.account,name",96,Entreprises liées,
+model,"account.account,name",97,Entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",98,Fournisseurs ordinaires,
+model,"account.account,name",99,Fournisseurs belges,
+model,"account.account,name",100,Fournisseurs C.E.E.,
+model,"account.account,name",101,Fournisseurs importation,
+model,"account.account,name",102,Acomptes reçus sur commandes,
+model,"account.account,name",103,Cautionnements reçus en numéraires,
+model,"account.account,name",104,Dettes diverses,
+model,"account.account,name",105,Entreprises liées,
+model,"account.account,name",106,Autres entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",107,"Administrateurs, gérants, associés",
+model,"account.account,name",108,Rentes viagères capitalisées,
+model,"account.account,name",109,Dettes envers les coparticipants des associations momentanées et en participation,
+model,"account.account,name",110,Autres dettes diverses,
+model,"account.account,name",111,COMPTES DE LIAISON DES ETABLISSEMENTS ET SUCCURSALES,
+model,"account.account,name",112,CLASSE 2. FRAIS D'ETABLISSEMENT. ACTIFS IMMOBILISES ET CREANCES A PLUS D'UN AN,
+model,"account.account,name",113,FRAIS D'ETABLISSEMENT,
+model,"account.account,name",114,Frais de constitution et d'augmentation de capital,
+model,"account.account,name",115,Frais de constitution et d'augmentation de capital,
+model,"account.account,name",116,Amortissements sur frais de constitution et d'augmentation de capital,
+model,"account.account,name",117,Frais d'émission d'emprunts et primes de remboursement,
+model,"account.account,name",118,Agios sur emprunts et frais d'émission d'emprunts,
+model,"account.account,name",119,Amortissements sur agios sur emprunts et frais d'émission d'emprunts,
+model,"account.account,name",120,Autres frais d'établissement,
+model,"account.account,name",121,Autres frais d'établissement,
+model,"account.account,name",122,Amortissements sur autres frais d'établissement,
+model,"account.account,name",123,Intérêts intercalaires,
+model,"account.account,name",124,Intérêts intercalaires,
+model,"account.account,name",125,Amortissements sur intérêts intercalaires,
+model,"account.account,name",126,Frais de restructuration,
+model,"account.account,name",127,Coût des frais de restructuration,
+model,"account.account,name",128,Amortissements sur frais de restructuration,
+model,"account.account,name",129,IMMOBILISATIONS INCORPORELLES,
+model,"account.account,name",130,Frais de recherche et de développement,
+model,"account.account,name",131,Frais de recherche et de mise au point,
+model,"account.account,name",132,Plus-values actées sur frais de recherche et de mise au point,
+model,"account.account,name",133,Amortissements sur frais de recherche et de mise au point,
+model,"account.account,name",134,"Concessions, brevets, licences, savoir-faire, marques et droits similaires",
+model,"account.account,name",135,"Concessions, brevets, licences, savoir-faire, marques, etc...",
+model,"account.account,name",136,"Plus-values actées sur concessions, brevets, etc...",
+model,"account.account,name",137,"Amortissements sur concessions, brevets, etc...",
+model,"account.account,name",138,Goodwill,
+model,"account.account,name",139,Coût d'acquisition,
+model,"account.account,name",140,Plus-values actées,
+model,"account.account,name",141,Amortissements sur goodwill,
+model,"account.account,name",142,Acomptes versés,
+model,"account.account,name",143,TERRAINS ET CONSTRUCTIONS,
+model,"account.account,name",144,Terrains,
+model,"account.account,name",145,Terrains,
+model,"account.account,name",146,Frais d'acquisition sur terrains,
+model,"account.account,name",147,Plus-values actées sur terrains,
+model,"account.account,name",148,Amortissements et réductions de valeur,
+model,"account.account,name",149,Amortissements sur frais d'acquisition,
+model,"account.account,name",150,Réductions de valeur sur terrains,
+model,"account.account,name",151,Constructions,
+model,"account.account,name",152,Bâtiments industriels,
+model,"account.account,name",153,Bâtiments administratifs et commerciaux,
+model,"account.account,name",154,Autres bâtiments d'exploitation,
+model,"account.account,name",155,Voies de transport et ouvrages d'art,
+model,"account.account,name",156,Constructions sur sol d'autrui,
+model,"account.account,name",157,Frais d'acquisition sur constructions,
+model,"account.account,name",158,Plus-values actées,
+model,"account.account,name",159,Sur bâtiments industriels,
+model,"account.account,name",160,Sur bâtiments administratifs et commerciaux,
+model,"account.account,name",161,Sur autres bâtiments d'exploitation,
+model,"account.account,name",162,Sur voies de transport et ouvrages d'art,
+model,"account.account,name",163,Amortissements sur constructions,
+model,"account.account,name",164,Sur bâtiments industriels,
+model,"account.account,name",165,Sur bâtiments administratifs et commerciaux,
+model,"account.account,name",166,Sur autres bâtiments d'exploitation,
+model,"account.account,name",167,Sur voies de transport et ouvrages d'art,
+model,"account.account,name",168,Sur constructions sur sol d'autrui,
+model,"account.account,name",169,Sur frais d'acquisition sur constructions,
+model,"account.account,name",170,Terrains bâtis,
+model,"account.account,name",171,Valeur d'acquisition,
+model,"account.account,name",172,Bâtiments industriels,
+model,"account.account,name",173,Bâtiments administratifs et commerciaux,
+model,"account.account,name",174,Autres bâtiments d'exploitation,
+model,"account.account,name",175,Voies de transport et ouvrages d'art,
+model,"account.account,name",176,Frais d'acquisition des terrains à bâtir,
+model,"account.account,name",177,Plus-values actées,
+model,"account.account,name",178,Sur bâtiments industriels	,
+model,"account.account,name",179,Sur bâtiments administratifs et commerciaux,
+model,"account.account,name",180,Sur autres bâtiments d'exploitation,
+model,"account.account,name",181,Sur voies de transport et ouvrages d'art,
+model,"account.account,name",182,Amortissements sur terrains bâtis,
+model,"account.account,name",183,Sur bâtiments industriels,
+model,"account.account,name",184,Sur bâtiments administratifs et commerciaux,
+model,"account.account,name",185,Sur autres bâtiments d'exploitation,
+model,"account.account,name",186,Sur voies de transport et ouvrages d'art,
+model,"account.account,name",187,Sur frais d'acquisition des terrains bâtis,
+model,"account.account,name",188,Autres droits réels sur des immeubles,
+model,"account.account,name",189,Valeur d'acquisition,
+model,"account.account,name",190,Plus-values actées,
+model,"account.account,name",191,Amortissements,
+model,"account.account,name",192,"INSTALLATIONS, MACHINES ET OUTILLAGE",
+model,"account.account,name",193,Installations,
+model,"account.account,name",194,Installation d'eau,
+model,"account.account,name",195,Installation d'électricité,
+model,"account.account,name",196,Installation de vapeur,
+model,"account.account,name",197,Installation de gaz,
+model,"account.account,name",198,Installation de chauffage,
+model,"account.account,name",199,Installation de conditionnement d'air,
+model,"account.account,name",200,Installation de chargement,
+model,"account.account,name",201,Machines,
+model,"account.account,name",202,Division A,
+model,"account.account,name",203,Division B,
+model,"account.account,name",204,Outillage,
+model,"account.account,name",205,Division A,
+model,"account.account,name",206,Division B,
+model,"account.account,name",207,Plus-values actées,
+model,"account.account,name",208,Sur installations,
+model,"account.account,name",209,Sur machines,
+model,"account.account,name",210,Sur outillage,
+model,"account.account,name",211,Amortissements,
+model,"account.account,name",212,Sur installations,
+model,"account.account,name",213,Sur machines,
+model,"account.account,name",214,Sur outillage,
+model,"account.account,name",215,MOBILIER ET MATERIEL ROULANT,
+model,"account.account,name",216,Mobilier,
+model,"account.account,name",217,Mobilier,
+model,"account.account,name",218,Mobilier des bâtiments industriels,
+model,"account.account,name",219,Mobilier des bâtiments administratifs et commerciaux,
+model,"account.account,name",220,Mobilier des autres bâtiments d'exploitation,
+model,"account.account,name",221,Mobilier oeuvres sociales,
+model,"account.account,name",222,Matériel de bureau et de service social,
+model,"account.account,name",223,Des bâtiments industriels,
+model,"account.account,name",224,Des bâtiments administratifs et commerciaux,
+model,"account.account,name",225,Des autres bâtiments d'exploitation,
+model,"account.account,name",226,Des oeuvres sociales,
+model,"account.account,name",227,Plus-values actées,
+model,"account.account,name",228,Plus-values actées sur mobilier,
+model,"account.account,name",229,Plus-values actées sur matériel de bureau et service social,
+model,"account.account,name",230,Amortissements,
+model,"account.account,name",231,Amortissements sur mobilier,
+model,"account.account,name",232,Amortissements sur matériel de bureau et service social,
+model,"account.account,name",233,Matériel roulant,
+model,"account.account,name",234,Matériel automobile,
+model,"account.account,name",235,Voitures,
+model,"account.account,name",236,Camions,
+model,"account.account,name",237,Matériel ferroviaire,
+model,"account.account,name",238,Matériel fluvial,
+model,"account.account,name",239,Matériel naval,
+model,"account.account,name",240,Matériel aérien,
+model,"account.account,name",241,Plus-values sur matériel roulant,
+model,"account.account,name",242,Plus-values sur matériel automobile,
+model,"account.account,name",243,Idem sur matériel ferroviaire,
+model,"account.account,name",244,Idem sur matériel fluvial,
+model,"account.account,name",245,Idem sur matériel naval,
+model,"account.account,name",246,Idem sur matériel aérien,
+model,"account.account,name",247,Amortissements sur matériel roulant,
+model,"account.account,name",248,Amortissements sur matériel automobile,
+model,"account.account,name",249,Idem sur matériel ferroviaire,
+model,"account.account,name",250,Idem sur matériel fluvial,
+model,"account.account,name",251,Idem sur matériel naval,
+model,"account.account,name",252,Idem sur matériel aérien,
+model,"account.account,name",253,IMMOBILISATION DETENUES EN LOCATION-FINANCEMENT ET DROITS SIMILAIRES,
+model,"account.account,name",254,Terrains et constructions,
+model,"account.account,name",255,Terrains,
+model,"account.account,name",256,Constructions,
+model,"account.account,name",257,"Plus-values sur emphytéose, leasing et droits similaires : terrains et constructions",
+model,"account.account,name",258,Amortissements et réductions de valeur sur terrains et constructions en leasing,
+model,"account.account,name",259,"Installations, machines et outillage",
+model,"account.account,name",260,Installations,
+model,"account.account,name",261,Machines,
+model,"account.account,name",262,Outillage,
+model,"account.account,name",263,"Plus-values actées sur installations, machines et outillage pris en leasing",
+model,"account.account,name",264,"Amortissements sur installations, machines et outillage pris en leasing",
+model,"account.account,name",265,Mobilier et matériel roulant,
+model,"account.account,name",266,Mobilier,
+model,"account.account,name",267,Matériel roulant,
+model,"account.account,name",268,Plus-values actées sur mobilier et matériel roulant en leasing,
+model,"account.account,name",269,Amortissements sur mobilier et matériel roulant en leasing,
+model,"account.account,name",270,AUTRES IMMOBILISATIONS CORPORELLES,
+model,"account.account,name",271,Frais d'aménagements de locaux pris en location,
+model,"account.account,name",272,Maison d'habitation,
+model,"account.account,name",273,Réserve immobilière,
+model,"account.account,name",274,Matériel d'emballage,
+model,"account.account,name",275,Emballages récupérables,
+model,"account.account,name",276,Plus-values actées sur autres immobilisations corporelles,
+model,"account.account,name",277,Amortissements sur autres immobilisations corporelles,
+model,"account.account,name",278,Amortissements sur frais d'aménagement des locaux pris en location,
+model,"account.account,name",279,Amortissements sur maison d'habitation,
+model,"account.account,name",280,Amortissements sur réserve immobilière,
+model,"account.account,name",281,Amortissements sur matériel d'emballage,
+model,"account.account,name",282,Amortissements sur emballages récupérables,
+model,"account.account,name",283,IMMOBILISATIONS CORPORELLES EN COURS ET ACOMPTES VERSES,
+model,"account.account,name",284,Immobilisations en cours,
+model,"account.account,name",285,Constructions,
+model,"account.account,name",286,"Installations, machines et outillage",
+model,"account.account,name",287,Mobilier et matériel roulant,
+model,"account.account,name",288,Autres immobilisations corporelles,
+model,"account.account,name",289,Avances et acomptes versés sur immobilisations en cours,
+model,"account.account,name",290,IMMOBILISATIONS FINANCIERES,
+model,"account.account,name",291,Participations dans des entreprises liées,
+model,"account.account,name",292,Valeur d'acquisition,
+model,"account.account,name",293,Montants non appelés,
+model,"account.account,name",294,Plus-values actées,
+model,"account.account,name",295,Réductions de valeurs actées,
+model,"account.account,name",296,Créances sur des entreprises liées,
+model,"account.account,name",297,Créances en compte,
+model,"account.account,name",298,Effets à recevoir,
+model,"account.account,name",299,Titres à revenu fixes,
+model,"account.account,name",300,Créances douteuses,
+model,"account.account,name",301,Réductions de valeurs actées,
+model,"account.account,name",302,Participations dans des entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",303,Valeur d'acquisition,
+model,"account.account,name",304,Montants non appelés,
+model,"account.account,name",305,Plus-values actées,
+model,"account.account,name",306,Réductions de valeurs actées,
+model,"account.account,name",307,Créances sur des entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",308,Créances en compte,
+model,"account.account,name",309,Effets à recevoir,
+model,"account.account,name",310,Titres à revenu fixe,
+model,"account.account,name",311,Créances douteuses,
+model,"account.account,name",312,Réductions de valeurs actées,
+model,"account.account,name",313,Autres actions et parts,
+model,"account.account,name",314,Valeur d'acquisition,
+model,"account.account,name",315,Montants non appelés,
+model,"account.account,name",316,Plus-values actées,
+model,"account.account,name",317,Réductions de valeur actées,
+model,"account.account,name",318,Autres créances,
+model,"account.account,name",319,Créances en compte,
+model,"account.account,name",320,Effets à recevoir,
+model,"account.account,name",321,Titres à revenu fixe,
+model,"account.account,name",322,Créances douteuses,
+model,"account.account,name",323,Réductions de valeur actées,
+model,"account.account,name",324,Cautionnements versés en numéraires,
+model,"account.account,name",325,"Téléphone, télefax, télex",
+model,"account.account,name",326,Gaz,
+model,"account.account,name",327,Eau,
+model,"account.account,name",328,Electricité,
+model,"account.account,name",329,Autres cautionnements versés en numéraires,
+model,"account.account,name",330,CREANCES A PLUS D'UN AN,
+model,"account.account,name",331,Créances commerciales,
+model,"account.account,name",332,Clients,
+model,"account.account,name",333,Créances en compte sur entreprises liées,
+model,"account.account,name",334,Sur entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",335,Sur clients Belgique,
+model,"account.account,name",336,Sur clients C.E.E.,
+model,"account.account,name",337,Sur clients exportation hors C.E.E.,
+model,"account.account,name",338,Créances sur les coparticipants,
+model,"account.account,name",339,Effets à recevoir,
+model,"account.account,name",340,Sur entreprises liées,
+model,"account.account,name",341,Sur entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",342,Sur clients Belgique,
+model,"account.account,name",343,Sur clients C.E.E.,
+model,"account.account,name",344,Sur clients exportation hors C.E.E.,
+model,"account.account,name",345,Retenues sur garanties,
+model,"account.account,name",346,Acomptes versés,
+model,"account.account,name",347,Créances douteuses,
+model,"account.account,name",348,Réductions de valeur actées,
+model,"account.account,name",349,Autres créances,
+model,"account.account,name",350,Créances en compte,
+model,"account.account,name",351,Créances entreprises liées,
+model,"account.account,name",352,Créances entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",353,Créances autres débiteurs,
+model,"account.account,name",354,Effets à recevoir,
+model,"account.account,name",355,Sur entreprises liées,
+model,"account.account,name",356,Sur entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",357,Sur autres débiteurs,
+model,"account.account,name",358,Créances résultant de la cession d'immobilisations données en leasing,
+model,"account.account,name",359,Créances douteuses,
+model,"account.account,name",360,Réductions de valeur actées,
+model,"account.account,name",361,CLASSE 3. STOCK ET COMMANDES EN COURS D'EXECUTION,
+model,"account.account,name",362,APPROVISIONNEMENTS - MATIERES PREMIERES,
+model,"account.account,name",363,Valeur d'acquisition,
+model,"account.account,name",364,Réductions de valeur actées,
+model,"account.account,name",365,APPROVISIONNEMENTS ET FOURNITURES,
+model,"account.account,name",366,Valeur d'acquisition,
+model,"account.account,name",367,Matières d'approvisionnement,
+model,"account.account,name",368,"Energie, charbon, coke, Mazout, essence, propane",
+model,"account.account,name",369,Produits d'entretien,
+model,"account.account,name",370,Fournitures diverses et petit outillage,
+model,"account.account,name",371,Imprimés et fournitures de bureau,
+model,"account.account,name",372,Fournitures de services sociaux,
+model,"account.account,name",373,Emballages commerciaux,
+model,"account.account,name",374,Emballages perdus,
+model,"account.account,name",375,Emballages récupérables,
+model,"account.account,name",376,Réductions de valeur actées,
+model,"account.account,name",377,EN COURS DE FABRICATION,
+model,"account.account,name",378,Valeur d'acquisition,
+model,"account.account,name",379,Produits semi-ouvrés,
+model,"account.account,name",380,Produits en cours de fabrication,
+model,"account.account,name",381,Travaux en cours,
+model,"account.account,name",382,Déchets,
+model,"account.account,name",383,Rebuts,
+model,"account.account,name",384,Travaux en association momentanée,
+model,"account.account,name",385,Réductions de valeur actées,
+model,"account.account,name",386,PRODUITS FINIS,
+model,"account.account,name",387,Valeur d'acquisition,
+model,"account.account,name",388,Produits finis,
+model,"account.account,name",389,Réductions de valeur actées,
+model,"account.account,name",390,MARCHANDISES,
+model,"account.account,name",391,Valeur d'acquisition,
+model,"account.account,name",392,Groupe A,
+model,"account.account,name",393,Groupe B,
+model,"account.account,name",394,Réductions de valeur actées,
+model,"account.account,name",395,IMMEUBLES DESTINES A LA VENTE,
+model,"account.account,name",396,Valeur d'acquisition,
+model,"account.account,name",397,Immeuble A,
+model,"account.account,name",398,Immeuble B,
+model,"account.account,name",399,Immeubles construits en vue de leur revente,
+model,"account.account,name",400,Immeuble A,
+model,"account.account,name",401,Immeuble B,
+model,"account.account,name",402,Réductions de valeurs actées,
+model,"account.account,name",403,ACOMPTES VERSES SUR ACHATS POUR STOCKS,
+model,"account.account,name",404,Acomptes versés,
+model,"account.account,name",405,Réductions de valeur actées,
+model,"account.account,name",406,COMMANDES EN COURS D'EXECUTION,
+model,"account.account,name",407,Valeur d'acquisition,
+model,"account.account,name",408,Bénéfice pris en compte,
+model,"account.account,name",409,Réductions de valeur actées,
+model,"account.account,name",410,CLASSE 4. CREANCES ET DETTES A UN AN AU PLUS,
+model,"account.account,name",2,Main Receivable,
+model,"account.account,name",411,CREANCES COMMERCIALES,
+model,"account.account,name",412,Clients,
+model,"account.account,name",413,"Rabais, remises, ristournes à accorder et autres notes de crédit à établir",
+model,"account.account,name",414,Créances résultant de livraisons de biens,
+model,"account.account,name",415,Effets à recevoir,
+model,"account.account,name",416,Effets à recevoir,
+model,"account.account,name",417,Effets à l'encaissement,
+model,"account.account,name",418,Effets à l'escompte,
+model,"account.account,name",419,"Clients, créances courantes, entreprises apparentées, administrateurs et gérants",
+model,"account.account,name",420,Entreprises liées,
+model,"account.account,name",421,Autres entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",422,Administrateurs et gérants d'entreprise,
+model,"account.account,name",423,Effets à recevoir sur entreprises apparentées et administrateurs et gérants,
+model,"account.account,name",424,Entreprises liées,
+model,"account.account,name",425,Autres entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",426,Administrateurs et gérants de l'entreprise,
+model,"account.account,name",427,Produits à recevoir,
+model,"account.account,name",428,Clients : retenues sur garanties,
+model,"account.account,name",429,Acomptes versés,
+model,"account.account,name",430,Créances douteuses,
+model,"account.account,name",431,Compensation clients,
+model,"account.account,name",432,Réductions de valeur actées,
+model,"account.account,name",433,AUTRES CREANCES,
+model,"account.account,name",434,"Capital appelé, non versé",
+model,"account.account,name",435,Appels de fonds,
+model,"account.account,name",436,Actionnaires défaillants,
+model,"account.account,name",437,T.V.A. à récupérer,
+model,"account.account,name",438,T.V.A. due,
+model,"account.account,name",439,T.V.A. due 0%,
+model,"account.account,name",440,T.V.A. due 6%,
+model,"account.account,name",441,T.V.A. due 12%,
+model,"account.account,name",442,T.V.A. due 21%,
+model,"account.account,name",443,T.V.A. déductible,
+model,"account.account,name",444,Compte courant administration T.V.A.,
+model,"account.account,name",445,Taxe d'égalisation due,
+model,"account.account,name",446,Impôts et versements fiscaux à récupérer,
+model,"account.account,name",447,à 4124 Impôts belges sur le résultat,
+model,"account.account,name",448,à 4127 Autres impôts belges,
+model,"account.account,name",449,Impôts étrangers,
+model,"account.account,name",450,Produits à recevoir,
+model,"account.account,name",451,Créances diverses,
+model,"account.account,name",452,Associés,
+model,"account.account,name",453,Avances et prêts au personnel,
+model,"account.account,name",454,Compte courant des associés en S.P.R.L.,
+model,"account.account,name",455,Compte courant des administrateurs et gérants,
+model,"account.account,name",456,Créances sur sociétés apparentées,
+model,"account.account,name",457,Emballages et matériel à rendre,
+model,"account.account,name",458,Etat et établissements publics,
+model,"account.account,name",459,Subsides à recevoir,
+model,"account.account,name",460,Autres créances,
+model,"account.account,name",461,"Rabais, ristournes, remises à obtenir et autres avoirs non encore reçus",
+model,"account.account,name",462,Créances douteuses,
+model,"account.account,name",463,Cautionnements versés en numéraires,
+model,"account.account,name",464,Réductions de valeur actées,
+model,"account.account,name",465,DETTES A PLUS D'UN AN ECHEANT DANS L'ANNEE,
+model,"account.account,name",466,Emprunts subordonnés,
+model,"account.account,name",467,Convertibles,
+model,"account.account,name",468,Non convertibles,
+model,"account.account,name",469,Emprunts obligataires non subordonnés,
+model,"account.account,name",470,Convertibles,
+model,"account.account,name",471,Non convertibles,
+model,"account.account,name",472,Dettes de location-financement et assimilées,
+model,"account.account,name",473,Financement de biens immobiliers,
+model,"account.account,name",474,Financement de biens mobiliers,
+model,"account.account,name",475,Etablissements de crédit,
+model,"account.account,name",476,Dettes en compte,
+model,"account.account,name",477,Promesses,
+model,"account.account,name",478,Crédits d'acceptation,
+model,"account.account,name",479,Autres emprunts,
+model,"account.account,name",480,Dettes commerciales,
+model,"account.account,name",481,Fournisseurs,
+model,"account.account,name",482,Effets à payer,
+model,"account.account,name",483,Cautionnements reçus en numéraires,
+model,"account.account,name",484,Dettes diverses,
+model,"account.account,name",485,Entreprises liées,
+model,"account.account,name",486,Entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",487,"Administrateurs, gérants, associés",
+model,"account.account,name",488,Autres dettes,
+model,"account.account,name",489,DETTES FINANCIERES,
+model,"account.account,name",490,Etablissements de crédit. Emprunts en compte à terme fixe,
+model,"account.account,name",491,Etablissements de crédit. Promesses,
+model,"account.account,name",492,Etablissements de crédit. Crédits d'acceptation,
+model,"account.account,name",493,Etablissements de crédit. Dettes en compte courant,
+model,"account.account,name",494,Autres emprunts,
+model,"account.account,name",495,DETTES COMMERCIALES,
+model,"account.account,name",3,Main Payable,
+model,"account.account,name",496,Fournisseurs,
+model,"account.account,name",497,Entreprises apparentées,
+model,"account.account,name",498,Entreprises liées,
+model,"account.account,name",499,Entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",500,Fournisseurs ordinaires,
+model,"account.account,name",501,Fournisseurs belges,
+model,"account.account,name",502,Fournisseurs CEE,
+model,"account.account,name",503,Fournisseurs importation,
+model,"account.account,name",504,Dettes envers les coparticipants,
+model,"account.account,name",505,Fournisseurs - retenues de garanties,
+model,"account.account,name",506,Effets à payer,
+model,"account.account,name",507,Entreprises apparentées,
+model,"account.account,name",508,Entreprises liées,
+model,"account.account,name",509,Entreprises avec lesquelles il existe un lien de participation,
+model,"account.account,name",510,Fournisseurs ordinaires,
+model,"account.account,name",511,Fournisseurs belges,
+model,"account.account,name",512,Fournisseurs CEE,
+model,"account.account,name",513,Fournisseurs importation,
+model,"account.account,name",514,Factures à recevoir,
+model,"account.account,name",515,Acomptes reçus,
+model,"account.account,name",516,Compensations fournisseurs,
+model,"account.account,name",517,"DETTES FISCALES, SALARIALES ET SOCIALES",
+model,"account.account,name",518,Dettes fiscales estimées,
+model,"account.account,name",519,à 4504 Impôts sur le résultat,
+model,"account.account,name",520,à 4507 Autres impôts en Belgique,
+model,"account.account,name",521,Impôts à l'étranger,
+model,"account.account,name",522,T.V.A. à payer,
+model,"account.account,name",523,T.V.A. due,
+model,"account.account,name",524,T.V.A. due 0%,
+model,"account.account,name",525,T.V.A. due 6%,
+model,"account.account,name",526,T.V.A. due 12%,
+model,"account.account,name",527,T.V.A. due 21%,
+model,"account.account,name",528,T.V.A. déductible,
+model,"account.account,name",529,Compte courant administration T.V.A.,
+model,"account.account,name",530,Taxe d'égalisation due,
+model,"account.account,name",531,Impôts et taxes à payer,
+model,"account.account,name",532,Autres impôts sur le résultat,
+model,"account.account,name",533,Autres impôts et taxes en Belgique,
+model,"account.account,name",534,Précompte immobilier,
+model,"account.account,name",535,Impôts communaux à payer,
+model,"account.account,name",536,Impôts provinciaux à payer,
+model,"account.account,name",537,Autres impôts et taxes à payer,
+model,"account.account,name",538,Impôts et taxes à l'étranger,
+model,"account.account,name",539,Précomptes retenus,
+model,"account.account,name",540,Précompte professionnel retenu sur rémunérations,
+model,"account.account,name",541,Précompte professionnel retenu sur tantièmes,
+model,"account.account,name",542,Précompte mobilier retenu sur dividendes attribués,
+model,"account.account,name",543,Précompte mobilier retenu sur intérêts payés,
+model,"account.account,name",544,Autres précomptes retenus,
+model,"account.account,name",545,Office National de la Sécurité Sociale,
+model,"account.account,name",546,Arriérés,
+model,"account.account,name",547,1er trimestre,
+model,"account.account,name",548,2ème trimestre,
+model,"account.account,name",549,3ème trimestre,
+model,"account.account,name",550,4ème trimestre,
+model,"account.account,name",551,Rémunérations,
+model,"account.account,name",552,"Administrateurs, gérants et commissaires",
+model,"account.account,name",553,Direction,
+model,"account.account,name",554,Employés,
+model,"account.account,name",555,Ouvriers,
+model,"account.account,name",556,Pécules de vacances,
+model,"account.account,name",557,Direction,
+model,"account.account,name",558,Employés,
+model,"account.account,name",559,Ouvriers,
+model,"account.account,name",560,Autres dettes sociales,
+model,"account.account,name",561,Provision pour gratifications de fin d'année,
+model,"account.account,name",562,Départs de personnel,
+model,"account.account,name",563,Oppositions sur rémunérations,
+model,"account.account,name",564,Assurances relatives au personnel,
+model,"account.account,name",565,Assurance loi,
+model,"account.account,name",566,Assurance salaire garanti ,
+model,"account.account,name",567,Assurance groupe ,
+model,"account.account,name",568,Assurances individuelles,
+model,"account.account,name",569,Caisse d'assurances sociales pour travailleurs indépendants,
+model,"account.account,name",570,Dettes et provisions sociales diverses,
+model,"account.account,name",571,ACOMPTES RECUS SUR COMMANDES,
+model,"account.account,name",572,DETTES DECOULANT DE L'AFFECTATION DES RESULTATS,
+model,"account.account,name",573,Dividendes et tantièmes d'exercices antérieurs,
+model,"account.account,name",574,Dividendes de l'exercice,
+model,"account.account,name",575,Tantièmes de l'exercice,
+model,"account.account,name",576,Autres allocataires,
+model,"account.account,name",577,DETTES DIVERSES,
+model,"account.account,name",578,Obligations et coupons échus,
+model,"account.account,name",579,Actionnaires - capital à rembourser,
+model,"account.account,name",580,Participation du personnel à payer,
+model,"account.account,name",581,Acomptes reçus d'autres tiers à moins d'un an,
+model,"account.account,name",582,Emballages et matériel consignés,
+model,"account.account,name",583,Cautionnements reçus en numéraires,
+model,"account.account,name",584,Autres dettes diverses,
+model,"account.account,name",585,COMPTES DE REGULARISATION ET COMPTES D'ATTENTE,
+model,"account.account,name",586,Charges à reporter,
+model,"account.account,name",587,Produits acquis,
+model,"account.account,name",588,Produits d'exploitation,
+model,"account.account,name",589,"Ristournes, rabais à obtenir",
+model,"account.account,name",590,Commissions à obtenir,
+model,"account.account,name",591,Autres produits d'exploitation,
+model,"account.account,name",592,Produits financiers,
+model,"account.account,name",593,Intérêts courus et non échus sur prêts et débits,
+model,"account.account,name",594,Autres produits financiers,
+model,"account.account,name",595,Charges à imputer,
+model,"account.account,name",596,Produits à reporter,
+model,"account.account,name",597,Produits d'exploitation à reporter,
+model,"account.account,name",598,Produits financiers à reporter,
+model,"account.account,name",599,Comptes d'attente,
+model,"account.account,name",600,Compte d'attente,
+model,"account.account,name",601,Compte de répartition périodique des charges,
+model,"account.account,name",602,Transferts d'exercice,
+model,"account.account,name",603,CLASSE 5. PLACEMENTS DE TRESORERIE ET DE VALEURS DISPONIBLES,
+model,"account.account,name",604,ACTIONS PROPRES,
+model,"account.account,name",605,ACTIONS ET PARTS,
+model,"account.account,name",606,Valeur d'acquisition,
+model,"account.account,name",607,Montants non appelés,
+model,"account.account,name",608,Réductions de valeur actées,
+model,"account.account,name",609,TITRES A REVENUS FIXES,
+model,"account.account,name",610,Valeur d'acquisition,
+model,"account.account,name",611,Réductions de valeur actées,
+model,"account.account,name",612,DEPOTS A TERME,
+model,"account.account,name",613,De plus d'un an,
+model,"account.account,name",614,De plus d'un mois et à un an au plus,
+model,"account.account,name",615,D'un mois au plus,
+model,"account.account,name",616,Réductions de valeur actées,
+model,"account.account,name",617,VALEURS ECHUES A L'ENCAISSEMENT,
+model,"account.account,name",618,Chèques à encaisser,
+model,"account.account,name",619,Coupons à encaisser,
+model,"account.account,name",620,ETABLISSEMENTS DE CREDIT.,
+model,"account.account,name",621,Comptes ouverts auprès des divers établissements,
+model,"account.account,name",622,OFFICE DES CHEQUES POSTAUX,
+model,"account.account,name",623,Compte courant,
+model,"account.account,name",624,Chèques émis,
+model,"account.account,name",4,Petty Cash,
+model,"account.account,name",625,CAISSES,
+model,"account.account,name",626,Caisses - espèces,
+model,"account.account,name",627,Caisse principale,
+model,"account.account,name",628,Caisses - timbres,
+model,"account.account,name",629,VIREMENTS INTERNES,
+model,"account.account,name",630,CLASSE 6. - CHARGES,
+model,"account.account,name",631,APPROVISIONNEMENTS ET MARCHANDISES,
+model,"account.account,name",5,Products Purchase,
+model,"account.account,name",632,Achats de matières premières,
+model,"account.account,name",633,Achats de fournitures,
+model,"account.account,name",634,"Achats de services, travaux et études",
+model,"account.account,name",635,Sous-traitances générales,
+model,"account.account,name",636,Achats de marchandises,
+model,"account.account,name",637,Achats d'immeubles destinés à la revente,
+model,"account.account,name",638,"Remises, ristournes et rabais obtenus sur achats",
+model,"account.account,name",639,Variations de stocks,
+model,"account.account,name",640,De matières premières,
+model,"account.account,name",641,De fournitures,
+model,"account.account,name",642,De marchandises,
+model,"account.account,name",643,D'immeubles destinés à la vente,
+model,"account.account,name",644,SERVICES ET BIENS DIVERS,
+model,"account.account,name",645,Loyers et charges locatives,
+model,"account.account,name",646,Loyers divers,
+model,"account.account,name",647,Charges locatives,
+model,"account.account,name",648,Entretien et réparation,
+model,"account.account,name",649,Fournitures faites à l'entreprise,
+model,"account.account,name",650,"Eau, gaz, électricité, vapeur",
+model,"account.account,name",651,Eau,
+model,"account.account,name",652,Gaz,
+model,"account.account,name",653,Electricité,
+model,"account.account,name",654,Vapeur,
+model,"account.account,name",655,"Téléphone, télégrammes, télex, téléfax, frais postaux",
+model,"account.account,name",656,Téléphone,
+model,"account.account,name",657,Télégrammes,
+model,"account.account,name",658,Télex et téléfax,
+model,"account.account,name",659,Frais postaux,
+model,"account.account,name",660,"Livres, bibliothèque",
+model,"account.account,name",661,Imprimés et fournitures de bureau,
+model,"account.account,name",662,Rétributions de tiers,
+model,"account.account,name",663,Redevances et royalties,
+model,"account.account,name",664,"Redevances pour brevets, licences, marques, accessoires",
+model,"account.account,name",665,Autres redevances,
+model,"account.account,name",666,Assurances non relatives au personnel,
+model,"account.account,name",667,Assurance incendie,
+model,"account.account,name",668,Assurance vol,
+model,"account.account,name",669,Assurance autos,
+model,"account.account,name",670,Assurance crédit,
+model,"account.account,name",671,Assurances frais généraux,
+model,"account.account,name",672,Divers,
+model,"account.account,name",673,Commissions aux tiers,
+model,"account.account,name",674,"Honoraires d'avocats, d'experts, etc ...",
+model,"account.account,name",675,Cotisations aux groupements professionnels,
+model,"account.account,name",676,"Dons, libéralités, ...",
+model,"account.account,name",677,Frais de contentieux,
+model,"account.account,name",678,Publications légales,
+model,"account.account,name",679,Transports et déplacements,
+model,"account.account,name",680,Transports de personnel,
+model,"account.account,name",681,"Voyages, déplacements, représentations",
+model,"account.account,name",682,Personnel intérimaire,
+model,"account.account,name",683,"Annonces, publicité, propagande et documentation",
+model,"account.account,name",684,Annonces et insertions,
+model,"account.account,name",685,Catalogues et imprimés,
+model,"account.account,name",686,Echantillons,
+model,"account.account,name",687,Foires et expositions,
+model,"account.account,name",688,Primes,
+model,"account.account,name",689,Cadeaux à la clientèle,
+model,"account.account,name",690,Missions et réceptions,
+model,"account.account,name",691,Documentation,
+model,"account.account,name",692,Sous-traitants,
+model,"account.account,name",693,Sous-traitants pour activités propres,
+model,"account.account,name",694,Sous-traitants d'associations momentanées,
+model,"account.account,name",695,Quote-part bénéficiaire des coparticipants,
+model,"account.account,name",696,Personnel intérimaire et personnes mises à la disposition  de l'entreprise,
+model,"account.account,name",697,"Rémunérations, primes pour assurances extralégales, pensions de retraite et de survie des administrateurs, gérants et associé...",
+model,"account.account,name",698,"REMUNERATIONS, CHARGES SOCIALES ET PENSIONS",
+model,"account.account,name",699,Rémunérations et avantages sociaux directs,
+model,"account.account,name",700,Administrateurs ou gérants,
+model,"account.account,name",701,Personnel de direction,
+model,"account.account,name",702,Employés,
+model,"account.account,name",703,Ouvriers,
+model,"account.account,name",704,Autres membres du personnel,
+model,"account.account,name",705,Cotisations patronales d'assurances sociales,
+model,"account.account,name",706,Sur salaires,
+model,"account.account,name",707,Sur appointements et commissions,
+model,"account.account,name",708,Primes patronales pour assurances extralégales,
+model,"account.account,name",709,Autres frais de personnel,
+model,"account.account,name",710,Assurances du personnel,
+model,"account.account,name",711,"Assurances loi, responsabilité civile, chemin du travail",
+model,"account.account,name",712,Assurance salaire garanti,
+model,"account.account,name",713,Assurances individuelles,
+model,"account.account,name",714,Charges sociales diverses,
+model,"account.account,name",715,Jours fériés payés,
+model,"account.account,name",716,Salaire hebdomadaire garanti,
+model,"account.account,name",717,Allocations familiales complémentaires,
+model,"account.account,name",718,"Charges sociales des administrateurs, gérants et commissaires",
+model,"account.account,name",719,Allocations familiales complémentaires pour non salariés,
+model,"account.account,name",720,Lois sociales pour indépendants,
+model,"account.account,name",721,Divers,
+model,"account.account,name",722,Pensions de retraite et de survie,
+model,"account.account,name",723,Administrateurs et gérants,
+model,"account.account,name",724,Personnel,
+model,"account.account,name",725,Provision pour pécule de vacances,
+model,"account.account,name",726,Dotations,
+model,"account.account,name",727,Utilisations et reprises,
+model,"account.account,name",728,"AMORTISSEMENTS, REDUCTIONS DE VALEUR ET PROVISIONS POUR RISQUES ET CHARGES",
+model,"account.account,name",729,Dotations aux amortissements et aux réductions de valeur sur immobilisations,
+model,"account.account,name",730,Dotations aux amortissements sur frais d'établissement,
+model,"account.account,name",731,Dotations aux amortissements sur immobilisations incorporelles,
+model,"account.account,name",732,Dotations aux amortissements sur immobilisations corporelles,
+model,"account.account,name",733,Dotations aux réductions de valeur sur immobilisations incorporelles,
+model,"account.account,name",734,Dotations aux réductions de valeur sur immobilisations corporelles,
+model,"account.account,name",735,Réductions de valeur sur stocks,
+model,"account.account,name",736,Dotations,
+model,"account.account,name",737,Reprises,
+model,"account.account,name",738,Réductions de valeur sur commandes en cours d'exécution,
+model,"account.account,name",739,Dotations,
+model,"account.account,name",740,Reprises,
+model,"account.account,name",741,Réductions de valeur sur créances commerciales à plus d'un an,
+model,"account.account,name",742,Dotations,
+model,"account.account,name",743,Reprises,
+model,"account.account,name",744,Réductions de valeur sur créances commerciales à un an au plus,
+model,"account.account,name",745,Dotations,
+model,"account.account,name",746,Reprises,
+model,"account.account,name",747,Provisions pour pensions et obligations similaires,
+model,"account.account,name",748,Dotations,
+model,"account.account,name",749,Utilisations et reprises,
+model,"account.account,name",750,Provisions pour grosses réparations et gros entretiens,
+model,"account.account,name",751,Dotations,
+model,"account.account,name",752,Utilisations et reprises,
+model,"account.account,name",753,Provisions pour autres risques et charges,
+model,"account.account,name",754,Dotations ,
+model,"account.account,name",755,Utilisations et reprises,
+model,"account.account,name",756,AUTRES CHARGES D'EXPLOITATION,
+model,"account.account,name",757,Charges fiscales d'exploitation,
+model,"account.account,name",758,Taxes et impôts directs,
+model,"account.account,name",759,Taxes sur autos et camions,
+model,"account.account,name",760,Taxes et impôts indirects,
+model,"account.account,name",761,Timbres fiscaux pris en charge par la firme,
+model,"account.account,name",762,Droits d'enregistrement,
+model,"account.account,name",763,T.V.A. non déductible,
+model,"account.account,name",764,Impôts provinciaux et communaux,
+model,"account.account,name",765,Taxe sur la force motrice,
+model,"account.account,name",766,Taxe sur le personnel occupé,
+model,"account.account,name",767,Taxes diverses,
+model,"account.account,name",768,Moins-values sur réalisations courantes d'immobilisations corporelles,
+model,"account.account,name",769,Moins-values sur réalisations de créances commerciales,
+model,"account.account,name",770,à 648 Charges d'exploitations diverses,
+model,"account.account,name",771,Charges d'exploitation portées à l'actif au titre de restructuration,
+model,"account.account,name",772,CHARGES FINANCIERES,
+model,"account.account,name",773,Charges des dettes,
+model,"account.account,name",774,"Intérêts, commissions et frais afférents aux dettes",
+model,"account.account,name",775,Amortissements des agios et frais d'émission d'emprunts,
+model,"account.account,name",776,Autres charges de dettes,
+model,"account.account,name",777,Intérêts intercalaires portés à l'actif,
+model,"account.account,name",778,Réductions de valeur sur actifs circulants,
+model,"account.account,name",779,Dotations ,
+model,"account.account,name",780,Reprises,
+model,"account.account,name",781,Moins-values sur réalisation d'actifs circulants,
+model,"account.account,name",782,Charges d'escompte de créances,
+model,"account.account,name",783,Différences de change,
+model,"account.account,name",784,Ecarts de conversion des devises,
+model,"account.account,name",785,"Frais de banques, de chèques postaux",
+model,"account.account,name",786,"Commissions sur ouvertures de crédit, cautions, avals",
+model,"account.account,name",787,Frais de vente des titres,
+model,"account.account,name",788,CHARGES EXCEPTIONNELLES,
+model,"account.account,name",789,Amortissements et réductions de valeur exceptionnels,
+model,"account.account,name",790,Sur frais d'établissement,
+model,"account.account,name",791,Sur immobilisations incorporelles,
+model,"account.account,name",792,Sur immobilisations corporelles,
+model,"account.account,name",793,Réductions de valeur sur immobilisations financières,
+model,"account.account,name",794,Provisions pour risques et charges exceptionnels,
+model,"account.account,name",795,Moins-values sur réalisation d'actifs immobilisés,
+model,"account.account,name",796,Sur immobilisations incorporelles,
+model,"account.account,name",797,Sur immobilisations corporelles,
+model,"account.account,name",798,Sur immobilisations détenues en location-financement et droits similaires,
+model,"account.account,name",799,Sur immobilisations financières,
+model,"account.account,name",800,Sur immeubles acquis ou construits en vue de la revente,
+model,"account.account,name",802,Pénalités et amendes diverses,
+model,"account.account,name",803,Différence de charge,
+model,"account.account,name",801,Autres charges exceptionnelles,
+model,"account.account,name",804,Charges exceptionnelles transférées à l'actif en frais de restructuration,
+model,"account.account,name",805,IMPOTS SUR LE RESULTAT,
+model,"account.account,name",806,Impôts belges sur le résultat de l'exercice,
+model,"account.account,name",807,Impôts et précomptes dus ou versés,
+model,"account.account,name",808,Excédent de versements d'impôts et précomptes porté à l'actif,
+model,"account.account,name",809,Charges fiscales estimées,
+model,"account.account,name",810,Impôts belges sur le résultat d'exercices antérieurs,
+model,"account.account,name",811,Suppléments d'impôts dus ou versés,
+model,"account.account,name",812,Suppléments d'impôts estimés,
+model,"account.account,name",813,Provisions fiscales constituées,
+model,"account.account,name",814,Impôts étrangers sur le résultat de l'exercice,
+model,"account.account,name",815,Impôts étrangers sur le résultat d'exercices antérieurs,
+model,"account.account,name",816,TRANSFERTS AUX RESERVES IMMUNISEES,
+model,"account.account,name",817,AFFECTATION DES RESULTATS,
+model,"account.account,name",818,Perte reportée de l'exercice précédent,
+model,"account.account,name",819,Dotation à la réserve légale,
+model,"account.account,name",820,Dotation aux autres réserves,
+model,"account.account,name",821,Bénéfice à reporter,
+model,"account.account,name",822,Rémunération du capital,
+model,"account.account,name",823,Administrateurs ou gérants,
+model,"account.account,name",824,Autres allocataires,
+model,"account.account,name",825,CLASSE 7. - PRODUITS,
+model,"account.account,name",826,CHIFFRE D'AFFAIRES,
+model,"account.account,name",827,Ventes de marchandises,
+model,"account.account,name",828,Ventes en Belgique,
+model,"account.account,name",829,Ventes dans les pays membres de la C.E.E.,
+model,"account.account,name",830,Ventes à l'exportation,
+model,"account.account,name",6,Products Sales,
+model,"account.account,name",831,Ventes de produits finis,
+model,"account.account,name",832,Ventes en Belgique,
+model,"account.account,name",833,Ventes dans les pays membres de la C.E.E.,
+model,"account.account,name",834,Ventes à l'exportation,
+model,"account.account,name",835,Ventes de déchets et rebuts,
+model,"account.account,name",836,Ventes en Belgique,
+model,"account.account,name",837,Ventes dans les pays membres de la C.E.E.,
+model,"account.account,name",838,Ventes à l'exportation,
+model,"account.account,name",839,Ventes d'emballages récupérables,
+model,"account.account,name",840,Facturations des travaux en cours,
+model,"account.account,name",841,Prestations de services,
+model,"account.account,name",842,Prestations de services en Belgique,
+model,"account.account,name",843,Prestations de services dans les pays membres de la C.E.E.,
+model,"account.account,name",844,Prestations de services en vue de l'exportation,
+model,"account.account,name",845,Pénalités et dédits obtenus par l'entreprise,
+model,"account.account,name",846,"Remises, ristournes et rabais accordés",
+model,"account.account,name",847,Sur ventes de marchandises,
+model,"account.account,name",848,Sur ventes de produits finis,
+model,"account.account,name",849,Sur ventes de déchets et rebuts,
+model,"account.account,name",850,Sur prestations de services,
+model,"account.account,name",851,Mali sur travaux facturés aux associations momentanées,
+model,"account.account,name",852,VARIATION DES STOCKS ET DES COMMANDES EN COURS D'EXECUTION,
+model,"account.account,name",853,Des en cours de fabrication,
+model,"account.account,name",854,Des produits finis,
+model,"account.account,name",855,Des immeubles construits destinés à la vente,
+model,"account.account,name",856,Des commandes en cours d'exécution,
+model,"account.account,name",857,Commandes en cours - Coût de revient,
+model,"account.account,name",858,Coût des commandes en cours d'exécution,
+model,"account.account,name",859,Coût des travaux en cours des associations momentanées,
+model,"account.account,name",860,Bénéfices portés en compte sur commandes en cours,
+model,"account.account,name",861,Sur commandes en cours d'exécution,
+model,"account.account,name",862,Sur travaux en cours des associations momentanées,
+model,"account.account,name",863,PRODUCTION IMMOBILISEE,
+model,"account.account,name",864,En frais d'établissement,
+model,"account.account,name",865,En immobilisations incorporelles,
+model,"account.account,name",866,En immobilisations corporelles,
+model,"account.account,name",867,En immobilisations en cours,
+model,"account.account,name",868,AUTRES PRODUITS D'EXPLOITATION,
+model,"account.account,name",869,Subsides d'exploitation et montants compensatoires,
+model,"account.account,name",870,Plus-values sur réalisations courantes d'immobilisations corporelles,
+model,"account.account,name",871,Plus-values sur réalisations de créances commerciales,
+model,"account.account,name",872,Produits de services exploités dans l'intérêt du personnel,
+model,"account.account,name",873,Commissions et courtages,
+model,"account.account,name",874,Redevances pour brevets et licences,
+model,"account.account,name",875,Prestations de services,
+model,"account.account,name",876,Revenus des immeubles affectés aux activités non professionnelles,
+model,"account.account,name",877,Locations diverses à caractère professionnel,
+model,"account.account,name",878,Produits divers,
+model,"account.account,name",879,Bonis sur reprises d'emballages consignés,
+model,"account.account,name",880,Bonis sur travaux en associations momentanées,
+model,"account.account,name",881,PRODUITS FINANCIERS,
+model,"account.account,name",882,Produits des immobilisations financières,
+model,"account.account,name",883,Revenus des actions,
+model,"account.account,name",884,Revenus des obligations,
+model,"account.account,name",885,Revenus des créances à plus d'un an,
+model,"account.account,name",886,Produits des actifs circulants,
+model,"account.account,name",887,Plus-values sur réalisations d'actifs circulants,
+model,"account.account,name",888,Subsides en capital et en intérêts,
+model,"account.account,name",889,Différences de change,
+model,"account.account,name",890,Ecarts de conversion des devises,
+model,"account.account,name",891,Produits des autres créances,
+model,"account.account,name",892,Escomptes obtenus,
+model,"account.account,name",893,PRODUITS EXCEPTIONNELS,
+model,"account.account,name",894,Reprises d'amortissements et de réductions de valeur,
+model,"account.account,name",895,Sur immobilisations incorporelles,
+model,"account.account,name",896,Sur immobilisations corporelles,
+model,"account.account,name",897,Reprises de réductions de valeur sur immobilisations financières,
+model,"account.account,name",898,Reprises de provisions pour risques et charges exceptionnelles,
+model,"account.account,name",899,Plus-values sur réalisation d'actifs immobilisés,
+model,"account.account,name",900,Sur immobilisations incorporelles,
+model,"account.account,name",901,Sur immobilisations corporelles,
+model,"account.account,name",902,Sur immobilisations financières,
+model,"account.account,name",903,Autres produits exceptionnels,
+model,"account.account,name",904,REGULARISATIONS D'IMPOTS ET REPRISES DE PROVISIONS FISCALES,
+model,"account.account,name",905,Impôts belges sur le résultat,
+model,"account.account,name",906,Régularisations d'impôts dus ou versés,
+model,"account.account,name",907,Régularisations d'impôts estimés,
+model,"account.account,name",908,Reprises de provisions fiscales,
+model,"account.account,name",909,Impôts étrangers sur le résultat,
+model,"account.account,name",910,AFFECTATION AUX RESULTATS,
+model,"account.account,name",911,Bénéfice reporté de l'exercice précédent,
+model,"account.account,name",912,Prélèvement sur le capital et les primes d'émission,
+model,"account.account,name",913,Prélèvement sur les réserves,
+model,"account.account,name",914,Perte à reporter,
+model,"account.account,name",915,Intervention d'associés,
+field,"account.account,credit",0,Credit,Crédit
+field,"account.account,company_id",0,Company,Société
+field,"account.account,shortcut",0,Shortcut,Raccourci
+field,"account.account,sign",0,Sign,Signe
+field,"account.account,currency_id",0,Secondary Currency,Devise
+field,"account.account,parent_id",0,Parents,Parents
+field,"account.account,note",0,Note,Note
+field,"account.account,debit",0,Debit,Débit
+field,"account.account,active",0,Active,Actif
+field,"account.account,child_id",0,Children,Comptes Enfants
+field,"account.account,balance",0,Balance,Solde
+field,"account.account,type",0,Account Type,Type de compte
+field,"account.account,reconcile",0,Reconcile,Réconciliation
+field,"account.account.type,code",0,Code,Code
+field,"account.account.type,name",0,Acc. Type Name,Intitulé
+model,"account.account.type,name",1,Receivable,Débiteurs
+model,"account.account.type,name",2,Payable,"Fournisseurs, créanciers"
+model,"account.account.type,name",3,View,Vue
+model,"account.account.type,name",4,Income,Produits
+model,"account.account.type,name",5,Expense,Charges
+model,"account.account.type,name",6,Tax,Impôts et taxes
+model,"account.account.type,name",7,Cash,Liquidités
+model,"account.account.type,name",8,Asset,Actifs
+model,"account.account.type,name",9,Equity,Capitaux propre
+model,"account.account.type,name",10,Closed,
+field,"account.account.type,code_from",0,Code From,Code de
+field,"account.account.type,sequence",0,Sequence,Séquence
+field,"account.account.type,close_method",0,Deferral Method,Méthode de report à nouveau
+field,"account.account.type,partner_account",0,Partner account,Compte de tiers
+field,"account.account.type,code_to",0,Code To,Code pour
+field,"account.analytic.account,code",0,Account code,Code du compte
+field,"account.analytic.account,quantity_max",0,Maximal quantity,Quantité maximale
+field,"account.analytic.account,contact_id",0,Contact,Contact
+field,"account.analytic.account,company_currency_id",0,Currency,Devise
+field,"account.analytic.account,date",0,Date End,Date de fin
+field,"account.analytic.account,partner_id",0,Associated partner,Partenaire associé
+field,"account.analytic.account,user_id",0,Account Manager,Comptable
+field,"account.analytic.account,date_start",0,Date Start,Date de départ
+field,"account.analytic.account,company_id",0,Company,Société
+field,"account.analytic.account,parent_id",0,Parent analytic account,Centre de coût parent
+field,"account.analytic.account,state",0,State,État
+field,"account.analytic.account,complete_name",0,Account Name,Nom du compte
+field,"account.analytic.account,debit",0,Debit,Solde
+field,"account.analytic.account,type",0,Account type,Type
+field,"account.analytic.account,description",0,Description,Description
+field,"account.analytic.account,child_ids",0,Childs Accounts,Compte fils
+field,"account.analytic.account,active",0,Active,Actif
+field,"account.analytic.account,stats_ids",0,Statistics,Statistiques
+field,"account.analytic.account,name",0,Account name,Nom du compte
+field,"account.analytic.account,credit",0,Credit,Solde
+field,"account.analytic.account,line_ids",0,Analytic entries,Écritures analytiques
+field,"account.analytic.account,balance",0,Balance,Solde
+field,"account.analytic.account,quantity",0,Quantity,Quantité
+field,"account.analytic.budget.post,sens",0,Direction,
+field,"account.analytic.budget.post,code",0,Code,Code
+field,"account.analytic.budget.post,dotation_ids",0,Expenses,Dépenses
+field,"account.analytic.budget.post,name",0,Name,Nom
+field,"account.analytic.budget.post,account_ids",0,Accounts,Comptes
+field,"account.analytic.budget.post.dotation,post_id",0,Item,Item
+field,"account.analytic.budget.post.dotation,amount",0,Amount,Montant
+field,"account.analytic.budget.post.dotation,period_id",0,Period,Période
+field,"account.analytic.budget.post.dotation,name",0,Name,Nom
+field,"account.analytic.budget.post.dotation,quantity",0,Quantity,Quantité
+field,"account.analytic.journal,active",0,Active,Actif
+field,"account.analytic.journal,line_ids",0,Lines,Lignes
+field,"account.analytic.journal,code",0,Journal code,Code du journal
+field,"account.analytic.journal,type",0,Type,Type
+field,"account.analytic.journal,name",0,Journal name,Nom du journal
+field,"account.analytic.line,code",0,Code,Code
+field,"account.analytic.line,user_id",0,User,Utilisateur
+field,"account.analytic.line,name",0,Description,Description
+field,"account.analytic.line,general_account_id",0,General account,Compte général
+field,"account.analytic.line,product_uom_id",0,UoM,Unité de mesure
+field,"account.analytic.line,journal_id",0,Analytic journal,Journal analytique
+field,"account.analytic.line,account_id",0,Analytic Account,Centre de coûts
+field,"account.analytic.line,amount",0,Amount,Montant
+field,"account.analytic.line,unit_amount",0,Quantity,Quantité
+field,"account.analytic.line,date",0,Date,Date
+field,"account.analytic.line,ref",0,Ref.,Référence
+field,"account.analytic.line,move_id",0,General entry,Écritures
+field,"account.analytic.line,product_id",0,Product,Produit
+field,"account.bank.statement,name",0,Name,Nom
+field,"account.bank.statement,state",0,State,Statut
+field,"account.bank.statement,balance_end",0,Balance,Solde
+field,"account.bank.statement,balance_start",0,Starting Balance,Solde de début
+field,"account.bank.statement,journal_id",0,Journal,Journal
+field,"account.bank.statement,move_line_ids",0,Entry lines,Ligne d'écriture
+field,"account.bank.statement,period_id",0,Period,Période
+field,"account.bank.statement,date",0,Date,Date
+field,"account.bank.statement,line_ids",0,Statement lines,Écritures
+field,"account.bank.statement,balance_end_real",0,Ending Balance,Solde final
+field,"account.bank.statement.line,reconcile_id",0,Reconcile,Réconcilier
+field,"account.bank.statement.line,note",0,Notes,Notes
+field,"account.bank.statement.line,ref",0,Ref.,Référence
+field,"account.bank.statement.line,name",0,Name,Libellé
+field,"account.bank.statement.line,type",0,Type,Type
+field,"account.bank.statement.line,statement_id",0,Statement,Déclaration
+field,"account.bank.statement.line,move_ids",0,Moves,Mouvements
+field,"account.bank.statement.line,amount",0,Amount,Montant
+field,"account.bank.statement.line,date",0,Date,Date
+field,"account.bank.statement.line,partner_id",0,Partner,Partenaire
+field,"account.bank.statement.line,account_id",0,Account,Compte
+field,"account.bank.statement.reconcile,total_balance",0,Balance,Balance
+field,"account.bank.statement.reconcile,name",0,Date,Date
+field,"account.bank.statement.reconcile,line_ids",0,Entries,Entrées
+field,"account.bank.statement.reconcile,total_entry",0,Total entries,Total des entrées
+field,"account.bank.statement.reconcile,partner_id",0,Partner,Partenaire
+field,"account.bank.statement.reconcile,total_new",0,Total write-off,Total des ajustements
+field,"account.bank.statement.reconcile,line_new_ids",0,Write-Off,Ajustements
+field,"account.bank.statement.reconcile,total_amount",0,Payment amount,Montant payé
+field,"account.bank.statement.reconcile.line,line_id",0,Reconcile,Réconcilier
+field,"account.bank.statement.reconcile.line,amount",0,Amount,Montant
+field,"account.bank.statement.reconcile.line,name",0,Description,Description
+field,"account.bank.statement.reconcile.line,account_id",0,Account,Compte Analytique 
+field,"account.budget.post,sens",0,Direction,Direction
+field,"account.budget.post,code",0,Code,Code
+field,"account.budget.post,dotation_ids",0,Expenses,Dépense
+field,"account.budget.post,name",0,Name,Nom
+field,"account.budget.post,account_ids",0,Accounts,Comptes
+field,"account.budget.post.dotation,post_id",0,Item,Élément
+field,"account.budget.post.dotation,amount",0,Amount,Montant
+field,"account.budget.post.dotation,period_id",0,Period,Période
+field,"account.budget.post.dotation,name",0,Name,Nom
+field,"account.budget.post.dotation,quantity",0,Quantity,Quantité
+field,"account.fiscalyear,date_stop",0,End date,Date de fin
+field,"account.fiscalyear,code",0,Code,Code
+field,"account.fiscalyear,name",0,Fiscal Year,Exercice comptable
+field,"account.fiscalyear,date_start",0,Start date,Date de début
+field,"account.fiscalyear,period_ids",0,Periods,Périodes
+field,"account.fiscalyear,state",0,State,Statut
+field,"account.invoice,origin",0,Origin,Document d'origine
+field,"account.invoice,comment",0,Additionnal Information,Commentaire
+field,"account.invoice,date_due",0,Due Date,Date d'échéance
+field,"account.invoice,check_total",0,Total,Total
+field,"account.invoice,reference",0,Invoice Reference,Référence
+field,"account.invoice,payment_term",0,Payment Term,Condition de paiement
+field,"account.invoice,number",0,Invoice Number,Numéro de facture
+field,"account.invoice,company_id",0,Company,Société
+field,"account.invoice,currency_id",0,Currency,Devise
+field,"account.invoice,address_invoice_id",0,Invoice Address,Adresse de facturation
+field,"account.invoice,partner_id",0,Partner,Partenaire
+field,"account.invoice,amount_untaxed",0,Untaxed,Montant HT
+field,"account.invoice,partner_bank_id",0,Partner bank,Banque partenaire
+field,"account.invoice,tax_line",0,Tax Lines,Lignes de taxe
+field,"account.invoice,journal_id",0,Journal,Journal
+field,"account.invoice,amount_tax",0,Tax,Montant de la taxe
+field,"account.invoice,state",0,State,État
+field,"account.invoice,type",0,Type,Type
+field,"account.invoice,invoice_line",0,Invoice Lines,Ligne de facture
+field,"account.invoice,account_id",0,Dest Account,Compte de tiers
+field,"account.invoice,reconciled",0,Reconciled,Réconcilier
+field,"account.invoice,date_invoice",0,Date Invoiced,Date de facturation
+field,"account.invoice,period_id",0,Force Period,Forcer la période
+field,"account.invoice,move_id",0,Invoice Movement,Transactions
+field,"account.invoice,amount_total",0,Total,Montant total
+field,"account.invoice,name",0,Description,Description
+field,"account.invoice,address_contact_id",0,Contact Address,Adresse du contact
+field,"account.invoice.line,uos_id",0,Unit,Unité de mesure
+field,"account.invoice.line,name",0,Description,Description
+field,"account.invoice.line,invoice_id",0,Invoice Ref,Réf. Facture
+field,"account.invoice.line,price_unit",0,Unit Price,Prix unitaire
+field,"account.invoice.line,price_subtotal",0,Subtotal,Montant
+field,"account.invoice.line,invoice_line_tax_id",0,Taxes,Taxes
+field,"account.invoice.line,note",0,Notes,Notes
+field,"account.invoice.line,discount",0,Discount (%),Escompte (%)
+field,"account.invoice.line,product_id",0,Product,Produit
+field,"account.invoice.line,account_analytic_id",0,Analytic Account,Compte Analytique 
+field,"account.invoice.line,quantity",0,Quantity,Quantité
+field,"account.invoice.line,account_id",0,Source Account,Compte achat/vente
+field,"account.invoice.tax,tax_amount",0,Tax Code Amount,Montant de la taxe
+field,"account.invoice.tax,name",0,Tax Description,Nom de la taxe
+field,"account.invoice.tax,sequence",0,Sequence,Séquence
+field,"account.invoice.tax,invoice_id",0,Invoice Line,Ligne de facture
+field,"account.invoice.tax,manual",0,Manual,Manuel
+field,"account.invoice.tax,base_amount",0,Base Code Amount,Montant HT
+field,"account.invoice.tax,base_code_id",0,Base Code,Compte de base
+field,"account.invoice.tax,tax_code_id",0,Tax Code,Type de taxe
+field,"account.invoice.tax,amount",0,Amount,Montant de la taxe
+field,"account.invoice.tax,base",0,Base,Base de calcul
+field,"account.invoice.tax,account_id",0,Tax Account,Compte de taxe
+field,"account.journal,default_debit_account_id",0,Default Debit Account,Compte de débit par défaut
+field,"account.journal,groups_id",0,Groups,Groupes
+field,"account.journal,update_posted",0,Allow Cancelling Entries,Permettre l'annulation des écritures
+field,"account.journal,code",0,Code,Code
+field,"account.journal,user_id",0,User,Utilisateur
+field,"account.journal,name",0,Journal Name,Nom du journal
+model,"account.journal,name",1,Sales Journal,Journal des achats
+model,"account.journal,name",2,Expenses Journal,Journal des dépenses
+model,"account.journal,name",3,Bank Journal,Journal de banque
+model,"account.journal,name",4,Stock Journal,Journal de stock
+field,"account.journal,centralisation",0,Centralised counterpart,Centralisation
+field,"account.journal,view_id",0,View,Vue
+field,"account.journal,type_control_ids",0,Type Controls,Types de contrôle
+field,"account.journal,sequence_id",0,Entry Sequence,N° d'écriture
+field,"account.journal,account_control_ids",0,Account,Compte
+field,"account.journal,active",0,Active,Actif
+field,"account.journal,type",0,Type,Type
+field,"account.journal,default_credit_account_id",0,Default Credit Account,Compte de crédit par défaut
+field,"account.journal.column,name",0,Column Name,Nom de colonne
+field,"account.journal.column,sequence",0,Sequence,Numérotation
+field,"account.journal.column,view_id",0,Journal View,Affichage
+field,"account.journal.column,required",0,Required,Obligatoire
+field,"account.journal.column,field",0,Field Name,Nom du champ
+field,"account.journal.column,readonly",0,Readonly,Lecture seule
+field,"account.journal.period,name",0,Journal-Period Name,Nom de la période du journal
+field,"account.journal.period,journal_id",0,Journal,Journal
+field,"account.journal.period,state",0,State,Statut
+field,"account.journal.period,period_id",0,Period,Période
+field,"account.journal.period,active",0,Active,Actif
+field,"account.journal.period,icon",0,Icon,Icône
+field,"account.journal.view,columns_id",0,Columns,Colonnes
+field,"account.journal.view,name",0,Journal View,Affichage
+field,"account.model,lines_id",0,Model Entries,Modèle d'écritures
+field,"account.model,ref",0,Ref,Réf
+field,"account.model,name",0,Model Name,Nom du modèle
+field,"account.model,journal_id",0,Journal,Nom du journal
+field,"account.model.line,model_id",0,Model,Modèle
+field,"account.model.line,name",0,Name,Nom
+field,"account.model.line,sequence",0,Sequence,Séquence
+field,"account.model.line,partner_id",0,Partner Ref.,Partenaire
+field,"account.model.line,account_id",0,Account,Compte
+field,"account.model.line,currency_id",0,Currency,Devise
+field,"account.model.line,credit",0,Credit,Crédit
+field,"account.model.line,date_maturity",0,Maturity date,Date échéance
+field,"account.model.line,debit",0,Debit,Débit
+field,"account.model.line,date",0,Current Date,Date courante
+field,"account.model.line,amount_currency",0,Amount Currency,Devise
+field,"account.model.line,ref",0,Ref.,Réf. document
+field,"account.model.line,quantity",0,Quantity,Quantité
+field,"account.move,name",0,Entry Name,N° d'écriture
+field,"account.move,journal_id",0,Journal,Journal
+field,"account.move,line_id",0,Entries,Écriture
+field,"account.move,state",0,State,Statut
+field,"account.move,period_id",0,Period,Période
+field,"account.move,ref",0,Ref,Référence
+field,"account.move.line,analytic_lines",0,Analytic lines,Lignes analytiques
+field,"account.move.line,statement_id",0,Statement,Relevé de compte
+field,"account.move.line,currency_id",0,Currency,Devise
+field,"account.move.line,active",0,Active,Actif
+field,"account.move.line,date_maturity",0,Maturity date,Date échéance
+field,"account.move.line,partner_id",0,Partner Ref.,Partenaire
+field,"account.move.line,blocked",0,Litigation,Litige
+field,"account.move.line,centralisation",0,Centralisation,Centralisation
+field,"account.move.line,journal_id",0,Journal,Journal
+field,"account.move.line,tax_code_id",0,Tax Account,Compte de TVA
+field,"account.move.line,state",0,State,Statut
+field,"account.move.line,debit",0,Debit,Débit
+field,"account.move.line,ref",0,Ref.,Réf document
+field,"account.move.line,account_id",0,Account,Compte
+field,"account.move.line,period_id",0,Period,Période
+field,"account.move.line,date_created",0,Creation date,Date de création
+field,"account.move.line,date",0,Effective date,Date
+field,"account.move.line,move_id",0,Move,N° d'écriture
+field,"account.move.line,reconcile_id",0,Reconcile,Lettrage
+field,"account.move.line,tax_amount",0,Tax/Base Amount,Montant
+field,"account.move.line,name",0,Name,Libellé
+field,"account.move.line,credit",0,Credit,Crédit
+field,"account.move.line,amount_currency",0,Amount Currency,Montant devise
+field,"account.move.line,balance",0,Balance,Solde
+field,"account.move.line,quantity",0,Quantity,Quantité
+field,"account.move.reconcile,line_id",0,Entry lines,Lignes d'écriture
+field,"account.move.reconcile,create_date",0,Creation date,Date de création
+field,"account.move.reconcile,type",0,Type,Type
+field,"account.move.reconcile,name",0,Name,Nom
+field,"account.payment.term,active",0,Active,Actif
+field,"account.payment.term,note",0,Description,Description
+field,"account.payment.term,name",0,Payment Term,Condition de paiement
+field,"account.payment.term,line_ids",0,Terms,Délais
+field,"account.payment.term.line,payment_id",0,Payment Term,Condition de paiement
+field,"account.payment.term.line,name",0,Line Name,Nom de ligne
+field,"account.payment.term.line,sequence",0,Sequence,Séquence
+field,"account.payment.term.line,days",0,Number of Days,Nombre de jour
+field,"account.payment.term.line,value",0,Value,Type
+field,"account.payment.term.line,condition",0,Condition,Condition
+field,"account.payment.term.line,value_amount",0,Value Amount,Montant
+field,"account.period,date_stop",0,End of period,Fin de la période
+field,"account.period,code",0,Code,Code
+field,"account.period,name",0,Period Name,Période
+field,"account.period,date_start",0,Start of period,Début de la période
+field,"account.period,state",0,State,Statut
+field,"account.period,fiscalyear_id",0,Fiscal Year,Exercice comptable
+field,"account.report.report,status",0,Status,Status
+field,"account.report.report,style",0,Style,Style
+field,"account.report.report,code",0,Code,Code
+field,"account.report.report,name",0,Name,Nom
+field,"account.report.report,sequence",0,Sequence,Séquence
+field,"account.report.report,type",0,Type,Type
+field,"account.report.report,expression_status",0,Status expression,Expression pour les status
+field,"account.report.report,child_ids",0,Childs,Enfants
+field,"account.report.report,note",0,Note,Note
+field,"account.report.report,parent_id",0,Parent,Parent
+field,"account.report.report,amount",0,Value,Valeur
+field,"account.report.report,active",0,Active,Actif
+field,"account.report.report,color_back",0,Back Color,Couleur de fond
+field,"account.report.report,expression",0,Expression,Expression
+field,"account.report.report,color_font",0,Font Color,Couleur de font
+field,"account.subscription,model_id",0,Model,Modèle
+field,"account.subscription,period_nbr",0,Period,Périodicité
+field,"account.subscription,lines_id",0,Subscription Lines,Transactions
+field,"account.subscription,name",0,Name,Nom
+field,"account.subscription,date_start",0,Starting date,Début de la période
+field,"account.subscription,period_total",0,Number of period,Nombre de période
+field,"account.subscription,state",0,State,Statut
+field,"account.subscription,period_type",0,Period Type,Type de période
+field,"account.subscription,ref",0,Ref.,Réf.
+field,"account.subscription.line,date",0,Date,Date
+field,"account.subscription.line,subscription_id",0,Subscription,Abonnement
+field,"account.subscription.line,move_id",0,Entry,Entrée
+field,"account.tax,domain",0,Domain,Domaine
+field,"account.tax,ref_tax_code_id",0,Tax Code,Code de taxe
+field,"account.tax,sequence",0,Sequence,Séquence
+field,"account.tax,base_sign",0,Base Code Sign,Facteur multiplicateur
+field,"account.tax,child_depend",0,Tax on Childs,Dépend d'enfants ?
+field,"account.tax,include_base_amount",0,Include in base amount,Inclus dans le montant
+field,"account.tax,ref_tax_sign",0,Tax Code Sign,Facteur multiplicateur
+field,"account.tax,applicable_type",0,Applicable Type,Applicable ?
+field,"account.tax,company_id",0,Company,Société
+field,"account.tax,name",0,Tax Name,Nom de la taxe
+field,"account.tax,tax_code_id",0,Tax Code,Code de taxe
+field,"account.tax,parent_id",0,Parent Tax Account,Compte de taxe parent
+field,"account.tax,python_compute_inv",0,Python Code (reverse),Code Python (TVA Incl)
+field,"account.tax,python_applicable",0,Python Code,Code Python
+field,"account.tax,type",0,Tax Type,Type de taxe
+field,"account.tax,ref_base_sign",0,Base Code Sign,Facteur multiplicateur
+field,"account.tax,tax_group",0,Tax Group,Type de taxe
+field,"account.tax,child_ids",0,Childs Tax Account,Compte de taxe enfant
+field,"account.tax,base_code_id",0,Base Code,Base de calcul
+field,"account.tax,active",0,Active,Actif
+field,"account.tax,ref_base_code_id",0,Base Code,Code de base
+field,"account.tax,account_paid_id",0,Refund Tax Account,Compte de taxe à payer
+field,"account.tax,account_collected_id",0,Invoice Tax Account,Compte de taxe à récupérer
+field,"account.tax,amount",0,Amount,Montant
+field,"account.tax,python_compute",0,Python Code,Code Python
+field,"account.tax,tax_sign",0,Tax Code Sign,Facteur multiplicateur
+field,"account.tax.code,info",0,Description,Description
+field,"account.tax.code,code",0,Case Code,Case de la déclaration fiscale
+field,"account.tax.code,name",0,Tax Case Name,Case de la déclaration fiscale
+field,"account.tax.code,sum",0,Year Sum,Montant total de l'année
+field,"account.tax.code,child_ids",0,Childs Codes,Codes fils
+field,"account.tax.code,company_id",0,Company,Société
+field,"account.tax.code,sign",0,Sign for parent,Signe pour le parent
+field,"account.tax.code,parent_id",0,Parent Code,Code parent
+field,"account.tax.code,line_ids",0,Lines,Lignes
+field,"account.tax.code,sum_period",0,Period Sum,Montant total de la période
+field,"auction.artists,birth_death_dates",0,Birth / Death dates, Dates naissance/décès
+field,"auction.artists,pseudo",0,Pseudo,Surnom
+field,"auction.artists,name",0,Artist/Author Name,Nom Artiste/Auteur
+field,"auction.artists,biography",0,Biography, Biographie
+field,"auction.bid,bid_lines",0,Bid,Ordre d'achat
+field,"auction.bid,contact_tel",0,Contact,
+field,"auction.bid,auction_id",0,Auction Date,Date de l'enchère
+field,"auction.bid,partner_id",0,Buyer Name, Nom de l'acheteur
+field,"auction.bid,name",0,Bid ID,ID de l'ordre d'achat
+field,"auction.bid_line,lot_id",0,Object, Objet
+field,"auction.bid_line,price",0,Maximum Price, Prix maximum
+field,"auction.bid_line,call",0,To be Called, A appeler
+field,"auction.bid_line,name",0,Bid date, Date de l'ordre d'achat
+field,"auction.bid_line,bid_id",0,Bid ID, ID de l'ordre d'achat
+field,"auction.dates,journal_seller_id",0,Seller Journal, Journal du vendeur
+field,"auction.dates,expo1",0,First Exposition Day, Premier jour de l'exposition
+field,"auction.dates,name",0,Auction date, Date de l'enchère
+field,"auction.dates,expo2",0,Last Exposition Day, Dernier jour d'exposition
+field,"auction.dates,acc_income",0,Income Account, Compte des entrées
+field,"auction.dates,journal_id",0,Buyer Journal, Journal de l'acheteur
+field,"auction.dates,adj_total",0,Total Adjudication, Adjudication totale
+field,"auction.dates,state",0,State, État
+field,"auction.dates,auction1",0,First Auction Day, Début de l'enchère
+field,"auction.dates,buyer_costs",0,Buyer Costs, Coût de l'acheteur
+field,"auction.dates,auction2",0,Last Auction Day, Fin de l'enchère
+field,"auction.dates,account_analytic_id",0,Analytic Account, Compte analytique
+field,"auction.dates,seller_costs",0,Seller Costs, Coûts des vendeurs
+field,"auction.dates,acc_expense",0,Expense Account, Comptes des dépenses
+field,"auction.deposit,info",0,Description, 
+field,"auction.deposit,create_uid",0,Created by, créé par
+field,"auction.deposit,specific_cost_ids",0,Specific Costs, Coûts spécifiques
+field,"auction.deposit,name",0,Depositer Inventory,Inventaire de dépôt
+field,"auction.deposit,date_dep",0,Deposit date, Date de dépôt
+field,"auction.deposit,total_neg",0,Allow Negative Amount, Permettre un montant négatif
+field,"auction.deposit,lot_id",0,Objects, Objets
+field,"auction.deposit,partner_id",0,Seller, Vendeur
+field,"auction.deposit,method",0,Withdrawned method, Méthode de retrait
+field,"auction.deposit,tax_id",0,Expenses, Dépenses
+field,"auction.deposit.cost,account",0,Destination Account, Compte de destination
+field,"auction.deposit.cost,deposit_id",0,Deposit, Dépôt
+field,"auction.deposit.cost,amount",0,Amount, Montant
+field,"auction.deposit.cost,name",0,Cost Name, Nom du coût
+field,"auction.lot.category,priority",0,Priority, Priorité
+field,"auction.lot.category,active",0,Active,
+field,"auction.lot.category,name",0,Category Name, Nom de la catégorie
+field,"auction.lot.category,aie_categ",0,Aie Category, Aie catégorie
+field,"auction.lot.history,lot_id",0,Object, Objet
+field,"auction.lot.history,price",0,Withdrawn price, Prix de retrait
+field,"auction.lot.history,auction_id",0,Auction date, Date de l'enchère
+field,"auction.lot.history,name",0,Date,
+field,"auction.lots,is_ok",0,Buyer s payment, Paiement de l'acheteur
+field,"auction.lots,vnd_lim",0,Seller limit, Limite du vendeur
+field,"auction.lots,statement_id",0,Payment, Paiement
+field,"auction.lots,net_margin",0,Net Margin (%), Marge nette (%) 
+field,"auction.lots,image",0,Image,
+field,"auction.lots,lot_num",0,List Number, N° de liste
+field,"auction.lots,ach_uid",0,Buyer, Acheteur
+field,"auction.lots,sel_inv_id",0,Seller Invoice, Facture du vendeur
+field,"auction.lots,vnd_lim_net",0,Net limit ?,
+field,"auction.lots,bord_vnd_id",0,Depositer Inventory,Dépositaire de l'inventaire
+field,"auction.lots,ach_emp",0,Taken Away, Emporté
+field,"auction.lots,create_uid",0,Created by, Créé par
+field,"auction.lots,net_revenue",0,Net revenue, Revenu net
+field,"auction.lots,artist2_id",0,Artist/Author 2,Artiste/Auteur 2
+field,"auction.lots,obj_comm",0,Commission,
+field,"auction.lots,paid_ach",0,Buyer invoice reconciled, Facture de l'acheteur réconciliée
+field,"auction.lots,lot_local",0,Location, Localisation
+field,"auction.lots,state",0,State, État
+field,"auction.lots,costs",0,Indirect costs,Coûts indirects
+field,"auction.lots,history_ids",0,Auction history,Historique de la vente
+field,"auction.lots,artist_id",0,Artist/Author, Artiste/Auteur
+field,"auction.lots,ach_login",0,Buyer Username, Nom de l'acheteur
+field,"auction.lots,gross_revenue",0,Gross revenue, Revenu brut
+field,"auction.lots,lot_type",0,Object category, Catégorie de l'objet
+field,"auction.lots,author_right",0,Author rights, Droit d'auteurs
+field,"auction.lots,ach_avance",0,Buyer Advance, Avance de l'acheteur
+field,"auction.lots,gross_margin",0,Gross Margin (%), Marge brute (%)
+field,"auction.lots,important",0,To be Emphatized,
+field,"auction.lots,name2",0,Short Description (2), Courte description (2)
+field,"auction.lots,lot_est1",0,Minimum Estimation,
+field,"auction.lots,lot_est2",0,Maximum Estimation, 
+field,"auction.lots,obj_num",0,Catalog Number,N° du catalogue
+field,"auction.lots,name",0,Short Description, Courte description
+field,"auction.lots,buyer_price",0,Buyer price, Prix de l'acheteur
+field,"auction.lots,ach_inv_id",0,Buyer Invoice, Facture de l'acheteur
+field,"auction.lots,obj_price",0,Adjudication price, Prix d'adjudication
+field,"auction.lots,obj_ret",0,Price retired, Prix de retrait
+field,"auction.lots,auction_id",0,Auction Date,Date de l'enchère
+field,"auction.lots,bid_lines",0,Bids, Ordre d'achat
+field,"auction.lots,paid_vnd",0,Seller Paid, Payé pour le vendeur
+field,"auction.lots,product_id",0,Product,Produit
+field,"auction.lots,obj_desc",0,Object Description, Description de l'objet
+field,"auction.lots,seller_price",0,Seller price, Prix du vendeur
+field,"board.board,name",0,Board,Tableau 
+field,"board.note,note",0,Note,Note
+field,"board.note,date",0,Date,Date
+field,"board.note,user_id",0,Author,Auteur
+field,"board.note,name",0,Subject,Sujet
+field,"board.note,type",0,Note type,Type de note
+field,"board.note.type,name",0,Note Type,Type de note
+field,"hr.action.reason,name",0,Reason,Motifs de pointage
+field,"hr.action.reason,action_type",0,Action's type,Type d'action
+field,"hr.attendance,action",0,Action,Pointage
+field,"hr.attendance,employee_id",0,Employee,Employé
+field,"hr.attendance,name",0,Date,Date
+field,"hr.attendance,action_desc",0,Action reason,Motif de pointage
+field,"hr.department,member_ids",0,Members,Membres
+field,"hr.department,name",0,Department Name,Nom du département
+field,"hr.department,child_ids",0,Childs Departments,Départements enfants
+field,"hr.department,company_id",0,Company,Société
+field,"hr.department,note",0,Note,Note
+field,"hr.department,parent_id",0,Parent Department,Département parent
+field,"hr.department,manager_id",0,Manager,Responsable
+field,"hr.employee,address_id",0,Contact address,Adresse
+field,"hr.employee,attendances",0,Employee's attendances,Pointage de l'employé
+field,"hr.employee,user_id",0,Tiny ERP User,Nom d'utilisateur
+field,"hr.employee,name",0,Employee,Nom de l'employé
+field,"hr.employee,started",0,Started on,Commencé le
+field,"hr.employee,notes",0,Notes,Notes
+field,"hr.employee,child_ids",0,Subordinates,Subordonnés
+field,"hr.employee,company_id",0,Company,Entreprise
+field,"hr.employee,holidays",0,Employee's holidays,Congés de l'employé
+field,"hr.employee,parent_id",0,Boss,Directeur
+field,"hr.employee,state",0,Attendance,Présence
+field,"hr.employee,active",0,Active,Actif
+field,"hr.employee,category_id",0,Category,Catégorie
+field,"hr.employee,holiday_max",0,Number of holidays,Nb jours de congé
+field,"hr.employee,workgroups",0,Employee's work team,Équipe de l'employé
+field,"hr.employee,regime",0,Workhours by week,Heures de travail hebdo.
+field,"hr.employee.category,parent_id",0,Parent category,Catégorie parents
+field,"hr.employee.category,child_ids",0,Childs Categories,Catégories enfants
+field,"hr.employee.category,name",0,Category,Catégorie
+field,"hr.holidays,employee_id",0,Employee,Employé
+field,"hr.holidays,date_from",0,Vacation start day,Début du congé
+field,"hr.holidays,holiday_status",0,Holiday's Status,Type de congés
+field,"hr.holidays,name",0,Description,Description
+field,"hr.holidays,date_to",0,Vacation end day,Fin du congé
+field,"hr.holidays.status,name",0,Holiday Status,Types de congés
+model,"hr.holidays.status,name",1,Unpaid holidays,Congés non payés
+model,"hr.holidays.status,name",2,Annual holidays,Congés annuels
+model,"hr.holidays.status,name",3,Sickness holidays,Congés maladie
+model,"hr.holidays.status,name",4,Maternity holidays,Congés de maternité
+model,"hr.holidays.status,name",5,Unauthorised holidays,Congés non autorisés
+model,"hr.holidays.status,name",6,Public holidays,Congés légaux
+field,"hr.timesheet,dayofweek",0,Day of week,Jour de la semaine
+field,"hr.timesheet,name",0,Name,Nom
+field,"hr.timesheet,tgroup_id",0,Employee's timesheet group,Groupe de feuille de présence
+field,"hr.timesheet,date_from",0,Starting date,Date début
+field,"hr.timesheet,hour_from",0,Work from,Présent depuis
+field,"hr.timesheet,hour_to",0,Work to,Jusqu'à
+field,"hr.timesheet.group,timesheet_id",0,Timesheet,Feuille de présence
+field,"hr.timesheet.group,manager",0,Workgroup manager,Responsable du groupe
+field,"hr.timesheet.group,name",0,Group name,Nom du groupe
+field,"ir.actions.act_window,domain",0,Domain Value,Domaine
+field,"ir.actions.act_window,name",0,Action Name,Nom de l'action
+model,"ir.actions.act_window,name",1,Menu,Menu
+model,"ir.actions.act_window,name",2,res.company,Entreprise
+model,"ir.actions.act_window,name",3,Languages,Langues
+model,"ir.actions.act_window,name",4,Users,Utilisateurs
+model,"ir.actions.act_window,name",5,Sequences,Séquences
+model,"ir.actions.act_window,name",6,Sequence Types,Type de séquence
+model,"ir.actions.act_window,name",7,Actions,Actions 
+model,"ir.actions.act_window,name",8,Execute,Exécuter
+model,"ir.actions.act_window,name",9,Group,Groupe
+model,"ir.actions.act_window,name",10,Report Custom,Rapport personnalisé
+model,"ir.actions.act_window,name",11,Report Xml,Rapport Xml
+model,"ir.actions.act_window,name",12,Window Actions,Actions Fenetres
+model,"ir.actions.act_window,name",13,Wizard,Assistant
+model,"ir.actions.act_window,name",14,Company's Structure,Structure de la société
+model,"ir.actions.act_window,name",15,Companies,Sociétés
+model,"ir.actions.act_window,name",16,Users,Utilisateurs
+model,"ir.actions.act_window,name",17,Change My Password,Changer mon mot de passe
+model,"ir.actions.act_window,name",18,Groups,Groupes
+model,"ir.actions.act_window,name",19,Roles Structure,Structure des rôles
+model,"ir.actions.act_window,name",20,Roles,Rôles
+model,"ir.actions.act_window,name",21,View,Vue
+model,"ir.actions.act_window,name",22,Attachments,Attachements
+model,"ir.actions.act_window,name",23,Custom Report,Rapport personnalisé
+model,"ir.actions.act_window,name",24,Objects,Objets
+model,"ir.actions.act_window,name",25,Fields,Champs
+model,"ir.actions.act_window,name",26,All terms,Tous les termes
+model,"ir.actions.act_window,name",27,Grant access to menu,Autoriser l'accès au menu
+model,"ir.actions.act_window,name",28,Scheduled Actions,Actions planifiées
+model,"ir.actions.act_window,name",29,Access controls,Contrôle d'accès
+model,"ir.actions.act_window,name",30,,
+model,"ir.actions.act_window,name",31,,
+model,"ir.actions.act_window,name",32,,
+model,"ir.actions.act_window,name",33,,
+model,"ir.actions.act_window,name",34,,
+model,"ir.actions.act_window,name",35,,
+model,"ir.actions.act_window,name",42,Categories of Modules,Catégories de modules
+model,"ir.actions.act_window,name",43,,
+model,"ir.actions.act_window,name",44,Modules,Modules
+model,"ir.actions.act_window,name",45,Installed modules,Modules installés
+model,"ir.actions.act_window,name",46,Uninstalled modules,Modules non-installés
+model,"ir.actions.act_window,name",47,"Modules to be installed, upgraded or removed","Modules à installer, mettre à jour ou effacer"
+model,"ir.actions.act_window,name",48,,
+model,"ir.actions.act_window,name",50,,
+model,"ir.actions.act_window,name",51,,
+model,"ir.actions.act_window,name",53,Partner Functions,Fonction du partenaire
+model,"ir.actions.act_window,name",54,Country,Pays
+model,"ir.actions.act_window,name",55,States,Etats
+model,"ir.actions.act_window,name",56,Partner contacts,Contacts partenaire
+model,"ir.actions.act_window,name",57,Partner Contacts,Contact partenaire
+model,"ir.actions.act_window,name",58,Partners Titles,Titres des partenaires
+model,"ir.actions.act_window,name",59,Partners,Partenaires
+model,"ir.actions.act_window,name",60,Payment term,Délai de paiement
+model,"ir.actions.act_window,name",61,Company Architecture,Structure de l'entreprise
+model,"ir.actions.act_window,name",62,Partner categories,Catégories de partenaires
+model,"ir.actions.act_window,name",63,,
+model,"ir.actions.act_window,name",64,Partner categories,Catégories de partenaires
+model,"ir.actions.act_window,name",65,Type of Partner Categories,Type de catégorie de partenaire 
+model,"ir.actions.act_window,name",66,Partner Categories,Catégorie de partenaire
+model,"ir.actions.act_window,name",67,Partner,Partenaire 
+model,"ir.actions.act_window,name",70,,
+model,"ir.actions.act_window,name",71,,
+model,"ir.actions.act_window,name",72,,
+model,"ir.actions.act_window,name",73,States of mind,Etat d'esprit
+model,"ir.actions.act_window,name",74,Default properties,Propriétés par défaut
+model,"ir.actions.act_window,name",75,,
+model,"ir.actions.act_window,name",78,Employees Structure,Structure des employés
+model,"ir.actions.act_window,name",79,,
+model,"ir.actions.act_window,name",80,,
+model,"ir.actions.act_window,name",81,Hierarchical view of this employee,Vue hiérarchisée de cet employé
+model,"ir.actions.act_window,name",82,,
+model,"ir.actions.act_window,name",83,,
+model,"ir.actions.act_window,name",84,Categories structure,Structure des catégories
+model,"ir.actions.act_window,name",85,,
+model,"ir.actions.act_window,name",86,,
+model,"ir.actions.act_window,name",87,,
+model,"ir.actions.act_window,name",88,,
+model,"ir.actions.act_window,name",93,Departments,déparements
+model,"ir.actions.act_window,name",94,Departments,Départements
+model,"ir.actions.act_window,name",96,,
+model,"ir.actions.act_window,name",97,,
+model,"ir.actions.act_window,name",98,,
+model,"ir.actions.act_window,name",99,,
+model,"ir.actions.act_window,name",100,,
+model,"ir.actions.act_window,name",101,,
+model,"ir.actions.act_window,name",102,,
+model,"ir.actions.act_window,name",103,,
+model,"ir.actions.act_window,name",104,,
+model,"ir.actions.act_window,name",105,,
+model,"ir.actions.act_window,name",106,,
+model,"ir.actions.act_window,name",107,,
+model,"ir.actions.act_window,name",108,Publish a note,Publier une note
+model,"ir.actions.act_window,name",130,Fiscal Years,Année fiscale
+model,"ir.actions.act_window,name",131,Periods,Périodes
+model,"ir.actions.act_window,name",132,Accounts,Comptes 
+model,"ir.actions.act_window,name",133,Chart of Accounts,Plan de comptes
+model,"ir.actions.act_window,name",134,Fast Chart of Accounts,Plan de compte rapide
+model,"ir.actions.act_window,name",135,Account journal,Journal de compte
+model,"ir.actions.act_window,name",136,Statements,Extraits 
+model,"ir.actions.act_window,name",137,Draft statements,Extraits brouillon
+model,"ir.actions.act_window,name",138,Account Types,Types de compte
+model,"ir.actions.act_window,name",139,Tax codes,Codes de taxe
+model,"ir.actions.act_window,name",140,Tax Report,Rapport de taxe
+model,"ir.actions.act_window,name",141,Taxes Structure,Structure de taxes
+model,"ir.actions.act_window,name",142,Taxes,Taxes
+model,"ir.actions.act_window,name",145,Open Journals,Journaux ouverts
+model,"ir.actions.act_window,name",146,,
+model,"ir.actions.act_window,name",147,Entries,Entrées 
+model,"ir.actions.act_window,name",148,Entry lines,Lignes d'entrée
+model,"ir.actions.act_window,name",150,Statements reconciliation,Réconciliation d'extraits
+model,"ir.actions.act_window,name",152,Entries,Entrées 
+model,"ir.actions.act_window,name",153,Unreconciled entries,Entrées non-réconciliées
+model,"ir.actions.act_window,name",154,Reconciled entries,Entrées réconciliées
+model,"ir.actions.act_window,name",155,Journals,journaux
+model,"ir.actions.act_window,name",156,Budgets,Budgets
+model,"ir.actions.act_window,name",157,,
+model,"ir.actions.act_window,name",158,,
+model,"ir.actions.act_window,name",159,,
+model,"ir.actions.act_window,name",160,Subscription Entries,Ecritures d’abonnement
+model,"ir.actions.act_window,name",161,Running Subscriptions,Abonnements en cours
+model,"ir.actions.act_window,name",162,Next Entries,Prochaine entrée
+model,"ir.actions.act_window,name",163,,
+model,"ir.actions.act_window,name",165,,
+model,"ir.actions.act_window,name",166,Chart of accounts,Plan de compte
+model,"ir.actions.act_window,name",167,VAT mode,Mode TVA
+model,"ir.actions.act_window,name",169,,
+model,"ir.actions.act_window,name",170,,
+model,"ir.actions.act_window,name",171,,
+model,"ir.actions.act_window,name",172,Bank statements,Extraits de compte
+model,"ir.actions.act_window,name",173,Entry lines,Lignes d'entrée
+model,"ir.actions.act_window,name",174,Receivables & Payables,Recevables & payables
+model,"ir.actions.act_window,name",175,All account entries,Toutes les entrées de compte
+model,"ir.actions.act_window,name",176,,
+model,"ir.actions.act_window,name",177,Customer Invoice,Facture client
+model,"ir.actions.act_window,name",178,Supplier Invoice,Facture fournisseur
+model,"ir.actions.act_window,name",179,Customer Refund,Note de crédit client 
+model,"ir.actions.act_window,name",180,Supplier Refund,Note de crédit fournisseur
+model,"ir.actions.act_window,name",181,Draft Customer Invoices,Facture client brouillon
+model,"ir.actions.act_window,name",182,PRO-FORMA Customer Invoices,Facture client Pro-Forma
+model,"ir.actions.act_window,name",183,Open Customer Invoices,Facture client ouverte
+model,"ir.actions.act_window,name",184,Draft Supplier Invoices,Facture fournisseur brouillon
+model,"ir.actions.act_window,name",185,Open Supplier Invoices,Ouvrir facture fournisseur
+model,"ir.actions.act_window,name",186,Draft Customer Refunds,Note de crédit client brouillon
+model,"ir.actions.act_window,name",187,Open Customer Refunds,Ouvrir les notes de crédit client
+model,"ir.actions.act_window,name",188,Draft Supplier Refunds,Notes de crédit fournisseur brouillon
+model,"ir.actions.act_window,name",189,Open Supplier Refunds,Ouvrir les notes de crédit fournisseur
+model,"ir.actions.act_window,name",190,All Invoices,Toutes les factures
+model,"ir.actions.act_window,name",191,Open invoices,Factures ouvertes
+model,"ir.actions.act_window,name",192,Open invoices,Factures ouvertes
+model,"ir.actions.act_window,name",193,Invoice lines,Lignes de facture
+model,"ir.actions.act_window,name",211,,
+model,"ir.actions.act_window,name",212,Analytic Charts of Accounts,Plan de compte analytique
+model,"ir.actions.act_window,name",213,,
+model,"ir.actions.act_window,name",214,,
+model,"ir.actions.act_window,name",215,,
+model,"ir.actions.act_window,name",216,,
+model,"ir.actions.act_window,name",217,,
+model,"ir.actions.act_window,name",218,,
+model,"ir.actions.act_window,name",219,,
+model,"ir.actions.act_window,name",220,Account cost and revenue by journal,Compte de coût et de revenu par journal
+model,"ir.actions.act_window,name",221,Account cost and revenue by journal (This Month),Compte de coût et de revenu par journal (ce mois)
+model,"ir.actions.act_window,name",222,,
+model,"ir.actions.act_window,name",223,Costs & revenues,Coûts et revenus
+model,"ir.actions.act_window,name",237,Custom reporting,Personnaliser un rapport
+model,"ir.actions.act_window,name",238,,
+model,"ir.actions.act_window,name",239,Custom reporting,Personnaliser un rapport
+model,"ir.actions.act_window,name",240,Fiscal Statements reporting,Rapport des extraits fiscaux
+model,"ir.actions.act_window,name",241,Indicators reporting,Rapport d'indicateurs
+model,"ir.actions.act_window,name",242,Others reportings,Autres rapports
+model,"ir.actions.act_window,name",244,,
+model,"ir.actions.act_window,name",245,,
+model,"ir.actions.act_window,name",246,Next Auctions, Prochaines ventes
+model,"ir.actions.act_window,name",247,Old Auctions, Anciennes ventes
+model,"ir.actions.act_window,name",248,,
+model,"ir.actions.act_window,name",249,,
+model,"ir.actions.act_window,name",250,,
+model,"ir.actions.act_window,name",251,,
+model,"ir.actions.act_window,name",252,,
+model,"ir.actions.act_window,name",253,Unsold objects, Objets non vendus
+model,"ir.actions.act_window,name",254,Unclassified objects, Objets inclassifiés
+model,"ir.actions.act_window,name",255,Deposit border, Bordereau de dépôt
+model,"ir.actions.act_window,name",256,,
+model,"ir.actions.act_window,name",257,,
+model,"ir.actions.act_window,name",258,,
+model,"ir.actions.act_window,name",259,Auction report, Rapport de l'auction
+model,"ir.actions.act_window,name",260,Auction report,Rapport de l'auction
+model,"ir.actions.act_window,name",261,Auction report, Rapport de l'auction
+model,"ir.actions.act_window,name",262,Seller's auction,Ventes/Vendeurs
+model,"ir.actions.act_window,name",263,Seller's auction, Ventes/Vendeurs
+model,"ir.actions.act_window,name",264,Seller's auction, Ventes/Vendeurs
+model,"ir.actions.act_window,name",265,Buyer's auction, Ventes/Vendeurs
+model,"ir.actions.act_window,name",266,Buyer's auction, Ventes/Vendeurs
+model,"ir.actions.act_window,name",267,Buyer's auction, Ventes/Vendeurs
+model,"ir.actions.act_window,name",268,Buyer's auction for all months, Ventes/Vendeurs de l'année en cours
+model,"ir.actions.act_window,name",269,Min est/Adj/Max est,
+model,"ir.actions.act_window,name",270,Min est/Adj/Max est,
+model,"ir.actions.act_window,name",271,,
+model,"ir.actions.act_window,name",272,,
+model,"ir.actions.act_window,name",273,,
+model,"ir.actions.act_window,name",274,,
+model,"ir.actions.act_window,name",275,,
+model,"ir.actions.act_window,name",276,,
+model,"ir.actions.act_window,name",277,,
+model,"ir.actions.act_window,name",278,,
+model,"ir.actions.act_window,name",279,Detailed lots, Lots détaillés
+model,"ir.actions.act_window,name",280,Simplified lots for adjudication, Lots simplifiés
+model,"ir.actions.act_window,name",281,Auction dates, Dates de l'enchère
+model,"ir.actions.act_window,name",282,Open lots, Lots ouverts
+model,"ir.actions.act_window,name",283,,
+model,"ir.actions.act_window,name",284,,
+model,"ir.actions.act_window,name",285,,
+model,"ir.actions.act_window,name",286,,
+model,"ir.actions.act_window,name",317,Auction member board, Tableau de bord de l'employé
+model,"ir.actions.act_window,name",318,Auction manager board, Tableau de bord pour le manager
+field,"ir.actions.act_window,view_type",0,Type of view,Type de vue
+field,"ir.actions.act_window,res_model",0,Model,Modèle
+field,"ir.actions.act_window,view_id",0,View Ref.,Réf. vue
+field,"ir.actions.act_window,views",0,Views,Vues
+field,"ir.actions.act_window,src_model",0,Source model,Modèle source
+field,"ir.actions.act_window,view_mode",0,Mode of view,Mode de vue
+field,"ir.actions.act_window,context",0,Context Value,Valeur contextuelle
+field,"ir.actions.act_window,type",0,Action Type,Type d'action
+field,"ir.actions.act_window,usage",0,Action Usage,Utilisation de l'action
+field,"ir.actions.act_window,view_ids",0,Views,Vues
+field,"ir.actions.act_window.view,act_window_id",0,Action,Action
+field,"ir.actions.act_window.view,multi",0,On multiple doc.,Sur document multiple
+field,"ir.actions.act_window.view,view_id",0,View,Vue
+field,"ir.actions.act_window.view,view_mode",0,Type of view,Type de vue
+field,"ir.actions.act_window.view,sequence",0,Sequence,Séquence
+field,"ir.actions.actions,usage",0,Action Usage,Utilisation de l'action
+field,"ir.actions.actions,type",0,Action Type,Type d'action
+field,"ir.actions.actions,name",0,Action Name,Nom de l'action
+field,"ir.actions.execute,usage",0,Action Usage,Utilisation de l'action
+field,"ir.actions.execute,func_name",0,Function Name,Nom de la fonction
+field,"ir.actions.execute,func_arg",0,Function Argument,Argument de la fonction
+field,"ir.actions.execute,type",0,type,Type
+field,"ir.actions.execute,name",0,name,Nom
+field,"ir.actions.group,usage",0,Action Usage,Utilisation de l'action
+field,"ir.actions.group,type",0,Action Type,Type d'action
+field,"ir.actions.group,name",0,Group Name,Nom du groupe
+field,"ir.actions.group,exec_type",0,Execution sequence,Séquence d'exécution
+field,"ir.actions.report.custom,multi",0,On multiple doc.,Sur document multiple
+field,"ir.actions.report.custom,name",0,Report Name,Nom de rapport
+field,"ir.actions.report.custom,usage",0,Action Usage,Utilisation de l'action
+field,"ir.actions.report.custom,model",0,Model,Modèle
+field,"ir.actions.report.custom,type",0,Report Type,Type de rapport
+field,"ir.actions.report.custom,report_id",0,Report Ref.,Réf. Rapport
+field,"ir.actions.report.xml,multi",0,On multiple doc.,Sur document multiple
+field,"ir.actions.report.xml,report_xsl",0,XSL path,Fichier XSL
+field,"ir.actions.report.xml,name",0,Name,Nom du rapport-XML
+model,"ir.actions.report.xml,name",49,Technical guide,Guide technique
+model,"ir.actions.report.xml,name",52,Labels,Étiquettes
+model,"ir.actions.report.xml,name",194,General Ledger,Grand livre
+model,"ir.actions.report.xml,name",195,Partner ledger,?
+model,"ir.actions.report.xml,name",196,Account balance,Balance des comptes
+model,"ir.actions.report.xml,name",197,Partner balance,Balance du partenaire
+model,"ir.actions.report.xml,name",198,Print Budget,Impression du budget
+model,"ir.actions.report.xml,name",199,Print Central Journal,Journal regroupé par compte
+model,"ir.actions.report.xml,name",200,Print General Journal,Journal général
+model,"ir.actions.report.xml,name",201,Print Journal,Journal détaillé par écriture
+model,"ir.actions.report.xml,name",202,Overdue payments,Rappels
+model,"ir.actions.report.xml,name",203,Invoices,Factures
+model,"ir.actions.report.xml,name",204,Transfers,Transferts
+model,"ir.actions.report.xml,name",205,IntraCom,IntraCom
+model,"ir.actions.report.xml,name",206,All Entries,Toutes les entrées
+model,"ir.actions.report.xml,name",207,Taxes report,Rapport de taxe
+model,"ir.actions.report.xml,name",224,Analytic Journal,Journal analytique
+model,"ir.actions.report.xml,name",226,Analytic Balance,Balance Analytique
+model,"ir.actions.report.xml,name",228,Inverted Analytic Balance,Balance Analytique Inversée
+model,"ir.actions.report.xml,name",230,Cost Ledger,Grand Livre
+model,"ir.actions.report.xml,name",232,Cost Ledger (Only quantities),Grand Livre (quantités uniquement)
+model,"ir.actions.report.xml,name",234,Analytic Check,Contrôle analytique
+model,"ir.actions.report.xml,name",236,Print Budget,Impression du budget
+model,"ir.actions.report.xml,name",243,Fiscal Statements,Extraits fiscaux
+model,"ir.actions.report.xml,name",287,Artists Biography,Biographie de l'auteur
+model,"ir.actions.report.xml,name",288,Bids phones,Téléphone: Ordre d'achat 
+model,"ir.actions.report.xml,name",289,Bids, Ordre d'achat
+model,"ir.actions.report.xml,name",290,Seller Labels, Intitulé du vendeur
+model,"ir.actions.report.xml,name",291,Catalog, Catalogue
+model,"ir.actions.report.xml,name",292,Deposit Letter, Lettre de dépôt
+model,"ir.actions.report.xml,name",293,Lots List, Liste des lots
+model,"ir.actions.report.xml,name",294,Lots List - Landscape, Liste des lots - Paysage
+model,"ir.actions.report.xml,name",295,Lots List Inventory,
+model,"ir.actions.report.xml,name",296,Lots List, Liste des lots
+model,"ir.actions.report.xml,name",297,Buyer lists, Listes des acheteurs
+model,"ir.actions.report.xml,name",298,Auction Totals with lists, Totaux de la vente
+model,"ir.actions.report.xml,name",299,Buyer Form, Fiche du acheteur
+model,"ir.actions.report.xml,name",300,Seller form, Fiche du vendeur
+model,"ir.actions.report.xml,name",301,Seller List, Listes des vendeurs 
+model,"ir.actions.report.xml,name",302,Bids per lot (phone), Ordre d'achat par lot(tél) 
+model,"ir.actions.report.xml,name",303,Auction's results, Résultat de la vente
+model,"ir.actions.report.xml,name",304,Results with buyer, Résultats des acheteurs
+field,"ir.actions.report.xml,report_rml_content",0,RML content,Contenu RML
+field,"ir.actions.report.xml,report_rml",0,RML path,Chemin RML
+field,"ir.actions.report.xml,auto",0,Automatic XSL:RML,XSL:RML Automatique
+field,"ir.actions.report.xml,report_sxw_content",0,SXW content,Contenu SXW
+field,"ir.actions.report.xml,report_name",0,Internal Name,Nom interne
+field,"ir.actions.report.xml,header",0,Add RML header,Ajouter un titre RML
+field,"ir.actions.report.xml,usage",0,Action Usage,Utilisation de l'action
+field,"ir.actions.report.xml,model",0,Model,Modèle de données
+field,"ir.actions.report.xml,type",0,Report Type,Type de rapport
+field,"ir.actions.report.xml,report_xml",0,XML path,Fichier XML
+field,"ir.actions.wizard,wiz_name",0,Wizard name,Nom de l'assistant
+field,"ir.actions.wizard,multi",0,Action on multiple doc.,Action sur des documents multiples
+field,"ir.actions.wizard,type",0,Action type,Type d'action
+field,"ir.actions.wizard,name",0,Wizard info,Info. sur l'assistant
+model,"ir.actions.wizard,name",36,Import module,Importer un module
+model,"ir.actions.wizard,name",37,Download module list,Télécharger la liste des modules
+model,"ir.actions.wizard,name",38,Apply upgrades,Appliquer les mises à jour
+model,"ir.actions.wizard,name",39,Install new language file,Installation d'un fichier de langue
+model,"ir.actions.wizard,name",40,Export language,Exporter un langage
+model,"ir.actions.wizard,name",41,Import language,Importer un langage
+model,"ir.actions.wizard,name",68,Send SMS,Envoyer un SMS
+model,"ir.actions.wizard,name",69,Mass Mailing,Mailing
+model,"ir.actions.wizard,name",76,Setup,Configuration
+model,"ir.actions.wizard,name",77,Setup,Configuration
+model,"ir.actions.wizard,name",89,Sign in / Sign out,Pointer l'entrée / Pointer la sortie
+model,"ir.actions.wizard,name",90,Print Timesheet by week,Imprimer Feuilles de présence par semaine
+model,"ir.actions.wizard,name",91,Print Timesheet by month,Imprimer Feuilles de présence par mois
+model,"ir.actions.wizard,name",92,Print Attendance Error Report,Imprimer écarts de présences
+model,"ir.actions.wizard,name",95,Check EAN13,Vérifier EAN13
+model,"ir.actions.wizard,name",109,Refund invoice,Note de crédit
+model,"ir.actions.wizard,name",110,Pay invoice,Payer la facture
+model,"ir.actions.wizard,name",111,Spread amount,Ventiler le montant
+model,"ir.actions.wizard,name",112,Close a fiscal year,Clôturer une année fiscale
+model,"ir.actions.wizard,name",113,Close Period,Clôturer la période
+model,"ir.actions.wizard,name",114,Automatic reconciliation,Réconciliation automatique
+model,"ir.actions.wizard,name",115,Reconcile Entries,Écritures réconciliées
+model,"ir.actions.wizard,name",116,Unreconcile Entries,Écritures non réconciliées
+model,"ir.actions.wizard,name",117,Reconcile entries,Réconcilier les entrées
+model,"ir.actions.wizard,name",118,Unreconcile Entries,Écritures non réconciliées
+model,"ir.actions.wizard,name",119,Unreconcile entries,Entrées non-réconciliées
+model,"ir.actions.wizard,name",120,Create subscription entries,?
+model,"ir.actions.wizard,name",121,Aged partner balance,Balance partenaire âgée
+model,"ir.actions.wizard,name",122,Partner balance,Balance du partenaire
+model,"ir.actions.wizard,name",123,Partner ledger,?
+model,"ir.actions.wizard,name",124,Budget,Budget
+model,"ir.actions.wizard,name",125,Account balance,Balance de compte
+model,"ir.actions.wizard,name",126,General ledger,Grand livre des comptes
+model,"ir.actions.wizard,name",127,Confirm draft invoices,Confirmer les factures brouillon
+model,"ir.actions.wizard,name",128,Cancel selected invoices,Annuler les factures sélectionnées
+model,"ir.actions.wizard,name",129,Duplicate,Dupliquer
+model,"ir.actions.wizard,name",143,Standard entry,Entrée standard
+model,"ir.actions.wizard,name",144,Standard entry,Entrée standard
+model,"ir.actions.wizard,name",149,Accounts Charts,Plan de comptes
+model,"ir.actions.wizard,name",151,Bank reconciliation,Réconciliation bancaire
+model,"ir.actions.wizard,name",164,Move line select,Déplacer la ligne sélectionnée
+model,"ir.actions.wizard,name",168,Set chart of accounts,Faire le plan de compte
+model,"ir.actions.wizard,name",208,Wizard taxes report,?
+model,"ir.actions.wizard,name",209,Spread amount,Ventiler le montant
+model,"ir.actions.wizard,name",210,Budget,Budget
+model,"ir.actions.wizard,name",225,Analytic Journal,Journal analytique
+model,"ir.actions.wizard,name",227,Analytic Balance,Balance analytique
+model,"ir.actions.wizard,name",229,Inverted Analytic Balance,Balance Analytique Inversée
+model,"ir.actions.wizard,name",231,Cost Ledger,Grand Livre
+model,"ir.actions.wizard,name",233,Cost Ledger (Only quantities),Grand Livre (quantités uniquement)
+model,"ir.actions.wizard,name",235,Analytic Check,Contrôle analytique
+model,"ir.actions.wizard,name",305,Send to website, Envoi vers le site web
+model,"ir.actions.wizard,name",306,Send results to Auction-in-europe.com, Envoi des résultats vers Auction-in-europe.com
+model,"ir.actions.wizard,name",307,Map buyer username to Partners, Associer un acheteur à un partenaire 
+model,"ir.actions.wizard,name",308,Change Auction Date, Changer la date de l'enchère
+model,"ir.actions.wizard,name",309,Pay objects of the buyer, Payer les objets de l'acheteur
+model,"ir.actions.wizard,name",310,Numerotation (automatic),Numérotation automatique
+model,"ir.actions.wizard,name",311,SMS Send, Envoi SMS
+model,"ir.actions.wizard,name",312,Invoice Seller objects, Facturer les objets du vendeur
+model,"ir.actions.wizard,name",313,Invoice Buyer objects, Facturer les objets de l'acheteur
+model,"ir.actions.wizard,name",314,Unmark as taken away, Marquer comme non emporté
+model,"ir.actions.wizard,name",315,Mark as taken away, Marquer comme emporté
+model,"ir.actions.wizard,name",316,Auction Catalog Flagey,
+field,"ir.attachment,description",0,Description,Description
+field,"ir.attachment,res_model",0,Resource Model,Modèle de ressource
+field,"ir.attachment,link",0,Link,Lien
+field,"ir.attachment,datas_fname",0,Data Filename,Nom du fichier
+field,"ir.attachment,res_id",0,Resource ID,ID ressource
+field,"ir.attachment,datas",0,Data,Données
+field,"ir.attachment,name",0,Attachment Name,Nom de la pièces jointe
+field,"ir.cron,function",0,Function,Fonction
+field,"ir.cron,args",0,Arguments,Arguments
+field,"ir.cron,user_id",0,User,Utilisateur
+field,"ir.cron,name",0,Name,Nom
+field,"ir.cron,interval_type",0,Interval Unit,Unité d'intervalle
+field,"ir.cron,numbercall",0,Number of calls,Nombre d'exécutions
+field,"ir.cron,nextcall",0,Next call date,Dernière exécution
+field,"ir.cron,priority",0,Priority,Priorité (0=Très urgent)
+field,"ir.cron,doall",0,Repeat missed,Recommencer tous les ratés
+field,"ir.cron,active",0,Active,Active
+field,"ir.cron,interval_number",0,Interval Number,Nombre d'intervalle
+field,"ir.cron,model",0,Model,Modèle
+field,"ir.default,uid",0,Users,Utilisateurs
+field,"ir.default,ref_table",0,Table Ref.,Réf. Table
+field,"ir.default,company_id",0,Company,Société
+field,"ir.default,value",0,Default Value,Valeur par défaut
+field,"ir.default,ref_id",0,ID Ref.,Réf. ID
+field,"ir.default,field_tbl",0,Model,Modèle
+field,"ir.default,field_name",0,Model field,Champs du modèle
+field,"ir.default,page",0,View,Vue
+field,"ir.exports,export_fields",0,Export Id,Exporter ID
+field,"ir.exports,resource",0,Resource,Ressource
+field,"ir.exports,name",0,Export name,Exporter le nom
+field,"ir.exports.line,export_id",0,Exportation,Exportation
+field,"ir.exports.line,name",0,Field name,Nom du champ
+field,"ir.model,info",0,Information,Information
+field,"ir.model,model",0,Object name,Modèle
+field,"ir.model,field_id",0,Fields,Ids des champs
+field,"ir.model,name",0,Model name,Nom
+model,"ir.model,name",1,ir.sequence.type,Type de séquence
+model,"ir.model,name",2,ir.sequence,Séquence
+model,"ir.model,name",3,ir.ui.menu,ir.ui.menu
+model,"ir.model,name",4,ir.ui.view,Vue
+model,"ir.model,name",5,ir.ui.view_sc,Raccourcis vue
+model,"ir.model,name",6,ir.actions.actions,Actions
+model,"ir.model,name",7,ir.actions.execute,Exécuter actions
+model,"ir.model,name",8,ir.actions.group,Groupe actions
+model,"ir.model,name",9,ir.actions.report.custom,Rapport personnalisés actions
+model,"ir.model,name",10,ir.actions.report.xml,Rapport XML actions
+model,"ir.model,name",11,ir.actions.act_window,Fenêtre d'action
+model,"ir.model,name",12,ir.actions.act_window.view,
+model,"ir.model,name",13,ir.actions.wizard,Assistant d'action
+model,"ir.model,name",14,ir.default,Défaut
+model,"ir.model,name",15,ir.model,Modèle
+model,"ir.model,name",16,ir.model.fields,Champs
+model,"ir.model,name",17,ir.model.access,ir.model.access
+model,"ir.model,name",18,ir.model.data,ir.model.data
+model,"ir.model,name",19,ir.report.custom,Rapport personnalisé
+model,"ir.model,name",20,ir.report.custom.fields,Champs personnalisés
+model,"ir.model,name",21,ir.attachment,Pièce jointe
+model,"ir.model,name",22,ir.cron,Tâche
+model,"ir.model,name",23,ir.values,Valeurs
+model,"ir.model,name",24,ir.translation,Traduction
+model,"ir.model,name",25,ir.exports,
+model,"ir.model,name",26,ir.exports.line,
+model,"ir.model,name",27,workflow,Workflow
+model,"ir.model,name",28,workflow.activity,Activité workflow
+model,"ir.model,name",29,workflow.transition,Transition workflow
+model,"ir.model,name",30,workflow.instance,Instance workflow
+model,"ir.model,name",31,workflow.workitem,
+model,"ir.model,name",32,workflow.triggers,Déclencheurs de workflow
+model,"ir.model,name",33,ir.rule.group,
+model,"ir.model,name",34,ir.rule,
+model,"ir.model,name",35,Module Repository,Dépôt de modules
+model,"ir.model,name",36,Module Category,Catégorie de module
+model,"ir.model,name",37,Module,Module
+model,"ir.model,name",38,Module dependency,Dépendances entre les modules
+model,"ir.model,name",39,Function of the contact,Fonction du contact
+model,"ir.model,name",40,Country,Pays
+model,"ir.model,name",41,Country state,État
+model,"ir.model,name",42,Payment term,Condition de paiement
+model,"ir.model,name",43,Partner category types,Types de catégorie partenaire
+model,"ir.model,name",44,Partner Categories,Catégories partenaire
+model,"ir.model,name",45,res.partner.title,Titre du partenaire
+model,"ir.model,name",46,Partner,Partenaire
+model,"ir.model,name",47,Partner Contact,Contact
+model,"ir.model,name",48,Bank Account Type,Type de compte bancaire
+model,"ir.model,name",49,Bank type fields,Champs types de banque
+model,"ir.model,name",50,Bank Details,Détail de la banque
+model,"ir.model,name",51,Channels,Canaux
+model,"ir.model,name",52,res.partner.som,État d'esprit
+model,"ir.model,name",53,res.partner.event,Évènement partenaire
+model,"ir.model,name",54,Partner Events,Évènement partenaire
+model,"ir.model,name",55,Currency,Devise
+model,"ir.model,name",56,Currency Rate,Taux de change
+model,"ir.model,name",57,res.company,Société
+model,"ir.model,name",58,res.groups,Groupes
+model,"ir.model,name",59,res.roles,Rôles
+model,"ir.model,name",60,res.lang,Langue
+model,"ir.model,name",61,res.users,Utilisateurs
+model,"ir.model,name",62,res.request,Requête
+model,"ir.model,name",63,res.request.link,Lien
+model,"ir.model,name",64,res.request.history,History
+model,"ir.model,name",65,ir.property,
+model,"ir.model,name",66,Timesheet,Feuille d'heures
+model,"ir.model,name",67,Employee Category,Catégorie d'employé
+model,"ir.model,name",68,Employee,Employé
+model,"ir.model,name",69,Timesheet Line,Ligne de feuille d'heures
+model,"ir.model,name",70,Action reason,Explication de la tâche
+model,"ir.model,name",71,Attendance,Pointage
+model,"ir.model,name",72,Holidays Status,Statut des vacances
+model,"ir.model,name",73,Holidays,Vacances
+model,"ir.model,name",74,hr.department,
+model,"ir.model,name",75,Product uom categ,Unité de mesure du produit
+model,"ir.model,name",76,Product Unit of Measure,Unité de mesure du produit
+model,"ir.model,name",77,Shipping Unit,Unité de livraison
+model,"ir.model,name",78,Product Category,Catégorie de produit
+model,"ir.model,name",79,Product Template,Modèle de produit
+model,"ir.model,name",80,Product,Produit
+model,"ir.model,name",81,Conditionnement,Conditionnement
+model,"ir.model,name",82,Information about a product supplier,Information sur le fournisseur du produit
+model,"ir.model,name",83,pricelist.partnerinfo,Informations sur le partenaire
+model,"ir.model,name",84,Price type,Type de prix
+model,"ir.model,name",85,Pricelist Type,Type de liste de prix
+model,"ir.model,name",86,Pricelist,Liste de prix
+model,"ir.model,name",87,Pricelist Version,Version de la liste de prix
+model,"ir.model,name",88,Pricelist item,Élément de la liste de prix
+model,"ir.model,name",89,board.board,
+model,"ir.model,name",90,board.note.type,
+model,"ir.model,name",91,board.note,?
+model,"ir.model,name",92,Payment Term,Condition de paiement
+model,"ir.model,name",93,Payment Term Line,Détail de la condition de paiement
+model,"ir.model,name",94,Account Type,Type de compte
+model,"ir.model,name",95,Account,Compte
+model,"ir.model,name",96,Journal View,Journal
+model,"ir.model,name",97,Journal Column,Colonne du journal
+model,"ir.model,name",98,Journal,Journal
+model,"ir.model,name",99,Fiscal Year,Exercice comptable
+model,"ir.model,name",100,Account period,Période
+model,"ir.model,name",101,Journal - Period,Journal - Période
+model,"ir.model,name",102,Account Entry,Écriture comptable
+model,"ir.model,name",103,Account Reconciliation,Lettrage de compte
+model,"ir.model,name",104,Tax Code,Code de taxe
+model,"ir.model,name",105,Tax,Taxe
+model,"ir.model,name",106,Budget item,Poste budgétaire
+model,"ir.model,name",107,Budget item endowment,Répartition des postes budgétaires
+model,"ir.model,name",108,Account Model,Modèle de compte
+model,"ir.model,name",109,Account Model Entries,Modèle d'écriture comptable
+model,"ir.model,name",110,Account Subscription,Écritures périodiques
+model,"ir.model,name",111,Account Subscription Line,Détail d'une écritures périodiques
+model,"ir.model,name",112,account.analytic.account,Centre de coûts
+model,"ir.model,name",113,account.analytic.journal,Journal analytique
+model,"ir.model,name",114,Budget item,Poste budgétaire
+model,"ir.model,name",115,Budget item endowment,Répartition des postes budgétaires
+model,"ir.model,name",116,Invoice,Facture
+model,"ir.model,name",117,Invoice line,Ligne de facture
+model,"ir.model,name",118,Invoice Tax,Taxe
+model,"ir.model,name",119,Bank Statement,Relevé bancaire
+model,"ir.model,name",120,Statement reconcile,Réconciliation d'extraits
+model,"ir.model,name",121,Statement reconcile line,Ligne d'extrait réconciliée
+model,"ir.model,name",122,Bank Statement Line,Détail du relevé bancaire
+model,"ir.model,name",123,Entry lines,Lignes d'entrée
+model,"ir.model,name",124,Analytic lines,Lignes analytiques
+model,"ir.model,name",125,Analytic account costs and revenues,Compte analytique coûts et revenus
+model,"ir.model,name",126,Account reporting,Rapport de compte
+model,"ir.model,name",127,auction.artists,
+model,"ir.model,name",128,auction.dates,
+model,"ir.model,name",129,Deposit Border,
+model,"ir.model,name",130,auction.deposit.cost,
+model,"ir.model,name",131,auction.lot.category,
+model,"ir.model,name",132,Object,
+model,"ir.model,name",133,Bid auctions,
+model,"ir.model,name",134,Lot history,
+model,"ir.model,name",135,Bid,
+model,"ir.model,name",136,Auction Reporting on buyer view,
+model,"ir.model,name",137,Auction Reporting on buyer view,
+model,"ir.model,name",138,Auction Reporting on seller view,
+model,"ir.model,name",139,Auction Reporting on seller view2,
+model,"ir.model,name",140,Auction Reporting on  view2,
+model,"ir.model,name",141,Auction Reporting on view1,
+model,"ir.model,name",142,Objects per day,
+model,"ir.model,name",143,comparaison estimate/adjudication ,
+model,"ir.model,name",144,report_auction_adjudication,
+model,"ir.model,name",145,Report Sign In/Out,
+model,"ir.model,name",146,Report deposit border,
+model,"ir.model,name",147,Object encoded,
+model,"ir.model,name",148,Object encoded,
+model,"ir.model,name",149,Unclassified objects ,
+field,"ir.model.access,model_id",0,Model,Modèle
+field,"ir.model.access,perm_read",0,Read Access,Accès en lecture
+field,"ir.model.access,name",0,Name,Nom
+field,"ir.model.access,perm_unlink",0,Delete Permission,Annuler la permission
+field,"ir.model.access,perm_write",0,Write Access,Accès en écriture
+field,"ir.model.access,perm_create",0,Create Access,Accès en création
+field,"ir.model.access,group_id",0,Group,Groupe
+field,"ir.model.data,noupdate",0,Non Updatable,Pas de mise à jour
+field,"ir.model.data,name",0,XML Identifier,Identification XML
+field,"ir.model.data,date_init",0,Init Date,Date initiale
+field,"ir.model.data,date_update",0,Update Date,Date de mise à jour
+field,"ir.model.data,module",0,Module,Module
+field,"ir.model.data,model",0,Model,Modèle
+field,"ir.model.data,res_id",0,Resource ID,ID de la ressource
+field,"ir.model.fields,model_id",0,Model id,Id Modèle
+field,"ir.model.fields,name",0,Name,Nom
+field,"ir.model.fields,relate",0,Click and Relate,Client et relier
+field,"ir.model.fields,group_name",0,Group Name,Nom du groupe
+field,"ir.model.fields,relation",0,Model Relation,Relation du modèle
+field,"ir.model.fields,groups",0,Groups,Groupes
+field,"ir.model.fields,ttype",0,Field Type,Type de fichier
+field,"ir.model.fields,model",0,Model Name,Nom du modèle
+field,"ir.model.fields,view_load",0,View Auto-Load,Automatique
+field,"ir.model.fields,field_description",0,Field Description,Description champs
+field,"ir.module.category,parent_id",0,Parent Category,Catégorie parent
+field,"ir.module.category,module_nr",0,# of Modules,Nombre de modules
+field,"ir.module.category,child_ids",0,Parent Category,Catégorie parent
+field,"ir.module.category,name",0,Name,Nom
+field,"ir.module.module,website",0,Website,Site Internet
+field,"ir.module.module,license",0,License,Licence
+field,"ir.module.module,name",0,Name,Nom
+field,"ir.module.module,dependencies_id",0,Dependencies,Dépendances
+field,"ir.module.module,author",0,Author,Auteur
+field,"ir.module.module,url",0,URL,URL
+field,"ir.module.module,demo",0,Demo data,Données démo
+field,"ir.module.module,state",0,State,État
+field,"ir.module.module,latest_version",0,Latest version,Dernière version
+field,"ir.module.module,installed_version",0,Installed version,Version installée
+field,"ir.module.module,shortdesc",0,Short description,Description courte
+field,"ir.module.module,category_id",0,Category,Catégorie
+field,"ir.module.module,description",0,Description,Description
+field,"ir.module.module.dependency,module_id",0,Module,Module
+field,"ir.module.module.dependency,state",0,State,Etat
+field,"ir.module.module.dependency,name",0,Name,Nom
+field,"ir.module.repository,url",0,Url,URL
+field,"ir.module.repository,filter",0,Filter,Filtre
+field,"ir.module.repository,active",0,Active,Actif
+field,"ir.module.repository,name",0,Name,Nom
+field,"ir.module.repository,sequence",0,Sequence,Séquence
+field,"ir.property,fields_id",0,Fields,Champs
+field,"ir.property,res_id",0,Resource,Ressource
+field,"ir.property,name",0,Name,Nom
+field,"ir.property,value",0,Value,Valeur
+field,"ir.property,company_id",0,Company,Entreprise
+field,"ir.report.custom,menu_id",0,Menu,Menu
+field,"ir.report.custom,model_id",0,Model,Modèle
+field,"ir.report.custom,limitt",0,Limit,Limite
+field,"ir.report.custom,print_format",0,Print format,Format d'impression
+field,"ir.report.custom,title",0,Report title,Entête du rapport
+field,"ir.report.custom,fields_child0",0,Fields,Champs
+field,"ir.report.custom,repeat_header",0,Repeat Header,Répéter l'entête
+field,"ir.report.custom,footer",0,Report Footer,Pied du rapport
+field,"ir.report.custom,state",0,State,État
+field,"ir.report.custom,frequency",0,Frequency,Fréquence
+field,"ir.report.custom,sortby",0,Sorted By,Trié par
+field,"ir.report.custom,print_orientation",0,Print orientation,Orientation
+field,"ir.report.custom,field_parent",0,Child Field,Champs fils
+field,"ir.report.custom,type",0,Report Type,Type de rapport
+field,"ir.report.custom,name",0,Report Name,Nom du rapport
+field,"ir.report.custom.fields,fc2_op",0,Relation,Relation
+field,"ir.report.custom.fields,operation",0,unknown,Inconnu
+field,"ir.report.custom.fields,fc1_op",0,Relation,Relation
+field,"ir.report.custom.fields,alignment",0,Alignment,Alignement
+field,"ir.report.custom.fields,fc2_operande",0,Constraint,Contrainte
+field,"ir.report.custom.fields,fc2_condition",0,condition,Condition
+field,"ir.report.custom.fields,width",0,Fixed Width,Largeur fixée
+field,"ir.report.custom.fields,sequence",0,Sequence,Séquence
+field,"ir.report.custom.fields,fc3_operande",0,Constraint,Contrainte
+field,"ir.report.custom.fields,fc0_condition",0,Condition,Condition
+field,"ir.report.custom.fields,fc0_op",0,Relation,Relation
+field,"ir.report.custom.fields,fontcolor",0,Font color,Couleur de police
+field,"ir.report.custom.fields,fc1_operande",0,Constraint,Contrainte
+field,"ir.report.custom.fields,field_child1",0,field child1,Champs fils 1
+field,"ir.report.custom.fields,field_child0",0,field child0,Champs fils 0
+field,"ir.report.custom.fields,field_child3",0,field child3,Champs fils 3
+field,"ir.report.custom.fields,field_child2",0,field child2,Champs fils 2
+field,"ir.report.custom.fields,fc1_condition",0,condition,Condition
+field,"ir.report.custom.fields,cumulate",0,Cumulate,Cumul
+field,"ir.report.custom.fields,report_id",0,Report Ref,Réf. du rapport
+field,"ir.report.custom.fields,fc3_op",0,Relation,Relation
+field,"ir.report.custom.fields,name",0,Name,Nom
+field,"ir.report.custom.fields,bgcolor",0,Background Color,Couleur de fond
+field,"ir.report.custom.fields,fc3_condition",0,condition,Condition
+field,"ir.report.custom.fields,fc0_operande",0,Constraint,Contrainte
+field,"ir.report.custom.fields,groupby",0,Group by,Grouper par
+field,"ir.rule,operator",0,Operator,Opérateur
+field,"ir.rule,operand",0,Operand,
+field,"ir.rule,field_id",0,Field,Champs
+field,"ir.rule,rule_group",0,Group,Groupe 
+field,"ir.rule.group,model_id",0,Model,
+field,"ir.rule.group,name",0,Name,
+field,"ir.rule.group,rules",0,Tests,
+field,"ir.rule.group,global",0,Global,
+field,"ir.rule.group,groups",0,Groups,
+field,"ir.rule.group,users",0,Users,
+field,"ir.sequence,code",0,Sequence Code,Code numérotation
+field,"ir.sequence,name",0,Sequence Name,Nom de la numérotation
+field,"ir.sequence,number_next",0,Next Number,Prochain numéro
+field,"ir.sequence,padding",0,Number padding,Remplissage nb
+field,"ir.sequence,number_increment",0,Increment Number,Pas d'incrément.
+field,"ir.sequence,prefix",0,Prefix,Préfixe
+field,"ir.sequence,active",0,Active,Actif
+field,"ir.sequence,suffix",0,Suffix,Suffixe
+field,"ir.sequence.type,code",0,Sequence Code,Code du type num.
+field,"ir.sequence.type,name",0,Sequence Name,Nom du type num.
+field,"ir.translation,lang",0,Language,Langue
+field,"ir.translation,src",0,Source,Source
+field,"ir.translation,name",0,Field Name,Nom du champ
+field,"ir.translation,res_id",0,Resource ID,Ressource
+field,"ir.translation,value",0,Translation Value,Traduction
+field,"ir.translation,type",0,Type,Type
+field,"ir.ui.menu,groups_id",0,Groups,Groupes
+field,"ir.ui.menu,name",0,Menu,Menu
+model,"ir.ui.menu,name",68,Partners,Partenaires
+model,"ir.ui.menu,name",4,Configuration,Configuration
+model,"ir.ui.menu,name",10,Base,Base
+model,"ir.ui.menu,name",15,Define Users,Définir les utilisateurs
+model,"ir.ui.menu,name",69,Configuration,Configuration
+model,"ir.ui.menu,name",79,Partners by Category,
+model,"ir.ui.menu,name",83,Define Partners Categories,
+model,"ir.ui.menu,name",86,Configuration,Configuration
+model,"ir.ui.menu,name",88,Define Currencies,Définir les devises
+model,"ir.ui.menu,name",114,Configuration,Configuration
+model,"ir.ui.menu,name",125,Pricelists,Listes de prix
+model,"ir.ui.menu,name",184,Choose a Chart of Accounts,
+model,"ir.ui.menu,name",274,Auction Member,
+model,"ir.ui.menu,name",275,Auction Manager,
+model,"ir.ui.menu,name",5,Custom,Personnalisation
+model,"ir.ui.menu,name",11,Define Main Company,Définir la société principale
+model,"ir.ui.menu,name",84,Define Partners,Définir les partenaires
+model,"ir.ui.menu,name",123,Pricelists,Listes de prix
+model,"ir.ui.menu,name",124,Pricelist Versions,
+model,"ir.ui.menu,name",151,Entries,Écritures
+model,"ir.ui.menu,name",183,Account,Compte
+model,"ir.ui.menu,name",185,Choose Tax Mode,
+model,"ir.ui.menu,name",82,Partner,Partenaire
+model,"ir.ui.menu,name",132,Periodical Processing,Traitements périodiques
+model,"ir.ui.menu,name",186,Set Chart of Accounts and Tax Mode,
+model,"ir.ui.menu,name",6,Translations,Traductions
+model,"ir.ui.menu,name",14,User,Utilisateur
+model,"ir.ui.menu,name",187,Modify the Chart of Accounts,
+model,"ir.ui.menu,name",188,Set Fiscal Year,
+model,"ir.ui.menu,name",7,Users,Utilisateurs
+model,"ir.ui.menu,name",189,Add Account Journal,
+model,"ir.ui.menu,name",191,Invoices,Factures
+model,"ir.ui.menu,name",166,Charts,Plan comptable
+model,"ir.ui.menu,name",8,Security,Sécurité
+model,"ir.ui.menu,name",138,Reporting,Reporting
+model,"ir.ui.menu,name",9,Modules Management,Gestion des modules
+model,"ir.ui.menu,name",12,Interface,Interfaces
+model,"ir.ui.menu,name",13,Languages,Langues
+model,"ir.ui.menu,name",16,Sequences,Numérotation des documents
+model,"ir.ui.menu,name",17,Sequences,Numérotation des documents
+model,"ir.ui.menu,name",18,Sequence Types,Types de numérotation
+model,"ir.ui.menu,name",19,Low Level,Bas niveau
+model,"ir.ui.menu,name",20,Base,Base
+model,"ir.ui.menu,name",21,Actions,Actions
+model,"ir.ui.menu,name",22,Actions,Actions
+model,"ir.ui.menu,name",23,Execute,Exécuter
+model,"ir.ui.menu,name",24,Group,Groupe
+model,"ir.ui.menu,name",25,Report Custom,Rapport personnalisé
+model,"ir.ui.menu,name",26,Report Xml,Rapport XML
+model,"ir.ui.menu,name",27,Window Actions,
+model,"ir.ui.menu,name",28,Wizard,Assistant
+model,"ir.ui.menu,name",30,Companies,
+model,"ir.ui.menu,name",31,Users,Utilisateurs
+model,"ir.ui.menu,name",32,Change My Password,
+model,"ir.ui.menu,name",33,Groups,Groupe d'utilisateurs
+model,"ir.ui.menu,name",34,Roles Structure,
+model,"ir.ui.menu,name",35,Define Roles,Définir les rôles
+model,"ir.ui.menu,name",36,View,Vues
+model,"ir.ui.menu,name",37,Attachments,Attachements
+model,"ir.ui.menu,name",38,Database Structure,Structure de la base de données
+model,"ir.ui.menu,name",39,Objects,Objets
+model,"ir.ui.menu,name",40,Fields,Champs
+model,"ir.ui.menu,name",41,All Terms,
+model,"ir.ui.menu,name",42,Define Access to Menu-Items,
+model,"ir.ui.menu,name",43,Scheduler,
+model,"ir.ui.menu,name",44,Scheduled Actions,Planification des actions
+model,"ir.ui.menu,name",45,Access Controls,Contrôle des accès
+model,"ir.ui.menu,name",46,Record Rules,
+model,"ir.ui.menu,name",47,Workflows,Workflows
+model,"ir.ui.menu,name",48,Workflows,Workflows
+model,"ir.ui.menu,name",49,Activities,Activité
+model,"ir.ui.menu,name",50,Transitions,Transitions
+model,"ir.ui.menu,name",51,Instances,Instances
+model,"ir.ui.menu,name",52,Workitems,Éléments du Workflow
+model,"ir.ui.menu,name",53,Import New Module,
+model,"ir.ui.menu,name",54,Update Modules List,
+model,"ir.ui.menu,name",55,Apply Upgrades,Appliquer les mises à jour
+model,"ir.ui.menu,name",56,Load New Language,
+model,"ir.ui.menu,name",57,Export Language,
+model,"ir.ui.menu,name",58,Import Language,
+model,"ir.ui.menu,name",59,Categories of Modules,Catégories des modules
+model,"ir.ui.menu,name",60,Modules,Modules
+model,"ir.ui.menu,name",61,Installed Modules,Modules installés
+model,"ir.ui.menu,name",62,Uninstalled Modules,Modules non installés
+model,"ir.ui.menu,name",63,"Modules to be Installed, Upgraded or Removed",
+model,"ir.ui.menu,name",64,Repositories,
+model,"ir.ui.menu,name",65,Requests,Requêtes
+model,"ir.ui.menu,name",66,Requests,Requêtes
+model,"ir.ui.menu,name",67,Request Links,Liens de requête
+model,"ir.ui.menu,name",70,Functions,Fonctions d'un contact
+model,"ir.ui.menu,name",71,Localisation,Localisations
+model,"ir.ui.menu,name",72,Countries,Pays
+model,"ir.ui.menu,name",73,States,États
+model,"ir.ui.menu,name",74,Partner Contacts,Contacts
+model,"ir.ui.menu,name",75,Titles,Titres
+model,"ir.ui.menu,name",76,Partners,Partenaires
+model,"ir.ui.menu,name",77,Categories,Catégories
+model,"ir.ui.menu,name",78,Category's Structure,
+model,"ir.ui.menu,name",80,Edit Categories,Éditer les catégories
+model,"ir.ui.menu,name",81,Type of Categories,Type de catégories
+model,"ir.ui.menu,name",85,Financial Management,Finance/Comptabilité
+model,"ir.ui.menu,name",89,Partner Events,
+model,"ir.ui.menu,name",90,Channels,Canaux
+model,"ir.ui.menu,name",91,Active Partner Events,
+model,"ir.ui.menu,name",92,States of Mind,États d'esprit
+model,"ir.ui.menu,name",93,Properties,Propriétés
+model,"ir.ui.menu,name",94,Default Properties,Propriétés par défaut
+model,"ir.ui.menu,name",95,All Properties,Toutes les propriétés
+model,"ir.ui.menu,name",96,Human Resources,Ressources humaines
+model,"ir.ui.menu,name",98,Configuration,Configuration
+model,"ir.ui.menu,name",99,Employees, Employés
+model,"ir.ui.menu,name",100,Employees, Employés
+model,"ir.ui.menu,name",101,New Employee,
+model,"ir.ui.menu,name",102,Timesheet Categories,
+model,"ir.ui.menu,name",103,Categories of Employee,Catégories d'employés
+model,"ir.ui.menu,name",104,Categories Structure,
+model,"ir.ui.menu,name",105,Attendances,Présences
+model,"ir.ui.menu,name",106,Attendances,Présences
+model,"ir.ui.menu,name",107,Vacation Request,
+model,"ir.ui.menu,name",108,Holiday Status,Statut des congés
+model,"ir.ui.menu,name",109,Attendance Reasons,Raisons du pointage
+model,"ir.ui.menu,name",110,Sign in/Out,
+model,"ir.ui.menu,name",111,Departments Structure,
+model,"ir.ui.menu,name",112,Define Departments,
+model,"ir.ui.menu,name",113,Products,Produits
+model,"ir.ui.menu,name",115,Products,Produits
+model,"ir.ui.menu,name",116,Variants,Variantes
+model,"ir.ui.menu,name",117,Templates,Modèles
+model,"ir.ui.menu,name",118,Products by Category,
+model,"ir.ui.menu,name",119,Products Categories,
+model,"ir.ui.menu,name",120,Unit of Measure,Unité de mesure
+model,"ir.ui.menu,name",121,Unit of Measure,Unité de mesure
+model,"ir.ui.menu,name",122,Unit of Measure Categories,
+model,"ir.ui.menu,name",126,Prices Types,Type de prix
+model,"ir.ui.menu,name",127,Pricelists Types,Type de liste de prix
+model,"ir.ui.menu,name",128,Dashboards, Tableaux de bord
+model,"ir.ui.menu,name",131,Close a Fiscal Year,
+model,"ir.ui.menu,name",133,Reconciliation,
+model,"ir.ui.menu,name",134,Automatic Reconciliation,
+model,"ir.ui.menu,name",135,Manual Reconciliation,
+model,"ir.ui.menu,name",136,Manual Unreconciliation,
+model,"ir.ui.menu,name",137,Create Subscription Entries,
+model,"ir.ui.menu,name",139,Partner Accounts,
+model,"ir.ui.menu,name",140,Aged Partner Balance,
+model,"ir.ui.menu,name",141,Partner Balance,
+model,"ir.ui.menu,name",142,Partner Ledger,
+model,"ir.ui.menu,name",143,Periods,Périodes
+model,"ir.ui.menu,name",144,Fiscal Years,Exercices comptables
+model,"ir.ui.menu,name",145,Periods,Périodes
+model,"ir.ui.menu,name",146,General Accounts,Plan comptable financier
+model,"ir.ui.menu,name",147,Accounts Definition,Définition des comptes
+model,"ir.ui.menu,name",148,Chart of Accounts,
+model,"ir.ui.menu,name",149,Journal,Journaux
+model,"ir.ui.menu,name",150,Journal Definition,Définition des journaux
+model,"ir.ui.menu,name",152,Statements,
+model,"ir.ui.menu,name",153,Draft Statements,
+model,"ir.ui.menu,name",154,Account Types,
+model,"ir.ui.menu,name",155,Taxes,Taxes
+model,"ir.ui.menu,name",157,Taxes,Taxes
+model,"ir.ui.menu,name",160,Taxes,Taxes
+model,"ir.ui.menu,name",161,Entries by Journal,
+model,"ir.ui.menu,name",162,Open Journals,
+model,"ir.ui.menu,name",163,Search Entries,
+model,"ir.ui.menu,name",164,Entries,Écritures
+model,"ir.ui.menu,name",165,Entry lines,Écritures
+model,"ir.ui.menu,name",167,Charts of Accounts,
+model,"ir.ui.menu,name",168,Fast Charts of Accounts,
+model,"ir.ui.menu,name",169,Bank Reconciliation,
+model,"ir.ui.menu,name",170,Create Statement Importing Entries,
+model,"ir.ui.menu,name",171,Check in Bank Journal,
+model,"ir.ui.menu,name",172,Print Journals,
+model,"ir.ui.menu,name",173,Print Budgets,
+model,"ir.ui.menu,name",174,Budgets,Budgets
+model,"ir.ui.menu,name",175,General Budgets,
+model,"ir.ui.menu,name",176,Models,Modèles
+model,"ir.ui.menu,name",177,Models Definition,Définition des modèles
+model,"ir.ui.menu,name",178,Payment Terms,Conditions de paiement
+model,"ir.ui.menu,name",179,Payment Terms,Conditions de paiement
+model,"ir.ui.menu,name",180,Subscription Entries,
+model,"ir.ui.menu,name",181,Running Subscriptions,
+model,"ir.ui.menu,name",182,Next Entries,
+model,"ir.ui.menu,name",190,Close Period,
+model,"ir.ui.menu,name",192,Customer Invoice,
+model,"ir.ui.menu,name",193,Supplier Invoice,
+model,"ir.ui.menu,name",194,Customer Refund,
+model,"ir.ui.menu,name",195,Supplier Refund,
+model,"ir.ui.menu,name",196,Draft Customer Invoices,
+model,"ir.ui.menu,name",197,PRO-FORMA Customer Invoices,
+model,"ir.ui.menu,name",198,Open Customer Invoices,
+model,"ir.ui.menu,name",199,Draft Supplier Invoices,
+model,"ir.ui.menu,name",200,Open Supplier Invoices,
+model,"ir.ui.menu,name",201,Draft Customer Refunds,
+model,"ir.ui.menu,name",202,Open Customer Refunds,
+model,"ir.ui.menu,name",203,Draft Supplier Refunds,
+model,"ir.ui.menu,name",204,Open Supplier Refunds,
+model,"ir.ui.menu,name",205,All Invoices,
+model,"ir.ui.menu,name",206,Taxes Report,
+model,"ir.ui.menu,name",207,Analytic Accounts,Comptabilité analytique
+model,"ir.ui.menu,name",208,Analytic Accounts,Comptabilité analytique
+model,"ir.ui.menu,name",209,Analytic Charts of Accounts,
+model,"ir.ui.menu,name",210,Analytic Charts of Accounts,
+model,"ir.ui.menu,name",211,Analytic,Comptabilité analytique
+model,"ir.ui.menu,name",212,Analytic Balance,Bilan analytique
+model,"ir.ui.menu,name",213,Analytic Entries,
+model,"ir.ui.menu,name",214,Analytic Entries,
+model,"ir.ui.menu,name",215,Analytic Journal Definition,Définition des journaux analytiques
+model,"ir.ui.menu,name",216,Print Analytic Journals,
+model,"ir.ui.menu,name",217,Entries by Journal,
+model,"ir.ui.menu,name",218,All Months,Tous les mois
+model,"ir.ui.menu,name",219,Account Cost and Revenue by Journal,
+model,"ir.ui.menu,name",220,This Month,Ce mois
+model,"ir.ui.menu,name",221,Account Cost and Revenue by Journal,
+model,"ir.ui.menu,name",222,Analytic Budgets,
+model,"ir.ui.menu,name",223,Custom Reporting,
+model,"ir.ui.menu,name",224,New Reporting Item Formula,
+model,"ir.ui.menu,name",225,Custom Reporting,
+model,"ir.ui.menu,name",226,Fiscal Statements,
+model,"ir.ui.menu,name",227,Indicators,
+model,"ir.ui.menu,name",228,Others,
+model,"ir.ui.menu,name",229,Auction Management, Gestion des enchères
+model,"ir.ui.menu,name",230,Configuration,Configuration
+model,"ir.ui.menu,name",231,Define Artists,Ajouter un artiste
+model,"ir.ui.menu,name",232,Object Categories,Catégories des objets
+model,"ir.ui.menu,name",233,Auction Dates, Dates des ventes aux enchères
+model,"ir.ui.menu,name",234,Next Auction Dates, Prochaines ventes
+model,"ir.ui.menu,name",235,Old Auction Dates, Anciennes ventes
+model,"ir.ui.menu,name",236,New Auction Dates, Nouvelle vente
+model,"ir.ui.menu,name",237,Objects,Objets
+model,"ir.ui.menu,name",238,All objects, Tous les objets
+model,"ir.ui.menu,name",239,Sold Objects, Objets vendus
+model,"ir.ui.menu,name",240,Objects to sell, Objets à vendre
+model,"ir.ui.menu,name",241,Unplanned objects, Objets non plannifiés
+model,"ir.ui.menu,name",242,Unsold Objects, Objets non vendus
+model,"ir.ui.menu,name",243,Unclassified objects, Objets non classifiés
+model,"ir.ui.menu,name",244,Sellers, Vendeurs
+model,"ir.ui.menu,name",245,Deposit border, Bordereau de dépôt
+model,"ir.ui.menu,name",246,Buyers, Acheteurs
+model,"ir.ui.menu,name",247,Bids, Ordres d'achat
+model,"ir.ui.menu,name",248,Bids line, Ligne de l'ordre d'achat
+model,"ir.ui.menu,name",249,Reporting,Reporting
+model,"ir.ui.menu,name",250,Auction, Ventes aux enchères
+model,"ir.ui.menu,name",251,Auction's summary, Résumé par vente
+model,"ir.ui.menu,name",252,Auction's revenues, Revenus par vente
+model,"ir.ui.menu,name",253,Seller, Vendeur
+model,"ir.ui.menu,name",254,Seller's summary, Résumé par vendeur
+model,"ir.ui.menu,name",255,Seller's revenues, Revenus par vendeur
+model,"ir.ui.menu,name",256,Buyer, Acheteur
+model,"ir.ui.menu,name",257,Buyer's summary, Résumé par acheteur
+model,"ir.ui.menu,name",258,Buyer's revenues, Revenus par vendeur
+model,"ir.ui.menu,name",259,Employees, Employés
+model,"ir.ui.menu,name",260,Comparison of estimations,Comparaison des estimations
+model,"ir.ui.menu,name",261,Manager,Manager 
+model,"ir.ui.menu,name",262,Comparison of estimations,Comparaison des estimations
+model,"ir.ui.menu,name",263,Attendance,Présence
+model,"ir.ui.menu,name",264,Attendance, Présence
+model,"ir.ui.menu,name",265,My Latest Deposits, Mes derniers Dépôts
+model,"ir.ui.menu,name",266,Latest Deposits, Derniers dépôts
+model,"ir.ui.menu,name",267,Encoded Objects Per Day, Objets encodés par jour
+model,"ir.ui.menu,name",268,My Encoded Objects Per Day, Mes objets encodés par jour
+model,"ir.ui.menu,name",269,Objects by Auction, Objets par vente
+model,"ir.ui.menu,name",270,Adjudication by Auction, Adjudication par vente
+model,"ir.ui.menu,name",271, Depositer's Statistics, Statistiques des dépôts
+model,"ir.ui.menu,name",272, Depositer's Statistics, Statistiques des dépôts
+model,"ir.ui.menu,name",273,Auction, Ventes aux enchères
+model,"ir.ui.menu,name",87,Currencies,Devises
+model,"ir.ui.menu,name",156,Tax codes,
+model,"ir.ui.menu,name",158,Tax Report,
+model,"ir.ui.menu,name",159,Taxes Structure,
+model,"ir.ui.menu,name",29,Company's Structure,
+model,"ir.ui.menu,name",3,Administration,Administration
+model,"ir.ui.menu,name",130,End of Year Treatments,
+model,"ir.ui.menu,name",97,Reporting,Reporting
+model,"ir.ui.menu,name",129,Notes,
+field,"ir.ui.menu,sequence",0,Sequence,Séquence
+field,"ir.ui.menu,parent_id",0,Parent Menu,Menu parent
+field,"ir.ui.menu,complete_name",0,Complete Name,Nom complet
+field,"ir.ui.menu,child_id",0,Child ids,Menu fils
+field,"ir.ui.menu,icon",0,Icon,Icône
+field,"ir.ui.view,inherit_id",0,Inherited View,Formulaire hérité
+field,"ir.ui.view,name",0,View Name,Nom de la vue
+field,"ir.ui.view,type",0,View Type,Type de la vue
+field,"ir.ui.view,priority",0,Priority,Priorité
+field,"ir.ui.view,model",0,Model,Modèle
+field,"ir.ui.view,arch",0,View Architecture,Architecture de la vue
+field,"ir.ui.view,field_parent",0,Childs Field,Champs enfants
+field,"ir.ui.view_sc,resource",0,Resource Name,Nom de la ressource
+field,"ir.ui.view_sc,user_id",0,User Ref.,Réf. utilisateur
+field,"ir.ui.view_sc,res_id",0,Resource Ref.,Réf. ressource
+field,"ir.ui.view_sc,name",0,Shortcut Name,Nom raccourci
+field,"ir.ui.view_sc,sequence",0,Sequence,Séquence
+field,"ir.values,user_id",0,User,Utilisateur
+field,"ir.values,name",0,Name,Nom
+field,"ir.values,key2",0,Value,Valeur
+field,"ir.values,object",0,Is Object,Objet
+field,"ir.values,company_id",0,Company,
+field,"ir.values,value",0,Value,Valeur
+field,"ir.values,meta",0,Meta Datas,Méta-données
+field,"ir.values,key",0,Name,Nom
+field,"ir.values,model",0,Name,Nom
+field,"ir.values,res_id",0,Resource ID,Id ressource
+field,"pricelist.partnerinfo,min_quantity",0,Quantity,Quantité minimale
+field,"pricelist.partnerinfo,price",0,Price,Prix
+field,"pricelist.partnerinfo,suppinfo_id",0,Partner Information,Infos partenaire
+field,"pricelist.partnerinfo,name",0,Description,Description
+field,"product.category,parent_id",0,Parent Category,Catégorie parent
+field,"product.category,property_account_expense_categ",0,Expense Account,Compte de dépenses
+field,"product.category,complete_name",0,Name,Nom
+field,"product.category,name",0,Name,Nom
+field,"product.category,sequence",0,Sequence,Séquence
+field,"product.category,child_id",0,Childs Categories,Catégorie enfant
+field,"product.category,property_account_income_categ",0,Income Account,Compte de revenus
+field,"product.packaging,rows",0,# of rows,Nb de couches
+field,"product.packaging,product_id",0,Product,Produit
+field,"product.packaging,weight",0,Weight Palette,Poids brut Palette
+field,"product.packaging,ean",0,EAN,EAN13/EAN14
+field,"product.packaging,ul_qty",0,UL by row,Nb UL par couche
+field,"product.packaging,width",0,Width,
+field,"product.packaging,qty",0,Quantity by UL,Nb UC/UL
+field,"product.packaging,ul",0,Type of UL,Type d'UL
+field,"product.packaging,length",0,Length,
+field,"product.packaging,code",0,Code,Code
+field,"product.packaging,active",0,Active,Actif
+field,"product.packaging,height",0,Height,
+field,"product.packaging,weight_ul",0,Weight UL,Poids brut UL
+field,"product.packaging,name",0,Description,Code UL
+field,"product.price.type,active",0,Active,Actif
+field,"product.price.type,field",0,Product Field,Champ produit
+field,"product.price.type,currency_id",0,Currency,Devise
+field,"product.price.type,name",0,Price Name,Type de prix
+model,"product.price.type,name",1,List Price,Prix tarif
+model,"product.price.type,name",2,Cost Price,
+field,"product.pricelist,active",0,Active,Actif
+field,"product.pricelist,currency_id",0,Currency,Devise
+field,"product.pricelist,type",0,Pricelist Type,Type de Tarif
+field,"product.pricelist,name",0,Name,Nom
+field,"product.pricelist,version_id",0,Pricelist Versions,Versions des tarifs
+field,"product.pricelist.item,price_round",0,Price Rounding,Arrondi du prix
+field,"product.pricelist.item,price_min_margin",0,Price Min. Margin,Marge minimale sur le prix
+field,"product.pricelist.item,name",0,Name,Nom
+field,"product.pricelist.item,base_pricelist_id",0,If Other Pricelist,Tarif de base
+field,"product.pricelist.item,sequence",0,Sequence,Priorité
+field,"product.pricelist.item,price_max_margin",0,Price Max. Margin,Marge maximale sur le prix
+field,"product.pricelist.item,product_tmpl_id",0,Product Template,Produit modèle
+field,"product.pricelist.item,base",0,Based on,Basé sur
+field,"product.pricelist.item,price_discount",0,Price Discount,Réduction sur le prix
+field,"product.pricelist.item,price_version_id",0,Price List Version,Tarif
+field,"product.pricelist.item,min_quantity",0,Min. Quantity,Quantité min.
+field,"product.pricelist.item,price_surcharge",0,Price Surcharge,Surcharge du prix
+field,"product.pricelist.item,categ_id",0,Product Category,Catégorie de prix
+field,"product.pricelist.item,product_id",0,Product,Produit
+field,"product.pricelist.type,name",0,Name,Type de Tarif
+field,"product.pricelist.type,key",0,Key,Code type
+field,"product.pricelist.version,items_id",0,Price List Items,Lignes du tarif
+field,"product.pricelist.version,name",0,Name,Nom
+field,"product.pricelist.version,date_end",0,End Date,Date de fin
+field,"product.pricelist.version,date_start",0,Start Date,Date de début
+field,"product.pricelist.version,active",0,Active,Actif
+field,"product.pricelist.version,pricelist_id",0,Price List,Tarif
+field,"product.product,ean13",0,EAN13,EAN13
+field,"product.product,code",0,Code,Code
+field,"product.product,virtual_available",0,Virtual Stock,Stock virtuel
+field,"product.product,incoming_qty",0,Incoming,Entrant
+field,"product.product,price",0,Customer Price,Prix client
+field,"product.product,packaging",0,Palettization,Palettisation
+field,"product.product,price_extra",0,Price Extra,Extra sur le prix
+field,"product.product,product_tmpl_id",0,Product Template,Modèle de produit
+field,"product.product,lst_price",0,List price,Liste de prix
+field,"product.product,outgoing_qty",0,Outgoing,Sortant
+field,"product.product,default_code",0,Code,Code
+field,"product.product,active",0,Active,Actif
+field,"product.product,qty_available",0,Real Stock,Quantité disponible
+field,"product.product,variants",0,Variants,Variantes
+field,"product.product,partner_ref",0,Customer ref,Réf. client
+field,"product.product,price_margin",0,Price Margin,Marge sur le prix
+field,"product.supplierinfo,pricelist_ids",0,Pricelist,Liste de prix
+field,"product.supplierinfo,product_id",0,Product,Produit
+field,"product.supplierinfo,sequence",0,Sequence,Séquence
+field,"product.supplierinfo,qty",0,Minimal quantity,Quantité minimale
+field,"product.supplierinfo,delay",0,Delivery delay,Délai de livraison
+field,"product.supplierinfo,product_code",0,Partner product reference,Référence produit du partenaire
+field,"product.supplierinfo,product_name",0,Partner product name,Nom du produit du partenaire
+field,"product.supplierinfo,name",0,Partner,Partenaire
+field,"product.template,warranty",0,Warranty (months),Garantie (mois)
+field,"product.template,supply_method",0,Supply method,Méthode d'appro.
+field,"product.template,uos_id",0,Unit of Sale,Unité secondaire
+field,"product.template,list_price",0,List Price,Prix listé
+field,"product.template,description",0,Description,Description
+field,"product.template,weight",0,Gross weight,Poids
+field,"product.template,weight_net",0,Net weight,
+field,"product.template,standard_price",0,Cost Price,Prix standard
+field,"product.template,purchase_ok",0,Can be Purchased,Peut être acheté
+field,"product.template,supplier_taxes_id",0,Supplier Taxes,
+field,"product.template,mes_type",0,Measure type,Type de mesure
+field,"product.template,uom_id",0,Default UOM,UDM défaut
+field,"product.template,sale_delay",0,Customer lead time,Délai d'appro.
+field,"product.template,description_purchase",0,Purchase Description,Description achat
+field,"product.template,property_account_income",0,Income Account,Compte de revenus
+field,"product.template,procure_method",0,Procure Method,Méthode d'appro.
+field,"product.template,seller_ids",0,Partners,Autres fournisseurs
+field,"product.template,cost_method",0,Costing Method,Méthode de coût
+field,"product.template,categ_id",0,Category,Catégorie
+field,"product.template,seller_delay",0,Supplier lead time,Délai de livraison
+field,"product.template,uos_coeff",0,UOM -> UOS Coeff,Coeff UM -> US
+field,"product.template,volume",0,Volume,Volume
+field,"product.template,tracking",0,Track lots,Tracer les lots
+field,"product.template,sale_ok",0,Can be sold,Peut être vendu
+field,"product.template,description_sale",0,Sale Description,Description vente
+field,"product.template,product_manager",0,Product Manager,Responsable produit
+field,"product.template,name",0,Name,Nom
+model,"product.template,name",1,Onsite Senior Intervention,
+model,"product.template,name",2,Onsite Intervention,
+model,"product.template,name",3,Basic PC,
+model,"product.template,name",4,Basic+ PC (assembly on order),
+model,"product.template,name",5,Medium PC,
+model,"product.template,name",6,Customizable PC,
+model,"product.template,name",7,Mainboard ASUStek A7N8X,
+model,"product.template,name",8,Mainboard ASUStek A7V8X-X,
+model,"product.template,name",9,Processor AMD Athlon XP 1800+,
+model,"product.template,name",10,Processor AMD Athlon XP 2200+,
+model,"product.template,name",11,HDD Seagate 7200.8 80GB,
+model,"product.template,name",12,HDD Seagate 7200.8 120GB,
+model,"product.template,name",13,HDD Seagate 7200.8 160GB,
+model,"product.template,name",14,Regular case fan 80mm,
+model,"product.template,name",15,Silent fan,
+model,"product.template,name",16,Regular processor config,
+model,"product.template,name",17,DDR 256MB PC400,
+model,"product.template,name",18,DDR 512MB PC400,
+model,"product.template,name",19,High speed processor config,
+model,"product.template,name",20,ATX Mid-size Tower,
+model,"product.template,name",21,HDD on demand,
+model,"product.template,name",22,RAM on demand,
+model,"product.template,name",23,Processor on demand,
+model,"product.template,name",24,Complete PC With Peripherals,
+model,"product.template,name",25,Keyboard,
+model,"product.template,name",26,Mouse,
+model,"product.template,name",27,Kit Keyboard + Mouse,
+model,"product.template,name",28,Oeuvres a 21%,
+field,"product.template,state",0,State,État
+field,"product.template,taxes_id",0,Customer Taxes,Taxes du produit
+field,"product.template,produce_delay",0,Manufacturing lead time,Délai de fabrication
+field,"product.template,uom_po_id",0,Purchase UOM,UDM d'achat
+field,"product.template,rental",0,Rentable product,Produit louable
+field,"product.template,type",0,Product Type,Type de produit
+field,"product.template,property_account_expense",0,Expense Account,Compte de dépenses
+field,"product.ul,type",0,Type,Type
+field,"product.ul,name",0,Name,UL
+field,"product.uom,rounding",0,Rounding Precision,Précision d'arrondi
+field,"product.uom,active",0,Active,Actif
+field,"product.uom,category_id",0,UOM Category,Catégorie d'UDM
+field,"product.uom,name",0,Name,Nom
+field,"product.uom,factor",0,Factor,Facteur
+field,"product.uom.categ,name",0,Name,Nom
+field,"report.attendance,total_attendance",0,Total,
+field,"report.attendance,employee_id",0,Employee,Employé
+field,"report.attendance,name",0,Date,
+field,"report.auction.adjudication,date",0,Date,
+field,"report.auction.adjudication,adj_total",0,Total Adjudication,Adjudication totale
+field,"report.auction.adjudication,state",0,State,État
+field,"report.auction.adjudication,user_id",0,User,Utilisateur
+field,"report.auction.adjudication,name",0,Auction date, Date de la vente
+field,"report.auction.estimation.adj.category,user_id",0,User,Utilisateur
+field,"report.auction.estimation.adj.category,obj_price",0,Adjudication price, Prix d'adjudication
+field,"report.auction.estimation.adj.category,lot_type",0,Object Type, Type de l'objet
+field,"report.auction.estimation.adj.category,adj_total",0,Total Adjudication, Adjudication totale
+field,"report.auction.estimation.adj.category,date",0,Date,
+field,"report.auction.estimation.adj.category,lot_est1",0,Minimum Estimation,
+field,"report.auction.estimation.adj.category,lot_est2",0,Maximum Estimation,
+field,"report.auction.object.date,month",0,Month,Mois
+field,"report.auction.object.date,user_id",0,User, Utilisateur
+field,"report.auction.object.date,obj_num",0,# of Objects, # d'objets
+field,"report.auction.object.date,name",0,Created date, Date de création
+field,"report.auction.view,obj_ret",0,# obj ret,
+field,"report.auction.view,min_est",0,Minimum Estimation,
+field,"report.auction.view,nseller",0,No of sellers, Nb de vendeurs
+field,"report.auction.view,nbuyer",0,No of buyers, Nb d'acheteurs
+field,"report.auction.view,nobjects",0,No of objects, Nb d'objets
+field,"report.auction.view,max_est",0,Maximum Estimation,
+field,"report.auction.view,auction_id",0,Auction date, Date de l'enchère
+field,"report.auction.view,adj_price",0,Adjudication price, Prix d'adjudication
+field,"report.auction.view2,gross_revenue",0,Gross revenue, Revenu brut
+field,"report.auction.view2,obj_number",0,# of Objects, Nb d'objets
+field,"report.auction.view2,sum_adj",0,Sum of adjudication, somme de l'adjudication
+field,"report.auction.view2,net_revenue",0,Net revenue,Revenu net
+field,"report.auction.view2,auction",0,Auction date,Date de l'enchère
+field,"report.auction.view2,obj_margin_procent",0,Net margin (%), Marge nette (%)
+field,"report.auction.view2,obj_margin",0,Avg margin, Moy de la marge
+field,"report.auction.view2,date",0,Auction date,Date de l'enchère
+field,"report.buyer.auction,total_price",0,Total Adj.,
+field,"report.buyer.auction,auction",0,Auction date,Date de la vente
+field,"report.buyer.auction,object",0,No of objects, Nb d'objets
+field,"report.buyer.auction,date",0,Create Date,Date de création
+field,"report.buyer.auction,avg_price",0,Avg Adj., Moy Adj
+field,"report.buyer.auction,buyer",0,Buyer, Acheteur
+field,"report.buyer.auction,buyer_login",0,Buyer Login, Login de l'acheteur
+field,"report.buyer.auction2,gross_revenue",0,Gross Revenue, Revenu brut
+field,"report.buyer.auction2,net_revenue",0,Net Revenue, Revenu net
+field,"report.buyer.auction2,auction",0,Auction date,
+field,"report.buyer.auction2,net_margin",0,Net Margin,
+field,"report.buyer.auction2,date",0,Create Date,
+field,"report.buyer.auction2,sumadj",0,Sum of adjustication,
+field,"report.buyer.auction2,buyer",0,Buyer, Acheteur
+field,"report.buyer.auction2,buyer_login",0,Buyer Login,Login de l'acheteur
+field,"report.deposit.border,total_marge",0,Total margin, Marge totale
+field,"report.deposit.border,nb_obj",0,# of objects,
+field,"report.deposit.border,bord",0,Depositer Inventory,
+field,"report.deposit.border,moy_est",0,Avg. Est,
+field,"report.deposit.border,seller",0,Seller,
+field,"report.hr.timesheet.invoice.journal,name",0,Month,Mois
+field,"report.hr.timesheet.invoice.journal,revenue",0,Debit,Débit
+field,"report.hr.timesheet.invoice.journal,journal_id",0,Journal,Journal
+field,"report.hr.timesheet.invoice.journal,account_id",0,Analytic Account,Compte analytique
+field,"report.hr.timesheet.invoice.journal,cost",0,Credit,Crédit
+field,"report.hr.timesheet.invoice.journal,quantity",0,Quantities,Quantités
+field,"report.object.encoded,gross_revenue",0,Gross revenue,
+field,"report.object.encoded,user_id",0,User,
+field,"report.object.encoded,obj_num",0,# of Encoded obj.,
+field,"report.object.encoded,net_revenue",0,Net revenue,
+field,"report.object.encoded,obj_margin",0,Net margin,
+field,"report.object.encoded,obj_ret",0,# obj ret,
+field,"report.object.encoded,state",0,State,
+field,"report.object.encoded,date",0,Create Date,
+field,"report.object.encoded,estimation",0,Estimation,
+field,"report.object.encoded,adj",0,Adj.,
+field,"report.object.encoded.manager,gross_revenue",0,Gross revenue,
+field,"report.object.encoded.manager,user_id",0,User,
+field,"report.object.encoded.manager,obj_num",0,# of Encoded obj.,
+field,"report.object.encoded.manager,net_revenue",0,Net revenue,
+field,"report.object.encoded.manager,obj_ret",0,# obj ret,
+field,"report.object.encoded.manager,obj_margin",0,Net margin,
+field,"report.object.encoded.manager,date",0,Create Date,
+field,"report.object.encoded.manager,estimation",0,Estimation,
+field,"report.object.encoded.manager,adj",0,Adj.,
+field,"report.seller.auction,total_price",0,Total adjudication,
+field,"report.seller.auction,auction",0,Auction date,
+field,"report.seller.auction,object_number",0,No of Objects,
+field,"report.seller.auction,seller",0,Seller,
+field,"report.seller.auction,state",0,State,
+field,"report.seller.auction,avg_estimation",0,Avg estimation,
+field,"report.seller.auction,avg_price",0,Avg adjudication,
+field,"report.seller.auction,date",0,Create Date,
+field,"report.seller.auction2,gross_revenue",0,Gross revenue,
+field,"report.seller.auction2,sum_adj",0,Sum Adjustication,
+field,"report.seller.auction2,net_revenue",0,Net revenue,
+field,"report.seller.auction2,auction",0,Auction date,
+field,"report.seller.auction2,seller",0,Seller,
+field,"report.seller.auction2,date",0,Auction date,
+field,"report.seller.auction2,net_margin",0,Net margin,
+field,"report.unclassified.objects,name",0,Short Description,
+field,"report.unclassified.objects,auction",0,Auction date,
+field,"report.unclassified.objects,obj_comm",0,Commission,
+field,"report.unclassified.objects,obj_price",0,Adjudication price,
+field,"report.unclassified.objects,lot_type",0,Object category,
+field,"report.unclassified.objects,state",0,State,
+field,"report.unclassified.objects,lot_num",0,List Number,
+field,"report.unclassified.objects,lot_est1",0,Minimum Estimation,
+field,"report.unclassified.objects,lot_est2",0,Maximum Estimation,
+field,"report.unclassified.objects,ach_login",0,Buyer Username,
+field,"report.unclassified.objects,bord_vnd_id",0,Depositer Inventory,
+field,"report.unclassified.objects,obj_num",0,Catalog Number,
+field,"res.company,rml_footer1",0,Report Footer 1,Pied de page état 1
+field,"res.company,rml_footer2",0,Report Footer 2,Pied de page état 2
+field,"res.company,name",0,Company Name,Nom société
+field,"res.company,child_ids",0,Childs Company,Sociétés enfants
+field,"res.company,currency_id",0,Currency,Devise
+field,"res.company,parent_id",0,Parent Company,Société parente
+field,"res.company,rml_header1",0,Report Header,Entête d'état
+field,"res.company,partner_id",0,Partner,Partenaire société
+field,"res.country,code",0,Country Code,Code du Pays
+field,"res.country,name",0,Country Name,Nom de Pays
+field,"res.country.state,code",0,State Code,Code de l'état
+field,"res.country.state,country_id",0,Country,Pays
+field,"res.country.state,name",0,State Name,Nom de l'état
+field,"res.currency,rate_ids",0,Rates,
+field,"res.currency,code",0,Code,Code devise
+field,"res.currency,name",0,Currency,Devise
+field,"res.currency,rounding",0,Rounding factor,Facteur d'arrondi
+field,"res.currency,rate",0,Current rate,Taux de conversion
+field,"res.currency,active",0,Active,Actif
+field,"res.currency,accuracy",0,Computational Accuracy,Précision de calcul
+field,"res.currency.rate,currency_id",0,Currency,
+field,"res.currency.rate,rate",0,Rate,
+field,"res.currency.rate,name",0,Date,
+field,"res.groups,users",0,Users,
+field,"res.groups,rule_groups",0,Rules,
+field,"res.groups,model_access",0,Access Controls,
+field,"res.groups,name",0,Group Name,Nom du groupe
+field,"res.groups,menu_access",0,Access Menu,
+field,"res.lang,active",0,Active,Actif
+field,"res.lang,direction",0,Direction,
+field,"res.lang,code",0,Code,Code
+field,"res.lang,name",0,Name,Nom
+field,"res.lang,translatable",0,Translatable,Traduisible
+field,"res.partner,website",0,Website,Site Web
+field,"res.partner,comment",0,Notes,Commentaires
+field,"res.partner,bank_ids",0,Banks,Banque
+field,"res.partner,ean13",0,EAN13,EAN13
+field,"res.partner,credit",0,Receivable,Crédit
+field,"res.partner,child_ids",0,Partner Ref.,Réf. Partenaire
+field,"res.partner,date",0,Date,Date
+field,"res.partner,address",0,Contacts,Adresse
+field,"res.partner,active",0,Active,Actif
+field,"res.partner,lang",0,Language,Langue
+field,"res.partner,credit_limit",0,Credit Limit,Limite de crédit
+field,"res.partner,user_id",0,Salesman,Commercial
+field,"res.partner,name",0,Name,Nom
+field,"res.partner,title",0,Title,Titre
+field,"res.partner,debit_limit",0,Debit Limit,Limite
+field,"res.partner,responsible",0,Users,Utilisateurs
+field,"res.partner,property_account_receivable",0,Account Receivable,Compte de client
+field,"res.partner,property_account_payable",0,Account Payable,Compte de fournisseur
+field,"res.partner,parent_id",0,Main Company,Société mère
+field,"res.partner,debit",0,Payable,Débit
+field,"res.partner,property_payment_term",0,Payment Term,Conditions de paiement
+field,"res.partner,property_account_tax",0,Default Tax,Taxe par défaut (export)
+field,"res.partner,category_id",0,Categories,Catégories
+field,"res.partner,ref",0,Code,Code
+field,"res.partner,events",0,events,Évènements
+field,"res.partner,vat",0,VAT,TVA
+field,"res.partner.address,function",0,Function,Fonction
+field,"res.partner.address,city",0,City,Ville
+field,"res.partner.address,fax",0,Fax,Fax
+field,"res.partner.address,name",0,Contact Name,Contact
+field,"res.partner.address,zip",0,Zip,Code postal
+field,"res.partner.address,title",0,Title,Titre
+field,"res.partner.address,mobile",0,Mobile,Portable
+field,"res.partner.address,partner_id",0,Partner,Réf. Partenaire
+field,"res.partner.address,street2",0,Street2,Adresse suite
+field,"res.partner.address,country_id",0,Country,Pays
+field,"res.partner.address,birthdate",0,Birthdate,Date de naissance
+field,"res.partner.address,phone",0,Phone,Téléphone
+field,"res.partner.address,street",0,Street,Adresse
+field,"res.partner.address,active",0,Active,Actif
+field,"res.partner.address,state_id",0,State,État
+field,"res.partner.address,type",0,Address Type,Type d'adresse
+field,"res.partner.address,email",0,E-Mail,E-Mail
+field,"res.partner.bank,city",0,City,Ville
+field,"res.partner.bank,owner_name",0,Account owner,
+field,"res.partner.bank,name",0,Description,Libellé du compte
+field,"res.partner.bank,zip",0,Zip,NPA
+field,"res.partner.bank,country_id",0,Country,Pays
+field,"res.partner.bank,bank_id",0,Bank,
+field,"res.partner.bank,bic",0,BIC/Swift code,
+field,"res.partner.bank,state",0,Bank type,
+field,"res.partner.bank,street",0,Street,Adresse
+field,"res.partner.bank,iban",0,IBAN,IBAN
+field,"res.partner.bank,bank_address_id",0,Bank address,
+field,"res.partner.bank,state_id",0,State,
+field,"res.partner.bank,partner_id",0,Partner,Partenaire
+field,"res.partner.bank,acc_number",0,Account number,
+field,"res.partner.bank.type,code",0,Code,Code
+field,"res.partner.bank.type,name",0,Name,Nom
+field,"res.partner.bank.type,field_ids",0,Type fields,
+field,"res.partner.bank.type.field,size",0,Max. Size,
+field,"res.partner.bank.type.field,readonly",0,Readonly,
+field,"res.partner.bank.type.field,required",0,Required,
+field,"res.partner.bank.type.field,name",0,Field name,
+field,"res.partner.bank.type.field,bank_type_id",0,Bank type,
+field,"res.partner.canal,active",0,Active,Actif
+field,"res.partner.canal,name",0,Channel Name,Nom du canal
+field,"res.partner.category,name",0,Category Name,Nom de la catégorie
+field,"res.partner.category,type_id",0,Category Type,Type de catégorie
+field,"res.partner.category,child_ids",0,Childs Category,Catégorie des fils
+field,"res.partner.category,parent_id",0,Parent Category,Catégorie du parent
+field,"res.partner.category,complete_name",0,Name,Nom
+field,"res.partner.category,active",0,Active,Actif
+field,"res.partner.category.type,name",0,Category Name,Nom de la catégorie
+field,"res.partner.event,user_id",0,User,Utilisateurs
+field,"res.partner.event,name",0,Events,Évènements
+field,"res.partner.event,probability",0,Probability (0.50),Probabilité
+field,"res.partner.event,canal_id",0,Channel,Canal
+field,"res.partner.event,partner_id",0,Partner,Partenaire
+field,"res.partner.event,planned_cost",0,Planned Cost,Coût estimé
+field,"res.partner.event,som",0,State of Mind,État d'esprit
+field,"res.partner.event,partner_type",0,Partner Relation,Relation Partenaire
+field,"res.partner.event,type",0,Type of Event,Type d'événement
+field,"res.partner.event,date",0,Date,Date
+field,"res.partner.event,document",0,Document,Document
+field,"res.partner.event,planned_revenue",0,Planned Revenue,Revenus estimés
+field,"res.partner.event,event_ical_id",0,iCal id,iCal id
+field,"res.partner.event,description",0,Description,Description
+field,"res.partner.event.type,active",0,Active,Actif
+field,"res.partner.event.type,name",0,Event Type,Type événement
+field,"res.partner.event.type,key",0,Key,Clé
+field,"res.partner.function,code",0,Code,Code
+field,"res.partner.function,name",0,Function name,Nom
+field,"res.partner.som,name",0,State of Mind,État d'esprit
+field,"res.partner.som,factor",0,Factor,Facteur
+field,"res.partner.title,domain",0,Domain,Type de titre
+field,"res.partner.title,name",0,Title,Titre
+model,"res.partner.title,name",1,Madam,Madame
+model,"res.partner.title,name",2,Miss,Mademoiselle
+model,"res.partner.title,name",3,Sir,Monsieur
+field,"res.partner.title,shortcut",0,Shortcut,Abréviation
+field,"res.payterm,name",0,Payment term (short name),Condition paiement
+field,"res.request,body",0,Request,Requête
+field,"res.request,create_date",0,Created date,Date de création
+field,"res.request,name",0,Subject,Description
+field,"res.request,ref_doc1",0,Document Ref 1,Réf. Document 1
+field,"res.request,state",0,State,Statut
+field,"res.request,priority",0,Priority,Priorité
+field,"res.request,date_sent",0,Date,Date
+field,"res.request,ref_doc2",0,Document Ref 2,Réf. documents 2
+field,"res.request,act_from",0,From,Requête de
+field,"res.request,ref_partner_id",0,Partner Ref.,Réf. Partenaire
+field,"res.request,active",0,Active,Actif
+field,"res.request,trigger_date",0,Trigger Date,Date déclenchement
+field,"res.request,act_to",0,To,Requête à
+field,"res.request,history",0,History,Historique
+field,"res.request.history,body",0,Body,Contenu
+field,"res.request.history,name",0,Summary,Résultat de l'action
+field,"res.request.history,act_from",0,From,Requête de
+field,"res.request.history,req_id",0,Request,Requête
+field,"res.request.history,date_sent",0,Date sent,Date d'envoi
+field,"res.request.history,act_to",0,To,Requête à
+field,"res.request.link,priority",0,Priority,Priorité
+field,"res.request.link,object",0,Object,Lien objet
+field,"res.request.link,name",0,Name,Nom
+model,"res.request.link,name",1,Product,Produit
+model,"res.request.link,name",2,Invoice,facture
+field,"res.roles,parent_id",0,Parent,Rôle Parent
+field,"res.roles,child_id",0,Childs,Enfant
+field,"res.roles,name",0,Role Name,Nom
+field,"res.users,menu_id",0,Menu Action,
+field,"res.users,groups_id",0,Groups,Groupes
+field,"res.users,address_id",0,Address,Adresse
+field,"res.users,name",0,Name,Nom
+field,"res.users,roles_id",0,Roles,Rôles
+field,"res.users,company_id",0,Company,société
+field,"res.users,rule_groups",0,Rules,
+field,"res.users,signature",0,Signature,Signature
+field,"res.users,active",0,Active,Actif
+field,"res.users,login",0,Login,Nom d'utilisateur
+field,"res.users,password",0,Password,Mot de passe
+field,"res.users,action_id",0,Home Action,Actions
+field,"workflow,activities",0,Activities,Activités
+field,"workflow,on_create",0,On Create,En création
+field,"workflow,name",0,Name,Nom
+field,"workflow,osv",0,Resource Model,Modèle
+field,"workflow.activity,kind",0,Kind,Genre
+field,"workflow.activity,name",0,Name,Nom
+field,"workflow.activity,join_mode",0,Join Mode,Type de jointure
+field,"workflow.activity,wkf_id",0,Workflow,Workflow
+field,"workflow.activity,flow_stop",0,Flow Stop,Fin de flux
+field,"workflow.activity,subflow_id",0,Subflow,Sous-flux
+field,"workflow.activity,split_mode",0,Split Mode,Mode de séparation
+field,"workflow.activity,action",0,Action,Action
+field,"workflow.activity,signal_send",0,Signal (subflow.*),Signal (sous-flux.*)
+field,"workflow.activity,out_transitions",0,Outgoing transitions,Transactions sortantes
+field,"workflow.activity,in_transitions",0,Incoming transitions,Transactions entrantes
+field,"workflow.activity,flow_start",0,Flow Start,Début de flux
+field,"workflow.instance,res_type",0,Resource Model,Modèle
+field,"workflow.instance,wkf_id",0,Workflow,Workflow
+field,"workflow.instance,res_id",0,Resource ID,Ressource
+field,"workflow.instance,uid",0,User ID,ID utilisateur
+field,"workflow.instance,state",0,State,État
+field,"workflow.transition,trigger_model",0,Trigger Type,Type d'action
+field,"workflow.transition,signal",0,Signal (button Name),Nom du bouton
+field,"workflow.transition,role_id",0,Role Required,Rôle requis
+field,"workflow.transition,act_from",0,Source Activity,Activité source
+field,"workflow.transition,act_to",0,Destination Activity,Activité destination
+field,"workflow.transition,trigger_expr_id",0,Trigger Expr ID,Expression
+field,"workflow.transition,condition",0,Condition,Condition
+field,"workflow.triggers,instance_id",0,Destination Instance,Instance
+field,"workflow.triggers,workitem_id",0,Workitem,Conditions
+field,"workflow.triggers,model",0,Model,Modèle
+field,"workflow.triggers,res_id",0,Resource ID,Ressource
+field,"workflow.workitem,subflow_id",0,Subflow,Processus enfant
+field,"workflow.workitem,act_id",0,Activity,Activité
+field,"workflow.workitem,state",0,State,État
+field,"workflow.workitem,inst_id",0,Instance,Instance
+selection,"account.account,close_method",0,None,Aucun
+selection,"account.account,close_method",0,Balance,Solde
+selection,"account.account,close_method",0,Detail,Détail
+selection,"account.account,close_method",0,Unreconciled,Non réconcilié
+selection,"account.account,sign",0,Negative,Négatif
+selection,"account.account,sign",0,Positive,Positif
+selection,"account.account.type,close_method",0,None,Aucun
+selection,"account.account.type,close_method",0,Balance,Solde
+selection,"account.account.type,close_method",0,Detail,Détail
+selection,"account.account.type,close_method",0,Unreconciled,Non réconcilié
+selection,"account.analytic.account,state",0,Draft,Brouillon
+selection,"account.analytic.account,state",0,Open,Ouvert
+selection,"account.analytic.account,state",0,Pending,En suspend
+selection,"account.analytic.account,state",0,Close,Clôturé
+selection,"account.analytic.account,type",0,View,Vue
+selection,"account.analytic.account,type",0,Normal,Normal
+selection,"account.analytic.budget.post,sens",0,Charge,Charge
+selection,"account.analytic.budget.post,sens",0,Product,Produit
+selection,"account.analytic.journal,type",0,Sale,Vente
+selection,"account.analytic.journal,type",0,Purchase,Achat
+selection,"account.analytic.journal,type",0,Cash,Espèces
+selection,"account.analytic.journal,type",0,General,Général
+selection,"account.analytic.journal,type",0,Situation,Situation
+selection,"account.bank.statement,state",0,Draft,Brouillon
+selection,"account.bank.statement,state",0,Confirm,Confirmé
+selection,"account.bank.statement.line,type",0,Supplier,Fournisseur
+selection,"account.bank.statement.line,type",0,Customer,Client
+selection,"account.bank.statement.line,type",0,General,Général
+selection,"account.budget.post,sens",0,Charge,Dépense
+selection,"account.budget.post,sens",0,Product,Produit
+selection,"account.fiscalyear,state",0,Draft,Brouillon
+selection,"account.fiscalyear,state",0,Done,Clôturé
+selection,"account.invoice,state",0,Draft,Brouillon
+selection,"account.invoice,state",0,Pro-forma,Pro-forma
+selection,"account.invoice,state",0,Open,Ouvertes
+selection,"account.invoice,state",0,Paid,Payées
+selection,"account.invoice,state",0,Canceled,Annulées
+selection,"account.invoice,type",0,Customer Invoice,Facture client
+selection,"account.invoice,type",0,Supplier Invoice,Facture fournisseur
+selection,"account.invoice,type",0,Customer Refund,Note de crédit client
+selection,"account.invoice,type",0,Supplier Refund,Note de crédit fournisseur
+selection,"account.journal,type",0,Sale,Journal des ventes
+selection,"account.journal,type",0,Purchase,Journal des achats
+selection,"account.journal,type",0,Cash,Journal de caisse
+selection,"account.journal,type",0,General,Journal général
+selection,"account.journal,type",0,Situation,Journal de situation
+selection,"account.journal.period,state",0,Draft,Brouillon
+selection,"account.journal.period,state",0,Printed,Imprimé
+selection,"account.journal.period,state",0,Done,Terminé
+selection,"account.model.line,date_maturity",0,Date of the day,Date du jour
+selection,"account.model.line,date_maturity",0,Partner Payment Term,Condition  paiement
+selection,"account.model.line,date",0,Date of the day,Date du jour
+selection,"account.model.line,date",0,Partner Payment Term,Condition  paiement
+selection,"account.move,state",0,Draft,Brouillon
+selection,"account.move,state",0,Posted,Transféré
+selection,"account.move.line,centralisation",0,Normal,Normal
+selection,"account.move.line,centralisation",0,Credit Centralisation,Centralisation crédit
+selection,"account.move.line,centralisation",0,Debit Centralisation,Centralisation débit
+selection,"account.move.line,state",0,Draft,Brouillon
+selection,"account.move.line,state",0,Valid,Valide
+selection,"account.payment.term.line,value",0,Percent,Pourcent
+selection,"account.payment.term.line,value",0,Balance,Solde
+selection,"account.payment.term.line,value",0,Fixed Amount,Montant fixe
+selection,"account.payment.term.line,condition",0,Net Days,Nb jours net
+selection,"account.payment.term.line,condition",0,End of Month,Fin de mois
+selection,"account.period,state",0,Draft,Brouillon
+selection,"account.period,state",0,Done,Clôturé
+selection,"account.report.report,status",0,Very Bad,Très mauvais
+selection,"account.report.report,status",0,Bad,Mauvais
+selection,"account.report.report,status",0,,Excellent
+selection,"account.report.report,status",0,Good,Bon
+selection,"account.report.report,status",0,Excellent,Excellent
+selection,"account.report.report,style",0,Header 1,
+selection,"account.report.report,style",0,Header 2,
+selection,"account.report.report,style",0,Header 3,
+selection,"account.report.report,style",0,Header 4,
+selection,"account.report.report,style",0,Normal,
+selection,"account.report.report,style",0,Small,
+selection,"account.report.report,type",0,Fiscal statement,Extrait fiscal
+selection,"account.report.report,type",0,Indicator,Indicateur
+selection,"account.report.report,type",0,Others,Autres
+selection,"account.report.report,color_back",0,,Orange
+selection,"account.report.report,color_back",0,Green,Vert
+selection,"account.report.report,color_back",0,Red,Rouge
+selection,"account.report.report,color_back",0,Pink,Rose
+selection,"account.report.report,color_back",0,Blue,Bleu
+selection,"account.report.report,color_back",0,Yellow,Jaune
+selection,"account.report.report,color_back",0,Cyan,Cyan
+selection,"account.report.report,color_back",0,Light Blue,Bleu clair
+selection,"account.report.report,color_back",0,Orange,Orange
+selection,"account.report.report,color_font",0,,Orange
+selection,"account.report.report,color_font",0,Green,Vert
+selection,"account.report.report,color_font",0,Red,Rouge
+selection,"account.report.report,color_font",0,Pink,Rose
+selection,"account.report.report,color_font",0,Blue,Bleu
+selection,"account.report.report,color_font",0,Yellow,Jaune
+selection,"account.report.report,color_font",0,Cyan,Cyan
+selection,"account.report.report,color_font",0,Light Blue,Bleu clair
+selection,"account.report.report,color_font",0,Orange,Orange
+selection,"account.subscription,state",0,Draft,Brouillon
+selection,"account.subscription,state",0,Running,En cours
+selection,"account.subscription,state",0,Done,Fait
+selection,"account.subscription,period_type",0,days,Jours
+selection,"account.subscription,period_type",0,month,Mois
+selection,"account.subscription,period_type",0,year,Année
+selection,"account.tax,applicable_type",0,True,VRAI
+selection,"account.tax,applicable_type",0,Python Code,Code Python
+selection,"account.tax,type",0,Percent,Pourcentage
+selection,"account.tax,type",0,Fixed,Fixe
+selection,"account.tax,type",0,None,Aucun
+selection,"account.tax,type",0,Python Code,Code Python
+selection,"account.tax,tax_group",0,VAT,TVA
+selection,"account.tax,tax_group",0,Other,Autre
+selection,"auction.dates,state",0,Draft,
+selection,"auction.dates,state",0,Closed,
+selection,"auction.deposit,method",0,Keep until sold,
+selection,"auction.deposit,method",0,Decrease limit of 10%,
+selection,"auction.deposit,method",0,Contact the Seller,
+selection,"auction.lot.category,aie_categ",0,Unclassifieds,
+selection,"auction.lot.category,aie_categ",0,Antiques,
+selection,"auction.lot.category,aie_categ",0,Antique/African Arts,
+selection,"auction.lot.category,aie_categ",0,Antique/Argenterie,
+selection,"auction.lot.category,aie_categ",0,Antique/Art from the Ivory Coast,
+selection,"auction.lot.category,aie_categ",0,Antique/Art from the Ivory Coast/African Arts,
+selection,"auction.lot.category,aie_categ",0,"Antique/Books, manuscripts, eso.",
+selection,"auction.lot.category,aie_categ",0,Antique/Carpet and textilles,
+selection,"auction.lot.category,aie_categ",0,Antique/Cartoons,
+selection,"auction.lot.category,aie_categ",0,Antique/Clocks and watches,
+selection,"auction.lot.category,aie_categ",0,Antique/Collectible & art objects,
+selection,"auction.lot.category,aie_categ",0,Antique/Engravings,
+selection,"auction.lot.category,aie_categ",0,Antique/Furnitures,
+selection,"auction.lot.category,aie_categ",0,Antique/Graphic Arts,
+selection,"auction.lot.category,aie_categ",0,Antique/Jewelry,
+selection,"auction.lot.category,aie_categ",0,Antique/Lightings,
+selection,"auction.lot.category,aie_categ",0,Antique/Metal Ware,
+selection,"auction.lot.category,aie_categ",0,Antique/Miniatures / Collections,
+selection,"auction.lot.category,aie_categ",0,Antique/Musical Instruments,
+selection,"auction.lot.category,aie_categ",0,Antique/Old weapons and militaria,
+selection,"auction.lot.category,aie_categ",0,Antique/Oriental Arts,
+selection,"auction.lot.category,aie_categ",0,Antique/Oriental Arts/Chineese furnitures,
+selection,"auction.lot.category,aie_categ",0,Antique/Others,
+selection,"auction.lot.category,aie_categ",0,Antique/Painting,
+selection,"auction.lot.category,aie_categ",0,"Antique/Porcelain, Ceramics, Glassmaking, ...",
+selection,"auction.lot.category,aie_categ",0,Antique/Posters,
+selection,"auction.lot.category,aie_categ",0,Antique/Religiosa,
+selection,"auction.lot.category,aie_categ",0,Antique/Scientific Instruments,
+selection,"auction.lot.category,aie_categ",0,"Antique/Sculpture, bronze, eso.",
+selection,"auction.lot.category,aie_categ",0,Antique/Tin / Copper wares,
+selection,"auction.lot.category,aie_categ",0,Antique/Toys,
+selection,"auction.lot.category,aie_categ",0,Antique/Verreries,
+selection,"auction.lot.category,aie_categ",0,Antique/Wine,
+selection,"auction.lot.category,aie_categ",0,Contemporary Art,
+selection,"auction.lot.category,aie_categ",0,Cont. Art/Arts,
+selection,"auction.lot.category,aie_categ",0,Cont. Art/Curiosa,
+selection,"auction.lot.category,aie_categ",0,Cont. Art/Jewelry,
+selection,"auction.lot.category,aie_categ",0,Cont. Art/Other Media,
+selection,"auction.lot.category,aie_categ",0,Cont. Art/Photo,
+selection,"auction.lot.category,aie_categ",0,Cont. Art/Painting,
+selection,"auction.lot.category,aie_categ",0,Cont. Art/Sculpture,
+selection,"auction.lot.category,aie_categ",0,Cont. Art/Shows,
+selection,"auction.lots,state",0,Draft,
+selection,"auction.lots,state",0,Unsold,
+selection,"auction.lots,state",0,Paid,
+selection,"auction.lots,state",0,Sold,
+selection,"hr.action.reason,action_type",0,Sign in,Pointer l'entrée
+selection,"hr.action.reason,action_type",0,Sign out,Pointer la sortie
+selection,"hr.attendance,action",0,Sign In,Pointer l'entrée
+selection,"hr.attendance,action",0,Sign Out,Pointer la sortie
+selection,"hr.attendance,action",0,Action,Pointage
+selection,"hr.employee,state",0,Absent,Absent
+selection,"hr.employee,state",0,Present,Présent
+selection,"hr.timesheet,dayofweek",0,Monday,Lundi
+selection,"hr.timesheet,dayofweek",0,Tuesday,Mardi
+selection,"hr.timesheet,dayofweek",0,Wednesday,Mercredi
+selection,"hr.timesheet,dayofweek",0,Thursday,Jeudi
+selection,"hr.timesheet,dayofweek",0,Friday,Vendredi
+selection,"hr.timesheet,dayofweek",0,Saturday,Samedi
+selection,"hr.timesheet,dayofweek",0,Sunday,Dimanche
+selection,"ir.actions.act_window,view_type",0,Tree,Arbre
+selection,"ir.actions.act_window,view_type",0,Form,Formulaire
+selection,"ir.actions.act_window.view,view_mode",0,Tree,Arbre
+selection,"ir.actions.act_window.view,view_mode",0,Form,Formulaire
+selection,"ir.actions.act_window.view,view_mode",0,Graph,Graphe
+selection,"ir.actions.act_window.view,view_mode",0,Calendar,Calendrier
+selection,"ir.cron,interval_type",0,Minutes,Minutes
+selection,"ir.cron,interval_type",0,Hours,Heures
+selection,"ir.cron,interval_type",0,Days,Jours
+selection,"ir.cron,interval_type",0,Weeks,Semaines
+selection,"ir.cron,interval_type",0,Months,Mois
+selection,"ir.module.module,license",0,GPL-2,
+selection,"ir.module.module,license",0,Other proprietary,?
+selection,"ir.module.module,state",0,Not Installable,Installation impossible
+selection,"ir.module.module,state",0,Not Installed,Non installé
+selection,"ir.module.module,state",0,Installed,Installé
+selection,"ir.module.module,state",0,To be upgraded,A mettre à jour
+selection,"ir.module.module,state",0,To be removed,A enlever
+selection,"ir.module.module,state",0,To be installed,A installer
+selection,"ir.module.module.dependency,state",0,Uninstallable,Installation impossible 
+selection,"ir.module.module.dependency,state",0,Not Installed,Non installé
+selection,"ir.module.module.dependency,state",0,Installed,Installé
+selection,"ir.module.module.dependency,state",0,To be upgraded,A mettre à niveau
+selection,"ir.module.module.dependency,state",0,To be removed,A éliminer 
+selection,"ir.module.module.dependency,state",0,To be installed,A installer
+selection,"ir.module.module.dependency,state",0,Unknown,Inconnu
+selection,"ir.report.custom,print_format",0,a4,A4
+selection,"ir.report.custom,print_format",0,a5,A5
+selection,"ir.report.custom,state",0,Unsubscribed,Non-souscrit
+selection,"ir.report.custom,state",0,Subscribed,Souscrit
+selection,"ir.report.custom,frequency",0,Yearly,Annuelle
+selection,"ir.report.custom,frequency",0,Monthly,Mensuelle
+selection,"ir.report.custom,frequency",0,Daily,Quotidien
+selection,"ir.report.custom,print_orientation",0,Landscape,Paysage
+selection,"ir.report.custom,print_orientation",0,Portrait,Portrait
+selection,"ir.report.custom,type",0,Tabular,Tabulaire
+selection,"ir.report.custom,type",0,Pie Chart,Camembert
+selection,"ir.report.custom,type",0,Bar Chart,Graphique en barre
+selection,"ir.report.custom,type",0,Line Plot,Traceur
+selection,"ir.report.custom.fields,fc2_op",0,>,>
+selection,"ir.report.custom.fields,fc2_op",0,<,<
+selection,"ir.report.custom.fields,fc2_op",0,=,=
+selection,"ir.report.custom.fields,fc2_op",0,in,inclus dans
+selection,"ir.report.custom.fields,fc2_op",0,(year)=,Année de
+selection,"ir.report.custom.fields,operation",0,None,Aucun
+selection,"ir.report.custom.fields,operation",0,Calculate Sum,Somme
+selection,"ir.report.custom.fields,operation",0,Calculate Average,Moyenne
+selection,"ir.report.custom.fields,operation",0,Calculate Count,Compte
+selection,"ir.report.custom.fields,operation",0,Get Max,Valeur maximum
+selection,"ir.report.custom.fields,fc1_op",0,>,>
+selection,"ir.report.custom.fields,fc1_op",0,<,<
+selection,"ir.report.custom.fields,fc1_op",0,=,=
+selection,"ir.report.custom.fields,fc1_op",0,in,inclus dans
+selection,"ir.report.custom.fields,fc1_op",0,(year)=,Année de
+selection,"ir.report.custom.fields,alignment",0,left,À gauche
+selection,"ir.report.custom.fields,alignment",0,right,À droite
+selection,"ir.report.custom.fields,alignment",0,center,Centré
+selection,"ir.report.custom.fields,fc0_op",0,>,>
+selection,"ir.report.custom.fields,fc0_op",0,<,<
+selection,"ir.report.custom.fields,fc0_op",0,=,=
+selection,"ir.report.custom.fields,fc0_op",0,in,inclus dans
+selection,"ir.report.custom.fields,fc0_op",0,(year)=,Année de
+selection,"ir.report.custom.fields,fc3_op",0,>,>
+selection,"ir.report.custom.fields,fc3_op",0,<,<
+selection,"ir.report.custom.fields,fc3_op",0,=,=
+selection,"ir.report.custom.fields,fc3_op",0,in,inclus dans
+selection,"ir.report.custom.fields,fc3_op",0,(year)=,Année de
+selection,"ir.rule,operator",0,=,
+selection,"ir.rule,operator",0,<>,
+selection,"ir.rule,operator",0,<=,
+selection,"ir.rule,operator",0,>=,
+selection,"ir.rule,operator",0,in,
+selection,"ir.rule,operator",0,child_of,
+selection,"ir.ui.view,type",0,Tree,Arbre
+selection,"ir.ui.view,type",0,Form,Formulaire
+selection,"ir.ui.view,type",0,Graph,
+selection,"ir.ui.view,type",0,Calendar,
+selection,"product.template,supply_method",0,Produce,Produire
+selection,"product.template,supply_method",0,Buy,Acheter
+selection,"product.template,mes_type",0,Fixed,Fixé
+selection,"product.template,mes_type",0,Variable,Variable
+selection,"product.template,procure_method",0,Make to Stock,Sortir du stock
+selection,"product.template,procure_method",0,Make to Order,Commander
+selection,"product.template,cost_method",0,Standard Price,Prix standard
+selection,"product.template,cost_method",0,Average Price,
+selection,"product.template,state",0,In Development,En développement
+selection,"product.template,state",0,In Production,
+selection,"product.template,state",0,End of Lifecycle,
+selection,"product.template,state",0,Obsolete,Obsolète
+selection,"product.template,type",0,Stockable Product,Produit stockable
+selection,"product.template,type",0,Consumable,Consommable
+selection,"product.template,type",0,Service,Service
+selection,"product.ul,type",0,Unit,
+selection,"product.ul,type",0,Pack,
+selection,"product.ul,type",0,Box,Box
+selection,"product.ul,type",0,Palet,
+selection,"report.auction.adjudication,state",0,Draft, 
+selection,"report.auction.adjudication,state",0,Closed,
+selection,"report.object.encoded,state",0,Draft,
+selection,"report.object.encoded,state",0,Unsold,
+selection,"report.object.encoded,state",0,Paid,
+selection,"report.object.encoded,state",0,Invoiced,
+selection,"report.seller.auction,state",0,Draft,
+selection,"report.seller.auction,state",0,Unsold,
+selection,"report.seller.auction,state",0,Sold,
+selection,"report.unclassified.objects,state",0,Draft,
+selection,"report.unclassified.objects,state",0,Unsold,
+selection,"report.unclassified.objects,state",0,Paid,
+selection,"report.unclassified.objects,state",0,Sold,
+selection,"res.lang,direction",0,Left-to-right,
+selection,"res.lang,direction",0,Right-to-left,
+selection,"res.partner.address,type",0,Default,Défaut
+selection,"res.partner.address,type",0,Invoice,Facturation
+selection,"res.partner.address,type",0,Delivery,Livraison
+selection,"res.partner.address,type",0,Contact,Contact
+selection,"res.partner.address,type",0,Other,Autre
+selection,"res.partner.event,partner_type",0,Customer,Client
+selection,"res.partner.event,partner_type",0,Retailer,Détaillant
+selection,"res.partner.event,partner_type",0,Commercial Prospect,Prospect
+selection,"res.partner.event,type",0,Sale Opportunity,Opportunité d'affaire
+selection,"res.partner.event,type",0,Purchase Offer,Offre d'achat
+selection,"res.partner.event,type",0,Prospect Contact,Contact
+selection,"res.partner.title,domain",0,Partner,Partenaire
+selection,"res.partner.title,domain",0,Contact,Contact
+selection,"res.request,state",0,draft,Brouillon
+selection,"res.request,state",0,waiting,En attente
+selection,"res.request,state",0,active,Active
+selection,"res.request,state",0,closed,Fermée
+selection,"res.request,priority",0,Low,Basse
+selection,"res.request,priority",0,Normal,Normale
+selection,"res.request,priority",0,High,Haute
+selection,"workflow.activity,kind",0,Dummy,FAUX
+selection,"workflow.activity,kind",0,Function,Fonction
+selection,"workflow.activity,kind",0,Subflow,Sous-flux
+selection,"workflow.activity,kind",0,Stop All,Tout arrêter
+selection,"workflow.activity,join_mode",0,Xor,Xor
+selection,"workflow.activity,join_mode",0,And,Et
+selection,"workflow.activity,split_mode",0,Xor,Xor
+selection,"workflow.activity,split_mode",0,Or,Ou
+selection,"workflow.activity,split_mode",0,And,Et
+rml,ir.module.reference,0,Reference Guide,Guide de référence
+rml,ir.module.reference,0,Introspection report on objects,Rapport sur les objets
+rml,ir.module.reference,0,Printed:,Imprimé:
+rml,ir.module.reference,0,Module:,Module :
+rml,ir.module.reference,0,Name:,Nom :
+rml,ir.module.reference,0,Version:,Version:
+rml,ir.module.reference,0,Directory:,Répertoire:
+rml,ir.module.reference,0,Web:,Web :
+rml,ir.module.reference,0,Object:,Objet :
+rml,ir.module.reference,0,",",","
+rml,account.general.ledger,0,General ledger,Grand Livre
+rml,account.general.ledger,0,Currency:,Devise
+rml,account.general.ledger,0,Printing date:,Date d'impression
+rml,account.general.ledger,0,at,A
+rml,account.general.ledger,0,Date,Date
+rml,account.general.ledger,0,Code,Code
+rml,account.general.ledger,0,Ref.,Référence
+rml,account.general.ledger,0,Entry label,Réf. Ecriture
+rml,account.general.ledger,0,Debit,Débit
+rml,account.general.ledger,0,Credit,Crédit
+rml,account.general.ledger,0,Progressive balance,Balance progressive
+rml,account.general.ledger,0,TOTAL (,Total
+rml,account.general.ledger,0,):,
+rml,account.general.ledger,0,TOTAL:,Total
+rml,account.third_party_ledger,0,Third party ledger,Livre des tiers
+rml,account.third_party_ledger,0,From,De
+rml,account.third_party_ledger,0,to,à
+rml,account.third_party_ledger,0,Complete,Complet
+rml,account.third_party_ledger,0,Currency:,Devise
+rml,account.third_party_ledger,0,Printing date:,Date d'impression
+rml,account.third_party_ledger,0,at,à
+rml,account.third_party_ledger,0,Date,Date
+rml,account.third_party_ledger,0,J. code,Code Journal
+rml,account.third_party_ledger,0,Voucher Nb,Numéro de pièce
+rml,account.third_party_ledger,0,Entry label,Nom de l’Ecriture
+rml,account.third_party_ledger,0,Debit,Débit
+rml,account.third_party_ledger,0,Credit,Crédit
+rml,account.third_party_ledger,0,Progressive balance,Balance progressive
+rml,account.third_party_ledger,0,Total for,Total pour
+rml,account.third_party_ledger,0,Balance brought forward,Balance cumulée
+rml,account.account.balance,0,Account balance,Balance de compte
+rml,account.account.balance,0,Currency:,Tenue de compte:
+rml,account.account.balance,0,Printing date:,Date d'impression :
+rml,account.account.balance,0,at,à
+rml,account.account.balance,0,Code,Code
+rml,account.account.balance,0,Account name,Intitulé des comptes
+rml,account.account.balance,0,Transactions,Mouvements
+rml,account.account.balance,0,Balance,Solde
+rml,account.account.balance,0,Debit,Débit
+rml,account.account.balance,0,Credit,Crédit
+rml,account.account.balance,0,Total:,Total
+rml,account.partner.balance,0,Third party balance,Balance des Tiers
+rml,account.partner.balance,0,From,Période du
+rml,account.partner.balance,0,to,au
+rml,account.partner.balance,0,Currency:,Tenue de compte:
+rml,account.partner.balance,0,Printing date:,Date d'impression :
+rml,account.partner.balance,0,at,à
+rml,account.partner.balance,0,Account number,Numéro de compte
+rml,account.partner.balance,0,Account name,Intitulé des comptes
+rml,account.partner.balance,0,Transactions,Mouvements
+rml,account.partner.balance,0,Balances,Soldes
+rml,account.partner.balance,0,In dispute,En litige
+rml,account.partner.balance,0,Debit,Débit
+rml,account.partner.balance,0,Credit,Crédit
+rml,account.partner.balance,0,Debit,Débit
+rml,account.partner.balance,0,Credit,Crédit
+rml,account.partner.balance,0,Grand total,Total général
+rml,account.partner.balance,0,Balance,Solde de la balance
+rml,account.budget,0,Budget Analysis,Analyse budgétaire
+rml,account.budget,0,From,Période du
+rml,account.budget,0,to,au
+rml,account.budget,0,Currency:,Tenue de compte:
+rml,account.budget,0,Printing date:,Date d'impression :
+rml,account.budget,0,at,à
+rml,account.budget,0,Budget item detail,Détail postes budgétaires
+rml,account.budget,0,Account Number,Numéro de compte
+rml,account.budget,0,Budget,Prévisions budgétaires
+rml,account.budget,0,Period Budget,Prévisions budgétaires Période
+rml,account.budget,0,Performance,Réalisations
+rml,account.budget,0,Spread,Écarts
+rml,account.budget,0,% performance,% réalisation
+rml,account.budget,0,Total,Total
+rml,account.budget,0,%,%
+rml,account.budget,0,Results,Résultats budgétaires
+rml,account.budget,0,%,%
+rml,account.central.journal,0,Central Journal,Journal centralisé
+rml,account.central.journal,0,Currency:,Tenue de compte:
+rml,account.central.journal,0,Printing date:,Date d'impression :
+rml,account.central.journal,0,at,à
+rml,account.central.journal,0,Account number,N° Compte
+rml,account.central.journal,0,Account name,Intitulé de compte
+rml,account.central.journal,0,Currency,Devises
+rml,account.central.journal,0,Debit,Débit
+rml,account.central.journal,0,Credit,Crédit
+rml,account.central.journal,0,TOTAL:,TOTAUX:
+rml,account.general.journal,0,General Journal,Journal Général
+rml,account.general.journal,0,Currency:,Tenue de compte:
+rml,account.general.journal,0,Printing date:,Date d'impression :
+rml,account.general.journal,0,at,à
+rml,account.general.journal,0,Journal code,Journal
+rml,account.general.journal,0,Journal name,Intitulé des journaux
+rml,account.general.journal,0,Period,Période
+rml,account.general.journal,0,Debit trans.,Mvts débit
+rml,account.general.journal,0,Credit trans.,Mvts crédit
+rml,account.general.journal,0,Total,Totaux
+rml,account.general.journal,0,TOTAL:,TOTAUX:
+rml,account.journal.period.print,0,Journal,Journal
+rml,account.journal.period.print,0,Currency:,Tenue de compte:
+rml,account.journal.period.print,0,Printing date:,Date d'impression :
+rml,account.journal.period.print,0,at,à
+rml,account.journal.period.print,0,Date,Date
+rml,account.journal.period.print,0,Voucher Nb,N° Pièce
+rml,account.journal.period.print,0,Account Number,N° Compte
+rml,account.journal.period.print,0,Third party,Tiers
+rml,account.journal.period.print,0,Entry label,Libellé Écriture
+rml,account.journal.period.print,0,Debit,Débit
+rml,account.journal.period.print,0,Credit,Crédit
+rml,account.journal.period.print,0,TOTAL:,TOTAUX:
+rml,account.rappel,0,VAT:,TVA:
+rml,account.rappel,0,Customer account statement,Relevé de compte client
+rml,account.rappel,0,Document,Document
+rml,account.rappel,0,:,:
+rml,account.rappel,0,Date:,Date:
+rml,account.rappel,0,Customer Ref:,N° client
+rml,account.rappel,0,"Dear Sir/Madam,","Madame, Monsieur"
+rml,account.rappel,0,"Exception made if there was a mistake of ours, it seems that the following bills staid unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.","Sauf erreur de notre part, il ressort de nos comptes que les montants suivants demeurent impayés à ce jour. Nous vous invitons dès lors à faire le nécessaire pour procéder à ce paiement afin qu'il nous parvienne dans les 10 jours."
+rml,account.rappel,0,"Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting departement at (+32).10.68.94.39.","Si votre paiement a croisé le présent rappel, veuillez considérer celui-ci comme nul et non-avenu. N'hésitez pas à prendre contact avec notre service comptabilité si besoin."
+rml,account.rappel,0,Best regards.,"Nous vous prions d'agréer, Madame, Monsieur, l'expression de nos sentiments distingués."
+rml,account.rappel,0,Date,Date
+rml,account.rappel,0,Description,Description
+rml,account.rappel,0,Ref,Réf
+rml,account.rappel,0,Maturity date,Échéance
+rml,account.rappel,0,Due,Dû
+rml,account.rappel,0,Paid,Payé
+rml,account.rappel,0,Maturity,Échu
+rml,account.rappel,0,Li.,Lit.
+rml,account.rappel,0,Sub-Total:,Sous-total
+rml,account.rappel,0,Balance:,Solde
+rml,account.rappel,0,Total amount due:,Total des montants dûs
+rml,account.rappel,0,EUR.,EUR
+rml,account.invoice,0,Tel. :,Tél :
+rml,account.invoice,0,Fax :,Fax :
+rml,account.invoice,0,VAT :,TVA :
+rml,account.invoice,0,Invoice,Facture
+rml,account.invoice,0,Refund,Note de crédit
+rml,account.invoice,0,Supplier Refund,Note de crédit fournisseur
+rml,account.invoice,0,Supplier Invoice,Facture fournisseur
+rml,account.invoice,0,Document,Document
+rml,account.invoice,0,:,:
+rml,account.invoice,0,Invoice Date:,Date de facturation:
+rml,account.invoice,0,Customer Ref:,Référence client:
+rml,account.invoice,0,Description,Description
+rml,account.invoice,0,Taxes,TVA
+rml,account.invoice,0,Quantity,Quantité
+rml,account.invoice,0,Unit Price,Prix unitaire
+rml,account.invoice,0,Disc. (%),Esc (%)
+rml,account.invoice,0,Price,Prix
+rml,account.invoice,0,Tax,TVA
+rml,account.invoice,0,Base,Base de calcul
+rml,account.invoice,0,Amount,Montant
+rml,account.invoice,0,Total (excl. taxes):,Total (HT) :
+rml,account.invoice,0,Taxes:,Taxes :
+rml,account.invoice,0,Total,Total
+rml,account.invoice,0,(incl. taxes):,(TTC)
+xsl,account.transfer,0,Document,Document récurrent
+xsl,account.transfer,0,Type,Type
+xsl,account.transfer,0,Reference,Référence
+xsl,account.transfer,0,Partner ID,Code partenaire
+xsl,account.transfer,0,Date,Date
+xsl,account.transfer,0,Amount,Montant
+xsl,account.transfer,0,Change,Change
+rml,account.tax.code.entries,0,Accounting Entries,Écritures comptables
+rml,account.tax.code.entries,0,Currency:,Devise :
+rml,account.tax.code.entries,0,Date,Date
+rml,account.tax.code.entries,0,Voucher Nb,Numéro de la pièce
+rml,account.tax.code.entries,0,Account Number,N° Compte
+rml,account.tax.code.entries,0,Third party (Country),Tiers (pays)
+rml,account.tax.code.entries,0,Entry label,Code taxe
+rml,account.tax.code.entries,0,Debit,Débit
+rml,account.tax.code.entries,0,Credit,Crédit
+rml,account.tax.code.entries,0,(,(
+rml,account.tax.code.entries,0,),)
+rml,account.tax.code.entries,0,TOTAL:,TOTAL :
+rml,account.vat.declaration,0,Tax Report,Déclaration TVA
+rml,account.vat.declaration,0,Period:,Période :
+rml,account.vat.declaration,0,Currency:,Devise :
+rml,account.vat.declaration,0,Printing date:,Date d'impression :
+rml,account.vat.declaration,0,at,à
+rml,account.vat.declaration,0,Tax Code / Account,Code TVA / Compte
+rml,account.vat.declaration,0,General Account,Compte général
+rml,account.vat.declaration,0,Debit,Débit
+rml,account.vat.declaration,0,Credit,Crédit
+rml,account.vat.declaration,0,Tax Amount,Montant
+rml,account.vat.declaration,0,-,
+rml,account.analytic.account.journal,0,Analytic journal,Journal analytique
+rml,account.analytic.account.journal,0,Period from,Période du
+rml,account.analytic.account.journal,0,to,au
+rml,account.analytic.account.journal,0,Currency:,Devise:
+rml,account.analytic.account.journal,0,Printing date:,Date d'impression :
+rml,account.analytic.account.journal,0,at,à
+rml,account.analytic.account.journal,0,Date,Date
+rml,account.analytic.account.journal,0,Code,Code Journal
+rml,account.analytic.account.journal,0,Move name,Mouvement
+rml,account.analytic.account.journal,0,Account n°,Compte n°
+rml,account.analytic.account.journal,0,Accounting moves,Mouvement de comptabilité
+rml,account.analytic.account.journal,0,General,générale
+rml,account.analytic.account.journal,0,Analytic,analytique
+rml,account.analytic.account.journal,0,-,-
+rml,account.analytic.account.journal,0,-,-
+rml,account.analytic.account.journal,0,-,-
+rml,account.analytic.account.journal,0,Sums of the journal,Total du journal
+rml,account.analytic.account.balance,0,Analytic Balance,Balance analytique
+rml,account.analytic.account.balance,0,Period from,Période du
+rml,account.analytic.account.balance,0,to,au
+rml,account.analytic.account.balance,0,Currency:,Devise:
+rml,account.analytic.account.balance,0,Printing date:,Date d'impression :
+rml,account.analytic.account.balance,0,at,à
+rml,account.analytic.account.balance,0,Code,Code
+rml,account.analytic.account.balance,0,Account Name,Compte
+rml,account.analytic.account.balance,0,Debit,Débit
+rml,account.analytic.account.balance,0,Credit,Crédit
+rml,account.analytic.account.balance,0,Balance,Balance
+rml,account.analytic.account.balance,0,Quantity,Quantité
+rml,account.analytic.account.balance,0,Total (,Total
+rml,account.analytic.account.balance,0,),
+rml,account.analytic.account.balance,0,Total,Total
+rml,account.analytic.account.inverted.balance,0,Inverted Analytic Balance,Balance analytique inversée
+rml,account.analytic.account.inverted.balance,0,Period from,Période du
+rml,account.analytic.account.inverted.balance,0,to,au
+rml,account.analytic.account.inverted.balance,0,Currency:,Devise:
+rml,account.analytic.account.inverted.balance,0,Printing date:,Date d'impression :
+rml,account.analytic.account.inverted.balance,0,at,à
+rml,account.analytic.account.inverted.balance,0,Code,Code
+rml,account.analytic.account.inverted.balance,0,Account Name,Compte
+rml,account.analytic.account.inverted.balance,0,Debit,Débit
+rml,account.analytic.account.inverted.balance,0,Credit,Crédit
+rml,account.analytic.account.inverted.balance,0,Balance,Balance
+rml,account.analytic.account.inverted.balance,0,Quantity,Quantité
+rml,account.analytic.account.inverted.balance,0,Total (,Total
+rml,account.analytic.account.inverted.balance,0,),
+rml,account.analytic.account.inverted.balance,0,Sum,Somme
+rml,account.analytic.account.cost_ledger,0,Cost Ledger,Grand livre analytique
+rml,account.analytic.account.cost_ledger,0,Period from,Période du
+rml,account.analytic.account.cost_ledger,0,to,au
+rml,account.analytic.account.cost_ledger,0,Currency:,Devise:
+rml,account.analytic.account.cost_ledger,0,Printing date:,Date d'impression :
+rml,account.analytic.account.cost_ledger,0,at,à
+rml,account.analytic.account.cost_ledger,0,Date,Date
+rml,account.analytic.account.cost_ledger,0,J.C.,C.J.
+rml,account.analytic.account.cost_ledger,0,Code,Code
+rml,account.analytic.account.cost_ledger,0,Move name,Nom du mouvement
+rml,account.analytic.account.cost_ledger,0,Debit,Débit
+rml,account.analytic.account.cost_ledger,0,Credit,Crédit
+rml,account.analytic.account.cost_ledger,0,Balance,Balance
+rml,account.analytic.account.cost_ledger,0,Total (,Total
+rml,account.analytic.account.cost_ledger,0,),
+rml,account.analytic.account.cost_ledger,0,Total (,Total
+rml,account.analytic.account.cost_ledger,0,),
+rml,account.analytic.account.cost_ledger,0,Total,Total
+rml,account.analytic.account.quantity_cost_ledger,0,Cost Ledger,Grand Livre
+rml,account.analytic.account.quantity_cost_ledger,0,Period from,Du
+rml,account.analytic.account.quantity_cost_ledger,0,to,au
+rml,account.analytic.account.quantity_cost_ledger,0,Currency:,Devise
+rml,account.analytic.account.quantity_cost_ledger,0,Printing date:,Date d'impression :
+rml,account.analytic.account.quantity_cost_ledger,0,at,à
+rml,account.analytic.account.quantity_cost_ledger,0,Date,Date
+rml,account.analytic.account.quantity_cost_ledger,0,J.C.,C.J.
+rml,account.analytic.account.quantity_cost_ledger,0,Code,Code
+rml,account.analytic.account.quantity_cost_ledger,0,Move name,Nom du mouvement
+rml,account.analytic.account.quantity_cost_ledger,0,Quantity,Quantité
+rml,account.analytic.account.quantity_cost_ledger,0,Total (,Total
+rml,account.analytic.account.quantity_cost_ledger,0,),
+rml,account.analytic.account.quantity_cost_ledger,0,Total (,Total
+rml,account.analytic.account.quantity_cost_ledger,0,),
+rml,account.analytic.account.quantity_cost_ledger,0,Total,Total
+rml,account.analytic.account.analytic.check,0,Analytic Check,Contrôle analytique
+rml,account.analytic.account.analytic.check,0,Periods from,Période de
+rml,account.analytic.account.analytic.check,0,to,De
+rml,account.analytic.account.analytic.check,0,Currency:,Devise
+rml,account.analytic.account.analytic.check,0,Printing date:,Date d'impression
+rml,account.analytic.account.analytic.check,0,at,A
+rml,account.analytic.account.analytic.check,0,Code,Code
+rml,account.analytic.account.analytic.check,0,Account Name,Nom du compte
+rml,account.analytic.account.analytic.check,0,General,Général
+rml,account.analytic.account.analytic.check,0,Debit,Débit
+rml,account.analytic.account.analytic.check,0,General,Général
+rml,account.analytic.account.analytic.check,0,Credit,Crédit
+rml,account.analytic.account.analytic.check,0,Analytic,Analytique
+rml,account.analytic.account.analytic.check,0,Debit,Débit
+rml,account.analytic.account.analytic.check,0,Analytic,Analytique
+rml,account.analytic.account.analytic.check,0,Credit,Crédit
+rml,account.analytic.account.analytic.check,0,Delta,
+rml,account.analytic.account.analytic.check,0,Debit,Débit
+rml,account.analytic.account.analytic.check,0,Delta,
+rml,account.analytic.account.analytic.check,0,Credit,Crédit
+rml,account.analytic.account.analytic.check,0,Total,Total
+rml,account.analytic.budget.print,0,Analytic Budget Analysis,Analyse budget analytique
+rml,account.analytic.budget.print,0,From,De
+rml,account.analytic.budget.print,0,to,De
+rml,account.analytic.budget.print,0,Currency:,Devise
+rml,account.analytic.budget.print,0,Printing date:,Date d'impression
+rml,account.analytic.budget.print,0,at,A
+rml,account.analytic.budget.print,0,Budget item detail,Détail ligne de budget
+rml,account.analytic.budget.print,0,Account Number,Numéro de compte
+rml,account.analytic.budget.print,0,Budget,Budget
+rml,account.analytic.budget.print,0,Period Budget,Budget de la période
+rml,account.analytic.budget.print,0,Performance,Performance
+rml,account.analytic.budget.print,0,Spread,
+rml,account.analytic.budget.print,0,% performance,
+rml,account.analytic.budget.print,0,Total,Total
+rml,account.analytic.budget.print,0,%,
+rml,account.analytic.budget.print,0,Results,Résultats
+rml,account.analytic.budget.print,0,%,
+rml,accounting.report,0,Accounting Report,Rapport comptable
+rml,accounting.report,0,Currency:,Devise
+rml,accounting.report,0,Printing date:,Date d'impression
+rml,accounting.report,0,at,à
+rml,accounting.report,0,Name,Nom
+rml,accounting.report,0,Code,Code
+rml,accounting.report,0,Amount,Montant
+rml,bids.lots,0,Cat.N,
+rml,bids.lots,0,Name,
+rml,bids.lots,0,Bid,
+rml,bids.lots,0,Phone,
+rml,auction.bids,0,Bid,
+rml,auction.bids,0,Buyer,
+rml,auction.bids,0,Tel,
+rml,auction.bids,0,Auction,
+rml,auction.catelog,0,Cat.N,
+rml,auction.catelog,0,Description,
+rml,auction.catelog,0,Estimate,
+rml,auction.catelog,0,-,
+rml,deposit.seller,0,",",
+rml,deposit.seller,0,Bruxelles:,
+rml,deposit.seller,0,"Madame, Monsieur,",
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,Veuillez trouver ci-dessous la liste des articles que vous avez déposés pour vente publique du,
+rml,deposit.seller,0,.,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,Les lots que vous avez déposés mais qui ne sont pas marqués ci-dessous passeront dans une vente prochaine.,
+rml,deposit.seller,0,"En restant à votre disposition, je vous prie d'agréer, Madame, Monsieur, l'assurance de mes sentiments distingués.",
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,.........,
+rml,deposit.seller,0,Fabien Pinckaers,
+rml,deposit.seller,0,Cat.N,
+rml,deposit.seller,0,List.N,
+rml,deposit.seller,0,Description,
+rml,deposit.seller,0,Estimate,
+rml,deposit.seller,0,/,
+rml,lots.list,0,Cat.N,
+rml,lots.list,0,Description and Bids,
+rml,lots.list,0,Est,
+rml,lots.list,0,Limit,
+rml,lots.list,0,"Inv,name",
+rml,lots.list,0,Buyer price,
+rml,lots.list,0,/,
+xsl,report.auction.lots.list.landscape,0,Cat. N.,
+xsl,report.auction.lots.list.landscape,0,Description,
+xsl,report.auction.lots.list.landscape,0,Est.,
+xsl,report.auction.lots.list.landscape,0,Limit,
+xsl,report.auction.lots.list.landscape,0,Orders,
+xsl,report.auction.lots.list.landscape,0,"Inv, Name",
+xsl,report.auction.lots.list.landscape,0,"Buyer, Price",
+xsl,report.auction.lots.list.landscape,0,NET,
+xsl,report.auction.lots.list.landscape,0,TEL:,
+xsl,report.auction.lots.list.landscape,0,BID:,
+xsl,report.auction.lots.list.landscape,0,", TEL:",
+rml,lots.list.inventory,0,Inv,
+rml,lots.list.inventory,0,List.N,
+rml,lots.list.inventory,0,Description,
+rml,lots.list.inventory,0,cat.N.,
+xsl,report.auction.lots.list,0,Cat. N.,
+xsl,report.auction.lots.list,0,Description and bids,
+xsl,report.auction.lots.list,0,Est.,
+xsl,report.auction.lots.list,0,Limit,
+xsl,report.auction.lots.list,0,"Inv, Name",
+xsl,report.auction.lots.list,0,"Buyer, Price",
+xsl,report.auction.lots.list,0,TEL:,
+xsl,report.auction.lots.list,0,BID:,
+xsl,report.auction.lots.list,0,", TEL:",
+xsl,report.auction.lots.list,0,NET,
+rml,buyer.list,0,Buyer,
+rml,buyer.list,0,Adj(EUR),
+rml,buyer.list,0,Buyer costs(,
+rml,buyer.list,0,%),
+rml,buyer.list,0,To pay,
+rml,buyer.list,0,Paid,
+rml,buyer.list,0,Total:,
+rml,auction.total.rml,0,Date printing:,
+rml,auction.total.rml,0,Auction,
+rml,auction.total.rml,0,Auction:,
+rml,auction.total.rml,0,Date:,
+rml,auction.total.rml,0,Items,
+rml,auction.total.rml,0,# of items:,
+rml,auction.total.rml,0,Min Estimate:,
+rml,auction.total.rml,0,Max Estimate:,
+rml,auction.total.rml,0,# of unsold items:,
+rml,auction.total.rml,0,Adjudication:,
+rml,auction.total.rml,0,Buyers,
+rml,auction.total.rml,0,# of buyers:,
+rml,auction.total.rml,0,# of paid items,
+rml,auction.total.rml,0,(based on invoices):,
+rml,auction.total.rml,0,# of commissions:,
+rml,auction.total.rml,0,# of items taken away:,
+rml,auction.total.rml,0,Debit:,
+rml,auction.total.rml,0,Credit:,
+rml,auction.total.rml,0,Paid:,
+rml,auction.total.rml,0,Sellers,
+rml,auction.total.rml,0,# of sellers:,
+rml,auction.total.rml,0,Debit:,
+rml,auction.total.rml,0,Credit:,
+rml,auction.total.rml,0,Paid:,
+rml,buyer_form_report,0,: Bordereau d'achat,
+rml,buyer_form_report,0,Document,
+rml,buyer_form_report,0,:,
+rml,buyer_form_report,0,Vente,
+rml,buyer_form_report,0,Ref,
+rml,buyer_form_report,0,Description,
+rml,buyer_form_report,0,Paid,
+rml,buyer_form_report,0,Adj(EUR),
+rml,buyer_form_report,0,Subtotal:,
+rml,buyer_form_report,0,BuyerCosts(,
+rml,buyer_form_report,0,%):,
+rml,buyer_form_report,0,Total:,
+rml,seller_form_report,0,",",
+rml,seller_form_report,0,Document:Bordereau de vente,
+rml,seller_form_report,0,Inventory:,
+rml,seller_form_report,0,Bank Account:,
+rml,seller_form_report,0,Customer Contact:,
+rml,seller_form_report,0,Cat.N,
+rml,seller_form_report,0,List.N,
+rml,seller_form_report,0,Description,
+rml,seller_form_report,0,Adj(EUR),
+rml,seller_form_report,0,Subtotal:,
+rml,seller_form_report,0,SellerCosts(,
+rml,seller_form_report,0,%):,
+rml,seller_form_report,0,Total:,
+xsl,report.auction.seller.list,0,Inv.,
+xsl,report.auction.seller.list,0,Seller,
+xsl,report.auction.seller.list,0,#,
+xsl,report.auction.seller.list,0,Adj.,
+xsl,report.auction.seller.list,0,To pay,
+xsl,report.auction.seller.list,0,Total:,
+rml,bids.phones.details,0,Cat.N,
+rml,bids.phones.details,0,Description,
+rml,bids.phones.details,0,Est,
+rml,bids.phones.details,0,Phone,
+rml,bids.phones.details,0,-,
+rml,auction.result,0,Num,
+rml,auction.result,0,Adj,
+rml,report.auction.buyer.result,0,Num,
+rml,report.auction.buyer.result,0,Adj,
+rml,report.auction.buyer.result,0,Buyer,
+view,auction.lots,0,Catalog,
+view,auction.lots,0,Ref,
+view,account.move.line,0,Account Entry Line,Écritures comptables
+view,account.move.line,0,Information,Information
+view,account.move.line,0,General Information,Information générale
+view,account.move.line,0,Optional Information,Information optionnelle
+view,account.move.line,0,State,État
+view,account.move.line,0,Analytic Lines,Lignes analytiques
+view,account.invoice,0,Supplier invoice,Facture fournisseur
+view,account.invoice,0,Invoice,Facture
+view,account.invoice,0,Invoice lines,Lignes de facture
+view,account.invoice,0,Taxes,Taxes
+view,account.invoice,0,Reset taxes,Réinitialiser taxes
+view,account.invoice,0,Compute,Calculer
+view,account.invoice,0,Validate,
+view,account.invoice,0,Cancel,Annuler
+view,account.invoice,0,Set to Draft,Mettre en brouillon
+view,account.invoice,0,Other Info,Autre information
+view,account.invoice,0,(keep empty to use the current period),(Garder vide pour utiliser la période courante)
+view,hr.attendance,0,Employee attendance,Pointage employé
+view,account.move.line,0,Account Entry Line,Écritures comptables
+view,account.move.line,0,Total debit,Total débit
+view,account.move.line,0,Total credit,Total crédit
+view,account.move.line,0,Account Entry Line,Écritures comptables
+view,account.move.line,0,St.,Ext.
+view,account.move.line,0,Total debit,Total débit
+view,account.move.line,0,Total credit,Total crédit
+view,res.partner.category,0,Partner categories,
+view,account.account,0,Chart of Accounts,Plan de comte
+view,product.product,0,Product,Produit
+view,product.product,0,Information,Information
+view,product.product,0,Procurement,
+view,product.product,0,Descriptions,Descriptions
+view,product.product,0,Description,Description
+view,product.product,0,Sale Description,Description de vente
+view,product.product,0,Purchase Description,Description d'achat
+view,product.product,0,Packaging,Unité logistique
+view,product.product,0,Properties,Propriétés
+view,res.users,0,Users,Utilisateurs
+view,ir.ui.menu,0,Menu,Menu
+view,res.partner.address,0,Partner contacts,
+view,res.partner,0,Partners,Partenaire
+view,hr.employee.category,0,Employees Categories,Catégories des employés
+view,account.analytic.account,0,Analytic account,Compte Analytique 
+view,account.report.report,0,Accounting reporting,Rapport comptable
+view,auction.lots,0,Catalog,
+view,auction.lots,0,Object,
+view,auction.lots,0,Description,
+view,auction.lots,0,Sold,
+view,auction.lots,0,Not sold,
+view,auction.lots,0,Set to draft,
+view,auction.lots,0,Seller,
+view,auction.lots,0,Seller information,
+view,auction.lots,0,History,
+view,auction.lots,0,Buyer,
+view,auction.lots,0,Buyer information, 
+view,auction.lots,0,Payment's history, Historique du paiement
+view,auction.lots,0,Bids,
+view,auction.lots,0,Bids,
+view,account.move.line,0,Account Entry Line,Écritures comptables
+view,account.move.line,0,Information,Information
+view,account.move.line,0,General Information,Information générale
+view,account.move.line,0,Optional Information,Information optionnelle
+view,account.move.line,0,State,État
+view,account.move.line,0,Analytic Lines,Lignes analytiques
+view,res.users,0,Users,Utilisateurs
+view,res.users,0,Please note that you will have to logout and relog if you change your password.,Veuillez noter que vous devrez vous déconnecter et reconnecter si vous changez votre mot de passe
+view,ir.ui.menu,0,Menu,Menu
+view,res.lang,0,Language,Langue
+view,res.groups,0,Groups,Groupes
+view,res.groups,0,Group,
+view,res.groups,0,Security,
+view,res.groups,0,Access Controls,
+view,res.users,0,Users,Utilisateurs
+view,res.users,0,User,
+view,res.users,0,Security,
+view,res.users,0,Users,Utilisateurs
+view,res.company,0,Company,Société
+view,res.company,0,Companies,Sociétés
+view,ir.sequence,0,Sequences,Numérotation
+view,ir.sequence,0,Configuration,Configuration
+view,ir.sequence,0,"Legend (for prefix, suffix)","Légende (pour préfixe, suffixe)"
+view,ir.sequence,0,Year: %(year)s,Année: %(year)s
+view,ir.sequence,0,Month: %(month)s,Mois: %(month)s
+view,ir.sequence,0,Day: %(day)s,Jour: %(day)s
+view,ir.sequence,0,Sequences,Numérotation
+view,ir.sequence.type,0,Sequence Type,Type de séquence
+view,ir.actions.actions,0,Action,Action
+view,ir.actions.actions,0,Action,Action
+view,ir.actions.execute,0,Execute,Exécuter
+view,ir.actions.execute,0,Execute,Exécuter
+view,ir.actions.group,0,Group,Groupe
+view,ir.actions.group,0,Group,Groupe
+view,ir.actions.report.custom,0,Report custom,Rapport personnalisé
+view,ir.actions.report.custom,0,Report custom,Rapport personnalisé
+view,ir.actions.report.xml,0,Report xml,Rapport xml
+view,ir.actions.report.xml,0,Report xml,Rapport xml
+view,ir.actions.act_window,0,Open Window,Ouvrir la fenêtre
+view,ir.actions.act_window,0,Open a Window,Ouvrir une fenêtre
+view,ir.actions.act_window,0,Views,Vues
+view,ir.actions.act_window,0,Views,Vues
+view,ir.actions.wizard,0,Wizard,Assistant
+view,res.roles,0,Role,Rôle
+view,res.roles,0,Roles,Rôles
+view,ir.ui.view,0,User Interface - Views,Interface utilisateur - Vues
+view,ir.attachment,0,Attachments,Pièces attachées
+view,ir.attachment,0,Description,Description
+view,ir.attachment,0,Attachments,Pièces attachées
+view,ir.report.custom.fields,0,Report Fields,Champs du rapport
+view,ir.report.custom.fields,0,Report Fields,Champs du rapport
+view,ir.report.custom,0,Custom Report,Rapport personnalisé
+view,ir.report.custom,0,Subscribe Report,Souscrire au rapport
+view,ir.report.custom,0,Unsubscribe Report,Désactiver état
+view,ir.model,0,Model Description,Description du modèle
+view,ir.model,0,Information,Information
+view,ir.model,0,Fields,Champs
+view,ir.model,0,Fields Description,Champs description
+view,ir.model,0,Model Description,Description du modèle
+view,ir.model.fields,0,Fields,Champs
+view,ir.model.fields,0,Fields,Champs
+view,ir.translation,0,Translations,Traduction
+view,ir.translation,0,Translations,Traduction
+view,ir.ui.view_sc,0,Shortcut,
+view,ir.ui.view_sc,0,Shortcut,
+view,ir.ui.menu,0,Menu,Menu
+view,ir.cron,0,Scheduled Actions,Actions planifiées
+view,ir.cron,0,Scheduled Actions,Actions planifiées
+view,ir.cron,0,Action to trigger,Action à déclencher
+view,ir.model.access,0,Access controls,Contrôles d'accès
+view,ir.model.access,0,Access controls,Contrôles d'accès
+view,ir.rule.group,0,Record rules,Entrer des règles 
+view,ir.rule.group,0,The rule is satisfied if at least one test is True,
+view,ir.rule.group,0,"If there is no test defined, the rule is always satified if not global",
+view,ir.rule.group,0,Record rules,Entrer des règles 
+view,ir.rule,0,Test,Test
+view,ir.rule,0,Test,Test
+view,workflow,0,Workflow,Processus
+view,workflow,0,Activities,Activités
+view,workflow,0,Workflow,Processus
+view,workflow.activity,0,Activity,Activité
+view,workflow.activity,0,Outgoing transitions,Évènements sortants
+view,workflow.activity,0,Transitions,Transitions
+view,workflow.activity,0,Incoming transitions,Évènements entrants
+view,workflow.activity,0,Transitions,Transitions
+view,workflow.activity,0,Activity,Activité
+view,workflow.transition,0,Transition,Évènement
+view,workflow.transition,0,Transition,Évènement
+view,workflow.instance,0,Workflow Instances,Instances de processus
+view,workflow.instance,0,Workflow Instances,Instances de processus
+view,workflow.workitem,0,Workflow Workitems,Conditions de processus
+view,workflow.workitem,0,Workflow Workitems,Conditions de processus
+view,ir.module.category,0,Module Category,Catégories de module
+view,ir.module.category,0,Module Category,Catégories de module
+view,ir.module.module,0,Module,Module
+view,ir.module.module,0,Module,Module
+view,ir.module.module,0,Install,Installer
+view,ir.module.module,0,Cancel Install,Annuler l'installation
+view,ir.module.module,0,Uninstall (beta),Désinstaller
+view,ir.module.module,0,Cancel Uninstall,Annuler la désinstallation
+view,ir.module.module,0,Upgrade,Mettre à jour
+view,ir.module.module,0,Cancel Upgrade,Annuler la mise à jour
+view,ir.module.module,0,Dependencies,Dépendances
+view,ir.module.module,0,Dependencies,Dépendances
+view,ir.module.module,0,Modules,Modules
+view,ir.module.repository,0,Repository,Dépôt de module
+view,ir.module.repository,0,Repository list,Liste des dépôts de module
+view,res.request,0,Requests,Requêtes
+view,res.request,0,Requests,Requêtes
+view,res.request,0,Request,Requête
+view,res.request,0,Description,Description
+view,res.request,0,Send,Envoyer
+view,res.request,0,Reply,Répondre
+view,res.request,0,References,Références
+view,res.request,0,Status,Statut
+view,res.request,0,End of Request,Clôturer la requête
+view,res.request,0,History,Historique
+view,res.request.link,0,Request Link,Lien vers requête
+view,res.request.link,0,Request Link,Lien vers requête
+view,res.request.history,0,Request History,Historique des requêtes
+view,res.request.history,0,Request History,Historique des requêtes
+view,res.partner.function,0,Partner Functions,Fonctions d'un contact
+view,res.country,0,Country,Pays
+view,res.country,0,Country,Pays
+view,res.country.state,0,State,État
+view,res.country.state,0,State,État
+view,res.partner.address,0,Partner contacts,
+view,res.partner.address,0,Contacts,Contacts
+view,res.partner.title,0,Partners Titles,Titres des partenaires
+view,res.partner,0,Partners,Partenaire
+view,res.partner,0,General,Informations
+view,res.partner,0,Partner contacts,
+view,res.partner,0,Categories,Catégories
+view,res.partner,0,Extra Info,Extra info
+view,res.partner,0,Bank account,
+view,res.partner,0,Bank account owner,
+view,res.partner,0,Bank Details,
+view,res.partner,0,Notes,Commentaires
+view,res.partner,0,Event History,Évènements
+view,res.partner,0,Properties,Propriétés
+view,res.payterm,0,Payment term,Condition de paiement
+view,res.partner.bank.type,0,Bank Account Type,Type de compte
+view,res.partner.bank.type,0,Bank Account Type,Type de compte
+view,res.partner.bank,0,Bank account,
+view,res.partner.bank,0,Bank account owner,
+view,res.partner.bank,0,Bank accounts,
+view,res.partner,0,Partners,Partenaire
+view,res.partner.category,0,Partner categories,
+view,res.partner.category,0,Partner Categories,Catégories de Partenaire
+view,res.partner.category.type,0,Type of Partner Categories,
+view,res.currency,0,Currencies,Devises
+view,res.currency,0,Currency,Devise
+view,res.currency,0,Rates,
+view,res.currency,0,Rates,
+view,res.partner.canal,0,Channel,Canal
+view,res.partner.event.type,0,Event Type,Type événement
+view,res.partner.som,0,Partner State of Mind,État d'esprit
+view,res.partner.som,0,Partner State of Mind,État d'esprit
+view,res.partner.event,0,Partner Events,Évènement
+view,res.partner.event,0,General Description,Description générale
+view,res.partner.event,0,Description,Description
+view,res.partner.event,0,Document Link,Lien Document
+view,res.partner.event,0,Partner Events,Évènement
+view,ir.property,0,Properties,propriétés
+view,ir.property,0,Property,Propriété
+view,ir.property,0,Properties,propriétés
+view,hr.employee,0,Employee,Employé
+view,hr.employee,0,Information,Information
+view,hr.employee,0,General Information,Information générale
+view,hr.employee,0,Working Data,Données de travail
+view,hr.employee,0,Sign in !,Pointer l'entrée
+view,hr.employee,0,Sign out !,Pointer la sortie
+view,hr.employee,0,Holidays,Congés
+view,hr.employee,0,Employees,Employés
+view,hr.employee,0,Employees,Employés
+view,hr.employee,0,Employees,Employés
+view,hr.timesheet.group,0,Timesheet category,Catégorie de feuille de présence
+view,hr.timesheet.group,0,Timesheets,Feuilles de présence
+view,hr.timesheet,0,Timesheet,Feuille de présence
+view,hr.timesheet,0,Timesheet,Feuille de présence
+view,hr.attendance,0,Employee attendance,Pointage employé
+view,hr.attendance,0,Employee attendances,Pointages employé
+view,hr.employee.category,0,Employee Category,Catégorie de l'employé
+view,hr.employee.category,0,Employees Categories,Catégories des employés
+view,hr.holidays,0,Employee holidays,Congés
+view,hr.holidays,0,Employee holidays,Congés
+view,hr.holidays,0,Vacations requests,Demandes de vacances
+view,hr.holidays.status,0,Define holiday status,Définir les types de congés
+view,hr.holidays.status,0,Holiday status,Types de congés
+view,hr.action.reason,0,Define attendance reason,Définir les motifs de pointage
+view,hr.action.reason,0,Attendance reasons,Motifs de pointage
+view,hr.department,0,department,département
+view,hr.department,0,Department,département
+view,hr.department,0,Notes,Notes
+view,hr.department,0,Companies,Sociétés
+view,product.product,0,Products,Produits
+view,product.product,0,Product Variant,Variante de produit
+view,product.product,0,Description,Description
+view,product.product,0,Product Variant,Variante de produit
+view,product.template,0,Product Template,Modèle
+view,product.template,0,Product Template,Modèle
+view,product.template,0,Information,Information
+view,product.template,0,Procurement (days),Approvisionnement (jours)
+view,product.template,0,Descriptions,Descriptions
+view,product.template,0,Sale Description,Description de vente
+view,product.template,0,Purchase Description,Description d'achat
+view,product.template,0,Properties,Propriétés
+view,product.category,0,Product Categories,
+view,product.category,0,Products Categories,Catégories des produits
+view,product.uom,0,Unit of Measure,Unité de mesure
+view,product.uom,0,Unit of Measure,Unité de mesure
+view,product.uom.categ,0,Unit of Measure categories,Catégories d'unité de mesure
+view,product.ul,0,Logisitcal Unit,Unité logistique
+view,product.packaging,0,Packaging,UL
+view,product.packaging,0,Packaging,UL
+view,product.packaging,0,Palletization,Palettisation
+view,product.packaging,0,Dimension,
+view,product.supplierinfo,0,Partner Information,Infos partenaire
+view,product.supplierinfo,0,Pricelist,Liste de prix
+view,product.supplierinfo,0,Partner Information,Infos partenaire
+view,product.supplierinfo,0,Seq,Seq
+view,product.pricelist.version,0,Pricelist Version,Tarif
+view,product.pricelist.version,0,Pricelist Version,Tarif
+view,product.pricelist.item,0,Products Listprices Items,Lignes du tarif
+view,product.pricelist.item,0,Products Listprices Items,Lignes du tarif
+view,product.pricelist.item,0,Rules Test Match,Description détail de tarif
+view,product.pricelist.item,0,Price Computation,Calcul du prix
+view,product.pricelist.item,0,New Price =,Nouveau prix =
+view,product.pricelist.item,0,Base Price,Prix de base
+view,product.pricelist.item,0,* ( 1 - ,* ( 1 -
+view,product.pricelist.item,0, ) + ,
+view,product.pricelist.item,0,Rounding Method,Méthode d'arrondi
+view,product.pricelist.item,0,Min. Margin,Marge Min.
+view,product.pricelist.item,0,Max. Margin,Marge Max.
+view,product.pricelist,0,Products Price List,Catégorie de tarif
+view,product.pricelist,0,Products Price List,Catégorie de tarif
+view,product.pricelist,0,Pricelist Name,Tarif
+view,product.pricelist,0,Pricelist Version,
+view,product.pricelist,0,Pricelist Version,
+view,product.price.type,0,Products Price Type,Type de prix produit
+view,product.pricelist.type,0,Pricelist Type,Type de Tarif
+view,board.note,0,Notes,Notes
+view,board.note,0,Note,Note
+view,account.fiscalyear,0,Fiscalyear,Exercice
+view,account.fiscalyear,0,Periods,Périodes
+view,account.fiscalyear,0,Period,Période
+view,account.fiscalyear,0,States,États
+view,account.fiscalyear,0,Create Monthly Periods,Ouverture de mois
+view,account.fiscalyear,0,Create 3 Months Periods,Ouverture de trimestre
+view,account.fiscalyear,0,Fiscalyear,Exercice
+view,account.period,0,Period,Période
+view,account.period,0,States,États
+view,account.period,0,Period,Période
+view,account.account,0,Account,Compte Analytique 
+view,account.account,0,General Information,Informations générales
+view,account.account,0,Notes,Commentaires
+view,account.account,0,Chart of accounts,Plan de comte
+view,account.journal.column,0,Journal Column,Colonne journal
+view,account.journal.column,0,Journal Column,Colonne journal
+view,account.journal.view,0,Journal View,Vue journal
+view,account.journal,0,Account Journal,Journal de saisie
+view,account.journal,0,Account Journal,Journal de saisie
+view,account.journal,0,General Information,Information générale
+view,account.journal,0,Entry Controls,Contrôle d'entrée
+view,account.journal,0,Accounts Type Allowed (empty for no control),Type de comptes autorisés (vide pour aucun contrôle)
+view,account.journal,0,Accounts Allowed (empty for no control),Comptes autorisés
+view,account.bank.statement,0,Statement,Relevé bancaire
+view,account.bank.statement,0,Statement,Relevé bancaire
+view,account.bank.statement,0,Entry encoding,Encoder entrée
+view,account.bank.statement,0,Statement lines,Lignes d'extraits
+view,account.bank.statement,0,Statement lines,Lignes d'extraits
+view,account.bank.statement,0,Notes,Notes
+view,account.bank.statement,0,Real Entries,Entrées réelles
+view,account.bank.statement,0,Compute,Calculer
+view,account.bank.statement,0,Confirm,Confirmer
+view,account.bank.statement,0,Cancel,Annuler
+view,account.bank.statement.reconcile,0,Reconcile,Réconcilier
+view,account.bank.statement.reconcile,0,Entries,Entrées
+view,account.bank.statement.reconcile,0,Write-Off,Ajustements
+view,account.bank.statement.reconcile,0,Compute,Calculer
+view,account.account.type,0,Account Type,Type compte
+view,account.account.type,0,Account Type,Type compte
+view,account.move,0,Account entry,Entrée de compte
+view,account.move.reconcile,0,Account Entry Reconcile,Réconcilier
+view,account.tax.code,0,Account Tax Code,Code du compte taxe
+view,account.tax.code,0,Account Tax Code,Code du compte taxe
+view,account.tax,0,Account Tax,Taxe
+view,account.tax,0,Account Tax,Taxe
+view,account.tax,0,Tax Definition,Taxes
+view,account.tax,0,Keep empty to use the income account,Laisser vide pour utiliser le compte de revenu (TVA au brut)
+view,account.tax,0,Keep empty to use the expense account,Laisser vide pour utiliser le compte de charge (TVA au brut)
+view,account.tax,0,Tax Declaration,Déclaration de TVA
+view,account.tax,0,Invoices,Factures
+view,account.tax,0,Refund Invoices,Note de crédit
+view,account.tax,0,Special Computation,Calcul particulier
+view,account.tax,0,Compute Code (if type=code),Formule (si type=code)
+view,account.tax,0,Applicable Code (if type=code),Code applicable (si type=code)
+view,account.move,0,Account Entry,Entrée comptable
+view,account.move,0,Account Entry,Entrée comptable
+view,account.move,0,General Information,Information générale
+view,account.move,0,Entry Lines,Écritures comptables
+view,account.move,0,Account Entry Line,Écritures comptables
+view,account.move,0,General Information,Information générale
+view,account.move,0,Optional Information,Information optionnelle
+view,account.move,0,State,État
+view,account.move,0,Account Entry Line,Écritures comptables
+view,account.move,0,Validate,Valider
+view,account.move,0,Cancel,Annuler
+view,account.journal.period,0,Journals,Journaux
+view,account.budget.post,0,Budget item,Poste budgétaire
+view,account.budget.post,0,Definition,Définition de campagne
+view,account.budget.post,0,Dotations,Dotations
+view,account.budget.post,0,Spread,Répartir
+view,account.budget.post,0,Accounts,Comptes
+view,account.budget.post,0,Budget item,Poste budgétaire
+view,account.budget.post.dotation,0,Budget items expenses,Dépenses poste budgétaire
+view,account.budget.post.dotation,0,Budget items expenses,Dépenses poste budgétaire
+view,account.model.line,0,Entry Model Line,Ligne d'écriture
+view,account.model.line,0,Entry Model Line,Ligne d'écriture
+view,account.model,0,Entry Model,Modèle d'entrée
+view,account.model,0,Create entries,Créer entrées
+view,account.model,0,Entry Model,Modèle d'entrée
+view,account.payment.term.line,0,Payment Term,Condition paiement
+view,account.payment.term.line,0,Payment Term,Condition paiement
+view,account.payment.term,0,Payment Term,Condition paiement
+view,account.payment.term,0,Information,Informations
+view,account.payment.term,0,Description on invoices,Commentaires factures
+view,account.payment.term,0,Computation,Calcul
+view,account.subscription.line,0,Subscription lines,Lignes abonnement
+view,account.subscription.line,0,Subscription lines,Lignes abonnement
+view,account.subscription,0,Entry Subscription,Écriture d'abonnement
+view,account.subscription,0,Entry Subscription,Écriture d'abonnement
+view,account.subscription,0,Subscription Periods,Périodes abonnement
+view,account.subscription,0,Compute,Calcul
+view,account.subscription,0,Remove Lines,Supprimer lignes
+view,account.subscription,0,Subscription Lines,Lignes abonnement
+view,account.subscription,0,State,État
+view,account.subscription,0,Set to Draft,Mettre en brouillon
+view,account.invoice.line,0,Invoice Line,Détail de la facture
+view,account.invoice.line,0,Invoice Line,Détail de la facture
+view,account.invoice.line,0,Line,Ligne
+view,account.invoice.line,0,Notes,Notes
+view,account.invoice.tax,0,Manual Invoice Taxes,Taxes manuelle
+view,account.invoice.tax,0,Manual Invoice Taxes,Taxes manuelle
+view,account.invoice.tax,0,Tax codes,Codes de taxe
+view,account.invoice,0,Invoice,Facture
+view,account.invoice,0,Untaxed amount,Montant non-taxé
+view,account.invoice,0,Total amount,Montant total
+view,account.invoice,0,Invoice,Facture
+view,account.invoice,0,Invoice,Facture
+view,account.invoice,0,Taxes,Taxes
+view,account.invoice,0,Reset taxes,Réinitialiser taxes
+view,account.invoice,0,Compute,Calculer
+view,account.invoice,0,PRO-FORMA,Pro-Forma
+view,account.invoice,0,Validate,
+view,account.invoice,0,Cancel,Annuler
+view,account.invoice,0,Set to Draft,Mettre en brouillon
+view,account.invoice,0,Other Info,Autre information
+view,account.invoice,0,(keep empty to use the current period),(Garder vide pour utiliser la période courante)
+view,account.analytic.account,0,Analytic account,Compte Analytique 
+view,account.analytic.account,0,Analytic account,Compte Analytique 
+view,account.analytic.account,0,Account Data,Données du compte
+view,account.analytic.account,0,Note,Note
+view,account.analytic.account,0,Statistics,Statistiques
+view,account.analytic.line,0,Analytic Entry,Entrée analytique
+view,account.analytic.line,0,Analytic Entries,Entrées analytiques
+view,account.analytic.line,0,Total quantity,Quantité totale
+view,account.analytic.line,0,Total amount,Montant total
+view,account.analytic.line,0,Project line,Ligne de projet
+view,account.analytic.journal,0,Analytic Journal,Journal analytique
+view,account.analytic.journal,0,Analytic Journal,Journal analytique
+view,report.hr.timesheet.invoice.journal,0,Analytic Entries Stats,Stats des entrées analytiques
+view,report.hr.timesheet.invoice.journal,0,Analytic Entries Stats,Stats des entrées analytiques
+view,report.hr.timesheet.invoice.journal,0,Analytic Entries Stats,Stats des entrées analytiques
+view,account.analytic.budget.post,0,Analytic Budget item,Ligne de bugdet analytique
+view,account.analytic.budget.post,0,Definition,Définition
+view,account.analytic.budget.post,0,Dotations,Dotations
+view,account.analytic.budget.post,0,Spread,Ventiler
+view,account.analytic.budget.post,0,Accounts,Comptes
+view,account.analytic.budget.post,0,Analytic Budget item,Ligne de bugdet analytique
+view,account.analytic.budget.post.dotation,0,Analytic Budget items expenses,Dépenses du budget
+view,account.analytic.budget.post.dotation,0,Analytic Budget items expenses,Dépenses du budget
+view,account.report.report,0,Accounting reporting,Rapport comptable
+view,account.report.report,0,General,Général
+view,account.report.report,0,Legend of operators,Légende des opérateurs
+view,account.report.report,0,Account cebit:,Débit du compte
+view,account.report.report,0,debit('ACCOUNT_CODE'),
+view,account.report.report,0,Account credit:,Credit Compte:
+view,account.report.report,0,credit('ACCOUNT_CODE'),Crédit
+view,account.report.report,0,Account balance:,Balance de compte
+view,account.report.report,0,balance('ACCOUNT_CODE'),Balance
+view,account.report.report,0,Report amount:,Montant Calculé
+view,account.report.report,0,report('REPORT_CODE'),Rapport comptable
+view,account.report.report,0,Operators:,Opérateurs
+view,account.report.report,0,+ - * / ( ),
+view,account.report.report,0,"Exemple: (balance('6','45') - credit('7')) / report('RPT1')",
+view,account.report.report,0,Return value for status,Valeur de retour pour status
+view,account.report.report,0,< -1:,
+view,account.report.report,0,Very bad,Très mauvais
+view,account.report.report,0,-1:,
+view,account.report.report,0,Bad,Mauvais
+view,account.report.report,0,0:,
+view,account.report.report,0,Normal,Normal
+view,account.report.report,0,1:,
+view,account.report.report,0,Good,Bon
+view,account.report.report,0,> 1:,
+view,account.report.report,0,Very Good,Très bien
+view,account.report.report,0,Notes,Notes
+view,account.report.report,0,Accounting reporting,Rapport comptable
+view,auction.artists,0,Artists,Artistes
+view,auction.artists,0,Artists,Artistes
+view,auction.lot.category,0,Lot Category, Catégorie du lot
+view,auction.lot.category,0,Lot Category, Catégorie du lot
+view,auction.dates,0,Auction Dates,Dates des enchères
+view,auction.dates,0,Beginning of the auction, Début de la vente
+view,auction.dates,0,End of auction, Fin de la vente
+view,auction.dates,0,Names,Noms
+view,auction.dates,0,Auctions,
+view,auction.dates,0,Dates,
+view,auction.dates,0,Commissions,
+view,auction.dates,0,Accounting,
+view,auction.dates,0,Analytic,
+view,auction.dates,0,State,
+view,auction.dates,0,Close + Create all invoices, Fermer et créer les factures
+view,auction.lots,0,Auction Objects, 
+view,auction.lots,0,Catalog,
+view,auction.lots,0,Lots,
+view,auction.lots,0,Auction,
+view,auction.lots,0,Auction,
+view,auction.lots,0,Bids,
+view,auction.lots,0,Sold,
+view,auction.lots,0,Not sold,
+view,auction.lots,0,Set to draft,
+view,auction.lots,0,Statements,
+view,auction.lots,0,Payment's history, Historique du paiement
+view,auction.deposit,0,Deposit Border,
+view,auction.deposit,0,Deposit Border Form,
+view,auction.deposit,0,General Informations,
+view,auction.deposit,0,Objects,
+view,auction.deposit,0,Objects,
+view,auction.deposit,0,Description,
+view,auction.deposit,0,Photos,
+view,auction.deposit,0,Extra Costs,
+view,auction.deposit,0,Deposit Costs,
+view,auction.deposit,0,Deposit Costs,
+view,auction.bid_line,0,Bids,
+view,auction.bid_line,0,Bids,
+view,auction.bid,0,Bids,
+view,auction.bid,0,Bid information,
+view,auction.bid,0,Bids,
+view,auction.bid,0,Bids,
+view,auction.bid,0,Bids,
+view,report.auction.view,0,Auction results,
+view,report.auction.view,0,Auctions results,
+view,report.auction.view2,0,Auction Reporting tree view2,
+view,report.auction.view2,0,Auctions,
+view,report.seller.auction,0,Auction reporting form view,
+view,report.seller.auction,0,Auction reporting tree view,
+view,report.seller.auction,0,Auction reporting graph view,
+view,report.seller.auction2,0,Auction reporting2 form view,
+view,report.seller.auction2,0,Auction reporting2 tree view,
+view,report.seller.auction2,0,Sum adj,
+view,report.seller.auction2,0,Sum net margin,
+view,report.seller.auction2,0,Auction seller reporting2 graph view,
+view,report.buyer.auction,0,Auction buyer reporting form view,
+view,report.buyer.auction,0,Auction buyer reporting tree view,
+view,report.buyer.auction2,0,Auction buyer reporting form view2,
+view,report.buyer.auction2,0,Auction buyer reporting tree view2,
+view,report.buyer.auction2,0,Sum adj,
+view,report.buyer.auction2,0,Sum net margin,
+view,report.unplanned.object,0,Unplanned Objects,
+view,report.unplanned.object,0,Unplanned Objects,
+view,report.auction.estimation.adj.category,0,Min est/Adj/Max est,
+view,report.auction.estimation.adj.category,0,Min est/Adj/Max est,
+view,report.auction.estimation.adj.category,0,Min est/Adj/Max est,
+view,report.attendance,0,User's pointing,
+view,report.attendance,0,User's pointing,
+view,report.auction.object.date,0,Objects per Day,
+view,report.auction.object.date,0,Objects per Day,
+view,report.auction.object.date,0,Objects per day,
+view,report.auction.adjudication,0,Total adjudication,
+view,report.auction.adjudication,0,Total adjudication,
+view,report.deposit.border,0,Depositer's statistics,
+view,report.object.encoded,0,Objects statistics,
+view,report.object.encoded,0,# objects,
+view,report.object.encoded,0,Objects statistics,
+view,report.object.encoded,0,Objects statistics,
+view,report.object.encoded.manager,0,Objects statistics,
+view,report.object.encoded.manager,0,# objects,
+view,report.object.encoded.manager,0,Total adj.,
+view,report.object.encoded.manager,0,Total net rev.,
+view,report.object.encoded.manager,0,Total gross rev.,
+view,report.object.encoded.manager,0,Object statistic,
+view,report.unclassified.objects,0,Unclassified objects,
+view,report.unclassified.objects,0,Ref,
+view,board.board,0,Auction manager ,
+view,board.board,0,My Latest Objects,
+view,board.board,0,Pay list statistics by user,
+view,board.board,0,Menu,
+view,board.board,0,My objects By Day,
+view,board.board,0,Estimations/Adjudication,
+view,board.board,0,Auction manager ,
+view,board.board,0,Latest objects,
+view,board.board,0,Summary pointing by user,
+view,board.board,0,Pay list statistics by user,
+view,board.board,0,My board,Mon tableau
+view,board.board,0,Total Adjudications,
+view,board.board,0,Min/Adj/Max,
+view,board.board,0,Objects by day,
+view,account.subscription.line,0,Subscription lines,Lignes abonnement
+view,account.bank.statement,0,Statement,Relevé bancaire
+view,account.bank.statement,0,Select entries,Sélectionner entrées
+view,account.bank.statement,0,Entry encoding,Encoder entrée
+view,account.bank.statement,0,Entry Lines,Écritures
+view,account.bank.statement,0,Statement lines,Lignes d'extraits
+view,account.bank.statement,0,Statement lines,Lignes d'extraits
+view,account.bank.statement,0,Compute,Calculer
+view,account.bank.statement,0,Confirm,Confirmer
+view,account.bank.statement,0,Cancel,Annuler
+wizard_field,"auction.lots.make_invoice,init,amount",0,Invoiced Amount,
+wizard_field,"auction.lots.make_invoice,init,objects",0,# of objects,
+wizard_field,"auction.lots.make_invoice,init,number",0,Invoice Number,
+wizard_button,"auction.lots.make_invoice,init,end",0,Cancel,
+wizard_button,"auction.lots.make_invoice,init,invoice",0,Create invoices,
+wizard_field,"module.module.update,init,repositories",0,Repositories,
+wizard_view,"module.module.update,init",0,Scan for new modules,
+wizard_view,"module.module.update,init",0,This function will check for new modules in the 'addons' path and on module repositories:,
+wizard_button,"module.module.update,init,end",0,Cancel,
+wizard_button,"module.module.update,init,update",0,Check new modules,
+wizard_field,"module.module.update,update,add",0,Number of modules added,
+wizard_field,"module.module.update,update,update",0,Number of modules updated,
+wizard_view,"module.module.update,update",0,New modules,
+wizard_button,"module.module.update,update,open_window",0,Ok,
+wizard_field,"account.move.journal,init,period_id",0,Period,Période
+wizard_field,"account.move.journal,init,journal_id",0,Journal,Journal
+wizard_view,"account.move.journal,init",0,Standard entries,Entrées standard
+wizard_button,"account.move.journal,init,end",0,Cancel,Annuler
+wizard_button,"account.move.journal,init,open",0,Open Journal,Ouvrir journal
+wizard_field,"account.analytic.account.balance.report,init,date1",0,Start of period,Début de la période
+wizard_field,"account.analytic.account.balance.report,init,date2",0,End of period,Fin de la période
+wizard_view,"account.analytic.account.balance.report,init",0,Select period,Sélectionner une période
+wizard_button,"account.analytic.account.balance.report,init,end",0,Cancel,Annuler
+wizard_button,"account.analytic.account.balance.report,init,report",0,Print,Imprimer
+wizard_button,"mrp.production.track,track,end",0,Cancel,Annuler
+wizard_button,"mrp.production.track,track,split",0,Track,Tracer
+wizard_button,"mrp.production.track,notrack,end",0,Cancel,Annuler
+wizard_field,"res.partner.spam_send,init,text",0,Message,Message
+wizard_field,"res.partner.spam_send,init,from",0,Sender's email,Email de l'expéditeur
+wizard_field,"res.partner.spam_send,init,subject",0,Subject,Sujet
+wizard_view,"res.partner.spam_send,init",0,Mass Mailing,Mailing de masse
+wizard_button,"res.partner.spam_send,init,end",0,Cancel,Annuler
+wizard_button,"res.partner.spam_send,init,send",0,Send Email,Envoyer un E-mail
+wizard_field,"stock.move.track,init,tracking_prefix",0,Tracking prefix,Préfixe pour traçabilité
+wizard_field,"stock.move.track,init,quantity",0,Quantity per lot,Quantité par lot
+wizard_view,"stock.move.track,init",0,Tracking a move,Tracer un mouvement
+wizard_button,"stock.move.track,init,end",0,Cancel,Annuler
+wizard_button,"stock.move.track,init,track",0,Ok,Ok
+wizard_field,"auction.lots.make_invoice_buyer,init,amount",0,Invoiced Amount,
+wizard_field,"auction.lots.make_invoice_buyer,init,objects",0,# of objects,
+wizard_field,"auction.lots.make_invoice_buyer,init,number",0,Invoice Number,
+wizard_field,"auction.lots.make_invoice_buyer,init,buyer_id",0,Buyer,
+wizard_view,"auction.lots.make_invoice_buyer,init",0,(Keep empty for automatic number),
+wizard_button,"auction.lots.make_invoice_buyer,init,end",0,Cancel,
+wizard_button,"auction.lots.make_invoice_buyer,init,invoice",0,Create invoices,
+wizard_field,"base_module_publish.module_publish,init,text",0,Introduction,Introduction
+wizard_view,"base_module_publish.module_publish,init",0,Module publication,Publication du module
+wizard_view,"base_module_publish.module_publish,init",0,Publication information,Information pour la publication
+wizard_button,"base_module_publish.module_publish,init,end",0,Cancel,Annuler
+wizard_button,"base_module_publish.module_publish,init,step1",0,Continue,Continuer
+wizard_field,"base_module_publish.module_publish,step2,login",0,Login,Nom d'utilisateur
+wizard_field,"base_module_publish.module_publish,step2,password",0,Password,Mot de passe
+wizard_field,"base_module_publish.module_publish,step2,email",0,Email,Email
+wizard_view,"base_module_publish.module_publish,step2",0,Module publication,Publication du module
+wizard_view,"base_module_publish.module_publish,step2",0,User information,Information utilisateur
+wizard_view,"base_module_publish.module_publish,step2",0,Please provide here your login on the Tiny ERP website.,Tapez votre login du site Tinyerp SVP
+wizard_view,"base_module_publish.module_publish,step2",0,"If you don't have an access, you can create one http://www.tinyerp.com/","Si vous n'avez pas d'accès, vous pouvez en créer un sur http;//tinyerp.com"
+wizard_button,"base_module_publish.module_publish,step2,end",0,Cancel,Annuler
+wizard_button,"base_module_publish.module_publish,step2,step1",0,Previous,Précédent
+wizard_button,"base_module_publish.module_publish,step2,publish",0,Publish,publier
+wizard_field,"base_module_publish.module_publish,step1,website",0,Website,Site web
+wizard_field,"base_module_publish.module_publish,step1,category",0,Category,Catégorie
+wizard_field,"base_module_publish.module_publish,step1,url_download",0,Download URL,Télécharger lien
+wizard_field,"base_module_publish.module_publish,step1,include_src",0,Include source,Inclure les sources
+wizard_field,"base_module_publish.module_publish,step1,name",0,Name,Nom
+wizard_field,"base_module_publish.module_publish,step1,license",0,Licence,Licence
+wizard_field,"base_module_publish.module_publish,step1,author",0,Author,Auteur
+wizard_field,"base_module_publish.module_publish,step1,url",0,Download URL,Télécharger lien
+wizard_field,"base_module_publish.module_publish,step1,image",0,Image file,Fichier image
+wizard_field,"base_module_publish.module_publish,step1,demourl",0,Demo URL,Démo lien
+wizard_field,"base_module_publish.module_publish,step1,docurl",0,Documentation URL,Lien de documentation
+wizard_field,"base_module_publish.module_publish,step1,version",0,Version,Version 
+wizard_field,"base_module_publish.module_publish,step1,shortdesc",0,Small description,Petite description
+wizard_field,"base_module_publish.module_publish,step1,operation",0,Operation,Opération
+wizard_field,"base_module_publish.module_publish,step1,description",0,Description,Description
+wizard_view,"base_module_publish.module_publish,step1",0,Module publication,Publication du module
+wizard_view,"base_module_publish.module_publish,step1",0,Verify your module information,Vérifiez les informations de votre module
+wizard_view,"base_module_publish.module_publish,step1",0,General,Général
+wizard_view,"base_module_publish.module_publish,step1",0,Description,Description
+wizard_button,"base_module_publish.module_publish,step1,end",0,Cancel,Annuler
+wizard_button,"base_module_publish.module_publish,step1,init",0,Previous,Précédent
+wizard_button,"base_module_publish.module_publish,step1,step2",0,Continue,Continuer
+wizard_field,"base_module_publish.module_publish,publish,result",0,Result page,Résultat de la page
+wizard_field,"base_module_publish.module_publish,publish,text_end",0,Summary,Résumé
+wizard_view,"base_module_publish.module_publish,publish",0,Module publication,Publication du module
+wizard_view,"base_module_publish.module_publish,publish",0,Information,Information 
+wizard_view,"base_module_publish.module_publish,publish",0,Result,Résultat
+wizard_button,"base_module_publish.module_publish,publish,end",0,Close,Fermer
+wizard_field,"account.aged.trial.balance,init,period_length",0,Period length (days),Durée d'une période (jours)
+wizard_field,"account.aged.trial.balance,init,company_id",0,Company,Société
+wizard_field,"account.aged.trial.balance,init,fiscalyear",0,Fiscal year,Année fiscale
+wizard_view,"account.aged.trial.balance,init",0,Aged Trial Balance,Echéancier
+wizard_button,"account.aged.trial.balance,init,end",0,Cancel,Annuler
+wizard_button,"account.aged.trial.balance,init,print",0,Print Aged Trial Balance,Imprimer l'échéancier
+wizard_view,"base_setup.base_setup,finish",0,Setup,Configuration
+wizard_view,"base_setup.base_setup,finish",0,Installation done,Installation faite
+wizard_view,"base_setup.base_setup,finish",0,Your new database is now fully installed.,Votre nouvelle base de données est maintenant totalement installée
+wizard_view,"base_setup.base_setup,finish",0,You can start using the system or continue the configuration using the menu Administration\Configuration,Vous pouvez commencer à utiliser le système ou continuer la configuration via le menu Administration/Configuration
+wizard_button,"base_setup.base_setup,finish,menu",0,Ok,Ok
+wizard_field,"base_setup.base_setup,company,profile",0,Profile,Profil
+wizard_field,"base_setup.base_setup,company,city",0,City,Ville
+wizard_field,"base_setup.base_setup,company,rml_footer2",0,Report Footer 2,Pied de page 2 de rapport
+wizard_field,"base_setup.base_setup,company,name",0,Company Name,Nom de la société
+wizard_field,"base_setup.base_setup,company,zip",0,Zip code,Code postal
+wizard_field,"base_setup.base_setup,company,currency",0,Currency,Devise
+wizard_field,"base_setup.base_setup,company,street2",0,Street2,Rue (suite)
+wizard_field,"base_setup.base_setup,company,country_id",0,Country,Pays
+wizard_field,"base_setup.base_setup,company,charts",0,Chart of accounts,Plan de comptes
+wizard_field,"base_setup.base_setup,company,rml_footer1",0,Report Footer 1,Pied de page 1 de rapport
+wizard_field,"base_setup.base_setup,company,phone",0,Phone,Téléphone
+wizard_field,"base_setup.base_setup,company,street",0,Street,Rue
+wizard_field,"base_setup.base_setup,company,rml_header1",0,Report Header,En-tête de rapport
+wizard_field,"base_setup.base_setup,company,state_id",0,State,Etat
+wizard_field,"base_setup.base_setup,company,email",0,E-mail,E-mail
+wizard_view,"base_setup.base_setup,company",0,Setup,Installation
+wizard_view,"base_setup.base_setup,company",0,Define main company,Définir la société principale
+wizard_view,"base_setup.base_setup,company",0,Report header,En-tête de rapport
+wizard_button,"base_setup.base_setup,company,previous",0,Previous,Précédent
+wizard_button,"base_setup.base_setup,company,update",0,Next,Suivant
+wizard_field,"base_setup.base_setup,update,profile",0,Profile,Profil
+wizard_field,"base_setup.base_setup,update,city",0,City,Ville
+wizard_field,"base_setup.base_setup,update,rml_footer2",0,Report Footer 2,Pied de page 2 de rapport
+wizard_field,"base_setup.base_setup,update,name",0,Company Name,Nom de la société
+wizard_field,"base_setup.base_setup,update,zip",0,Zip code,Code postal
+wizard_field,"base_setup.base_setup,update,currency",0,Currency,Devise
+wizard_field,"base_setup.base_setup,update,street2",0,Street2,Rue (suite)
+wizard_field,"base_setup.base_setup,update,country_id",0,Country,Pays
+wizard_field,"base_setup.base_setup,update,charts",0,Chart of accounts,Plan de compte
+wizard_field,"base_setup.base_setup,update,rml_footer1",0,Report Footer 1,Pied de page 1 de rapport
+wizard_field,"base_setup.base_setup,update,phone",0,Phone,Téléphone
+wizard_field,"base_setup.base_setup,update,street",0,Street,Rue
+wizard_field,"base_setup.base_setup,update,rml_header1",0,Report Header,En-tête de rapport
+wizard_field,"base_setup.base_setup,update,state_id",0,State,Etat
+wizard_field,"base_setup.base_setup,update,email",0,E-mail,E-mail
+wizard_view,"base_setup.base_setup,update",0,Setup,Configuration
+wizard_view,"base_setup.base_setup,update",0,Summary,Résumé
+wizard_button,"base_setup.base_setup,update,company",0,Previous,Précédent
+wizard_button,"base_setup.base_setup,update,finish",0,Install,Installer
+wizard_field,"base_setup.base_setup,charts,profile",0,Profile,Profil
+wizard_field,"base_setup.base_setup,charts,city",0,City,Ville
+wizard_field,"base_setup.base_setup,charts,rml_footer2",0,Report Footer 2,Pied de page 2 de rapport
+wizard_field,"base_setup.base_setup,charts,name",0,Company Name,Nom de la société
+wizard_field,"base_setup.base_setup,charts,zip",0,Zip code,Code postal
+wizard_field,"base_setup.base_setup,charts,currency",0,Currency,Devise
+wizard_field,"base_setup.base_setup,charts,street2",0,Street2,Rue (suite)
+wizard_field,"base_setup.base_setup,charts,country_id",0,Country,Pays
+wizard_field,"base_setup.base_setup,charts,charts",0,Chart of accounts,Plan de compte
+wizard_field,"base_setup.base_setup,charts,rml_footer1",0,Report Footer 1,Pied de page 1 de rapport
+wizard_field,"base_setup.base_setup,charts,phone",0,Phone,Téléphone
+wizard_field,"base_setup.base_setup,charts,street",0,Street,Rue
+wizard_field,"base_setup.base_setup,charts,rml_header1",0,Report Header,En-tête de rapport
+wizard_field,"base_setup.base_setup,charts,state_id",0,State,Etat
+wizard_field,"base_setup.base_setup,charts,email",0,E-mail,E-mail
+wizard_view,"base_setup.base_setup,charts",0,Setup,Installation
+wizard_view,"base_setup.base_setup,charts",0,Select a chart of accounts,Sélectionner un plan de comptes
+wizard_view,"base_setup.base_setup,charts",0,There are many other chart of accounts available.,
+wizard_view,"base_setup.base_setup,charts",0,"If you don't select one now, you'll be able to install an other one through the Administration menu.",
+wizard_button,"base_setup.base_setup,charts,init",0,Previous,Précédent
+wizard_button,"base_setup.base_setup,charts,company",0,Next,Suivant
+wizard_field,"base_setup.base_setup,init,profile",0,Profile,Profil
+wizard_field,"base_setup.base_setup,init,city",0,City,Ville
+wizard_field,"base_setup.base_setup,init,rml_footer2",0,Report Footer 2,Pied de page 2 de rapport
+wizard_field,"base_setup.base_setup,init,name",0,Company Name,Nom de la société
+wizard_field,"base_setup.base_setup,init,zip",0,Zip code,Code postal
+wizard_field,"base_setup.base_setup,init,currency",0,Currency,Devise
+wizard_field,"base_setup.base_setup,init,street2",0,Street2,Rue (suite)
+wizard_field,"base_setup.base_setup,init,country_id",0,Country,Pays
+wizard_field,"base_setup.base_setup,init,charts",0,Chart of accounts,Plan de comptes
+wizard_field,"base_setup.base_setup,init,rml_footer1",0,Report Footer 1,Pied de page 1 de rapport
+wizard_field,"base_setup.base_setup,init,phone",0,Phone,Téléphone
+wizard_field,"base_setup.base_setup,init,street",0,Street,Rue
+wizard_field,"base_setup.base_setup,init,rml_header1",0,Report Header,En-tête de rapport
+wizard_field,"base_setup.base_setup,init,state_id",0,State,Etat
+wizard_field,"base_setup.base_setup,init,email",0,E-mail,E-mail
+wizard_view,"base_setup.base_setup,init",0,Setup,Installation
+wizard_view,"base_setup.base_setup,init",0,Select a profile,Sélectionner un profil
+wizard_view,"base_setup.base_setup,init",0,A profile sets a pre-selection of modules for enterprise needs.,Un profil définit une pré-sélection de modules pour les besoins de l'entreprise
+wizard_view,"base_setup.base_setup,init",0,You'll be able to install others modules later through the Administration menu.,Vous pourrez installer d'autres modules plus tard via le menu Administration
+wizard_button,"base_setup.base_setup,init,menu",0,Cancel,Annuler
+wizard_button,"base_setup.base_setup,init,next",0,Next,Suivant
+wizard_field,"auction.pay.buy,init,statement_id2",0,Statement,
+wizard_field,"auction.pay.buy,init,statement_id3",0,Statement,
+wizard_field,"auction.pay.buy,init,statement_id1",0,Statement,
+wizard_field,"auction.pay.buy,init,amount3",0,Amount paid,
+wizard_field,"auction.pay.buy,init,amount2",0,Amount paid,
+wizard_field,"auction.pay.buy,init,amount",0,Amount paid,
+wizard_field,"auction.pay.buy,init,total",0,Amount to paid,
+wizard_field,"auction.pay.buy,init,buyer_id",0,Buyer,
+wizard_view,"auction.pay.buy,init",0,Pay objects,
+wizard_button,"auction.pay.buy,init,end",0,Cancel,
+wizard_button,"auction.pay.buy,init,pay",0,Pay,
+wizard_view,"account.move.line.unreconcile,init",0,Unreconciliation,Déréconciliation
+wizard_view,"account.move.line.unreconcile,init",0,Unreconciliation transactions,Transactions non réconciliées
+wizard_view,"account.move.line.unreconcile,init",0,"If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable",
+wizard_button,"account.move.line.unreconcile,init,end",0,Cancel,Annuler
+wizard_button,"account.move.line.unreconcile,init,unrec",0,Unreconcile,Déréconcilie
+wizard_field,"account.move.line.unreconcile.select,init,account_id",0,Account,Compte
+wizard_view,"account.move.line.unreconcile.select,init",0,Unreconciliation,Déréconciliation
+wizard_button,"account.move.line.unreconcile.select,init,end",0,Cancel,Annuler
+wizard_button,"account.move.line.unreconcile.select,init,open",0,Open for unreconciliation,Ouvrir pour déréconciliation
+wizard_field,"auction.lots.send.aie.results,init,uname",0,Login,
+wizard_field,"auction.lots.send.aie.results,init,dates",0,Auction Date,
+wizard_field,"auction.lots.send.aie.results,init,password",0,Password,
+wizard_button,"auction.lots.send.aie.results,init,date_ask",0,Continue,
+wizard_button,"auction.lots.send.aie.results,init,end",0,Cancel,
+wizard_field,"auction.lots.send.aie.results,date_ask,uname",0,Login,
+wizard_field,"auction.lots.send.aie.results,date_ask,dates",0,Auction Date,
+wizard_field,"auction.lots.send.aie.results,date_ask,password",0,Password,
+wizard_field,"auction.lots.send.aie.results,date_ask,objects",0,# of objects,
+wizard_button,"auction.lots.send.aie.results,date_ask,send",0,Send on your website,
+wizard_button,"auction.lots.send.aie.results,date_ask,end",0,Cancel,
+wizard_field,"res.partner.sms_send,init,text",0,SMS Message,Message SMS
+wizard_field,"res.partner.sms_send,init,password",0,Password,mot de passe
+wizard_field,"res.partner.sms_send,init,app_id",0,API ID,API ID
+wizard_field,"res.partner.sms_send,init,user",0,Login,Nom d'utilisateur
+wizard_view,"res.partner.sms_send,init",0,SMS - Gateway: clickatell,Passerelle SMS : clickatell
+wizard_view,"res.partner.sms_send,init",0,Bulk SMS send,Envoi de SMS
+wizard_button,"res.partner.sms_send,init,end",0,Cancel,Annuler
+wizard_button,"res.partner.sms_send,init,send",0,Send SMS,envoyer SMS
+wizard_field,"auction.pay.sel,init,amount",0,Amount paid,
+wizard_field,"auction.pay.sel,init,period_id",0,Period,
+wizard_field,"auction.pay.sel,init,journal_id",0,Journal,
+wizard_field,"auction.pay.sel,init,dest_account_id",0,Payment to Account,
+wizard_view,"auction.pay.sel,init",0,Pay invoice,
+wizard_button,"auction.pay.sel,init,pay",0,Pay,
+wizard_button,"auction.pay.sel,init,end",0,Cancel,
+wizard_field,"stock.picking.make,init,lot_lines",0,Lot Lines,Lignes de lot
+wizard_view,"stock.picking.make,init",0,Lots lines,Lignes de lots
+wizard_button,"stock.picking.make,init,end",0,Cancel,Annuler
+wizard_button,"stock.picking.make,init,make",0,Make Parcel,Faire un paquet
+wizard_field,"base_module_publish.module_export,init,include_src",0,Include sources,Inclure les sources
+wizard_view,"base_module_publish.module_export,init",0,Export module,Exporter module
+wizard_view,"base_module_publish.module_export,init",0,Export module,Exporter module
+wizard_button,"base_module_publish.module_export,init,end",0,Cancel,Annuler
+wizard_button,"base_module_publish.module_export,init,zip",0,Ok,Ok
+wizard_field,"base_module_publish.module_export,zip,module_file",0,Module .zip file,Module fichier .zip
+wizard_field,"base_module_publish.module_export,zip,module_filename",0,Filename,Nom de fichier
+wizard_view,"base_module_publish.module_export,zip",0,Finish,Terminer
+wizard_view,"base_module_publish.module_export,zip",0,Module successfully exported !,Module exporté avec succès
+wizard_button,"base_module_publish.module_export,zip,end",0,Close,Fermer
+wizard_field,"account.fiscalyear.close,init,sure",0,Check this box,Cocher cette case
+wizard_field,"account.fiscalyear.close,init,report_journal",0,New Entries Journal,Journal
+wizard_field,"account.fiscalyear.close,init,report_name",0,Name of new entries,Nom des nouvelles entrées
+wizard_field,"account.fiscalyear.close,init,fy2_id",0,New Fiscal Year,Nouvelle année fiscale
+wizard_field,"account.fiscalyear.close,init,fy_id",0,Fiscal Year to close,Année fiscale à clôturer
+wizard_field,"account.fiscalyear.close,init,report_new",0,Create new entries,Créer nouvelles entrées
+wizard_view,"account.fiscalyear.close,init",0,Close Fiscal Year,Clôturer l'année fiscale
+wizard_view,"account.fiscalyear.close,init",0,Are you sure ?,Êtes-vous sûr?
+wizard_button,"account.fiscalyear.close,init,end",0,Cancel,Annuler
+wizard_button,"account.fiscalyear.close,init,close",0,Close Fiscal Year,Clôturer l'année fiscale
+wizard_field,"delivery.invoice_onshipping,init,group",0,Group by partner,Grouper par partenaire
+wizard_field,"delivery.invoice_onshipping,init,journal_id",0,Destination Journal,Journal de destination
+wizard_view,"delivery.invoice_onshipping,init",0,Create invoices,Créer factures
+wizard_view,"delivery.invoice_onshipping,init",0,Create invoices,Créer factures
+wizard_button,"delivery.invoice_onshipping,init,end",0,Cancel,Annuler
+wizard_button,"delivery.invoice_onshipping,init,create_invoice",0,Create invoice,Créer facture
+wizard_field,"huissier.labels.reprint,init,start",0,De,
+wizard_field,"huissier.labels.reprint,init,stop",0,a,
+wizard_button,"huissier.labels.reprint,init,reprint",0,Imprimer,
+wizard_button,"huissier.labels.reprint,init,end",0,Annuler,
+wizard_field,"hr.print_week,init,init_date",0,Starting Date,Date de début
+wizard_field,"hr.print_week,init,end_date",0,Ending Date,Date de fin
+wizard_view,"hr.print_week,init",0,Select a time span,Sélectionner une période
+wizard_view,"hr.print_week,init",0,Select a starting and a end date,Sélectionner une date de début et de fin
+wizard_button,"hr.print_week,init,print",0,Print Timesheet,Imprimer Timesheet
+wizard_button,"hr.print_week,init,end",0,Cancel,Annuler
+wizard_view,"lunch.order.cancel,init",0,Cancel Order,
+wizard_view,"lunch.order.cancel,init",0,Are you sure you want to cancel this order ?,
+wizard_button,"lunch.order.cancel,init,end",0,No,
+wizard_button,"lunch.order.cancel,init,cancel",0,Yes,
+wizard_field,"hr_timesheet.si_so,sign_out,date",0,Starting Date,Date de début
+wizard_field,"hr_timesheet.si_so,sign_out,state",0,Current state,État actuel
+wizard_field,"hr_timesheet.si_so,sign_out,server_date",0,Current Date,Date du jour
+wizard_field,"hr_timesheet.si_so,sign_out,name",0,Employee's name,Nom de l'employé
+wizard_view,"hr_timesheet.si_so,sign_out",0,Sign in / Sign out,Pointer l'entrée / Pointer la sortie
+wizard_view,"hr_timesheet.si_so,sign_out",0,Sign in,Pointer l'entrée
+wizard_view,"hr_timesheet.si_so,sign_out",0,(local time on the server side),(Heure locale du côté serveur)
+wizard_view,"hr_timesheet.si_so,sign_out",0,(Keep empty for current time),(Garder vide pour le moment)
+wizard_button,"hr_timesheet.si_so,sign_out,end",0,Cancel,Annuler
+wizard_button,"hr_timesheet.si_so,sign_out,si_result",0,Start Working,Commencer le travail
+wizard_field,"hr_timesheet.si_so,sign_in,info",0,Work Description,Description du travail
+wizard_field,"hr_timesheet.si_so,sign_in,name",0,Employee's name,Nom de l'employé
+wizard_field,"hr_timesheet.si_so,sign_in,date_start",0,Starting Date,Date de début
+wizard_field,"hr_timesheet.si_so,sign_in,state",0,Current state,Etat actuel
+wizard_field,"hr_timesheet.si_so,sign_in,server_date",0,Current Server Date,Date du serveur
+wizard_field,"hr_timesheet.si_so,sign_in,date",0,Closing Date,Date de clôture
+wizard_field,"hr_timesheet.si_so,sign_in,analytic_amount",0,Minimum Analytic Amount,Montant analytique minimum
+wizard_field,"hr_timesheet.si_so,sign_in,account_id",0,Analytic Account,Compte analytique
+wizard_view,"hr_timesheet.si_so,sign_in",0,Sign in status,Statut
+wizard_view,"hr_timesheet.si_so,sign_in",0,General Information,Information générale
+wizard_view,"hr_timesheet.si_so,sign_in",0,Work done in the last period,Travail effectué dans la dernière période
+wizard_view,"hr_timesheet.si_so,sign_in",0,(Keep empty for current_time),(Garder vide pour la date actuelle)
+wizard_button,"hr_timesheet.si_so,sign_in,end",0,Cancel,Annuler
+wizard_button,"hr_timesheet.si_so,sign_in,so_result",0,Change Work,Changer de travail
+wizard_button,"hr_timesheet.si_so,sign_in,so_result_end",0,Stop Working,Arrêter le travail
+wizard_field,"stock.ups_xml,init,weight",0,Lot weight,Poids du lot
+wizard_view,"stock.ups_xml,init",0,UPS XML generator,Générateur UPS XML
+wizard_view,"stock.ups_xml,init",0,UPS generator,Générateur UPS
+wizard_button,"stock.ups_xml,init,end",0,Cancel,Annuler
+wizard_button,"stock.ups_xml,init,ups_save",0,Get xml file,Acquérir le fichier xml
+wizard_button,"stock.ups_xml,init,ups_upload",0,Upload xml file,Charger le fichier xml
+wizard_view,"stock.ups_xml,ups_upload",0,UPS XML generator,Générateur UPS XML
+wizard_view,"stock.ups_xml,ups_upload",0,File uploaded,Fichier chargé
+wizard_button,"stock.ups_xml,ups_upload,end",0,End,Fin
+wizard_field,"stock.ups_xml,ups_save,xmlfile",0,XML File,Fichier XML
+wizard_view,"stock.ups_xml,ups_save",0,UPS XML generator,Générateur UPS XML
+wizard_view,"stock.ups_xml,ups_save",0,Save the attached file,Sauver le fichier attaché
+wizard_button,"stock.ups_xml,ups_save,end",0,End,Fin
+wizard_field,"sale.order.make_invoice,init,grouped",0,Group the invoices,Grouper les factures
+wizard_view,"sale.order.make_invoice,init",0,Create invoices,Créer les factures
+wizard_view,"sale.order.make_invoice,init",0,Do you really want to create the invoices ?,Voulez-vous vraiment créer les factures ?
+wizard_button,"sale.order.make_invoice,init,end",0,Cancel,Annuler
+wizard_button,"sale.order.make_invoice,init,invoice",0,Create invoices,Créer les factures
+wizard_field,"account.analytic.budget.spread,init,amount",0,Amount,Montant
+wizard_field,"account.analytic.budget.spread,init,quantity",0,Quantity,Quantité
+wizard_field,"account.analytic.budget.spread,init,fiscalyear",0,Fiscal Year,Année fiscale
+wizard_view,"account.analytic.budget.spread,init",0,Spread,Ventiler
+wizard_button,"account.analytic.budget.spread,init,end",0,Cancel,Annuler
+wizard_button,"account.analytic.budget.spread,init,spread",0,Spread,Ventiler
+wizard_field,"auction.lots.enable,init,confirm_en",0,Catalog Number,
+wizard_view,"auction.lots.enable,init",0,Confirmation enable taken away,
+wizard_button,"auction.lots.enable,init,end",0,Cancel,
+wizard_button,"auction.lots.enable,init,go",0,Enable Taken away,
+wizard_field,"hr.timesheet.attendance.report,init,init_date",0,Starting Date,Date de début
+wizard_field,"hr.timesheet.attendance.report,init,end_date",0,Ending Date,Date de fin
+wizard_field,"hr.timesheet.attendance.report,init,max_delay",0,Max. Delay (Min),Délais max (Min)
+wizard_view,"hr.timesheet.attendance.report,init",0,Select a time span,Sélectionner une période
+wizard_view,"hr.timesheet.attendance.report,init",0,Analysis Information,Information
+wizard_view,"hr.timesheet.attendance.report,init",0,"Bellow this delay, the error is considered as volunteer","Au-dessous de ce délai, l'erreur est considérée comme volontaire"
+wizard_button,"hr.timesheet.attendance.report,init,print",0,Print Attendance Report,Imprimer le rapport de présences
+wizard_button,"hr.timesheet.attendance.report,init,end",0,Cancel,Annuler
+wizard_field,"hr.timesheet.invoice.create,init,product",0,Product,Produit
+wizard_field,"hr.timesheet.invoice.create,init,name",0,Name of entry,Nom de l'entrée
+wizard_field,"hr.timesheet.invoice.create,init,price",0,Cost,Coût
+wizard_field,"hr.timesheet.invoice.create,init,accounts",0,Analytic Accounts,Comptes analytiques
+wizard_field,"hr.timesheet.invoice.create,init,time",0,Time spent,Temps dépensé
+wizard_field,"hr.timesheet.invoice.create,init,date",0,Date,Date
+wizard_view,"hr.timesheet.invoice.create,init",0,Do you want details for each line of the invoices ?,Désirez-vous les détails pour chaque ligne des factures?
+wizard_view,"hr.timesheet.invoice.create,init",0,Choose accounts you want to invoice,Choisissez les comptes que vous désirez facturer
+wizard_view,"hr.timesheet.invoice.create,init",0,Choose a product for intermediary invoice,Choisir un produit pour une facture intermédiaire
+wizard_button,"hr.timesheet.invoice.create,init,end",0,Cancel,Annuler
+wizard_button,"hr.timesheet.invoice.create,init,create",0,Create invoices,Créer les factures
+wizard_field,"account.vat.declaration,init,period_id",0,Period,Période
+wizard_field,"account.vat.declaration,init,company_id",0,Company,Société
+wizard_field,"account.vat.declaration,init,based_on",0,Base on,Basé sur
+wizard_view,"account.vat.declaration,init",0,Select period,Sélectionner une période
+wizard_button,"account.vat.declaration,init,end",0,Cancel,Annuler
+wizard_button,"account.vat.declaration,init,report",0,Print VAT Decl.,Imprimer décl. TVA
+wizard_field,"account.account.balance.report,init,periods",0,Periods,Période
+wizard_field,"account.account.balance.report,init,fiscalyear",0,Fiscal year,Année fiscale
+wizard_view,"account.account.balance.report,init",0,Select period,Sélectionner une période
+wizard_button,"account.account.balance.report,init,end",0,Cancel,Annuler
+wizard_button,"account.account.balance.report,init,report",0,Print,Imprimer
+wizard_field,"account.analytic.account.analytic.check.report,init,date1",0,Start of period,Démarrer période
+wizard_field,"account.analytic.account.analytic.check.report,init,date2",0,End of period,Fin de la période
+wizard_view,"account.analytic.account.analytic.check.report,init",0,Select period,Sélectionner période
+wizard_button,"account.analytic.account.analytic.check.report,init,end",0,Cancel,Annuler
+wizard_button,"account.analytic.account.analytic.check.report,init,report",0,Print,Imprimer
+wizard_field,"base_report_designer.modify,get_form_result,file_sxw",0,Your .SXW file,Votre fichier .SXW
+wizard_field,"base_report_designer.modify,get_form_result,report_id",0,Report,Rapport 
+wizard_view,"base_report_designer.modify,get_form_result",0,Get a report,Recevoir un rapport
+wizard_view,"base_report_designer.modify,get_form_result",0,The .SXW report,Rapport .SXW
+wizard_view,"base_report_designer.modify,get_form_result",0,"This is the template of your requested report. Save it as a .SXW file and open it with OpenOffice. Don't forget to install the Tiny OpenOffice package to modify it. Once it is modified, re-upload it in Tiny ERP using this wizard.",
+wizard_button,"base_report_designer.modify,get_form_result,end",0,Close,Fermer
+wizard_button,"base_report_designer.modify,get_form_result,send_form",0,Upload the modified report,Upload le rapport modifié
+wizard_field,"base_report_designer.modify,get_form,report_id",0,Report,Rapport 
+wizard_view,"base_report_designer.modify,get_form",0,Get a report,Recevoir un rapport
+wizard_view,"base_report_designer.modify,get_form",0,Select your report,Sélectionner votre rapport
+wizard_button,"base_report_designer.modify,get_form,end",0,Cancel,Annuler
+wizard_button,"base_report_designer.modify,get_form,get_form_result",0,Continue,Continuer
+wizard_field,"base_report_designer.modify,init,text",0,Introduction,Introduction
+wizard_field,"base_report_designer.modify,init,operation",0,Operation,Opération
+wizard_view,"base_report_designer.modify,init",0,Report designer,Report Designer
+wizard_view,"base_report_designer.modify,init",0,Report designer introduction,Introduction au report designer
+wizard_button,"base_report_designer.modify,init,end",0,Cancel,Annuler
+wizard_button,"base_report_designer.modify,init,get_form",0,Modify a report,Modifier un rapport
+wizard_field,"base_report_designer.modify,send_form,file_sxw",0,Your .SXW file,Votre fichier .sxw 
+wizard_field,"base_report_designer.modify,send_form,report_id",0,Report,Rapport 
+wizard_view,"base_report_designer.modify,send_form",0,Get a report,Recevoir un rapport
+wizard_view,"base_report_designer.modify,send_form",0,Upload your modified report,Upload le rapport modifié
+wizard_button,"base_report_designer.modify,send_form,end",0,Close,Fermer
+wizard_button,"base_report_designer.modify,send_form,send_form_result",0,Update the report,Mettre à jour le rapport
+wizard_view,"base_report_designer.modify,send_form_result",0,Report modified,Rapport modifié
+wizard_view,"base_report_designer.modify,send_form_result",0,Report modified,Rapport modifié
+wizard_view,"base_report_designer.modify,send_form_result",0,Your report has been modified.,Votre rapport a été modifié
+wizard_button,"base_report_designer.modify,send_form_result,end",0,Close,Fermer
+wizard_button,"res.partner.ean13,init,end",0,Ignore,Ignorer
+wizard_button,"res.partner.ean13,init,correct",0,Correct EAN13,Corriger EAN13
+wizard_view,"account.reconcile.unreconcile,init",0,Unreconciliation,Déréconciliation
+wizard_view,"account.reconcile.unreconcile,init",0,Unreconciliation transactions,Ecritures non réconciliées
+wizard_view,"account.reconcile.unreconcile,init",0,"If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable",
+wizard_button,"account.reconcile.unreconcile,init,end",0,Cancel,Annuler
+wizard_button,"account.reconcile.unreconcile,init,unrec",0,Unreconcile,Déréconcilie
+wizard_field,"account.chart,init,fiscalyear",0,Fiscal year,Année fiscale
+wizard_view,"account.chart,init",0,Account charts,Plan de compte
+wizard_button,"account.chart,init,end",0,Cancel,Annuler
+wizard_button,"account.chart,init,open",0,Open Charts,Ouvre le plan de comptes
+wizard_view,"module.module.scan,init",0,Scan for new modules,Rechercher les nouveaux modules
+wizard_view,"module.module.scan,init",0,This function will check if you installed new modules in the 'addons' path of your server installation.,Cette fonction va vérifier si vous avez installé des nouveaux modules dans le répertoire « addons » du serveur
+wizard_button,"module.module.scan,init,end",0,Cancel,Annuler
+wizard_button,"module.module.scan,init,addmod",0,Check new modules,Vérifier les nouveaux modules
+wizard_field,"huissier.dossier.close.from_lot,init,salle",0,Frais de salle,
+wizard_field,"huissier.dossier.close.from_lot,init,voirie",0,Frais de voirie,
+wizard_field,"huissier.dossier.close.from_lot,init,acquis",0,Pour acquis,
+wizard_field,"huissier.dossier.close.from_lot,init,frais",0,Frais de vente,
+wizard_field,"huissier.dossier.close.from_lot,init,total",0,Total,
+wizard_field,"huissier.dossier.close.from_lot,init,adj",0,Adjudications,
+wizard_button,"huissier.dossier.close.from_lot,init,close_dossier",0,Cloturer le PV,
+wizard_button,"huissier.dossier.close.from_lot,init,end",0,Annuler,
+wizard_button,"huissier.dossier.close.from_lot,wait_pv,print_invoice",0,Imprimer la facture,
+wizard_button,"huissier.dossier.close.from_lot,wait_pv,end",0,Fermer,
+wizard_field,"huissier.dossier.close,init,salle",0,Frais de salle,
+wizard_field,"huissier.dossier.close,init,voirie",0,Frais de voirie,
+wizard_field,"huissier.dossier.close,init,acquis",0,Pour acquis,
+wizard_field,"huissier.dossier.close,init,frais",0,Frais de vente,
+wizard_field,"huissier.dossier.close,init,total",0,Total,
+wizard_field,"huissier.dossier.close,init,adj",0,Adjudications,
+wizard_button,"huissier.dossier.close,init,close_dossier",0,Cloturer le PV,
+wizard_button,"huissier.dossier.close,init,end",0,Annuler,
+wizard_button,"huissier.dossier.close,wait_pv,print_invoice",0,Imprimer la facture,
+wizard_button,"huissier.dossier.close,wait_pv,end",0,Fermer,
+wizard_field,"sale.order.line.make_invoice,init,grouped",0,Group the invoices,Grouper les factures
+wizard_view,"sale.order.line.make_invoice,init",0,Create invoices,Créer les factures
+wizard_view,"sale.order.line.make_invoice,init",0,Do you really want to create the invoices ?,Voulez-vous vraiment créer les factures ?
+wizard_button,"sale.order.line.make_invoice,init,end",0,Cancel,Annuler
+wizard_button,"sale.order.line.make_invoice,init,invoice",0,Create invoices,Créer les factures
+wizard_field,"auction.lots.numerotate_cont,init,number",0,First Number,
+wizard_view,"auction.lots.numerotate_cont,init",0,First Number,
+wizard_button,"auction.lots.numerotate_cont,init,end",0,Exit,
+wizard_button,"auction.lots.numerotate_cont,init,set_number",0,Numerotation,
+wizard_field,"account.analytic.account.inverted.balance.report,init,date1",0,Start of period,Début de la période
+wizard_field,"account.analytic.account.inverted.balance.report,init,date2",0,End of period,Fin de la période
+wizard_view,"account.analytic.account.inverted.balance.report,init",0,Select period,Sélectionner une période
+wizard_button,"account.analytic.account.inverted.balance.report,init,end",0,Cancel,Annuler
+wizard_button,"account.analytic.account.inverted.balance.report,init,report",0,Print,Imprimer
+wizard_field,"auction.lots.send.aie,init,uname",0,Login,
+wizard_field,"auction.lots.send.aie,init,dates",0,Auction Date,
+wizard_field,"auction.lots.send.aie,init,password",0,Password,
+wizard_field,"auction.lots.send.aie,init,numerotation",0,Numerotation,
+wizard_button,"auction.lots.send.aie,init,date_ask",0,Continue,
+wizard_button,"auction.lots.send.aie,init,end",0,Cancel,
+wizard_field,"auction.lots.send.aie,date_ask,lang",0,Langage,
+wizard_field,"auction.lots.send.aie,date_ask,dates",0,Auction Date,
+wizard_field,"auction.lots.send.aie,date_ask,uname",0,Login,
+wizard_field,"auction.lots.send.aie,date_ask,objects",0,# of objects,
+wizard_field,"auction.lots.send.aie,date_ask,numerotation",0,Numerotation,
+wizard_field,"auction.lots.send.aie,date_ask,password",0,Password,
+wizard_button,"auction.lots.send.aie,date_ask,send",0,Send on your website,
+wizard_button,"auction.lots.send.aie,date_ask,end",0,Cancel,
+wizard_field,"account.automatic.reconcile,init,date1",0,Start of period,Début de période
+wizard_field,"account.automatic.reconcile,init,date2",0,End of period,Fin de période
+wizard_field,"account.automatic.reconcile,init,power",0,Power,Puissance
+wizard_field,"account.automatic.reconcile,init,max_amount",0,Maximum write-off amount,Montant maximum de différence autorisé
+wizard_field,"account.automatic.reconcile,init,journal_id",0,Journal,Journal
+wizard_field,"account.automatic.reconcile,init,writeoff_acc_id",0,Account,Compte
+wizard_field,"account.automatic.reconcile,init,period_id",0,Period,Période
+wizard_field,"account.automatic.reconcile,init,account_ids",0,Account to reconcile,Comptes à réconcilier
+wizard_view,"account.automatic.reconcile,init",0,Reconciliation,Réconciliation
+wizard_view,"account.automatic.reconcile,init",0,Options,Réglages
+wizard_view,"account.automatic.reconcile,init",0,Write-Off Move,Traitement les différences de paiement
+wizard_button,"account.automatic.reconcile,init,end",0,Cancel,Annuler
+wizard_button,"account.automatic.reconcile,init,reconcile",0,Reconcile,Réconciliation
+wizard_field,"account.automatic.reconcile,reconcile,reconciled",0,Reconciled transactions,Transactions réconciliées
+wizard_field,"account.automatic.reconcile,reconcile,unreconciled",0,Not reconciled transactions,Transaction non réconciliées
+wizard_view,"account.automatic.reconcile,reconcile",0,Reconciliation result,Résultat de la réconciliation
+wizard_button,"account.automatic.reconcile,reconcile,end",0,OK,OK
+wizard_field,"mrp.procurement.compute,init,po_cycle",0,PO Cycle,Fréquence d'achat
+wizard_field,"mrp.procurement.compute,init,user_id",0,Send Result To,Envoyer le résultat à
+wizard_field,"mrp.procurement.compute,init,schedule_cycle",0,Scheduler Cycle,Programmer les cycles
+wizard_field,"mrp.procurement.compute,init,security_lead",0,Security Days,Jours de sécurité
+wizard_field,"mrp.procurement.compute,init,po_lead",0,PO Lead Time,Délai d'approvisionnement
+wizard_field,"mrp.procurement.compute,init,picking_lead",0,Packing Lead Time,
+wizard_view,"mrp.procurement.compute,init",0,Parameters,Paramètres
+wizard_view,"mrp.procurement.compute,init",0,Time (days),Durée (jours)
+wizard_view,"mrp.procurement.compute,init",0,Control,Contrôle
+wizard_button,"mrp.procurement.compute,init,end",0,Cancel,Annuler
+wizard_button,"mrp.procurement.compute,init,compute",0,Compute Procurements,Calculer les besoins
+wizard_view,"account.invoice.refund,init",0,Refund Invoice,Note de crédit
+wizard_view,"account.invoice.refund,init",0,Are you sure you want to refund this invoice ?,Êtes-vous sûr de vouloir rembourser cette facture?
+wizard_button,"account.invoice.refund,init,end",0,Cancel,Annuler
+wizard_button,"account.invoice.refund,init,refund",0,Refund Invoice,Note de crédit
+wizard_field,"account.budget.report,init,date1",0,Start of period,Début de la période
+wizard_field,"account.budget.report,init,date2",0,End of period,Fin de la période
+wizard_view,"account.budget.report,init",0,Select period,Sélectionner une période
+wizard_button,"account.budget.report,init,end",0,Cancel,Annuler
+wizard_button,"account.budget.report,init,report",0,Print,Imprimer
+wizard_field,"account.invoice.pay,init,amount",0,Amount paid,Montant payé
+wizard_field,"account.invoice.pay,init,period_id",0,Period,Période
+wizard_field,"account.invoice.pay,init,journal_id",0,Journal,Journal
+wizard_view,"account.invoice.pay,init",0,Pay invoice,Payer la facture
+wizard_button,"account.invoice.pay,init,end",0,Cancel,Annuler
+wizard_button,"account.invoice.pay,init,writeoff_check",0,Pay Invoice,Payer la facture
+wizard_field,"account.invoice.pay,addendum,writeoff_acc_id",0,Write-Off account,Compte de pertes et profits
+wizard_field,"account.invoice.pay,addendum,writeoff_journal_id",0,Write-Off journal,Journal des ajustements
+wizard_view,"account.invoice.pay,addendum",0,Information addendum,Informations supplémentaires
+wizard_view,"account.invoice.pay,addendum",0,Write-Off Move,Mouvement d'ajustement
+wizard_button,"account.invoice.pay,addendum,end",0,Cancel,Annuler
+wizard_button,"account.invoice.pay,addendum,reconcile",0,Pay and reconcile,Payer et réconcilier
+wizard_field,"auction.lots.auction_move,init,auction_id",0,Auction Date,
+wizard_view,"auction.lots.auction_move,init",0,Change Auction Date,
+wizard_view,"auction.lots.auction_move,init",0,"Warning, this will erase the object adjudication price and its buyer !",
+wizard_button,"auction.lots.auction_move,init,set_date",0,Move to Auction date,
+wizard_button,"auction.lots.auction_move,init,end",0,Cancel,
+wizard_field,"huissier.labels.pay,init,last",0,a,
+wizard_field,"huissier.labels.pay,init,account_id",0,Compte destination,
+wizard_field,"huissier.labels.pay,init,price",0,Prix unitaire,
+wizard_field,"huissier.labels.pay,init,value",0,Montant a payer,
+wizard_field,"huissier.labels.pay,init,first",0,De,
+wizard_button,"huissier.labels.pay,init,pay",0,Payer les vignettes,
+wizard_button,"huissier.labels.pay,init,end",0,Annuler,
+wizard_field,"account.analytic.account.quantity_cost_ledger.report,init,date1",0,Start of period,Début de la période
+wizard_field,"account.analytic.account.quantity_cost_ledger.report,init,journal",0,Journals,Journaux
+wizard_field,"account.analytic.account.quantity_cost_ledger.report,init,date2",0,End of period,Fin de la période
+wizard_view,"account.analytic.account.quantity_cost_ledger.report,init",0,Select period,Sélectionner une période
+wizard_view,"account.analytic.account.quantity_cost_ledger.report,init",0,Cost Legder for period,Grand Livre par période
+wizard_view,"account.analytic.account.quantity_cost_ledger.report,init",0,and Journals,et journaux
+wizard_button,"account.analytic.account.quantity_cost_ledger.report,init,end",0,Cancel,Annuler
+wizard_button,"account.analytic.account.quantity_cost_ledger.report,init,report",0,Print,Imprimer
+wizard_field,"product_price,init,number",0,Number of products to produce,Nombre de produits à produire
+wizard_view,"product_price,init",0,Paid ?,Payé ?
+wizard_button,"product_price,init,end",0,Cancel,Annuler
+wizard_button,"product_price,init,price",0,Print product price,Imprimer le prix du produit
+wizard_field,"account.analytic.profit,init,date_from",0,From,De
+wizard_field,"account.analytic.profit,init,employee_ids",0,Employee,Employé
+wizard_field,"account.analytic.profit,init,journal_ids",0,Journal,Journal
+wizard_field,"account.analytic.profit,init,date_to",0,To,à
+wizard_view,"account.analytic.profit,init",0,Choose,Choisir
+wizard_button,"account.analytic.profit,init,end",0,Cancel,Annuler
+wizard_button,"account.analytic.profit,init,report",0,Print,Imprimer
+wizard_field,"account.period.close,init,sure",0,Check this box,Cocher cette case
+wizard_view,"account.period.close,init",0,Close Period,Clôturer période
+wizard_view,"account.period.close,init",0,Are you sure ?,Êtes-vous sûr?
+wizard_button,"account.period.close,init,end",0,Cancel,Annuler
+wizard_button,"account.period.close,init,close",0,Close Period,Clôturer période
+wizard_view,"auction.lots.cancel,init",0,Cancel Payment,
+wizard_view,"auction.lots.cancel,init",0,Are you sure you want to refund this invoice ?,
+wizard_button,"auction.lots.cancel,init,make_cancel",0,Cancel Payment,
+wizard_button,"auction.lots.cancel,init,end",0,Cancel,
+wizard_view,"purchase.order.merge,init",0,Merge orders,Fusionner les commandes
+wizard_view,"purchase.order.merge,init",0,Are you sure you want to merge these orders ?,Êtes-vous sûr de vouloir fusionner ces commandes?
+wizard_view,"purchase.order.merge,init",0,"Please note that orders will only be merged if they are to the same partner and going to the same location, and lines will only be merged if they are exactly the same except for the quantity and unit.","Veuillez noter que les commandes ne seront fusionnées que si elles sont destinées au même partenaire et vont à la même zone de stockage, et que les lignes ne seront fusionnées que si elles sont exactement les mêmes, sauf pour la quantité et l'unité"
+wizard_button,"purchase.order.merge,init,end",0,Cancel,Annuler
+wizard_button,"purchase.order.merge,init,merge",0,Merge orders,Fusionner les commandes
+wizard_field,"delivery.sale.order,init,carrier_id",0,Delivery Method,Méthode de livraison
+wizard_view,"delivery.sale.order,init",0,Create deliveries,Créer les livraisons
+wizard_view,"delivery.sale.order,init",0,Delivery Method,Méthode de livraison
+wizard_button,"delivery.sale.order,init,end",0,Cancel,Annuler
+wizard_button,"delivery.sale.order,init,delivery",0,Create delivery line,Créer les lignes de livraison
+wizard_field,"account.subscription.generate,init,date",0,Date,Date
+wizard_view,"account.subscription.generate,init",0,Subscription Compute,Calcul de la souscription
+wizard_view,"account.subscription.generate,init",0,Generate entries before:,Générer les entrée avant:
+wizard_button,"account.subscription.generate,init,end",0,Cancel,Annuler
+wizard_button,"account.subscription.generate,init,generate",0,Compute Entry Dates,Calculer les dates d'entrée
+wizard_view,"module.upgrade,start",0,System upgrade done,Mise à jour terminée
+wizard_view,"module.upgrade,start",0,System upgrade done,Mise à jour terminée
+wizard_view,"module.upgrade,start",0,The modules have been upgraded / installed !,Les modules ont été mis à niveau/installés
+wizard_view,"module.upgrade,start",0,You may have to reinstall some language pack.,Certains modules ont été mis à jour / installés => nous vous suggérons de réinstaller les langues !
+wizard_view,"module.upgrade,start",0,We suggest you to reload the menu tab (Ctrl+t Ctrl+r).,
+wizard_button,"module.upgrade,start,end",0,Close,Clôturer
+wizard_field,"module.upgrade,init,module_download",0,Modules to download,
+wizard_field,"module.upgrade,init,module_info",0,Modules to update,
+wizard_view,"module.upgrade,init",0,System Upgrade,Mise à jour du système
+wizard_view,"module.upgrade,init",0,Your system will be upgraded.,Votre système va être mis à jour
+wizard_view,"module.upgrade,init",0,Note that this operation my take a few minutes.,Cette opération peut prendre quelques minutes....
+wizard_view,"module.upgrade,init",0,Modules to update,Modules à mettre à jour
+wizard_view,"module.upgrade,init",0,Modules to download,
+wizard_button,"module.upgrade,init,end",0,Cancel,Annuler
+wizard_button,"module.upgrade,init,start",0,Start Upgrade,Lancer la mise à jour
+wizard_view,"auction.lots.buyer_map,done",0,All objects are assigned to buyers !,
+wizard_button,"auction.lots.buyer_map,done,end",0,Close,
+wizard_field,"auction.lots.buyer_map,check,ach_uid",0,Buyer,
+wizard_field,"auction.lots.buyer_map,check,ach_login",0,Buyer Username,
+wizard_button,"auction.lots.buyer_map,check,end",0,Exit,
+wizard_button,"auction.lots.buyer_map,check,set_buyer",0,Update,
+wizard_field,"auction.lots.numerotate,init,bord_vnd_id",0,Depositer Inventory,
+wizard_field,"auction.lots.numerotate,init,lot_num",0,Lot Number,
+wizard_view,"auction.lots.numerotate,init",0,Object Reference,
+wizard_button,"auction.lots.numerotate,init,search",0,Continue,
+wizard_button,"auction.lots.numerotate,init,end",0,Exit,
+wizard_field,"auction.lots.numerotate,search,name",0,Short Description,
+wizard_field,"auction.lots.numerotate,search,lot_inv",0,Object Inventory,
+wizard_field,"auction.lots.numerotate,search,lot_num",0,Inventory Number,
+wizard_field,"auction.lots.numerotate,search,lot_est1",0,Minimum Estimation,
+wizard_field,"auction.lots.numerotate,search,lot_est2",0,Maximum Estimation,
+wizard_field,"auction.lots.numerotate,search,obj_desc",0,Description,
+wizard_field,"auction.lots.numerotate,search,obj_num",0,Catalog Number,
+wizard_view,"auction.lots.numerotate,search",0,Object Reference,
+wizard_view,"auction.lots.numerotate,search",0,Object Reference,
+wizard_button,"auction.lots.numerotate,search,end",0,Exit,
+wizard_button,"auction.lots.numerotate,search,set_number",0,Numerotation,
+wizard_field,"crm.case.section.menu,init,menu_name",0,Menu base name,Nom des menus
+wizard_field,"crm.case.section.menu,init,section_id",0,Case Section,Section du cas
+wizard_field,"crm.case.section.menu,init,menu_parent_id",0,Parent menu,Menu parent
+wizard_view,"crm.case.section.menu,init",0,Create menus for cases,Créer des menus pour les cas
+wizard_button,"crm.case.section.menu,init,end",0,Cancel,Annuler
+wizard_button,"crm.case.section.menu,init,create",0,Create menu Entries,Créer des entrées au menu
+wizard_field,"hr.print_month,init,year",0,Year,Année
+wizard_field,"hr.print_month,init,month",0,Month,Mois
+wizard_view,"hr.print_month,init",0,Select a month,Sélectionner un mois
+wizard_view,"hr.print_month,init",0,Select a month,Sélectionner un mois
+wizard_button,"hr.print_month,init,print",0,Print Timesheet,Imprimer Timesheet
+wizard_button,"hr.print_month,init,end",0,Cancel,Annuler
+wizard_button,"stock.return.picking,init,end",0,Cancel,Annuler
+wizard_button,"stock.return.picking,init,return",0,Return,Retour
+wizard_field,"account.wizard.account.duplicate,init,company_id",0,Company,Société
+wizard_view,"account.wizard.account.duplicate,init",0,Duplicate account charts,Dupliquer le plan de compte
+wizard_button,"account.wizard.account.duplicate,init,end",0,Cancel,Annuler
+wizard_button,"account.wizard.account.duplicate,init,duplicate",0,Duplicate,Dupliquer
+wizard_field,"stock.invoice_onshipping,init,group",0,Group by partner,
+wizard_field,"stock.invoice_onshipping,init,journal_id",0,Destination Journal,
+wizard_view,"stock.invoice_onshipping,init",0,Create invoices,
+wizard_view,"stock.invoice_onshipping,init",0,Create invoices,
+wizard_button,"stock.invoice_onshipping,init,end",0,Cancel,
+wizard_button,"stock.invoice_onshipping,init,create_invoice",0,Create invoice,
+wizard_field,"account.partner.balance.report,init,date1",0,Start of period,Début de la période
+wizard_field,"account.partner.balance.report,init,date2",0,End of period,Fin de la période
+wizard_field,"account.partner.balance.report,init,company_id",0,Company,Société
+wizard_field,"account.partner.balance.report,init,fiscalyear",0,Fiscal year,Année fiscale
+wizard_view,"account.partner.balance.report,init",0,Select period,Sélectionner une période
+wizard_button,"account.partner.balance.report,init,end",0,Cancel,Annuler
+wizard_button,"account.partner.balance.report,init,report",0,Print,Imprimer
+wizard_field,"project.task.close,mail_ask,email",0,E-Mails,E-mails
+wizard_field,"project.task.close,mail_ask,description",0,Description,Description
+wizard_view,"project.task.close,mail_ask",0,Send mail to customer,Envoyer mail au client
+wizard_button,"project.task.close,mail_ask,end",0,Cancel,Annuler
+wizard_button,"project.task.close,mail_ask,close",0,Quiet close,Fermer (sans mail)
+wizard_button,"project.task.close,mail_ask,mail_send",0,Send Message,Envoyer un message
+wizard_view,"lunch.cashbox.clean,init",0,Reset cashbox,
+wizard_view,"lunch.cashbox.clean,init",0,Are you sure you want to reset this cashbox ?,
+wizard_button,"lunch.cashbox.clean,init,end",0,Cancel,
+wizard_button,"lunch.cashbox.clean,init,zero",0,Set to Zero,
+wizard_field,"populate_payment,init,entries",0,Entries,
+wizard_view,"populate_payment,init",0,Populate Payment : ,
+wizard_button,"populate_payment,init,end",0,_Cancel,
+wizard_button,"populate_payment,init,create",0,_Add to payment order,
+wizard_field,"account.analytic.account.journal.report,init,date1",0,Start of period,Début de la période
+wizard_field,"account.analytic.account.journal.report,init,date2",0,End of period,Fin de la période
+wizard_view,"account.analytic.account.journal.report,init",0,Analytic Journal Report,Rapport Journal Analytique
+wizard_button,"account.analytic.account.journal.report,init,end",0,Cancel,Annuler
+wizard_button,"account.analytic.account.journal.report,init,report",0,Print,Imprimer
+wizard_field,"account_followup.followup.print.all,init,partner_ids",0,Partners,Partenaire
+wizard_field,"account_followup.followup.print.all,init,email_body",0,Email body,Corps du mail
+wizard_field,"account_followup.followup.print.all,init,email_conf",0,Send email confirmation,Envoyer email de confirmation
+wizard_view,"account_followup.followup.print.all,init",0,Select partners,Sélectionner partenaire
+wizard_view,"account_followup.followup.print.all,init",0,FollowUp selection,Sélection des rappels
+wizard_view,"account_followup.followup.print.all,init",0,Select partners to remind,Sélectionner partenaire à rappeler
+wizard_view,"account_followup.followup.print.all,init",0,Email confirmation,Email de confirmation
+wizard_view,"account_followup.followup.print.all,init",0,Not yet implemented !,Pas encore implémenté
+wizard_view,"account_followup.followup.print.all,init",0,Email body,Corps du mail
+wizard_view,"account_followup.followup.print.all,init",0,Legend,Légende
+wizard_view,"account_followup.followup.print.all,init",0,%(partner_name)s: Partner name,
+wizard_view,"account_followup.followup.print.all,init",0,%(user_signature)s: Partner name,
+wizard_view,"account_followup.followup.print.all,init",0,%(followup_level)s: Followup level,
+wizard_view,"account_followup.followup.print.all,init",0,%(followup_amount)s: Followup level,
+wizard_view,"account_followup.followup.print.all,init",0,%(followup_details)s: Followup level,
+wizard_button,"account_followup.followup.print.all,init,end",0,Cancel,Annuler
+wizard_button,"account_followup.followup.print.all,init,print",0,Print Follow Ups,Imprimer rappels
+wizard_field,"hr.si_so,si_ask_so,name",0,Employee's name,Nom de l'employé
+wizard_field,"hr.si_so,si_ask_so,last_time",0,Your last sign out,Votre dernière sortie
+wizard_view,"hr.si_so,si_ask_so",0,Sign in / Sign out,Pointer
+wizard_view,"hr.si_so,si_ask_so",0,You did not signed out the last time. Please enter the date and time you signed out.,Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure à laquelle vous êtes parti(e)
+wizard_button,"hr.si_so,si_ask_so,end",0,Cancel,Annuler
+wizard_button,"hr.si_so,si_ask_so,si",0,Sign in,Pointer
+wizard_field,"hr.si_so,so_ask_si,name",0,Employee's name,Nom de l'employé
+wizard_field,"hr.si_so,so_ask_si,last_time",0,Your last sign in,Votre dernier pointage
+wizard_view,"hr.si_so,so_ask_si",0,Sign in / Sign out,Pointer
+wizard_view,"hr.si_so,so_ask_si",0,You did not signed in the last time. Please enter the date and time you signed in.,Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure à laquelle vous êtes arrivé(e)
+wizard_button,"hr.si_so,so_ask_si,end",0,Cancel,Annuler
+wizard_button,"hr.si_so,so_ask_si,so",0,Sign out,Supprimer pointage
+wizard_field,"hr.si_so,init,state",0,Current state,État actuel
+wizard_field,"hr.si_so,init,name",0,Employee's name,Nom de l'employé
+wizard_view,"hr.si_so,init",0,Sign in / Sign out,Pointer
+wizard_view,"hr.si_so,init",0,You are now ready to sign in or out of the attendance follow up,Vous pouvez maintenant pointer
+wizard_button,"hr.si_so,init,end",0,Cancel,Annuler
+wizard_button,"hr.si_so,init,si_test",0,Sign in,Pointer
+wizard_button,"hr.si_so,init,so_test",0,Sign out,Supprimer
+wizard_field,"account.analytic.budget.report,init,date1",0,Start of period,Démarrer période
+wizard_field,"account.analytic.budget.report,init,date2",0,End of period,Fin de la période
+wizard_view,"account.analytic.budget.report,init",0,Select period,Sélectionner période
+wizard_button,"account.analytic.budget.report,init,end",0,Cancel,Annuler
+wizard_button,"account.analytic.budget.report,init,report",0,Print,Imprimer
+wizard_field,"hr.analytical.timesheet,init,year",0,Year,Année
+wizard_field,"hr.analytical.timesheet,init,user_id",0,User,Utilisateur
+wizard_field,"hr.analytical.timesheet,init,month",0,Month,Mois
+wizard_view,"hr.analytical.timesheet,init",0,Choose your month,Choisissez le mois
+wizard_button,"hr.analytical.timesheet,init,end",0,Cancel,Annuler
+wizard_button,"hr.analytical.timesheet,init,report",0,Print,Imprimer
+wizard_field,"project.wiz_bill,init,task_invoice",0,Tasks to invoice,Tâches à facturer
+wizard_field,"project.wiz_bill,init,invoice_num",0,Generated invoices,Factures générées
+wizard_field,"project.wiz_bill,init,sale_account_id",0,Income account,Compte de revenu
+wizard_field,"project.wiz_bill,init,journal_id",0,Journal,Journal
+wizard_field,"project.wiz_bill,init,task_total",0,Number of tasks,Nombre de tâches
+wizard_field,"project.wiz_bill,init,total",0,Total Price,Prix total
+wizard_view,"project.wiz_bill,init",0,Billing wizard,Paiements
+wizard_button,"project.wiz_bill,init,end",0,Cancel,Annuler
+wizard_button,"project.wiz_bill,init,bill",0,Ok,OK
+wizard_field,"huissier.emporte,init,lot_ids",0,Lots Emportes,
+wizard_view,"huissier.emporte,init",0,Mark Lots,
+wizard_view,"huissier.emporte,init",0,Selectionner les lots qui sont livres,
+wizard_button,"huissier.emporte,init,valid",0,       Valider       ,
+wizard_field,"account.move.line.reconcile,init,trans_nbr",0,# of Transaction,# de transactions
+wizard_field,"account.move.line.reconcile,init,credit",0,Credit amount,Montant Crédit
+wizard_field,"account.move.line.reconcile,init,writeoff",0,Write-Off amount,Montant de l'ajustement
+wizard_field,"account.move.line.reconcile,init,debit",0,Debit amount,Montant Débit
+wizard_view,"account.move.line.reconcile,init",0,Reconciliation,Réconciliation
+wizard_view,"account.move.line.reconcile,init",0,Reconciliation transactions,Mouvement de réconciliation
+wizard_view,"account.move.line.reconcile,init",0,Write-Off,Pertes et profits
+wizard_button,"account.move.line.reconcile,init,end",0,Cancel,Annuler
+wizard_button,"account.move.line.reconcile,init,writeoff_check",0,Reconcile,Réconciler
+wizard_field,"account.move.line.reconcile,addendum,period_id",0,Write-Off Period,Période d'ajustement
+wizard_field,"account.move.line.reconcile,addendum,journal_id",0,Write-Off Journal,Journal des pertes et profits
+wizard_field,"account.move.line.reconcile,addendum,writeoff_acc_id",0,Write-Off account,Compte d'ajustement
+wizard_view,"account.move.line.reconcile,addendum",0,Information addendum,Informations supplémentaires
+wizard_view,"account.move.line.reconcile,addendum",0,Write-Off Move,Mouvement d'ajustement
+wizard_button,"account.move.line.reconcile,addendum,end",0,Cancel,Annuler
+wizard_button,"account.move.line.reconcile,addendum,reconcile",0,Reconcile,Réconciler
+wizard_view,"stock.move.replace,init",0,Replace a component,Remplacer un composant
+wizard_view,"stock.move.replace,init",0,Component,Composant
+wizard_button,"stock.move.replace,init,end",0,Cancel,Annuler
+wizard_button,"stock.move.replace,init,replace",0,Replace,Remplacer
+wizard_view,"stock.move.replace,replace",0,Replace result,Remplacer le résultat
+wizard_view,"stock.move.replace,replace",0,Replacing successful !,Remplacement réussi!
+wizard_button,"stock.move.replace,replace,end",0,Ok,Ok
+wizard_field,"auction.lots.sms_send,init,text",0,SMS Message,
+wizard_field,"auction.lots.sms_send,init,password",0,Password,
+wizard_field,"auction.lots.sms_send,init,app_id",0,API ID,
+wizard_field,"auction.lots.sms_send,init,user",0,Login,
+wizard_view,"auction.lots.sms_send,init",0,SMS - Gateway: clickatell,
+wizard_view,"auction.lots.sms_send,init",0,Bulk SMS send,
+wizard_button,"auction.lots.sms_send,init,send",0,Send SMS,
+wizard_button,"auction.lots.sms_send,init,end",0,Cancel,
+wizard_field,"auction.lots.transfer.unsold.object,init,auction_id_to",0,To Auction Date,
+wizard_field,"auction.lots.transfer.unsold.object,init,auction_id_from",0,From Auction Date,
+wizard_view,"auction.lots.transfer.unsold.object,init",0,Draft To Posted,
+wizard_view,"auction.lots.transfer.unsold.object,init",0,Transfer unsold Object: Current auction date to another ,
+wizard_button,"auction.lots.transfer.unsold.object,init,transfer",0,Transfer,
+wizard_button,"auction.lots.transfer.unsold.object,init,end",0,Cancel,
+wizard_field,"lunch.order.confirm,init,confirm_cashbox",0,Name of box,
+wizard_view,"lunch.order.confirm,init",0,Orders Confirmation,
+wizard_button,"lunch.order.confirm,init,end",0,Cancel,
+wizard_button,"lunch.order.confirm,init,go",0,Confirm Order,
+wizard_button,"stock.partial_picking,init,end",0,Cancel,Annuler
+wizard_button,"stock.partial_picking,init,split",0,Make Picking,Valider
+wizard_view,"stock.partial_picking,end2",0,Packing result,?
+wizard_view,"stock.partial_picking,end2",0,The packing has been successfully made !,L'emballage a été fait avec succès
+wizard_button,"stock.partial_picking,end2,end",0,Close,Fermer
+wizard_view,"auction.lots.able,init",0,Confirmation set taken away,
+wizard_button,"auction.lots.able,init,end",0,Cancel,
+wizard_button,"auction.lots.able,init,go",0,Able Taken away,
+wizard_button,"huissier.lots.payment,init,payer",0,Payer,
+wizard_button,"huissier.lots.payment,init,end",0,Annuler,
+wizard_field,"mrp.workcenter.load,init,measure_unit",0,Amount measuring unit,Unité de mesure
+wizard_field,"mrp.workcenter.load,init,time_unit",0,Type of period,Type de période
+wizard_view,"mrp.workcenter.load,init",0,Select time unit,Sélectionner une unité de temps
+wizard_button,"mrp.workcenter.load,init,end",0,Cancel,Annuler
+wizard_button,"mrp.workcenter.load,init,report",0,Print,Imprimer
+wizard_view,"module.lang.install,start",0,Language file loaded.,Fichier de traduction chargé
+wizard_view,"module.lang.install,start",0,Installation done,Installation terminée
+wizard_view,"module.lang.install,start",0,The selected language has been successfully installed. You must change the preferences of the user and open a new menu to view changes.,La langue sélectionnée a été installée avec succès. Vous devez changer les préférences de l'utilisateur et ouvrir un nouveau menu pour voir les changements
+wizard_button,"module.lang.install,start,end",0,Ok,OK
+wizard_field,"module.lang.install,init,lang",0,Language,Langue
+wizard_view,"module.lang.install,init",0,System Upgrade,Ajout/mise à jour d'une langue
+wizard_view,"module.lang.install,init",0,System Upgrade,Ajout/mise à jour d'une langue
+wizard_view,"module.lang.install,init",0,Choose a language to install:,Choisissez une langue à installer:
+wizard_view,"module.lang.install,init",0,Note that this operation may take a few minutes.,Cette opération peut prendre quelques minutes...
+wizard_button,"module.lang.install,init,end",0,Cancel,Annuler
+wizard_button,"module.lang.install,init,start",0,Start installation,Lancer l'installation
+wizard_field,"huissier.caisse,init,dossier_id",0,Dossier,
+wizard_button,"huissier.caisse,init,end",0,Annuler,
+wizard_button,"huissier.caisse,init,continue",0,Continuer,
+wizard_field,"huissier.caisse,continue,partner_id",0,Acheteur,
+wizard_button,"huissier.caisse,continue,valid",0,       Valider       ,
+wizard_field,"module.lang.export,init,lang",0,Language,Langue
+wizard_view,"module.lang.export,init",0,Export language,Exporter une langue
+wizard_view,"module.lang.export,init",0,Export translation file,Exporter le fichier de traduction
+wizard_view,"module.lang.export,init",0,Choose a language to export:,Choisissez une langue à exporter
+wizard_button,"module.lang.export,init,end",0,Cancel,Annuler
+wizard_button,"module.lang.export,init,finish",0,Ok,Ok
+wizard_field,"module.lang.export,finish,data",0,File,Fichier
+wizard_view,"module.lang.export,finish",0,Export language,Exporter une langue
+wizard_view,"module.lang.export,finish",0,Export done,Exportation faite
+wizard_view,"module.lang.export,finish",0,Save this document to a .CSV file and open it with  your favourite spreadsheet software. The file  encoding is UTF-8. You have to translate the latest  column before reimporting it.,Sauvez ce document sous fichier .csv et ouvrez-le avec votre logiciel de calcul habituel. L'encodage se fait en UTF-8. Traduisez la dernière colonne avant de réimporter le fichier
+wizard_button,"module.lang.export,finish,end",0,Close,Clôturer
+wizard_field,"account.move.line.reconcile.select,init,account_id",0,Account,Compte
+wizard_view,"account.move.line.reconcile.select,init",0,Reconciliation,Réconciliation
+wizard_button,"account.move.line.reconcile.select,init,end",0,Cancel,Annuler
+wizard_button,"account.move.line.reconcile.select,init,open",0,Open for reconciliation,Ouvrir pour réconciliation
+wizard_field,"account.general.ledger.report,init,periods",0,Periods,Périodes
+wizard_field,"account.general.ledger.report,init,fiscalyear",0,Fiscal year,Année fiscale
+wizard_view,"account.general.ledger.report,init",0,Select period,Sélectionner période
+wizard_button,"account.general.ledger.report,init,end",0,Cancel,Annuler
+wizard_button,"account.general.ledger.report,init,report",0,Print,Imprimer
+wizard_field,"account.third_party_ledger.report,init,date1",0,Start of period,Démarrer la période
+wizard_field,"account.third_party_ledger.report,init,date2",0,End of period,Finir la période
+wizard_field,"account.third_party_ledger.report,init,company_id",0,Company,Société
+wizard_field,"account.third_party_ledger.report,init,fiscalyear",0,Fiscal year,Année fiscale
+wizard_view,"account.third_party_ledger.report,init",0,Select period,Sélectionner période
+wizard_button,"account.third_party_ledger.report,init,end",0,Cancel,Annuler
+wizard_button,"account.third_party_ledger.report,init,report",0,Print,Imprimer
+wizard_field,"hr.analytical.timesheet.my,init,year",0,Year,Année
+wizard_field,"hr.analytical.timesheet.my,init,user_id",0,User,Utilisateur
+wizard_field,"hr.analytical.timesheet.my,init,month",0,Month,Mois
+wizard_view,"hr.analytical.timesheet.my,init",0,Choose your month,Choisir votre mois
+wizard_button,"hr.analytical.timesheet.my,init,end",0,Cancel,Annuler
+wizard_button,"hr.analytical.timesheet.my,init,report",0,Print,Imprimer
+wizard_field,"module.lang.import,init,code",0,Code (eg:en_US),Code (ex: fr_FR)
+wizard_field,"module.lang.import,init,data",0,File,Fichier
+wizard_field,"module.lang.import,init,name",0,Language name,Nom de la langue
+wizard_view,"module.lang.import,init",0,Import language,Importer la langue
+wizard_view,"module.lang.import,init",0,Import new language,Importer une nouvelle langue
+wizard_view,"module.lang.import,init",0,You have to import a .CSV file wich is encoded in UTF-8. Please check that the first line of your file is:,Vous devez importer un fichier .csv encodé en UTF-8. Veuillez vérifier que la première ligne de votre fichier est:
+wizard_view,"module.lang.import,init",0,"type,name,res_id,src,value",
+wizard_button,"module.lang.import,init,end",0,Cancel,Annuler
+wizard_button,"module.lang.import,init,finish",0,Ok,Ok
+wizard_field,"hr.analytical.timesheet_users,init,user_ids",0,Users,Utilisateurs
+wizard_field,"hr.analytical.timesheet_users,init,year",0,Year,Année
+wizard_field,"hr.analytical.timesheet_users,init,month",0,Month,Mois
+wizard_view,"hr.analytical.timesheet_users,init",0,Choose Users,Choisir les utilisateurs
+wizard_button,"hr.analytical.timesheet_users,init,end",0,Cancel,Annuler
+wizard_button,"hr.analytical.timesheet_users,init,report",0,Print,Imprimer
+wizard_field,"account.move.bank.reconcile,init,journal_id",0,Journal,Journal
+wizard_view,"account.move.bank.reconcile,init",0,Bank reconciliation,Réconciliation bancaire
+wizard_button,"account.move.bank.reconcile,init,end",0,Cancel,Annuler
+wizard_button,"account.move.bank.reconcile,init,open",0,Open for bank reconciliation,Ouvrir pour réconciliation
+wizard_field,"auction.lots.invoice,init,amount_paid",0,Amount paid,
+wizard_field,"auction.lots.invoice,init,number",0,Invoice Number,
+wizard_field,"auction.lots.invoice,init,amount_topay",0,Amount to pay,
+wizard_field,"auction.lots.invoice,init,amount",0,Invoiced Amount,
+wizard_field,"auction.lots.invoice,init,objects",0,# of objects,
+wizard_field,"auction.lots.invoice,init,ach_uid",0,Buyer Name,
+wizard_button,"auction.lots.invoice,init,invoice",0,Create Invoice,
+wizard_button,"auction.lots.invoice,init,end",0,Cancel,
+wizard_field,"account.analytic.account.cost_ledger.report,init,date1",0,Start of period,Début de la période
+wizard_field,"account.analytic.account.cost_ledger.report,init,date2",0,End of period,Fin de la période
+wizard_view,"account.analytic.account.cost_ledger.report,init",0,Select period,Sélectionner une période
+wizard_button,"account.analytic.account.cost_ledger.report,init,end",0,Cancel,Annuler
+wizard_button,"account.analytic.account.cost_ledger.report,init,report",0,Print,Imprimer
+wizard_field,"scrum.product.backlog.task.create,init,user_id",0,Assign To,Attribué à
+wizard_view,"scrum.product.backlog.task.create,init",0,Create Tasks,Créer tâches
+wizard_button,"scrum.product.backlog.task.create,init,end",0,Cancel,Annuler
+wizard_button,"scrum.product.backlog.task.create,init,create",0,Create Tasks,Créer tâches
+wizard_field,"account.budget.spread,init,amount",0,Amount,Valeur
+wizard_field,"account.budget.spread,init,quantity",0,Quantity,Quantité
+wizard_field,"account.budget.spread,init,fiscalyear",0,Fiscal Year,Exercice comptable
+wizard_view,"account.budget.spread,init",0,Spread,Ventiler
+wizard_button,"account.budget.spread,init,end",0,Cancel,Annuler
+wizard_button,"account.budget.spread,init,spread",0,Spread,Ventiler
+wizard_field,"mrp.procurement.compute.all,init,po_cycle",0,PO Cycle,Fréquence d'achat
+wizard_field,"mrp.procurement.compute.all,init,user_id",0,Send Result To,Envoyer résultat à
+wizard_field,"mrp.procurement.compute.all,init,schedule_cycle",0,Scheduler Cycle,Planifier les Cycles
+wizard_field,"mrp.procurement.compute.all,init,security_lead",0,Security Days,Jours de sécurité
+wizard_field,"mrp.procurement.compute.all,init,po_lead",0,PO Lead Time,Délai d'approvisionnement
+wizard_field,"mrp.procurement.compute.all,init,picking_lead",0,Packing Lead Time,
+wizard_field,"mrp.procurement.compute.all,init,automatic",0,Automatic orderpoint,Point de commande automatique
+wizard_view,"mrp.procurement.compute.all,init",0,Scheduler Parameters,Paramètres du calcul des besoins
+wizard_view,"mrp.procurement.compute.all,init",0,Time (days),Durée (jours)
+wizard_view,"mrp.procurement.compute.all,init",0,Control,Contrôle
+wizard_button,"mrp.procurement.compute.all,init,end",0,Cancel,Annuler
+wizard_button,"mrp.procurement.compute.all,init,compute",0,Compute Procurements,Calculer les besoins
+wizard_field,"hr.timesheet.final.invoice.create,init,balance_amount",0,Balance amount,Montant de la balance
+wizard_field,"hr.timesheet.final.invoice.create,init,name",0,Name of entry,Nom de l'entrée
+wizard_field,"hr.timesheet.final.invoice.create,init,price",0,Cost,Coût
+wizard_field,"hr.timesheet.final.invoice.create,init,use_amount_max",0,Use Max. Invoice Price,Utiliser un montant maxium à facturer
+wizard_field,"hr.timesheet.final.invoice.create,init,balance_product",0,Balance product,Balance de produit
+wizard_field,"hr.timesheet.final.invoice.create,init,time",0,Time spent,Temps dépensé
+wizard_field,"hr.timesheet.final.invoice.create,init,date",0,Date,Date
+wizard_view,"hr.timesheet.final.invoice.create,init",0,Do you want details for each line of the invoices ?,Voulez-vous les détails pour chaque ligne de facture ?
+wizard_view,"hr.timesheet.final.invoice.create,init",0,Invoice Balance amount,Montant Total
+wizard_button,"hr.timesheet.final.invoice.create,init,end",0,Cancel,Annuler
+wizard_button,"hr.timesheet.final.invoice.create,init,create",0,Create invoices,Créer des factures
+wizard_button,"huissier.palais,init,palais",0,Imprimer le listing,
+wizard_button,"huissier.palais,init,end",0,Annuler,
+wizard_view,"base.module.import,import",0,Module import,Importation du module
+wizard_view,"base.module.import,import",0,Module successfully imported !,Module importé avec succès
+wizard_button,"base.module.import,import,open_window",0,Close,Fermer
+wizard_field,"base.module.import,init,module_file",0,Module .ZIP file,Fichier .zip du module
+wizard_view,"base.module.import,init",0,Module import,Importer un module
+wizard_view,"base.module.import,init",0,Module import,Importer un module
+wizard_view,"base.module.import,init",0,Please give your module .ZIP file to import.,Donnez le fichier .zip de votre module à importer
+wizard_button,"base.module.import,init,end",0,Cancel,Annuler
+wizard_button,"base.module.import,init,import",0,Import module,Importer un module
+wizard_button,"stock.move.split,init,end",0,Cancel,Annuler
+wizard_button,"stock.move.split,init,split",0,Split,Répartir
+wizard_field,"base_module_publish.module_publish_all,init,text",0,Introduction,Introduction
+wizard_view,"base_module_publish.module_publish_all,init",0,Module publication,Publication du module
+wizard_view,"base_module_publish.module_publish_all,init",0,Publication information,Information pour la publication
+wizard_button,"base_module_publish.module_publish_all,init,end",0,Cancel,Annuler
+wizard_button,"base_module_publish.module_publish_all,init,login",0,Ok,Ok
+wizard_field,"base_module_publish.module_publish_all,login,login",0,Login,Nom d'utilisateur
+wizard_field,"base_module_publish.module_publish_all,login,password",0,Password,Mot de passe
+wizard_field,"base_module_publish.module_publish_all,login,email",0,Email,Email
+wizard_view,"base_module_publish.module_publish_all,login",0,Module publication,Publication du module
+wizard_view,"base_module_publish.module_publish_all,login",0,User information,Information utilisateur
+wizard_view,"base_module_publish.module_publish_all,login",0,Please provide here your login on the Tiny ERP website.,
+wizard_view,"base_module_publish.module_publish_all,login",0,"If you don't have an access, you can create one http://www.tinyerp.com/",
+wizard_button,"base_module_publish.module_publish_all,login,end",0,Cancel,
+wizard_button,"base_module_publish.module_publish_all,login,publish",0,Publish,
+wizard_field,"base_module_publish.module_publish_all,publish,already",0,Modules already updated,
+wizard_field,"base_module_publish.module_publish_all,publish,update",0,Modules updated,
+wizard_field,"base_module_publish.module_publish_all,publish,error",0,Modules in error,
+wizard_view,"base_module_publish.module_publish_all,publish",0,Module publication,
+wizard_view,"base_module_publish.module_publish_all,publish",0,Upload information,
+wizard_button,"base_module_publish.module_publish_all,publish,end",0,Close,
+wizard_field,"mrp.procurement.orderpoint.compute,init,automatic",0,Automatic orderpoint,Point de commande automatique
+wizard_view,"mrp.procurement.orderpoint.compute,init",0,Parameters,Paramètres
+wizard_button,"mrp.procurement.orderpoint.compute,init,end",0,Cancel,Annuler
+wizard_button,"mrp.procurement.orderpoint.compute,init,compute",0,Compute Procurements,Calculer les besoins
+wizard_field,"hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date1",0,Start of period,
+wizard_field,"hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date2",0,End of period,
+wizard_view,"hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init",0,Select period,
+wizard_button,"hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,end",0,Cancel,
+wizard_button,"hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,report",0,Print,
+wizard_button,"product.ean13,init,end",0,Ignore,Ignorer
+wizard_button,"product.ean13,init,correct",0,Correct EAN13,Corriger EAN13
diff --git a/addons/auction/migrate/migrate.py b/addons/auction/migrate/migrate.py
new file mode 100644
index 00000000000..6d95f70089c
--- /dev/null
+++ b/addons/auction/migrate/migrate.py
@@ -0,0 +1,386 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+
+import psycopg
+import csv
+
+db_old = "in"
+print 'Extracting data from db '+db_old
+
+def import_sql(cr, fname, query, fields=None, trigger=None):
+    cr.execute(query)
+    if not fields:
+        fields = map(lambda x: x[0], cr.description)
+    fp = file(fname,'wb')
+    result = cr.fetchall()
+    if trigger:
+        result = map(lambda x: tuple(trigger(cr, list(x))), result)
+    writer = csv.writer(fp,lineterminator='\n')
+    writer.writerow(fields)
+    writer.writerows(result)
+    fp.close()
+
+
+db = psycopg.connect("dbname="+db_old)
+cr = db.cursor()
+
+
+
+cr.execute("update auction_lots set state='draft' where state is null or state = '' ")
+cr.execute("update auction_lots set state='sold' where state='invoiced'")
+
+
+cr.execute('select id,name from res_partner')
+res= cr.fetchall()
+names=[]
+for r in res:
+    if r[1] in names:
+        cr.execute("update res_partner set name= %s where id=%d",(r[1]+str(r[0]),r[0]))
+    else:
+        names.append(r[1])
+
+# cr.execute('select id,name from res_country')
+# res= cr.fetchall()
+# names=[]
+# for r in res:
+#   if r[1] in names:
+#       cr.execute("update res_country set name= %s where id=%d",(str(r[1])+str(r[0]),r[0]))
+#   else:
+#       names.append(r[1])
+
+# cr.execute('select id,code from res_country')
+# res= cr.fetchall()
+# names=[]
+# for r in res:
+#   if r[1] in names:
+#       cr.execute("update res_country set code= %s where id=%d",(str(r[1])+str(r[0]),r[0]))
+#   else:
+#       names.append(r[1])
+
+
+
+def _account_trigger(cr, x):
+    x = list(x)
+    if x[5] not in ('receivable','payable','view','income','expense','tax','cash','asset','equity','closed'):
+        x[5] = {'stock_inventory':'asset','stock_income':'income','stock_expense':'expense'}.get(x[5], 'asset')
+    return tuple(x)
+# account.account
+import_sql(cr,
+    'account.account.csv',
+    "select 'account' || id as id, code, name, 'EUR' as currency_id, True as active, type from account_account",
+    trigger = _account_trigger
+)
+
+#account.tax
+import_sql(cr,
+    'account.tax.csv',
+    """select
+            'tax' || id as id,
+            domain,
+            name,
+            'account'||account_collected_id as "account_collected_id:id",
+            'account'||account_paid_id as "account_paid_id:id",
+            amount,
+            child_depend,
+            type
+        from
+            account_tax
+    """
+)
+
+#res.country
+# import_sql(cr,
+#   'res.country.csv',
+#   """
+#   select
+#   'country'||id as id,
+#   coalesce(name,id::char(10)) as "name",
+#   coalesce(code,id::char(10)) as "code"
+#   from
+#   res_country
+#   """
+# )
+#clients category
+import_sql(cr,  
+    'res.partner.category.csv',
+    """
+    select
+    name,
+    active
+    from 
+    res_partner_category
+    """
+)
+##res.partner.category.rel
+#import_sql(cr,
+#   'res.partner.category.rel.csv',
+#   """
+#   select
+#   'partner'||rel.partner_id as "partner_id:id",
+#   'categ'||rel.category_id as "category_id:id"
+#   from
+#   res_partner_category_rel rel, res_partner r
+#   where rel.partner_id=r.id
+#   """
+#)
+#res.partner
+import_sql(cr,
+    'res.partner.csv',
+    """
+    select
+    'partner'||r.id as id,
+    r.lang,
+    r.website,
+    r.name,
+    r.comment,
+
+    r.active
+    from
+    res_partner r
+    """
+)
+
+#   (select cat.name||'\N' from res_partner r1, res_partner_category cat,res_partner_category_rel rel where r1.id=rel.partner_id and rel.category_id=cat.id) as "category_id",
+#   title,
+
+#res.partner.address
+import_sql(cr,
+    'res.partner.address.csv',
+    """
+    select
+    'address'||id as id,
+    coalesce('partner'||partner_id,'partner_unknown') as "partner_id:id",
+    name,
+    street,
+    zip,
+    city,
+    email,
+    phone,
+    type,
+    mobile,
+    fax
+    from
+    res_partner_address
+    """
+)
+#   'country'||country as "country_id:id",
+
+
+#auction.lot.category
+
+import_sql(cr,
+    'auction.lot.category.csv',
+    """
+    select
+        'cat'||id as "id",
+        name,
+        active
+    from
+        auction_lot_category
+    order by
+        id
+    """
+)
+#auction.dates.csv
+
+import_sql(cr,
+    'auction.dates.csv',
+    """
+    select
+    
+        'date'||id as "id",
+        'Auction'||id as "name",
+        expo1,
+        expo2,
+        'auction_db.account'||acc_expense as "acc_expense:id",
+        'auction_db.account'||acc_income as "acc_income:id",
+        coalesce(state,'draft') as "state",
+        auction1,
+        auction2,
+        'account.expenses_journal' as "journal_seller_id:id",
+        'account.sales_journal' as "journal_id:id",
+        'auction_db.aaa_un' as "account_analytic_id:id"
+        
+    from
+        auction_dates
+    order by
+        id
+    """
+)
+
+# auction.artist.csv
+
+import_sql(cr,
+    'auction.artists.csv',
+    """
+    select
+        'artist'||id as "id",
+        name,
+        biography,
+        birth_death_dates
+        
+    from
+        auction_artists
+    order by
+        id
+    """
+)
+
+
+# auction.deposit.csv
+
+import_sql(cr,
+    'auction.deposit.csv',
+    """
+    select
+        'deposit'||id as "id",
+        name,
+        date_dep,
+        coalesce('auction_db.partner'||partner_id,'auction_db.partner_unknown') as "partner_id:id",
+        method,
+        'auction_db.tax'||tax_id as "tax_id:id",
+        total_neg
+        
+    from
+        auction_deposit
+    order by
+        id
+    """
+)
+
+
+#lot 
+import_sql(cr,
+    'auction.lots.csv',
+    """
+    select
+        'lot'||l.id as id,      
+        'auction_db2.date'||l.auction_id as "auction_id:id",
+        'auction_db2.deposit'||l.bord_vnd_id as "bord_vnd_id:id",
+        l.name,
+        l.name2,
+        l.author_right,
+        l.lot_est1,
+        l.lot_est1,
+        l.lot_local,
+        l.artist_id,
+        l.artist2_id,
+        l.important,
+        l.obj_desc,
+        l.obj_num,
+        l.obj_ret,
+        l.obj_comm,
+        l.obj_price,
+        l.ach_avance,
+        l.ach_login,
+        'auction_db.partner'||l.ach_uid as "ach_uid:id",
+        l.ach_emp,
+        l.vnd_lim,
+        l.vnd_lim_net,
+        coalesce(l.state,'draft') as "state",
+        'auction_db.product_product_unknown' as "product_id:id" 
+    from
+        auction_lots l join auction_dates d on (l.auction_id=d.id) join auction_deposit o on (l.bord_vnd_id=o.id) where d.expo2 like '2007%' 
+    order by
+        l.id
+    """
+)
+
+
+#       'auction_db.invoice'||ach_inv_id as "ach_inv_id:id",
+#       'auction_db.invoice'||ach_inv_id as "sel_inv_id:id",
+
+def _deposit(cr, rec):
+    if not rec[3]:
+        rec[3] = '6025'
+    return rec
+
+
+
+
+# 'invoice'||invoice_id as "invoice_id:id",
+import_sql(cr,
+    'account.invoice.csv',
+    """
+    select
+        'invoice'||id as "id",
+        comment,
+        date_due,
+        number,
+        'base.main_company' as "company_id:id",
+        'auction_db.address'||address_invoice_id as "address_invoice_id:id",
+        'auction_db.partner'||partner_id as "partner_id:id",
+        state,
+        type,
+        'auction_db.account'||account_id as "account_id:id",
+        date_invoice,
+        name,
+        'auction_db.address'||address_contact_id as "address_contact_id:id"
+    from
+        account_invoice
+    order by
+        id
+    """
+)
+
+import_sql(cr,
+    'account.invoice.line.csv',
+    """
+    select
+        name,
+        'invoice'||invoice_id as "invoice_id:id",
+        price_unit,
+        'auction_db.account'||account_id as "account_id:id",
+        quantity
+    from
+        account_invoice_line
+    order by
+        id
+    """
+)
+
+#auction.bid.csv
+
+import_sql(cr,
+    'auction.bid.csv',
+    """
+    select
+        'bid'||b.id as "id",
+        'date'||b.auction_id as "auction_id:id",
+        coalesce('auction_db.partner'||b.partner_id,'auction_db.partner_unknown') as "partner_id:id",
+        b.name,
+        b.contact_tel 
+    from
+        auction_bid b join auction_dates d on (b.auction_id=d.id) where d.expo2 like '2007%'
+    order by
+        b.id
+    """
+)
+
+
+#auction.bid_line.csv
+import_sql(cr,
+    'auction.bid_line.csv',
+    """
+    select 
+        line.name,
+        'auction_db2.bid'||line.bid_id as "bid_id:id",
+        'auction_db3.lot'||line.lot_id as "lot_id:id",
+        line.price,
+        line.call
+        
+    from
+        auction_bid_line line join auction_bid b on (b.id=line.bid_id) join auction_lots lot on (lot.id=line.lot_id) join auction_deposit o on (lot.bord_vnd_id=o.id)  join auction_dates d on (lot.auction_id=d.id) where d.expo2 like '2007%' and o.date_dep like '2007%'
+    order by
+        line.id
+    """
+)
+
+
+
+
+
+
+cr.close()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/migrate/v_migrate.py b/addons/auction/migrate/v_migrate.py
new file mode 100644
index 00000000000..8b96b1243c4
--- /dev/null
+++ b/addons/auction/migrate/v_migrate.py
@@ -0,0 +1,120 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+
+import psycopg
+import csv
+
+db_old = "in"
+print 'Extracting data from db '+db_old
+#
+#def import_sql(cr, fname, query, fields=None, trigger=None):
+#   cr.execute(query)
+#   fp = file(fname,'wb')
+#   result = cr.fetchall()
+#   if trigger:
+#       result = map(lambda x: tuple(trigger(cr, list(x))), result)
+#   writer = csv.writer(fp,lineterminator='\n')
+#   writer.writerow(["id","lang","website","name","comment","active","category_id"])
+#   for line in result:
+#       cr.execute("SELECT c.name from res_partner_category_rel r join res_partner p on (p.id=r.partner_id)  join res_partner_category c on (r.category_id=c.id) where p.name=%s",(line[3],))
+#       cats= ",".join([l[0] for l in cr.fetchall()])
+#       print "cats",cats
+#       line=line + (cats,)
+#       writer.writerow(line)
+#   fp.close()
+#
+#db = psycopg.connect("dbname="+db_old)
+#cr = db.cursor()
+def import_sql(cr, fname, query, fields=None, trigger=None):
+    cr.execute(query)
+    fp = file(fname,'wb')
+    result = cr.fetchall()
+    if trigger:
+        result = map(lambda x: tuple(trigger(cr, list(x))), result)
+    writer = csv.writer(fp,lineterminator='\n')
+    writer.writerow(["id","lang","website","name","comment","active","category_id"])
+    for line in result:
+        cr.execute("SELECT c.name from res_partner_category_rel r join res_partner p on (p.id=r.partner_id)  join res_partner_category c on (r.category_id=c.id) where p.name=%s",(line[3],))
+        l = ''
+        for x in cr.fetchall():
+            if not l:
+                l = x[0]
+            else:
+                l += ',' + x[0]
+        writer.writerow(line + (l,))
+
+
+#       print l
+#       head,tail= l[:1], l[1:]
+#       if not head: head= [None]
+#       writer.writerow(line+tuple(head))
+#       for t in tail:
+#           writer.writerow((None,None,None,None,None,None)+(t,))
+
+
+#       for l in cr.fetchall():
+#           a=0
+#           lenght=len(l)
+#           line=line + (l[a],)
+#           print "l[0]",a,l[a]
+#           print line
+#           writer.writerow(line)
+#           a=a+1
+#           while a< lenght:
+#               line2=(None,None,None,None,None,None,) +(l[a],)
+#               writer.writerow(line2)
+#               a=a+1
+    fp.close()
+
+    #       if l[0] != cats:
+    #           line2=",,,,,"+(l[0][1:],)
+    #           print "line2",line2
+db = psycopg.connect("dbname="+db_old)
+cr = db.cursor()
+
+cr.execute("update auction_lots set state='draft' where state is null or state = '' ")
+cr.execute("update auction_lots set state='sold' where state='invoiced'")
+
+
+cr.execute('select id,name from res_partner')
+res= cr.fetchall()
+names=[]
+for r in res:
+    if r[1] in names:
+        cr.execute("update res_partner set name= %s where id=%d",(r[1]+str(r[0]),r[0]))
+    else:
+        names.append(r[1])
+
+
+##clients category
+#import_sql(cr, 
+#   'res.partner.category.csv',
+#   """
+#   select
+#   name,
+#   active
+#   from 
+#   res_partner_category
+#   """
+#)
+
+#res.partner
+import_sql(cr,
+    'res.partner.csv',
+    """
+    select
+    'partner'||r.id as id,
+    r.lang,
+    r.website,
+    r.name,
+    r.comment,
+    r.active
+    from
+    res_partner r --limit 10
+    """
+)
+
+
+#   (select cat.name||'\N' from res_partner r1, res_partner_category cat,res_partner_category_rel rel where r1.id=rel.partner_id and rel.category_id=cat.id) as "category_id",
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/__init__.py b/addons/auction/report/__init__.py
new file mode 100644
index 00000000000..e5044a270b8
--- /dev/null
+++ b/addons/auction/report/__init__.py
@@ -0,0 +1,61 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 flagey_huissier
+import total
+import auction_invoice
+import seller_address
+import artists_lots
+import lots_list
+import lots_list_inventory
+import auction_result
+import catelogwithpictures
+import auction_objects
+import buyer_form_report
+import seller_form_report
+
+
+
+import buyer_list
+
+import auction_catelog
+import auction_buyer_result
+#import auction_total_rml
+#import auction_report
+import auction_total_rml
+import deposit_seller
+import auction_artists
+import bids_lots
+import bids_phones_details
+import auction_bids
+import catalog2
+import report_lot_bar_code
+import huissier
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/ach_bordereau.xml b/addons/auction/report/ach_bordereau.xml
new file mode 100644
index 00000000000..a1314f79241
--- /dev/null
+++ b/addons/auction/report/ach_bordereau.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<borderform-list>
+	<city type="data" name="city"/>
+	<date type="function" name="today"/>
+
+	<borderform type="fields" name="ach_login,auction_id,ach_uid">
+		<title type="field" name="auction_id.name"/>
+		<login type="field" name="ach_login"/>
+		<client_info type="zoom" name="ach_uid">
+			<name type="field" name="name"/>
+			<ref type="field" name="ref"/>
+			<title type="field" name="title"/>
+			<street type="field" name="address.street"/>
+			<street2 type="field" name="address.street2"/>
+			<zip type="field" name="address.zip"/>
+			<city type="field" name="address.city"/>
+			<!--<country type="field" name="address.country.name"/>-->
+			<phone type="field" name="address.phone"/>
+			<mobile type="field" name="address.mobile"/>
+		</client_info>
+		<objects>
+			<cost type="call" name="compute_buyer_costs" args="">
+					<!--<name value="name"/>-->
+					<amount value="amount"/>
+			</cost>
+
+			<!--<cost type="field" name="auction_id.buyer_costs"/>
+					<name value="name"/>
+					<amount value="amount"/>
+			</cost>-->
+
+
+			<!--<cost type="call" name="compute_buyer_costs" args="">
+				<name value="name"/>
+					<amount value="amount"/>
+			</cost>-->
+
+
+
+
+
+			<object type="fields" name="obj_num,id">
+				<id type="field" name="id"/>
+				<barcode type="field" name="id" addchecksum="false" print-text="true"/>
+				<!--<barcode value="id" addchecksum="false" print-text="true"/>
+-->
+				<cost type="call" name="compute_buyer_costs" args="">
+					<!--<id value="id"/>-->
+					<amount value="amount"/>
+				</cost>
+				<barcode type="field" name="id"/>
+				<ref type="field" name="obj_num"/>
+				<title type="field" name="name"/>
+				<desc type="field" name="obj_desc"/>
+				<price type="field" name="obj_price"/>
+				<avance type="field" name="ach_avance"/>
+				<state type="field" name="state"/>
+			</object>
+		</objects>
+	</borderform>
+</borderform-list>
diff --git a/addons/auction/report/ach_bordereau.xsl b/addons/auction/report/ach_bordereau.xsl
new file mode 100644
index 00000000000..e95eddfe35d
--- /dev/null
+++ b/addons/auction/report/ach_bordereau.xsl
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/rml_template.xsl"/>
+
+
+
+<xsl:template name="first_page_frames">
+		<xsl:if test="$page_format='a4_normal'">
+			<frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="22.0cm"/>
+		</xsl:if>
+
+		<xsl:if test="$page_format='a4_letter'">
+			<frame id="address" x1="11cm" y1="21.5cm" width="6cm" height="1cm"/>
+			<frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="21.0cm"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template match="/">
+		<xsl:call-template name="rml"/>
+	</xsl:template>
+	<xsl:template name="stylesheet">
+		<paraStyle name="login-title" fontName="Helvetica" fontSize="12"/>
+		<paraStyle name="login" fontName="Helvetica-Bold" fontSize="16"/>
+		<paraStyle name="style1"  leftIndent="10cm" fontName="Helvetica-Bold" />
+		<paraStyle name="cost-name" fontName="Helvetica-BoldOblique" fontSize="10" alignment="RIGHT"/>
+		<blockTableStyle id="objects">
+			 <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
+			 <lineStyle kind="LINEBELOW" start="0,0" stop="-1,0"/>
+		</blockTableStyle>
+		<blockTableStyle id="object-totals">
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="RIGHT" start="2,0" stop="-1,-1"/>
+			 <lineStyle kind="LINEABOVE" start="-1,0" stop="-1,0"/>
+			 <lineStyle kind="LINEABOVE" start="-1,-1" stop="-1,-1"/>
+		</blockTableStyle>
+</xsl:template>
+
+	<xsl:template name="story">
+		<xsl:apply-templates select="borderform-list"/>
+	</xsl:template>
+
+	<xsl:template match="borderform-list">
+		<xsl:apply-templates select="borderform">
+			<xsl:sort order="ascending" select="client_info/name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+	<xsl:template match="client_info">
+			<para style="style1">
+  				 <xsl:value-of select="title"/>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="name"/>
+
+		</para>
+		<para style="style1"><xsl:value-of select="street"/></para>
+		<para style="style1"><xsl:value-of select="street2" /></para>
+		<para style="style1">
+			<xsl:value-of select="zip"/>
+			<xsl:text> </xsl:text>
+			<xsl:value-of select="city"/>
+		</para>
+		<para style="style1"><xsl:value-of select="country"/></para>
+			<spacer length="0.4cm" width="1mm"/>
+			<spacer length="0.8cm"/>
+	</xsl:template>
+
+	<xsl:template match="borderform">
+	<setNextTemplate name="other_pages"/>
+		<nextFrame/>
+		<xsl:apply-templates select="client_info"/>
+		<spacer length="0.8cm"/>
+<!--		<setNextTemplate name="other_pages"/>-->
+<!--		<nextFrame/>-->
+		<para style="login-title" t="1">Plate Number:</para>
+		<para style="login"><xsl:value-of select="login"/></para>
+
+		<spacer length="1cm"/>
+
+		<para>
+			<b t="1">Document</b>: <xsl:text t="1">Buyer form</xsl:text>
+		</para><para>
+			<b t="1">Auction</b>: <xsl:value-of select="title"/>
+		</para>
+		<xsl:if test="client_info">
+			<para>
+				<b t="1">Customer Contact</b>:
+				<xsl:value-of select="client_info/phone"/>
+				<xsl:if test="number(string-length(client_info/mobile) &gt; 0) + number(string-length(client_info/phone) &gt; 0) = 2">
+					<xsl:text> - </xsl:text>
+				</xsl:if>
+				<xsl:value-of select="client_info/mobile"/>
+			</para><para>
+				<b t="1">Customer Reference</b>: <xsl:value-of select="client_info/ref"/>
+			</para>
+		</xsl:if>
+		<spacer length="1cm"/>
+		<xsl:apply-templates select="objects"/>
+<!--		<setNextTemplate name="first_page"/>-->
+<!--<pageBreak/>-->
+	</xsl:template>
+	<xsl:template match="objects">
+		<blockTable colWidths="0.2cm,1.4cm,9.0cm,1.5cm,2.3cm,2.0cm" style="objects">
+
+			<tr>
+				<td t="1"></td>
+				<td t="1">Cat</td>
+				<td t="1">Description</td>
+				<td t="1">Paid</td>
+				<td t="1">Adj.(EUR)</td>
+				<td t="1">Total</td>
+			</tr>
+			<xsl:apply-templates select="object"/>
+		</blockTable>
+		<condPageBreak height="1.2cm"/>
+		<blockTable colWidths="0.2cm,1.4cm,9.0cm,1.5cm,2.3cm,2.0cm" style="object-totals">
+			<tr>
+				<td/>
+				<td/>
+				<td/>
+
+				<td/>
+				<td t="1">Subtotal:</td>
+				<td><xsl:value-of select="format-number(sum(object[price != '']/price), '#,##0.00')"/></td>
+			</tr>
+<!--			<xsl:apply-templates select="cost"/>-->
+			<tr>
+				<td/>
+				<td/>
+				<td/>
+
+				<td/>
+				<td t="1">Buyer Cost:</td>
+				<td><xsl:value-of select="format-number(sum(object/cost/amount), '#,##0.00')"/></td>
+			</tr>
+			<tr>
+				<td/>
+				<td/>
+				<td/>
+
+				<td/>
+				<td t="1">Total:</td>
+				<td><xsl:value-of select="format-number(sum(object[price != '']/price) + sum(object/cost/amount), '#,##0.00')"/></td>
+			</tr>
+		</blockTable>
+	</xsl:template>
+
+
+
+	<xsl:template match="object">
+		<tr>
+			<td></td>
+			<td><xsl:value-of select="ref"/></td>
+			<td>
+				<para>
+					<b><xsl:value-of select="title"/><xsl:text>. </xsl:text></b>
+					<xsl:value-of select="desc"/>
+				</para>
+			</td>
+			<td><xsl:if test="state='paid'"><xsl:text>X</xsl:text></xsl:if></td>
+			<td>
+				<xsl:if test="price!=''">
+					<xsl:value-of select="format-number(price, '#,##0.00')"/>
+				</xsl:if>
+			</td>
+
+			<td>
+				<xsl:if test="price!=''">
+					<xsl:value-of select="format-number(price + sum(cost/amount), '#,##0.00')"/>
+				</xsl:if>
+			</td>
+		</tr>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/ach_bordereau_photo.xml b/addons/auction/report/ach_bordereau_photo.xml
new file mode 100644
index 00000000000..207107d172d
--- /dev/null
+++ b/addons/auction/report/ach_bordereau_photo.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<borderform-list>
+	<city type="data" name="city"/>
+	<date type="function" name="today"/>
+
+	<borderform type="fields" name="ach_login,auction_id,ach_uid">
+		<title type="field" name="auction_id.name"/>
+		<login type="field" name="ach_login"/>
+		<client_info type="zoom" name="ach_uid">
+			<name type="field" name="name"/>
+			<ref type="field" name="ref"/>
+			<title type="field" name="title"/>
+			<street type="field" name="address.street"/>
+			<street2 type="field" name="address.street2"/>
+			<zip type="field" name="address.zip"/>
+			<city type="field" name="address.city"/>
+			<!--<country type="field" name="address.country.name"/>-->
+			<phone type="field" name="address.phone"/>
+			<mobile type="field" name="address.mobile"/>
+		</client_info>
+		<objects>
+<!--			<cost type="call" name="compute_buyer_costs" args="">-->-->
+				<name value="name"/>
+				<amount value="amount"/>
+<!--			</cost>-->
+			<object type="fields" name="obj_num,id">
+				<ref type="field" name="obj_num"/>
+				<title type="field" name="name"/>
+				<desc type="field" name="obj_desc"/>
+				<price type="field" name="obj_price"/>
+				<avance type="field" name="ach_avance"/>
+				<state type="field" name="state"/>
+				<image type="attachment" name="id"/>
+			</object>
+		</objects>
+	</borderform>
+</borderform-list>
diff --git a/addons/auction/report/ach_bordereau_photo.xsl b/addons/auction/report/ach_bordereau_photo.xsl
new file mode 100644
index 00000000000..22526d37883
--- /dev/null
+++ b/addons/auction/report/ach_bordereau_photo.xsl
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/rml_template.xsl"/>
+
+	<xsl:template match="/">
+		<xsl:call-template name="rml"/>
+	</xsl:template>
+
+	<xsl:template name="stylesheet">
+		<paraStyle name="login-title" fontName="Helvetica" fontSize="12"/>
+		<paraStyle name="login" fontName="Helvetica-Bold" fontSize="16"/>
+
+		<blockTableStyle id="objects">
+			 <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
+			 <lineStyle kind="LINEBELOW" start="0,0" stop="-1,0"/>
+		</blockTableStyle>
+
+		<blockTableStyle id="object-totals">
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="RIGHT"/>
+			 <lineStyle kind="LINEABOVE" start="-1,0" stop="-1,0"/>
+			 <lineStyle kind="LINEABOVE" start="-1,-1" stop="-1,-1"/>
+		</blockTableStyle>
+	</xsl:template>
+
+	<xsl:template name="story">
+		<xsl:apply-templates select="borderform-list"/>
+	</xsl:template>
+
+	<xsl:template match="borderform-list">
+		<xsl:apply-templates select="borderform">
+			<xsl:sort order="ascending" select="client_info/name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="client_info">
+		<para>
+			<b>
+				<xsl:value-of select="title" />
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="name"/>
+			</b>
+		</para>
+		<para><xsl:value-of select="street"/></para>
+		<para><xsl:value-of select="street2"/></para>
+		<para>
+			<xsl:value-of select="zip"/>
+			<xsl:text> </xsl:text>
+			<xsl:value-of select="city"/>
+		</para>
+<!--		<para><xsl:value-of select="country"/></para>-->
+	</xsl:template>
+
+	<xsl:template match="borderform">
+		<xsl:apply-templates select="client_info"/>
+
+		<setNextTemplate name="other_pages"/>
+		<nextFrame/>
+
+		<para style="login-title" t="1">Plate Number:</para>
+		<para style="login"><xsl:value-of select="login"/></para>
+
+		<spacer length="1cm"/>
+
+		<para>
+			<b t="1">Document</b>: <xsl:text t="1">Buyer form</xsl:text>
+		</para><para>
+			<b t="1">Auction</b>: <xsl:value-of select="title"/>
+		</para>
+
+		<xsl:if test="client_info">
+			<para>
+				<b t="1">Customer Contact</b>:
+				<xsl:value-of select="client_info/phone"/>
+				<xsl:if test="number(string-length(client_info/mobile) &gt; 0) + number(string-length(client_info/phone) &gt; 0) = 2">
+					<xsl:text> - </xsl:text>
+				</xsl:if>
+				<xsl:value-of select="client_info/mobile"/>
+			</para><para>
+				<b t="1">Customer Reference</b>: <xsl:value-of select="client_info/ref"/>
+			</para>
+		</xsl:if>
+
+		<spacer length="1cm"/>
+
+		<xsl:apply-templates select="objects"/>
+
+		<setNextTemplate name="first_page"/>
+		<pageBreak/>
+	</xsl:template>
+
+	<xsl:template match="objects">
+		<blockTable colWidths="3.1cm,1.8cm,9.6cm,1.5cm,2.2cm" style="objects">
+			<tr>
+				<td/>
+				<td t="1">Cat. N.</td>
+				<td t="1">Description</td>
+				<td t="1">Paid</td>
+				<td t="1">Adj.(EUR)</td>
+			</tr>
+			<xsl:apply-templates select="object"/>
+		</blockTable>
+		<condPageBreak height="3.2cm"/>
+		<blockTable colWidths="3.1cm,1.8cm,9.6cm,1.5cm,2.2cm" style="object-totals">
+			<tr>
+				<td/>
+				<td/>
+				<td/>
+				<td t="1">Subtotal:</td>
+				<td><xsl:value-of select="format-number(sum(object[price != '']/price), '#,##0.00')"/></td>
+			</tr>
+			<xsl:apply-templates select="cost"/>
+			<tr>
+				<td/>
+				<td/>
+				<td/>
+				<td t="1">Total:</td>
+				<td><xsl:value-of select="format-number(sum(object[price != '']/price) + sum(cost/amount), '#,##0.00')"/></td>
+			</tr>
+		</blockTable>
+	</xsl:template>
+
+	<xsl:template match="cost">
+		<tr>
+			<td/>
+			<td/>
+			<td/>
+			<td><xsl:value-of select="name"/>:</td>
+			<td><xsl:value-of select="format-number(amount, '#,##0.00')"/></td>
+		</tr>
+	</xsl:template>
+
+	<xsl:template match="object">
+		<tr>
+			<td>
+				<xsl:if test="image">
+					<image width="2.5cm" height="2.2cm">
+						<xsl:attribute name="name"><xsl:value-of select="image"/></xsl:attribute>
+					</image>
+				</xsl:if>
+			</td>
+			<td><xsl:value-of select="ref"/></td>
+			<td>
+				<para>
+					<b><xsl:value-of select="title"/><xsl:text>. </xsl:text></b>
+					<xsl:value-of select="desc"/>
+				</para>
+			</td>
+			<td><xsl:if test="state='paid'"><xsl:text>X</xsl:text></xsl:if></td>
+			<td>
+				<xsl:if test="price!=''">
+					<xsl:value-of select="format-number(price, '#,##0.00')"/>
+				</xsl:if>
+			</td>
+		</tr>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/artists.xml b/addons/auction/report/artists.xml
new file mode 100644
index 00000000000..0c63f338051
--- /dev/null
+++ b/addons/auction/report/artists.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE artists>
+<artists>
+	<artist type="fields" name="name,id">
+		<name type="field" name="name"></name>
+		<birth_death_dates type="field" name="birth_death_dates"></birth_death_dates>
+		<biography type="field" name="biography"></biography>
+	</artist>
+</artists>
diff --git a/addons/auction/report/artists.xsl b/addons/auction/report/artists.xsl
new file mode 100644
index 00000000000..98e3bde4b01
--- /dev/null
+++ b/addons/auction/report/artists.xsl
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<xsl:template match="/">
+			<xsl:apply-templates select="artists"/>
+</xsl:template>
+
+
+<xsl:template match="artists">
+
+	<document>
+		<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Bids report" author="Generated by Tiny ERP, Fabien Pinckaers">
+
+
+			<pageTemplate id="all">
+				<pageGraphics/>
+					<frame id="principal" x1="1.0cm" y1="2.0cm" width="19.0cm" height="26.0cm" alignment="center"/>
+			</pageTemplate>
+		</template>
+
+		<stylesheet>
+		<paraStyle name="spacebefore" alignment="center" fontName="Courier" fontSize="12" spaceBefore="0" spaceAfter="0"/>
+		<paraStyle name="spaceafter" fontName="Courier" fontSize="12" spaceBefore="0" spaceAfter="0"/>
+
+		<blockTableStyle id="artist">
+			<blockLeftPadding  start="0,0" stop="-1,-1" length="5mm"/>
+			<blockRightPadding start="0,0" stop="-1,-1" length="5mm"/>
+			<blockTopPadding start="0,0" stop="-1,0" length="5mm"/>
+			<blockBottomPadding start="0,0" stop="-1,0" length="2mm"/>
+			<blockBottomPadding start="0,-1" stop="-1,-1" length="5mm"/>
+
+			<blockValign value="TOP"/>
+			<blockAlignment value="LEFT"/>
+			<lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,0"/>
+			<lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
+			<lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+			<lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="0,-1"/>
+			<lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+		</blockTableStyle>
+		</stylesheet>
+		<story>
+
+	<xsl:apply-templates select="artist"/>
+	</story>
+	</document>
+</xsl:template>
+
+
+<xsl:template match="artist">
+
+			<blockTable repeatRows="1" style="artist" colWidths="18.0cm">
+				<tr>
+					<td>
+						<para style="spacebefore"><b><xsl:value-of select="name"/><xsl:text> (</xsl:text><xsl:value-of select="birth_death_dates"/><xsl:text>)</xsl:text></b></para>
+					</td>
+				</tr>
+
+				<tr>
+					<td>
+						<para style="spaceafter"><xsl:value-of select="biography"/></para>
+					</td>
+				</tr>
+			</blockTable>
+
+			<blockTable rowHeights="2cm" colWidths="18.0cm">
+				<tr>
+					<td>
+					</td>
+				</tr>
+			</blockTable>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/artists_lots.py b/addons/auction/report/artists_lots.py
new file mode 100644
index 00000000000..92c59720458
--- /dev/null
+++ b/addons/auction/report/artists_lots.py
@@ -0,0 +1,61 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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.
+#
+##############################################################################
+
+from report.interface import report_int
+import netsvc
+
+class report_artistlot(report_int):
+    def __init__(self, name):
+        report_int.__init__(self, name)
+
+    def create(self,cr, uid, ids, datas, context):
+        service = netsvc.LocalService("object_proxy")
+        lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', ids, ['artist_id'])
+        print " THE VALUE GET BY THE ARTIST TABLE",lots;
+        artists = []
+        for lot in lots:
+            if lot['artist_id'] and lot['artist_id'] not in artists:
+                artists.append(lot['artist_id'][0])
+
+        print "THE VALUES OF ARTIST LIST",artists;
+        if not len(artists):
+            raise 'UserError', 'Objects '
+
+        datas['ids'] = artists
+
+        self._obj_report = netsvc.LocalService('report.report.auction.artists')
+        return self._obj_report.create(cr,uid, artists, datas, context)
+
+    def result(self):
+        return self._obj_report.result()
+
+report_artistlot('report.auction.artists_lots')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/auction_artists.py b/addons/auction/report/auction_artists.py
new file mode 100644
index 00000000000..74fcd680278
--- /dev/null
+++ b/addons/auction/report/auction_artists.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+
+class auction_artists(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(auction_artists, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+
+        })
+report_sxw.report_sxw('report.auction.artists', 'auction.lots', 'addons/auction/report/auction_artists.rml',parser=auction_artists)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/auction_artists.rml b/addons/auction/report/auction_artists.rml
new file mode 100644
index 00000000000..d9d212f26ff
--- /dev/null
+++ b/addons/auction/report/auction_artists.rml
@@ -0,0 +1,75 @@
+<?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="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="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <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="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Courier-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Courier" fontSize="11.0" leading="14" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Courier" fontSize="11.0" leading="14" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Courier" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.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-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font face="Times-Roman" size="7.0">[[ repeatIn(objects,'o') ]]</font>
+    </para>
+    <para style="P3">
+      <font color="white"> .........</font>
+    </para>
+    <para style="P4"><font face="Times-Roman" size="12.0">Article</font>: <font face="Times-Roman" size="11.0">[[o.product_id and o.product_id.name or False]]</font></para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="474.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P5"/>
+          <para style="P6">[[o.artist_id and 'Artist1: '+o.artist_id.name or False]]</para>
+          <para style="P7">[[o.artist_id and 'Biography: '+o.artist_id.biography or False]]</para>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+          <para style="P6">[[o.artist2_id and 'Artist2: '+o.artist2_id.name or False]]</para>
+          <para style="P8">
+            <font face="Courier">[[o.artist_id2 and 'Biography: '+o.artist_id2.biography or False]]</font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P9">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/multi_company_account/__terp__.py b/addons/auction/report/auction_bids.py
similarity index 72%
rename from addons/multi_company_account/__terp__.py
rename to addons/auction/report/auction_bids.py
index 9294a0ae6ca..7c3d5e83aaa 100644
--- a/addons/multi_company_account/__terp__.py
+++ b/addons/auction/report/auction_bids.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
 #
 # $Id$
 #
@@ -25,19 +25,22 @@
 # 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.
-###############################################################################
-{
-    "name" : "Multi company for accounting module",
-    "version" : "0.1",
-    "author" : "Tiny",
-    "depends" : ["base", "account", "multi_company"],
-    "category" : "Generic Modules/Accounting",
-    "init_xml" : [],
-    "demo_xml" : ["multi_company_account_demo.xml",],
-    "update_xml" : ["multi_company_account_data.xml", "multi_company_account_view.xml",],
-    "active": False,
-    "installable": True
-}
+#
+##############################################################################
+
+
+import pooler
+import time
+from report import report_sxw
+
+
+class auction_bids(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(auction_bids, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+        })
+report_sxw.report_sxw('report.auction.bids', 'auction.bid', 'addons/auction/report/auction_bids.rml',parser=auction_bids)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/auction/report/auction_bids.rml b/addons/auction/report/auction_bids.rml
new file mode 100644
index 00000000000..72c61003dae
--- /dev/null
+++ b/addons/auction/report/auction_bids.rml
@@ -0,0 +1,91 @@
+<?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="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+      <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#cccccc" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#cccccc" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#cccccc" 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="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Courier" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Courier" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Courier" spaceBefore="0.0" spaceAfter="6.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="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="43.0,167.0,90.0,138.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P2">Bid </para>
+        </td>
+        <td>
+          <para style="P3">Buyer</para>
+        </td>
+        <td>
+          <para style="P2">Tel</para>
+        </td>
+        <td>
+          <para style="P2">Auction</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="43.0,167.0,90.0,138.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P4"><font face="Times-Roman" size="7.0">[[ repeatIn(objects,'o') ]]</font>[[o.name]]</para>
+        </td>
+        <td>
+          <para style="P4">[[ o.partner_id and o.partner_id.name or False]]</para>
+        </td>
+        <td>
+          <para style="P5">[[o.contact_tel]]</para>
+        </td>
+        <td>
+          <para style="P6">[[o.auction_id and o.auction_id.name or False]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/auction_buyer_result.py b/addons/auction/report/auction_buyer_result.py
new file mode 100644
index 00000000000..2eba63629fd
--- /dev/null
+++ b/addons/auction/report/auction_buyer_result.py
@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+
+class auction_buyer_result(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(auction_buyer_result, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+
+        })
+report_sxw.report_sxw('report.auction.buyer.result', 'auction.lots', 'addons/auction/report/auction_buyer_result.rml',parser=auction_buyer_result)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/auction_buyer_result.rml b/addons/auction/report/auction_buyer_result.rml
new file mode 100644
index 00000000000..3f07e8cdde8
--- /dev/null
+++ b/addons/auction/report/auction_buyer_result.rml
@@ -0,0 +1,85 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" rightIndent="13.0" leftIndent="11.0" fontName="Courier-BoldOblique" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="112.0,74.0,356.0" style="Table6">
+      <tr>
+        <td>
+          <para style="P2">Num</para>
+        </td>
+        <td>
+          <para style="P2">Adj</para>
+        </td>
+        <td>
+          <para style="P2">Buyer</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="112.0,74.0,356.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P1">[[repeatIn(objects,'o') ]]<font face="Times-Roman" size="12.0">[[o. obj_num ]]</font></para>
+        </td>
+        <td>
+          <para style="P1">[[ o.obj_price]]</para>
+        </td>
+        <td>
+          <para style="P3">[[o.ach_uid and o.ach_uid.name or False ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/auction_catelog.py b/addons/auction/report/auction_catelog.py
new file mode 100644
index 00000000000..d2638c41087
--- /dev/null
+++ b/addons/auction/report/auction_catelog.py
@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+
+class auction_catelog(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(auction_catelog, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+
+        })
+report_sxw.report_sxw('report.auction.catelog', 'auction.lots', 'addons/auction/report/auction_catelog.rml', parser=auction_catelog)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/auction_catelog.rml b/addons/auction/report/auction_catelog.rml
new file mode 100644
index 00000000000..688be5a1f08
--- /dev/null
+++ b/addons/auction/report/auction_catelog.rml
@@ -0,0 +1,86 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
+			 <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
+			 <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
+			 <blockTextColor colorName="white" start="0,0" stop="-1,0"/>
+			 <lineStyle kind="LINEBELOW" start="0,0" stop="-1,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+
+
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" alignment="RIGHT"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" rightIndent="17.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">[[ time.strftime('%Y-%m-%d') ]] </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="65.0,398.0,94.0" style="Table3">
+      <tr>
+        <td>
+          <para style="P3">Cat.N</para>
+        </td>
+        <td>
+          <para style="P3">Description</para>
+        </td>
+        <td>
+          <para style="P4">Estimate</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P5">[[ repeatIn(objects,'o') ]] <font face="Courier" size="9.0">[[o. obj_num ]]</font></para>
+        </td>
+        <td>
+          <para style="P6">[[o. name]]</para>
+        </td>
+        <td>
+          <para style="P7">[[o. lot_est1 ]]-[[o.lot_est2]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/auction_invoice.py b/addons/auction/report/auction_invoice.py
new file mode 100644
index 00000000000..2dbd74551cf
--- /dev/null
+++ b/addons/auction/report/auction_invoice.py
@@ -0,0 +1,59 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+from report.interface import report_int
+import netsvc
+
+class auction_invoice(report_int):
+    def __init__(self, name):
+        report_int.__init__(self, name)
+
+    def create(self,cr, uid, ids, datas, context):
+        service = netsvc.LocalService("object_proxy")
+        lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', ids, ['ach_inv_id'])
+
+        invoices = {}
+        for l in lots:
+            if l['ach_inv_id']:
+                invoices[l['ach_inv_id'][0]]=True
+        new_ids = invoices.keys()
+        if not len(new_ids):
+            raise 'UserError', 'Objects not Invoiced !'
+
+        datas['ids'] = new_ids
+
+        self._obj_invoice = netsvc.LocalService('report.account.invoice')
+        return self._obj_invoice.create(cr,uid, new_ids, datas, context)
+
+    def result(self):
+        return self._obj_invoice.result()
+
+auction_invoice('report.auction.invoice')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/auction_objects.py b/addons/auction/report/auction_objects.py
new file mode 100644
index 00000000000..64a3e9d976d
--- /dev/null
+++ b/addons/auction/report/auction_objects.py
@@ -0,0 +1,61 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+class auction_objects(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        print "int the report objects"
+        super(auction_objects, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            #'lines': self.lines
+            #'get_data' : self.get_data
+        })
+
+#   def lines(self, auction_id):
+#        print " in the lines fuction"
+#        print "value of  auction_id",auction_id.id,auction_id.name........................
+#
+#        cr.execute('select ad.name from auction_dates ad, a1uction_lots al where ad.id=al.%d group by ad.name',(auction_id))
+#        print "value of query",cr.fetchone()
+#        return self.cr.fetchone()[0]
+#   def get_data(self, auction_id):
+#       res = self.pool.get('auction.bid.lines').read(self.cr,self.uid,[lot_id])
+#       print res;
+#       print "=================================================="
+#       return True
+
+
+
+report_sxw.report_sxw('report.auction.objects', 'auction.lots', 'addons/auction/report/auction_objects.rml', parser=auction_objects)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/auction_objects.rml b/addons/auction/report/auction_objects.rml
new file mode 100644
index 00000000000..57131941f95
--- /dev/null
+++ b/addons/auction/report/auction_objects.rml
@@ -0,0 +1,217 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <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"/>
+      <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
+      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+      <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#cccccc" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#cccccc" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#cccccc" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="17.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" rightIndent="17.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="P8" fontName="Times-Roman" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="9.0" leading="11"/>
+    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P12" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P15" fontName="Times-Roman" fontSize="17.0" leading="21" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P16" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P17" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" backColor="#ffffff" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P18" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="142.0,226.0,157.0" repeatRows="1" style="Tableau1">
+      <tr>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+          <para style="P2">Buyer form with picture</para>
+        </td>
+        <td>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="Table Contents">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">Currency: [[ company.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">[[ repeatIn(objects,'o') ]]</para>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <para style="P8">Printed on: [[ time.strftime('%Y-%m-%d') ]]</para>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <para style="P9">[[ setTag('para','image',{'width':'100.0','height':'80.0','name':str(o.id)}) ]][[ o.image or setTag('image','para') ]]</para>
+    <para style="P10">
+      <font color="white"> </font>
+    </para>
+    <para style="P8"><font face="Times-Roman">Auction</font>: [[ o.auction_id.name ]]</para>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+    <para style="P12">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="95.0,165.0,73.0,192.0" style="Tableau2">
+      <tr>
+        <td>
+          <para style="P4">Catalog No</para>
+        </td>
+        <td>
+          <para style="P4">Description</para>
+        </td>
+        <td>
+          <para style="P4">Paid</para>
+        </td>
+        <td>
+          <para style="P4">Adj(EUR)</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="147.0,113.0,73.0,192.0" style="Tableau3">
+      <tr>
+        <td>
+          <para style="P4">[[ o.obj_num ]]</para>
+        </td>
+        <td>
+          <para style="P13">[[ o.name ]]</para>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P14">Price </para>
+          <para style="P4"><font face="Times-Roman" size="9.0">Buyer Costs</font>:</para>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+          <para style="P15">Total:</para>
+        </td>
+        <td>
+          <blockTable colWidths="94.0,94.0" style="Table4">
+            <tr>
+              <td>
+                <para style="P16"/>
+              </td>
+              <td>
+                <para style="P16">[[ o.obj_price ]] </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P16">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P16">[[ sum_taxes(o.auction_id.id,o.obj_price) ]]</para>
+                <para style="P16">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P16">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P17">[[ o.obj_price + sum_taxes(o.auction_id.id,o.obj_price) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="P13">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P18">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/auction_result.py b/addons/auction/report/auction_result.py
new file mode 100644
index 00000000000..16bf45dd9f7
--- /dev/null
+++ b/addons/auction/report/auction_result.py
@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+
+class auction_result(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(auction_result, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+
+        })
+report_sxw.report_sxw('report.auction.result', 'auction.lots', 'addons/auction/report/auction_result.rml',parser=auction_result)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/auction_result.rml b/addons/auction/report/auction_result.rml
new file mode 100644
index 00000000000..0944c227ee8
--- /dev/null
+++ b/addons/auction/report/auction_result.rml
@@ -0,0 +1,87 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="13.0" leftIndent="11.0" fontName="Courier-BoldOblique" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Courier" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Courier" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" rightIndent="17.0" leftIndent="0.0" fontName="Courier-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" rightIndent="17.0" leftIndent="0.0" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" rightIndent="17.0" leftIndent="0.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" rightIndent="13.0" leftIndent="11.0" fontName="Courier-BoldOblique" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P8">
+      <font face="Courier" size="10.0"/>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="95.0,98.0" style="Table6">
+      <tr>
+        <td>
+          <para style="P1">Num</para>
+        </td>
+        <td>
+          <para style="P1">Adj</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="95.0,98.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P6">[[repeatIn(objects,'o') ]]<font face="Times-Roman" size="12.0">[[o. obj_num ]]</font></para>
+        </td>
+        <td>
+          <para style="P6">[[ o.obj_price]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P10">
+      <font color="white"> </font>
+    </para>
+    <para style="P10">
+      <font color="white"> </font>
+    </para>
+    <para style="P10">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/auction_total.rml b/addons/auction/report/auction_total.rml
new file mode 100644
index 00000000000..f394099d21e
--- /dev/null
+++ b/addons/auction/report/auction_total.rml
@@ -0,0 +1,229 @@
+<?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="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Courier" alignment="LEFT"/>
+    <paraStyle name="P2" fontName="Times-Roman"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="15.0" leading="19"/>
+    <paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Courier-Bold" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" alignment="LEFT"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Courier-Bold" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P7" rightIndent="17.0" leftIndent="0.0" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Courier" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="13.0" leading="16" 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-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <section>
+      <para style="P2">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="482.0" style="Table4">
+        <tr>
+          <td>
+            <para style="P3">Auction</para>
+            <para style="Standard">[[ repeatIn(get_auc_detail(objects),'ab') ]]
+            </para>
+            <para style="Standard">
+              <font face="Times-Roman"/>
+            </para>
+            <para style="P4">Auction name:[[ ab['name'] ]]</para>
+            <para style="P4">Auction Date:[[ ab['auction1'] ]]</para>
+            <para style="P4">
+              <font color="white"> </font>
+            </para>
+            <para style="P3">Items</para>
+            <para style="P4">
+              <font color="white"> </font>
+            </para>
+            <blockTable colWidths="238.0,238.0" style="Table6">
+              <tr>
+                <td>
+                  <para style="Standard"># of items:</para>
+                </td>
+                <td>
+                  <para style="Standard">
+                    <font face="Times-Roman" size="10.0">[[ sum_taxes(ab['id']) ]]</font>
+                  </para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard">Min Estimate:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[sum_minadj(ab['id']) ]]</para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard">Max Estimate:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[sum_maxadj(ab['id']) ]]</para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard"># of unsold items:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[sold_item(ab['id']) ]]</para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard">Adjudication:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[sum_adj(ab['id']) ]]</para>
+                </td>
+              </tr>
+            </blockTable>
+            <para style="P4">
+              <font color="white"> </font>
+            </para>
+            <para style="P4">
+              <font color="white"> </font>
+            </para>
+            <para style="P3">Buyers</para>
+            <para style="P4">
+              <font color="white"> </font>
+            </para>
+            <blockTable colWidths="238.0,238.0" style="Table1">
+              <tr>
+                <td>
+                  <para style="Standard"># of buyers:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[sum_buyer(ab['id']) ]]</para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard"># of paid items (based on invoices):</para>
+                </td>
+                <td>
+                  <para style="Standard">[[sum_buyer_paid (ab['id']) ]]</para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard"># of commissions:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[count_comm (ab['id']) ]]</para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard"># of items taken away:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[ count_take (ab['id']) ]]</para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard">Debit:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[ sum_credit(ab['id']) ]]</para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard">Paid:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[ chek_paid (ab['id']) ]]</para>
+                </td>
+              </tr>
+            </blockTable>
+            <para style="P7">
+              <font color="white"> </font>
+            </para>
+            <blockTable colWidths="238.0,238.0" style="Table2">
+              <tr>
+                <td>
+                  <para style="P3">Sellers</para>
+                </td>
+                <td>
+                  <para style="P9">
+                    <font color="white"> </font>
+                  </para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard"># of sellers:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[ sum_seller(ab['id']) ]]</para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard">Debit:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[sum_credit_seller(ab['id']) ]]</para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="Standard">Paid:</para>
+                </td>
+                <td>
+                  <para style="Standard">[[check_paid_seller(ab['id']) ]]</para>
+                </td>
+              </tr>
+            </blockTable>
+            <para style="P4">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+  </story>
+</document>
+
diff --git a/addons/auction/report/auction_total_rml.py b/addons/auction/report/auction_total_rml.py
new file mode 100644
index 00000000000..82a6e8f101f
--- /dev/null
+++ b/addons/auction/report/auction_total_rml.py
@@ -0,0 +1,169 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+
+class auction_total_rml(report_sxw.rml_parse):
+    total_obj=[]
+    def __init__(self, cr, uid, name, context):
+        super(auction_total_rml, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'sum_taxes':self.sum_taxes,
+            'sold_item':self.sold_item,
+            'sum_buyer':self.sum_buyer,
+            'sum_seller':self.sum_seller,
+            'sum_buyer_paid':self.sum_buyer_paid,
+            'sum_adj':self.sum_adj,
+            'count_comm':self.count_comm,
+            'sum_minadj':self.sum_minadj,
+            'sum_maxadj':self.sum_maxadj,
+            'sum_credit':self.sum_credit,
+            'sum_debit': self.sum_debit,
+            'chek_paid': self.chek_paid,
+            'check_paid_seller': self.check_paid_seller,
+            'count_take': self.count_take,
+            'sum_credit_seller':self.sum_credit_seller,
+            'sum_debit_buyer': self.sum_debit_buyer,
+            'get_auc_detail': self.get_auc_detail
+        })
+    def get_auc_detail(self,objects):
+        auc_lot_ids = []
+        for lot_id  in objects:
+            auc_lot_ids.append(lot_id.id)
+        self.total_obj=auc_lot_ids
+        self.cr.execute('select auction_id from auction_lots where id in ('+','.join(map(str,auc_lot_ids))+') group by auction_id')
+        auc_date_ids = self.cr.fetchall()
+        auct_dat=[]
+        for ad_id in auc_date_ids:
+            auc_dates_fields = self.pool.get('auction.dates').read(self.cr,self.uid,ad_id[0],['name','auction1','id'])
+            auct_dat.append(auc_dates_fields)
+        return auct_dat
+
+
+    def sum_taxes(self,auction_id):
+            self.cr.execute("select count(1) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d group by auction_id "%(auction_id))
+            res = self.cr.fetchone()
+            print "GGGGGGGGGgg",res[0]
+            return res[0]
+    def sold_item(self, object_id):
+        self.cr.execute("select count(1) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d and state in ('unsold') "%(object_id,))
+        res = self.cr.fetchone()
+        print "SOLD" ,res
+        return str(res[0])
+
+
+    def sum_buyer(self, auction_id):
+        self.cr.execute("select count(*) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d and (ach_uid is not null or ach_login is not null) "%(auction_id))
+        res = self.cr.fetchone()
+        return str(res[0])
+
+
+    def sum_seller(self, auction_id):
+        self.cr.execute("select count(distinct bord_vnd_id)  from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d AND bord_vnd_id is not null "%(auction_id))
+        res = self.cr.fetchone()
+        return res[0]
+
+    def sum_adj(self, auction_id):
+        self.cr.execute("select sum(obj_price) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d "%(auction_id))
+        res = self.cr.fetchone()
+        return str(res[0])
+
+    def count_take(self, auction_id):
+        self.cr.execute("select count(*) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d and ach_emp='True' "%(auction_id))
+        res = self.cr.fetchone()
+        return str(res[0])
+
+    def chek_paid(self, auction_id):
+        self.cr.execute("select count(1) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d and ((paid_ach='T') or (is_ok='T')) "%(auction_id))
+        res = self.cr.fetchone()
+        return str(res[0])
+    def check_paid_seller(self,auction_id):
+        print "hhhhhhh"
+        self.cr.execute("select sum(seller_price) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d and paid_vnd != 'T' "%(auction_id))
+        res = self.cr.fetchone()
+        print ">>>>>>>>>>>>>>",res
+        return str(res[0]) or 0.0
+
+    def sum_credit(self,auction_id):
+        print "object",auction_id
+
+        self.cr.execute("select sum(buyer_price) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d "%(auction_id))
+        res = self.cr.fetchone()
+        return str(res[0])
+
+    def sum_debit_buyer(self,auction_id):
+        self.cr.execute("select sum(buyer_price) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d "%(auction_id))
+        res = self.cr.fetchone()
+        return str(res[0] or 0)
+
+    def sum_debit(self,object_id):
+        self.cr.execute("select sum(seller_price) from auction_lots where auction_id=%d "%(object_id,))
+        res = self.cr.fetchone()
+        return str(res[0] or 0)
+
+    def sum_credit_seller(self, object_id):
+
+
+        self.cr.execute("select sum(seller_price) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d "%(object_id))
+        res = self.cr.fetchone()
+        return str(res[0] or 0)
+
+    def sum_minadj(self, auction_id):
+        self.cr.execute('select sum(lot_est1) from auction_lots where id in ('+','.join(map(str,self.total_obj))+') and auction_id=%d '%(auction_id))
+        res = self.cr.fetchone()
+        print "min est",res[0]
+        return str(res[0]) or 0
+
+    def sum_maxadj(self, auction_id):
+        self.cr.execute('select sum(lot_est2) from auction_lots where id in ('+','.join(map(str,self.total_obj))+') and auction_id=%d '%(auction_id))
+        res = self.cr.fetchone()
+        return str(res[0]) or 0
+
+    def sum_buyer_paid(self, auction_id):
+        self.cr.execute("select count(*) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d and state = 'paid' "%(auction_id))
+        res = self.cr.fetchone()
+        return str(res[0])
+
+    def count_comm(self, auction_id):
+        self.cr.execute("select count(*) from auction_lots where id in ("+",".join(map(str,self.total_obj))+") and auction_id=%d and obj_comm is not null "%(auction_id))
+        res = self.cr.fetchone()
+        return str(res[0])
+
+
+report_sxw.report_sxw('report.auction.total.rml', 'auction.lots', 'addons/auction/report/auction_total.rml',parser=auction_total_rml)
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/auction_total_rml.rml b/addons/auction/report/auction_total_rml.rml
new file mode 100644
index 00000000000..9fb70d789e5
--- /dev/null
+++ b/addons/auction/report/auction_total_rml.rml
@@ -0,0 +1,326 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="17.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Times-BoldItalic" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P5" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/>
+    <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="20.0" leading="25" alignment="LEFT"/>
+    <paraStyle name="P9" rightIndent="17.0" leftIndent="0.0" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/>
+    <paraStyle name="P12" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" fontName="Times-Roman" fontSize="13.0" leading="16" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Times-Roman" fontSize="13.0" leading="16" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P15" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/>
+    <paraStyle name="P16" fontName="Times-Roman" alignment="LEFT"/>
+    <paraStyle name="P17" fontName="Times-Roman" fontSize="13.0" leading="16" alignment="LEFT"/>
+    <paraStyle name="P18" fontName="Times-Roman" fontSize="20.0" leading="25"/>
+    <paraStyle name="P19" fontName="Times-Roman" fontSize="20.0" leading="25"/>
+    <paraStyle name="P20" fontName="Times-Roman"/>
+    <paraStyle name="P21" fontName="Times-Roman" alignment="LEFT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">[[ repeatIn(objects,'o') ]]</para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="140.0,385.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P4">
+            <font face="Times-Roman">Date printing:</font>
+          </para>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P6">[[ time.strftime('%Y-%m-%d') ]] </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="142.0,383.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P8">Auction</para>
+        </td>
+        <td>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P9">[[ repeatIn(objects,'o') ]]</para>
+        </td>
+        <td>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Auction: </para>
+        </td>
+        <td>
+          <para style="P6">[[ o.auction_id and o.auction_id.name or False]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Date:</para>
+        </td>
+        <td>
+          <para style="P6">[[ o.auction_id and o.auction_id.auction1 ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P10">
+      <font color="white"> </font>
+    </para>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="262.0,262.0" style="Table3">
+      <tr>
+        <td>
+          <para style="P11">Items</para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P9">[[ repeatIn(objects,'o') ]]</para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13"># of items:</para>
+        </td>
+        <td>
+          <para style="Standard">[[ sum_taxes(o.auction_id.id ) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13">Min Estimate:</para>
+        </td>
+        <td>
+          <para style="P14">[[ o.lot_est1 ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13">Max Estimate:</para>
+        </td>
+        <td>
+          <para style="Standard">[[o.lot_est2]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13"># of unsold items:</para>
+        </td>
+        <td>
+          <para style="Standard">[[ unsold_item(o.auction_id.id ) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13">Adjudication:</para>
+        </td>
+        <td>
+          <para style="Standard">[[o.obj_price]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+    <para style="P13">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="262.0,262.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P11">Buyers</para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P15">[[ sum_taxes(o.auction_id.id ) ]]</para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16"># of buyers:</para>
+        </td>
+        <td>
+          <para style="Standard">[[ sum_buyer(o.auction_id.id ) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13"># of paid items:</para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13"># of commissions:</para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P17"># of items taken away:</para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13">Credit:</para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13">Paid:</para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P13">
+      <font color="white"> </font>
+    </para>
+    <para style="P13">
+      <font color="white"> </font>
+    </para>
+    <para style="P13">
+      <font color="white"> </font>
+    </para>
+    <para style="P18">
+      <font color="white"> </font>
+    </para>
+    <para style="P19">Sellers</para>
+    <para style="P20">
+      <font color="white"> </font>
+    </para>
+    <para style="P21">
+      <font color="white"> </font>
+    </para>
+    <para style="P13"># of sellers:</para>
+    <para style="P13">Debit:</para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/bids.xml b/addons/auction/report/bids.xml
new file mode 100644
index 00000000000..a00a3fff86b
--- /dev/null
+++ b/addons/auction/report/bids.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE adresses SYSTEM "/home/pinky/code/terp/xml/dtd/fiches.dtd">
+<bids>
+	<bid type="fields" name="id">
+		<auction type="field" name="auction_id.name"></auction>
+		<bids_name type="field" name="name"></bids_name>
+		<client_info>
+			<partner_name type="field" name="partner_id.name"/>
+			<street type="field" name="partner_id.address.street"/>
+			<street2 type="field" name="partner_id.address.street2"/>
+			<zipcode type="field" name="partner_id.address.zip"/>
+			<city type="field" name="partner_id.address.city"/>
+			<contact type="field" name="contact_tel"/>
+		</client_info>
+		<bid_lines>
+			<bid_line type="zoom" name="bid_lines">
+				<lot_id type="field" name="lot_id.obj_num"></lot_id>
+				<lot_desc type="field" name="lot_id.obj_desc"></lot_desc>
+				<lot_price type="field" name="price"></lot_price>
+				<call type="field" name="call"></call>
+			</bid_line>
+		</bid_lines>
+	</bid>
+</bids>
diff --git a/addons/auction/report/bids.xsl b/addons/auction/report/bids.xsl
new file mode 100644
index 00000000000..829cd2b4079
--- /dev/null
+++ b/addons/auction/report/bids.xsl
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/rml_template.xsl"/>
+
+	<xsl:template match="/">
+		<xsl:call-template name="rml"/>
+	</xsl:template>
+
+	<xsl:template name="stylesheet">
+		<paraStyle name="nospace" fontName="Courier" fontSize="9" spaceBefore="0" spaceAfter="0"/>
+		<paraStyle name="nospace2" fontName="Courier" fontSize="10" spaceBefore="0" spaceAfter="0"/>
+		<paraStyle name="bigspace" fontName="Courier" fontSize="10" spaceBefore="0" spaceAfter="20"/>
+
+		<blockTableStyle id="bid">
+			<blockValign value="TOP"/>
+			<blockAlignment value="LEFT"/>
+			<lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,0"/>
+			<lineStyle kind="LINEBELOW" colorName="black" start="0,0" stop="-1,0"/>
+			<lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
+			<lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+			<lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="0,-1"/>
+			<lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+			<blockBackground colorName="(0.85,0.85,0.85)" start="0,0" stop="-1,0"/>
+		</blockTableStyle>
+	</xsl:template>
+
+	<xsl:template name="story">
+		<xsl:apply-templates select="bids"/>
+	</xsl:template>
+
+	<xsl:template match="bids">
+		<xsl:apply-templates select="bid"/>
+		<pageBreak/>
+	</xsl:template>
+
+<!---	<xsl:template match="bid"> make a chaange a data of all the bidders-->
+	<xsl:template match="/">
+		<para style="nospace2"><xsl:value-of select="client_info/partner_name"/></para>
+		<para style="nospace2"><xsl:value-of select="client_info/street"/></para>
+		<para style="nospace2"><xsl:value-of select="client_info/street2"/></para>
+		<para style="nospace2">
+			<xsl:value-of select="client_info/zipcode"/><xsl:text> </xsl:text>
+			<xsl:value-of select="client_info/city"/>
+		</para>
+		<nextFrame/>
+		<setNextTemplate name="other_pages"/>
+		<para style="nospace">
+			<b><xsl:text t="1">Title: </xsl:text></b>
+			<xsl:value-of select="bids_name"/>
+		</para>
+		<para style="nospace">
+			<b><xsl:text t="1">Contact: </xsl:text></b>
+			<xsl:value-of select="client_info/contact"/>
+		</para>
+		<para style="bigspace">
+			<b><xsl:text t="1">Item: </xsl:text></b>
+			<xsl:text t="1">BID, </xsl:text>
+			<xsl:value-of select="auction"/>
+		</para>
+		<xsl:apply-templates select="bid_lines"/>
+		<nextFrame/>
+		<setNextTemplate name="first_page"/>
+	</xsl:template>
+
+	<xsl:template match="bid_lines">
+		<blockTable repeatRows="1" style="bid" colWidths="2.0cm,12.5cm,2.0cm,1.5cm">
+			<tr>
+				<td>
+					<para style="nospace"><b><xsl:text t="1">Cat. N.</xsl:text></b></para>
+				</td>
+
+				<td>
+					<para style="nospace"><b><xsl:text t="1">Description</xsl:text></b></para>
+				</td>
+
+				<td>
+					<para style="nospace"><b><xsl:text t="1">Price</xsl:text></b></para>
+				</td>
+
+				<td>
+					<para style="nospace"><b><xsl:text t="1">Tel?</xsl:text></b></para>
+				</td>
+			</tr>
+			<xsl:apply-templates select="bid_line"/>
+		</blockTable>
+	</xsl:template>
+
+	<xsl:template match="bid_line">
+		<tr>
+			<td>
+				<para style="nospace"><xsl:value-of select="lot_id"/></para>
+			</td>
+
+			<td>
+				<para style="nospace"><xsl:value-of select="lot_desc"/></para>
+			</td>
+
+			<td>
+				<para style="nospace"><xsl:value-of select="lot_price"/></para>
+			</td>
+
+			<td>
+				<para style="nospace">
+					<xsl:choose>
+						<xsl:when test="call=1">
+							<xsl:text t="1">yes</xsl:text>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:text t="1">no</xsl:text>
+						</xsl:otherwise>
+					</xsl:choose>
+				</para>
+			</td>
+		</tr>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/addons/auction/report/bids_lots.py b/addons/auction/report/bids_lots.py
new file mode 100644
index 00000000000..dd6b3c70ba8
--- /dev/null
+++ b/addons/auction/report/bids_lots.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+
+
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+
+class bids_lots(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(bids_lots, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+        })
+report_sxw.report_sxw('report.bids.lots', 'auction.lots', 'addons/auction/report/bids_lots.rml',parser=bids_lots)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/bids_lots.rml b/addons/auction/report/bids_lots.rml
new file mode 100644
index 00000000000..1b272090353
--- /dev/null
+++ b/addons/auction/report/bids_lots.rml
@@ -0,0 +1,89 @@
+<?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="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+      <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#cccccc" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#cccccc" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#cccccc" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Courier" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Courier" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Courier" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Courier" spaceBefore="0.0" spaceAfter="6.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-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="70.0,140.0,90.0,139.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P2">Cat.N </para>
+        </td>
+        <td>
+          <para style="P2">Name</para>
+        </td>
+        <td>
+          <para style="P2">Bid</para>
+        </td>
+        <td>
+          <para style="P2">Phone</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P3">[[ repeatIn(objects,'o') ]]</para>
+          <para style="P4">[[o.obj_num]]</para>
+        </td>
+        <td>
+          <para style="P4">[[ o.ach_uid and o.ach_uid.name or False]]</para>
+        </td>
+        <td>
+          <para style="P5">[[o.bid_lines[0] and o.bid_lines[0].bid_id.name or False]]</para>
+        </td>
+        <td>
+          <para style="P6">[[o.bid_lines[0] and o.bid_lines[0].bid_id.contact_tel or False]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/bids_phones_details.py b/addons/auction/report/bids_phones_details.py
new file mode 100644
index 00000000000..fa55fe27a04
--- /dev/null
+++ b/addons/auction/report/bids_phones_details.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+
+
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+
+class bids_phones_details(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(bids_phones_details, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+        })
+report_sxw.report_sxw('report.bids.phones.details', 'auction.lots', 'addons/auction/report/bids_phones_details.rml',parser=bids_phones_details)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/bids_phones_details.rml b/addons/auction/report/bids_phones_details.rml
new file mode 100644
index 00000000000..0c3b2d00783
--- /dev/null
+++ b/addons/auction/report/bids_phones_details.rml
@@ -0,0 +1,100 @@
+<?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="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+      <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#cccccc" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#cccccc" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#cccccc" 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="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Courier" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Courier" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Courier" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Courier" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Courier" 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="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="43.0,167.0,90.0,138.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P4">Cat.N </para>
+        </td>
+        <td>
+          <para style="P2">Description</para>
+        </td>
+        <td>
+          <para style="P4">Est</para>
+        </td>
+        <td>
+          <para style="P4">Phone</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="43.0,167.0,90.0,139.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P6">[[ repeatIn(objects,'o') ]]</para>
+          <para style="P5">[[o.obj_num]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.name]]</para>
+        </td>
+        <td>
+          <para style="P8">[[o.lot_est1]]-[[o.lot_est2]]</para>
+        </td>
+        <td>
+          <para style="P7">[[o.bid_lines[0] and o.bid_lines[0].bid_id.contact_tel or False]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/buyer_form_report.py b/addons/auction/report/buyer_form_report.py
new file mode 100644
index 00000000000..8301f3ba092
--- /dev/null
+++ b/addons/auction/report/buyer_form_report.py
@@ -0,0 +1,94 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+from osv import osv
+
+class buyer_form_report(report_sxw.rml_parse):
+    count=0
+    c=0
+    def __init__(self, cr, uid, name, context):
+        super(buyer_form_report, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'sum_taxes': self.sum_taxes,
+            'buyerinfo' : self.buyer_info,
+            'grand_total' : self.grand_buyer_total,
+    })
+
+    def sum_taxes(self, lot):
+        amount=0.0
+        taxes=[]
+        if lot.author_right:
+            taxes.append(lot.author_right)
+        if lot.auction_id:
+            taxes += lot.auction_id.buyer_costs
+        tax=self.pool.get('account.tax').compute(self.cr,self.uid,taxes,lot.obj_price,1)
+        for t in tax:
+            amount+=t['amount']
+        return amount
+    def buyer_info(self):
+        objects = [object for object in self.localcontext.get('objects')]
+        print "OBJECTS",objects
+        ret_dict = {}
+        ret_list = []
+        for object in objects:
+            print "Object :",object
+#           print ret_dict
+
+            partner = ret_dict.get(object.ach_uid.id,False)
+            print "Partner :",partner
+            if not partner:
+
+                ret_dict[object.ach_uid.id] = {'partner' : object.ach_uid or False,'lots':[object]}
+            else:
+
+                lots = partner.get('lots')
+                print "Lots :",lots
+                lots.append(object)
+#       print 'ret dict :',ret_dict
+#       buyer_ids=self.pool.get(auction.lots).read(cr,uid,lot)
+
+
+        print "Return ret_dict.values() :",ret_dict.values()
+        return ret_dict.values()
+
+    def grand_buyer_total(self,o):
+        grand_total = 0
+        for oo in o:
+            grand_total =grand_total + oo['obj_price'] +self.sum_taxes(oo)
+        return grand_total
+
+report_sxw.report_sxw('report.buyer_form_report', 'auction.lots', 'addons/auction/report/buyer_form_report.rml', parser=buyer_form_report)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/buyer_form_report.rml b/addons/auction/report/buyer_form_report.rml
new file mode 100644
index 00000000000..23da02d881f
--- /dev/null
+++ b/addons/auction/report/buyer_form_report.rml
@@ -0,0 +1,228 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <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"/>
+      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="7.0" leading="9"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER"/>
+    <paraStyle name="P3" rightIndent="1.0" leftIndent="0.0" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P6" rightIndent="9.0" leftIndent="0.0" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" rightIndent="12.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" rightIndent="12.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" rightIndent="12.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" rightIndent="0.0" leftIndent="13.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="2.0"/>
+    <paraStyle name="P15" rightIndent="0.0" leftIndent="13.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P16" fontName="Times-Roman" fontSize="12.0" leading="15"/>
+    <paraStyle name="P17" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P18" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P19" rightIndent="12.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P20" rightIndent="12.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P21" rightIndent="0.0" leftIndent="13.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="2.0"/>
+    <paraStyle name="P22" rightIndent="0.0" leftIndent="13.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="2.0"/>
+    <paraStyle name="P23" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P24" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P25" rightIndent="12.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Frame contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Sender" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P16">[[ repeatIn(buyerinfo(),'o') ]]</para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="232.0,142.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
+          <para style="Addressee">[[o['partner'] and o['partner'].address[0].street or False]]</para>
+          <para style="Addressee">[[o['partner'] and o['partner'].address[0].zip or False]][[o['partner'] and o['partner'].address[0].city or False]]</para>
+          <para style="Addressee">[[o['partner'] and o['partner'].address[0].country_id.name or False]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P5"><font face="Times-Roman">Document</font>: Bordereau d'achat</para>
+    <para style="P5"><font face="Times-Roman">Vente</font>: [[ o.auction_id.name ]]</para>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="58.0,137.0,137.0,76.0,99.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="P6">Ref</para>
+        </td>
+        <td>
+          <para style="P7">Description</para>
+        </td>
+        <td>
+          <para style="P24"><font face="Times-Roman">Vente</font>:</para>
+        </td>
+        <td>
+          <para style="P8">Paid</para>
+        </td>
+        <td>
+          <para style="P9">Adj(EUR)</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="58.0,138.0,138.0,77.0,96.0" style="Tableau2">
+      <tr>
+        <td>
+          <para style="P11"><font face="Times-Roman" size="7.0">[[ repeatIn(o['lots'],'oo') ]]</font> [[ oo.obj_num ]]</para>
+        </td>
+        <td>
+          <para style="P12">[[ oo.name ]]</para>
+        </td>
+        <td>
+          <para style="P25">[[ oo.auction_id.name ]]</para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P13">Subtotal:</para>
+          <para style="P11">BuyerCosts([['%.0f'%((oo.auction_id and oo.auction_id.buyer_costs[0].amount) *100) or False]]%):</para>
+          <para style="P11">Total:</para>
+          <para style="P11">
+            <font color="white"> </font>
+          </para>
+          <para style="P11">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <blockTable colWidths="85.0" style="Table1">
+            <tr>
+              <td>
+                <para style="P14">[[ oo.obj_price ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P14">[[ sum_taxes(oo) ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P14">[[ oo.obj_price + sum_taxes(oo) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P15">
+            <font color="white"> </font>
+          </para>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P15">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P10">
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+    </para>
+    <blockTable colWidths="525.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P18">Grand Total : [[ grand_total(o['lots']) ]] </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P10">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/buyer_list.py b/addons/auction/report/buyer_list.py
new file mode 100644
index 00000000000..59877960a3c
--- /dev/null
+++ b/addons/auction/report/buyer_list.py
@@ -0,0 +1,106 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+from osv import osv
+
+class buyer_list(report_sxw.rml_parse):
+    auc_lot_ids=[]
+    sum_adj_price_val=0.0
+    sum_buyer_obj_price_val=0.0
+    sum_buyer_price_val=0.0
+    sum_lot_val=0.0
+    def __init__(self, cr, uid, name, context):
+        super(buyer_list, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'lines_lots_from_auction' : self.lines_lots_from_auction,
+            'lines_lots_auct_lot' : self.lines_lots_auct_lot,
+            'sum_adj_price':self.sum_adj_price,
+            'sum_buyer_obj_price':self.sum_buyer_obj_price,
+            'sum_buyer_price':self.sum_buyer_price,
+            'sum_lots':self.sum_lots
+    })
+
+    def lines_lots_from_auction(self,objects):
+
+        auc_lot_ids = []
+        for lot_id  in objects:
+            auc_lot_ids.append(lot_id.id)
+        self.auc_lot_ids=auc_lot_ids
+        self.cr.execute('select auction_id from auction_lots where id in ('+','.join(map(str,auc_lot_ids))+') group by auction_id')
+        auc_date_ids = self.cr.fetchall()
+        auct_dat=[]
+        for ad_id in auc_date_ids:
+            auc_dates_fields = self.pool.get('auction.dates').read(self.cr,self.uid,ad_id[0],['name'])
+            self.cr.execute('select * from auction_buyer_taxes_rel abr,auction_dates ad where ad.id=abr.auction_id and ad.id=%d'%(ad_id[0],))
+            res=self.cr.fetchall()
+            total=0
+            for r in res:
+                buyer_rel_field = self.pool.get('account.tax').read(self.cr,self.uid,r[1],['amount'])
+                total = total + buyer_rel_field['amount']
+            auc_dates_fields['amount']=total
+            auct_dat.append(auc_dates_fields)
+        return auct_dat
+
+    def lines_lots_auct_lot(self,obj):
+        auc_lot_ids = []
+
+        auc_date_ids = self.pool.get('auction.dates').search(self.cr,self.uid,([('name','like',obj['name'])]))
+
+#       self.cr.execute('select ach_uid,count(1) as no_lot, sum(obj_price) as adj_price, sum(buyer_price)-sum(obj_price) as buyer_cost ,sum(buyer_price) as to_pay from auction_lots where id in ('+','.join(map(str,self.auc_lot_ids))+') and  auction_id=%d  and ach_uid is not null group by ach_uid '%(auc_date_ids[0]))
+        self.cr.execute('select ach_login as ach_uid,count(1) as no_lot, sum(obj_price) as adj_price, sum(buyer_price)-sum(obj_price) as buyer_cost ,sum(buyer_price) as to_pay from auction_lots where  id in ('+','.join(map(str,self.auc_lot_ids))+') and  auction_id=%d and ach_login is not null  group by ach_login order by ach_login'%(auc_date_ids[0]))
+        res = self.cr.dictfetchall()
+        print "ressssssssssss",res
+        for r in res:
+#           if r['ach_uid']:
+#               tnm=self.pool.get('res.partner').read(self.cr,self.uid,[r['ach_uid']],['name'])#
+#               r.__setitem__('ach_uid',tnm[0]['name'])
+                self.sum_adj_price_val = self.sum_adj_price_val + r['adj_price']
+                self.sum_buyer_obj_price_val = self.sum_buyer_obj_price_val + r['buyer_cost']
+                self.sum_buyer_price_val = self.sum_buyer_price_val + r['to_pay']
+                self.sum_lot_val = self.sum_lot_val + r['no_lot']#
+        return res
+    def sum_lots(self):
+        return self.sum_lot_val
+    def sum_adj_price(self):
+        return self.sum_adj_price_val
+
+    def sum_buyer_obj_price(self):
+        return self.sum_buyer_obj_price_val
+
+    def sum_buyer_price(self):
+        return self.sum_buyer_price_val
+report_sxw.report_sxw('report.buyer.list', 'auction.lots', 'addons/auction/report/buyer_list.rml', parser=buyer_list)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/buyer_list.rml b/addons/auction/report/buyer_list.rml
new file mode 100644
index 00000000000..571fb1b86a5
--- /dev/null
+++ b/addons/auction/report/buyer_list.rml
@@ -0,0 +1,127 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+     <lineStyle kind="LINEBELOW" colorName="red" start="0,0" stop="-1,0"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+       <lineStyle kind="LINEABOVE" colorName="red" start="0,0" stop="-1,0"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="7.0" leading="9"/>
+    <paraStyle name="P3" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="center" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="center" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+      <paraStyle name="P61" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <story>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P5">[[ time.strftime('%d/%m/%Y')]]</para>
+    <para style="P4">[[ repeatIn(lines_lots_from_auction(objects),'o') ]]</para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P6">[[o['name'] or False]]</para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P2">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="131.0,39.0,89.0,121.0,140.0" style="Table2">
+        <tr>
+          <td>
+            <para style="P6">Buyer </para>
+          </td>
+          <td>
+            <para style="P6">#</para>
+          </td>
+          <td>
+            <para style="P6">Adj(EUR)</para>
+          </td>
+          <td>
+            <para style="P6">Buyer costs([[ o['amount' ]*100 ]]%)</para>
+          </td>
+          <td>
+            <para style="P6">To pay</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="P61">[[ repeatIn(lines_lots_auct_lot(o),'a') ]] </para>
+             <para style="P61">[[ a['ach_uid'] ]]</para>
+          </td>
+          <td>
+            <para style="P4">[[ a['no_lot'] or '0.0' ]]</para>
+          </td>
+          <td>
+            <para style="P4">[[ a['adj_price'] or '0.0' ]]</para>
+
+          </td>
+          <td>
+            <para style="P4">[[ a['buyer_cost'] or '0.0' ]]</para>
+          </td>
+          <td>
+            <para style="P4">[[a['to_pay'] or '0.0' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="Standard">
+        <font color="white"> .........</font>
+        <font color="white"> .........</font>
+        <font color="white"> .........</font>
+      </para>
+    </section>
+    <blockTable colWidths="127.0,43.0,87.0,122.0,140.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P6">Total:</para>
+        </td>
+        <td>
+          <para style="P4">[[ '%.0f' % (sum_lots() or 0.0)  ]]</para>
+        </td>
+        <td>
+          <para style="P6">[[  '%.2f' % (sum_adj_price() or 0.0)  ]]</para>
+        </td>
+        <td>
+          <para style="P6">[[ '%.2f' % (sum_buyer_obj_price() or 0.0)  ]]</para>
+        </td>
+        <td>
+          <para style="P6">[[ '%.2f' % (sum_buyer_price() or 0.0)   ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/buyer_list.xml b/addons/auction/report/buyer_list.xml
new file mode 100644
index 00000000000..5f72f051421
--- /dev/null
+++ b/addons/auction/report/buyer_list.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<achat-listing>
+	<date type="function" name="today"></date>
+	<subject>Listing des acheteurs</subject>
+	<auctions type="fields" name="auction_id">
+		<title type="field" name="auction_id.name"/>
+		<cost-index type="call" name="" args="">
+			<id value="id"/>
+			<name value="name"/>
+	</cost-index>
+		<buyers type="fields" name="ach_login">
+			<id type="field" name="id"/>
+			<login type="field" name="ach_login"/>
+			<name type="field" name="ach_uid.name"/>
+			<product type="fields" name="obj_num,id">
+			<cost type="call" name="" args="">
+					<id value="id"/>
+					<amount value="amount"/>
+				</cost>
+				<ref type="field" name="obj_num"/>
+				<price type="field" name="obj_price" default="0.0"/>
+				<paid type="field" name="state"/>
+				<payment type="field" name="ach_pay_id.id"/>
+			</product>
+		</buyers>
+	</auctions>
+</achat-listing>
diff --git a/addons/auction/report/buyer_list.xsl b/addons/auction/report/buyer_list.xsl
new file mode 100644
index 00000000000..38d739ebf31
--- /dev/null
+++ b/addons/auction/report/buyer_list.xsl
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<xsl:template match="/">
+		<xsl:apply-templates select="achat-listing"/>
+	</xsl:template>
+
+	<xsl:template match="achat-listing">
+		<document filename="example.pdf">
+			<template pageSize="21cm,29.7cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Bordereau acheteur" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+				<pageTemplate id="first">
+					<pageGraphics>
+						<drawRightString x="19.0cm" y="26.0cm"><xsl:value-of select="date"/></drawRightString>
+					</pageGraphics>
+					<frame id="col1" x1="2.0cm" y1="2.5cm" width="17.0cm" height="22.7cm"/>
+				</pageTemplate>
+			</template>
+			
+			<stylesheet>
+				<paraStyle name="name" fontName="Helvetica-Bold" fontSize="16" alignment="center"/>
+				<paraStyle name="cost-name" fontName="Helvetica-BoldOblique" fontSize="10" alignment="RIGHT"/>
+				<blockTableStyle id="products">
+					 <blockAlignment value="RIGHT" start="2,0" stop="-1,-1"/>
+					 <lineStyle kind="LINEBELOW" start="0,0" stop="-1,0"/>
+					 <lineStyle kind="LINEABOVE" start="0,-1" stop="-1,-1"/>
+					 <blockFont name="Helvetica-BoldOblique" size="11" start="0,0" stop="-1,0"/>
+					 <blockValign value="TOP"/>
+				</blockTableStyle>
+			</stylesheet>
+
+			<story>
+				<xsl:apply-templates select="auctions"/>
+			</story>
+		</document>
+	</xsl:template>
+
+	<xsl:template match="auctions">
+		<para style="name"><xsl:value-of select="title"/></para>
+		<xsl:variable name="colWidths">
+			<xsl:choose>
+				<xsl:when test="count(//cost-index)=0">1.5cm,7.5cm,1cm,2.2cm,2cm</xsl:when>
+				<xsl:otherwise>
+					<xsl:text>1.5cm,7.5cm,1cm,2.2cm</xsl:text>
+					<xsl:for-each select="//cost-index">
+						<xsl:text>,2cm</xsl:text>
+					</xsl:for-each>
+					<xsl:text>,2cm</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+
+		<spacer length="1cm"/>
+		
+		<blockTable style="products" repeatRows="1"> 
+			<xsl:attribute name="colWidths">
+				<xsl:value-of select="$colWidths"/>
+			</xsl:attribute>
+			
+			<tr>
+				<td t="1">Buyer</td>
+				<td/>
+				<td t="1">Adj.</td>
+				<xsl:for-each select="//cost-index">
+					<xsl:sort select="id" data-type="number"/>
+					<td><para style="cost-name"><xsl:value-of select="name"/></para></td>
+				</xsl:for-each>
+				<td><para style="cost-name" t="1">To pay</para></td>
+				<td><para style="cost-name" t="1">Already paid</para></td>
+			</tr>
+			
+			<xsl:apply-templates select="buyers">
+				<xsl:sort select="login" order="ascending" data-type="number"/>
+				<xsl:sort select="name" order="ascending"/>
+			</xsl:apply-templates>
+			
+			<tr>
+				<td/>
+				<td><para><b t="1">Total:</b></para></td>
+				<td><xsl:value-of select="sum(buyers/product/price)"/></td>
+				<xsl:for-each select="//cost-index">
+					<xsl:sort select="id" data-type="number"/>
+					<xsl:variable name="cost_id" select="id"/>
+					<td><xsl:value-of select="format-number(sum(//buyers/product/cost[id=$cost_id]/amount), '#,##0.00')"/></td>
+				</xsl:for-each>
+				<td><xsl:value-of select="sum(buyers/product[payment = '']/price) + sum(buyers/product[payment = '']/cost/amount)"/></td>
+				<td><xsl:value-of select="sum(buyers/product[payment !='']/price) + sum(buyers/product[payment !='']/cost/amount)"/></td>
+			</tr>
+		</blockTable>
+	</xsl:template>
+
+	<xsl:template match="buyers">
+		<xsl:variable name="buyer_id" select="id"/>
+		<tr>
+			<td><xsl:value-of select="login"/></td>
+			<td><xsl:value-of select="name"/></td>
+			<td><xsl:value-of select="sum(product/price)"/></td>
+			<xsl:for-each select="//cost-index">
+				<xsl:sort select="id" data-type="number"/>
+				<xsl:variable name="cost_id" select="id"/>
+				<td><xsl:value-of select="sum(//buyers[id=$buyer_id]/product/cost[id=$cost_id]/amount)"/></td>
+			</xsl:for-each>
+			<td><xsl:value-of select="sum(product[payment = '']/price) + sum(product[payment = '']/cost/amount)"/></td>
+			<td><xsl:value-of select="sum(product[payment !='']/price) + sum(product[payment !='']/cost/amount)"/></td>
+		</tr>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/catalog.xml b/addons/auction/report/catalog.xml
new file mode 100644
index 00000000000..ae171457a97
--- /dev/null
+++ b/addons/auction/report/catalog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<catalog>
+	<auction type="zoom" name="auction_id">
+		<date-expo1 type="field" name="expo1"/>
+		<date-expo2 type="field" name="expo2"/>
+		<date-au1 type="field" name="auction1"/>
+		<date-au2 type="field" name="auction2"/>
+		<name type="field" name="name"/>
+	</auction>
+	<lines>
+		<line type="fields" name="obj_num,id">
+			<lot-number type="field" name="obj_num"/>
+			<lot-author type="field" name="artist_id.name"/>
+			<lot-title type="field" name="name"/>
+			<lot-info type="field" name="obj_desc"/>
+			<lot-est1 type="field" name="lot_est1"/>
+			<lot-est2 type="field" name="lot_est2"/>
+		</line>
+	</lines>
+</catalog>
diff --git a/addons/auction/report/catalog.xsl b/addons/auction/report/catalog.xsl
new file mode 100644
index 00000000000..29ba5e57b9b
--- /dev/null
+++ b/addons/auction/report/catalog.xsl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/rml_template.xsl"/>
+	<xsl:variable name="page_format">a4_normal</xsl:variable>
+
+	<xsl:template match="/">
+		<xsl:call-template name="rml"/>
+	</xsl:template>
+
+	<xsl:template name="stylesheet">
+		<paraStyle name="name" fontName="Helvetica-Bold" fontSize="16" alignment="center"/>
+		<blockTableStyle id="result">
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
+			 <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
+			 <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
+			 <blockTextColor colorName="white" start="0,0" stop="-1,0"/>
+			 <lineStyle kind="LINEBELOW" start="0,0" stop="-1,0"/>
+		</blockTableStyle>
+	</xsl:template>
+
+	<xsl:template name="story">
+		<xsl:apply-templates select="catalog"/>
+	</xsl:template>
+
+	<xsl:template match="catalog">
+		<xsl:apply-templates select="auction"/>
+		<xsl:apply-templates select="lines"/>
+	</xsl:template>
+
+	<xsl:template match="auction">
+		<para style="name"><xsl:value-of select="name"/></para>
+	</xsl:template>
+
+	<xsl:template match="lines">
+		<spacer length="1cm"/>
+		<blockTable colWidths="1.8cm,12.5cm,3cm" repeatRows="1" style="result">
+		<tr>
+			<td t="1">Cat. N.</td>
+			<td t="1">Description</td>
+			<td t="1">Estimate</td>
+		</tr>
+			<xsl:apply-templates select="line"/>
+		</blockTable>
+		<pageBreak/>
+	</xsl:template>
+
+	<xsl:template match="line">
+		<tr>
+			<td><xsl:value-of select="lot-number"/></td>
+			<td>
+				<para>
+					<xsl:if test="lot-author != ''">
+						<b><xsl:value-of select="lot-author"/></b>
+						<xsl:text>: </xsl:text>
+					</xsl:if>
+					<b><xsl:value-of select="lot-title"/></b>
+					<xsl:text>. </xsl:text>
+					<xsl:value-of select="lot-info"/>
+				</para>
+			</td>
+			<td>
+				<xsl:if test="lot-est1!=''">
+					<xsl:value-of select="round(lot-est1)"/>
+				</xsl:if>
+				<xsl:text> / </xsl:text>
+				<xsl:if test="lot-est2!=''">
+					<xsl:value-of select="round(lot-est2)"/>
+				</xsl:if>
+			</td>
+		</tr>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/catalog2.py b/addons/auction/report/catalog2.py
new file mode 100644
index 00000000000..527363df8ad
--- /dev/null
+++ b/addons/auction/report/catalog2.py
@@ -0,0 +1,177 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 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 datetime
+import time
+from report.interface import report_rml
+from report.interface import toxml
+import pooler
+from osv import osv,orm
+from time import strptime
+from xml.dom import minidom
+import sys
+import os
+import re
+import netsvc
+import base64
+import wizard
+import photo_shadow
+
+def escape(s):
+    return str(s or '').replace('<br/>','').decode('latin1','replace').encode('utf-8')
+
+
+class auction_catalog(report_rml):
+
+    def create_xml(self, cr, uid, ids, data, context):
+
+        xml = self.catalog_xml(cr, uid, ids, data, context)
+        temp=self.post_process_xml_data(cr, uid, xml, context)
+
+        return temp
+    def catalog_xml(self,cr,uid,ids,data,context,cwid="0"):
+        impl = minidom.getDOMImplementation()
+
+        doc = impl.createDocument(None, "report", None)
+
+        catalog=doc.createElement('catalog')
+        doc.documentElement.appendChild(catalog)
+
+
+        infodb='info'
+        commdb='comm'
+        tab_avoid = []
+        tab_no_photo=[]
+        for id in ids:
+            lot_ids=pooler.get_pool(cr.dbname).get('auction.lots').search(cr, uid, [('auction_id', '=', id)])
+            ab=pooler.get_pool(cr.dbname).get('auction.lots').read(cr,uid,lot_ids,['auction_id','name','lot_num','lot_est1','lot_est2'],context)
+            auction_dates_ids = [x["auction_id"][0] for x in ab]
+
+            res=pooler.get_pool(cr.dbname).get('auction.dates').read(cr,uid,ids,['name','auction1','auction2'],context)
+            # name emelment
+            key = 'name'
+            categ = doc.createElement(key)
+            categ.appendChild(doc.createTextNode(escape(res[0]["name"])))
+            catalog.appendChild(categ)
+
+             #Auctuion Date element
+            categ = doc.createElement("AuctionDate1")
+            categ.appendChild(doc.createTextNode(escape(res[0]['auction1'])))
+            catalog.appendChild(categ)
+
+            # Action Date 2 element
+            categ = doc.createElement("AuctionDate2")
+            categ.appendChild(doc.createTextNode(escape(res[0]['auction2'])))
+            catalog.appendChild(categ)
+
+    #         promotion element
+            promo = doc.createElement('promotion1')
+
+            #fp = file('/home/tiny/terp/4.2/server/bin/addons/auction/report/images/flagey_logo.jpg','r')
+            fp = file('/home/pinky/code/terp/branches/extra_addons/trunk/auction/report/images/flagey_logo.jpg','r')
+            file_data = fp.read()
+            promo.appendChild(doc.createTextNode(base64.encodestring(file_data)))
+            catalog.appendChild(promo)
+            promo = doc.createElement('promotion2')
+            #fp = file('/home/tiny/terp/4.2/server/bin/addons/auction/report/images/aeko_logo.jpg','r')
+            fp = file('/home/pinky/code/terp/branches/extra_addons/trunk/auction/report/images/flagey_logo.jpg','r')
+            file_data = fp.read()
+            promo.appendChild(doc.createTextNode(base64.encodestring(file_data)))
+            catalog.appendChild(promo)
+
+            #product element
+            products = doc.createElement('products')
+            catalog.appendChild(products)
+            side = 0
+            length = 0
+            auction_ids = []
+            for test in ab:
+                if test.has_key('auction_id'):
+                    auction_ids.append(str(test['auction_id'][0]))
+            cr.execute('select * from auction_lots where auction_id in ('+ ','.join(auction_ids)+')')
+            res = cr.dictfetchall()
+            for cat in res:
+                product =doc.createElement('product')
+                products.appendChild(product)
+                if cat['obj_desc']:
+                    infos = doc.createElement('infos')
+                    lines = re.split('<br/>|\n', unicode(cat['obj_desc'],'utf-8').encode('latin1'))
+                    for line in lines:
+                        xline = doc.createElement('info')
+                        xline.appendChild(doc.createTextNode(escape(line.decode('latin-1','replace').encode('utf-8'))))
+                        infos.appendChild(xline)
+                    product.appendChild(infos)
+                    if cat['lot_num']:
+                        lnum = doc.createElement('lot_num')
+                        lnum.appendChild(doc.createTextNode(escape(cat['lot_num'])))
+                        infos.appendChild(lnum)
+
+                    dest = os.path.join('/tmp/pdf_catalog/',str(cwid),str(cat['obj_desc'])+'.jpg')
+                    print dest
+                    if not cat['image']:
+                        print "Cat wiht no Image "
+
+                    else:
+                            print"in else "
+                            import random
+                            limg = doc.createElement('photo_small')
+                            file_name = '/tmp/image_%d.jpg' % (random.randint(1,1000),)
+                            fp = file(file_name,'wb+')
+                            content = base64.decodestring(cat['image'])
+                            fp.write(content)
+                            fp.close()
+                            fp = file(file_name,'r')
+                            size = photo_shadow.convert_catalog(fp, '/tmp/test.jpg',110)
+                            fp = file('/tmp/test.jpg')
+                            file_data = fp.read()
+                            test_data = base64.encodestring(file_data)
+                            limg.appendChild(doc.createTextNode(test_data))
+                            infos.appendChild(limg)
+
+                for key in ('lot_est1','lot_est2'):
+                    ref2 = doc.createElement(key)
+                    ref2.appendChild(doc.createTextNode( escape(cat[key] or 0.0)))
+                    product.appendChild(ref2)
+                oldlength = length
+                length += 2.0
+                if length>23.7:
+                    side += 1
+                    length = length - oldlength
+                    ref3 = doc.createElement('newpage')
+                    ref3.appendChild(doc.createTextNode( "1" ))
+                    product.appendChild(ref3)
+                if side%2:
+                    ref4 = doc.createElement('side')
+                    ref4.appendChild(doc.createTextNode( "1" ))
+                    product.appendChild(ref4)
+                xml1 = doc.toxml()
+        return xml1
+auction_catalog('report.auction.cat_flagy', 'auction.dates','','addons/auction/report/catalog2.xsl')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/catalog2.xsl b/addons/auction/report/catalog2.xsl
new file mode 100755
index 00000000000..b2794ec6763
--- /dev/null
+++ b/addons/auction/report/catalog2.xsl
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format"  xmlns:date="http://exslt.org/dates-and-times"extension-element-prefixes="date">
+
+
+<xsl:template match="report">
+<document>
+
+<template>
+<!--	<pageTemplate id="first">-->
+<!--		<pageGraphics>-->
+<!--			<stroke color="(0.6,0.3,0.1)"/>-->
+<!--			<fill color="(0.6,0.3,0.1)"/>-->
+
+			<image x="7cm" y="25cm" file="/home/tiny/terp/4.2/server/bin/addons/auction/report/images/aeko_logo.jpg"/>
+						<image x="7cm" y="25cm" file="/home/pinky/code/terp/branches/extra_addons/trunk/auction/report/images/flagey_logo.jpg"/>
+			<lines>1cm 3.0cm 20cm 3.0cm</lines>
+			<setFont name="Helvetica" size="15"/>
+			<drawCentredString x="105mm" y="2.2cm">Hotel des ventes Flagey</drawCentredString>
+			<setFont name="Helvetica" size="11"/>
+			<drawCentredString x="105mm" y="1.6cm">Rue du Nid, 4 - B-1050 Bruxelles - Tel: 02/644.97.67</drawCentredString>
+			<drawCentredString x="105mm" y="1.0cm">Web: Flagey.com - Mail: info@flagey.com - Fax: 02.646.32.35</drawCentredString>
+
+
+			<fill color="(0.2,0.2,0.2)"/>
+			<stroke color="(0.2,0.2,0.2)"/>
+
+<!--		</pageGraphics>-->
+<!--		<frame id="column" x1="2.0cm" y1="6cm" width="18cm" height="18cm"/>-->
+<!--	</pageTemplate>-->
+	<pageTemplate id="first">
+		<pageGraphics>
+<!--			<image x="1.0cm" y="27.3cm" file="/home/tiny/terp/4.2/server/bin/addons/auction/report/images/flagey_head.png"/>-->
+-			<image x="1.0cm" y="27.3cm" file="/home/pinky/code/terp/branches/extra_addons/trunk/auction/report/images/flagey_logo.jpg"/>
+			<drawRightString x="19.0cm" y="27.6cm"> Vente  antiquitée le  <xsl:value-of select="date:day-name(catalog/AuctionDate1)"/> &#160;<xsl:value-of select="date:day-in-month(catalog/AuctionDate1)"/>&#160;<xsl:value-of select="date:month-name(catalog/AuctionDate1)"/> &#160;<xsl:value-of select="date:year(catalog/AuctionDate1)"/></drawRightString>-->
+			<lineMode width="1mm"/>
+			<setFont name="Helvetica" size="26"/>
+<!--			<drawString x="10mm" y="27.8cm">Flagey.com</drawString>-->
+			<fill color="(0.2,0.2,0.2)"/>
+			<stroke color="#2b24b6"/>
+			<lineMode width="0.5mm"/>
+			<lines>1cm 1.6cm 20cm 1.6cm</lines>
+			<lines>1.0cm 27.3cm 20cm 27.3cm</lines>
+
+			<setFont name="Helvetica" size="12"/>
+			<drawString x="10mm" y="1.0cm">www.flagey.com</drawString>
+			<drawCentredString x="105mm" y="1.0cm">Tel: 02.644.97.67 - Fax: 02.646.32.35</drawCentredString>
+			<drawRightString x="200mm" y="1.0cm">info@flagey.com</drawRightString>
+		</pageGraphics>
+		<frame id="column" x1="1cm" y1="1.5cm" width="9.4cm" height="25.5cm"/>
+		<frame id="column" x1="10.8cm" y1="1.5cm" width="9.4cm" height="25.5cm"/>
+	</pageTemplate>
+</template>
+<stylesheet>
+        <paraStyle name="slogan1" fontName="Times-Roman" fontSize="11" alignment="left" spaceBefore="0.0" spaceAfter="0.0"/>
+         <paraStyle name="slogan2" fontName="Times-Roman" fontSize="9" alignment="right" spaceBefore="0.0" spaceAfter="0.0"/>
+         <paraStyle name="slogan5"  alignment="right" />
+		<paraStyle name="slogan" fontName="Times New Roman-Italic" fontSize="11" alignment="left" spaceBefore="0.0" spaceAfter="0.0"/>
+         <paraStyle name="slogan3"  xml:lang="en-fr" fontName="Times-Roman" fontSize="16" alignment="center" spaceAfter="0.5" />
+          <paraStyle name="slogan4" fontName="Helvetica" fontSize="10" alignment="right" spaceBefore="0.0"/>
+        <paraStyle name="footnote" fontName="Helvetica" fontSize="10" alignment="center" />
+        <paraStyle name="note" fontName="Helvetica" fontSize="8" leftIndent="3mm"/>
+        <paraStyle name="homehead" fontName="Helvetica" fontSize="12" alignment="center"/>
+        <paraStyle name="artist" fontName="Helvetica-Bold"/>
+        <paraStyle name="prodtitle" fontName="Helvetica-BoldOblique" fontSize="8"/>
+        <blockTableStyle id="infos">
+                <blockValign value="TOP"/>
+                <blockTopPadding value="0"/>
+                <blockBottomPadding value="0"/>
+        </blockTableStyle>
+        <blockTableStyle id="imagestyle">
+
+         <blockHalign value="right"/>
+     	<blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
+
+
+        </blockTableStyle>
+
+        <blockTableStyle id="product1">
+                <blockValign value="TOP"/>
+<!--              <blockAlignment value="RIGHT" start="1,0" stop="-1,0"/>-->
+				 <blockAlignment value="RIGHT"/>
+
+                <blockTopPadding legnth="0"  start="0,0" stop="0,-1" />
+                <blockLeftPadding legnth="0"  start="0,0" stop="0,-1" />
+
+
+		<blockAlignment value="CENTER" start="0,0" stop="0,-1"/>
+        </blockTableStyle>
+        <blockTableStyle id="donation">
+                <blockFont name="Helvetica-BoldOblique" size="24" start="0,0" stop="-1,0"/>
+                <blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
+                <lineStyle kind="LINEBELOW" start="0,0" stop="-1,0"/>
+        </blockTableStyle>
+</stylesheet>
+
+	<story>
+
+<!--<setNextTemplate name="others"/>-->
+<!--	<pageBreak/>-->
+	<xsl:apply-templates select="catalog/products"/>
+</story>
+</document>
+</xsl:template>
+
+
+<xsl:template match="products">
+			<xsl:apply-templates select="product">
+				<xsl:sort order="ascending" data-type="number" select="infos/lot_num"/>
+			</xsl:apply-templates>
+
+</xsl:template>
+
+<xsl:template match="product">
+<!--        <xsl:if test="newpage">-->
+<!--                <condPageBreak height="20cm"/>-->
+<!--        </xsl:if>-->
+
+<xsl:choose>
+<xsl:when test="string-length(infos/photo) &gt;2  or string-length(infos/photo_small) &gt;2 ">
+
+            <blockTable style="product1" colWidths="6.5cm,2.5cm" >
+
+                 <tr>
+                     <td>
+                       <para style="slogan1">
+	                  <xpre><b><xsl:value-of select="infos/lot_num"/> &#160;- &#160;</b>  <xsl:value-of select="infos/info"/>
+						</xpre></para>
+						  <spacer length="2.0mm"/>
+		     			   <xsl:if test="lot_est1&gt;0">
+				           <para style="slogan2">
+				           <xpre>
+				             Est. <i> <xsl:value-of select="format-number(lot_est1, '#,##0.00')"/>/&#160;<xsl:value-of select="format-number(lot_est2, '#,##0.00')"/> Euro</i></xpre></para>
+				       </xsl:if>
+					</td>
+						<td>
+
+							<xsl:if test="infos/photo_small" >
+
+									<image x="0" y="0" height="2.5cm" width="2cm" >
+
+									<xsl:value-of select="infos/photo_small"/>
+
+									</image>
+
+							</xsl:if>
+				   </td>
+		    </tr>
+  </blockTable>
+</xsl:when>
+<xsl:otherwise>
+			<!-- photo on the right-->
+
+       <blockTable style="product1" colWidths="9cm">
+		       <tr>
+		                     <td>
+		                       <para style="slogan1">
+		                       <xpre>
+			                  <b><xsl:value-of select="infos/lot_num"/>&#160;- &#160;</b>  <xsl:value-of select="infos/info"/>
+								</xpre></para>
+								  <spacer length="2.0mm"/>
+				     			   <xsl:if test="lot_est1&gt;0">
+						           <para style="slogan2">
+						           <xpre>
+						            Est. <i><xsl:value-of select="format-number(lot_est1, '#,##0.00')"/>/&#160;<xsl:value-of select="format-number(lot_est2, '#,##0.00')"/> Euro
+						           </i>
+						           </xpre>
+						            </para>
+						       </xsl:if>
+							</td>
+
+				  </tr>
+  </blockTable>
+</xsl:otherwise>
+</xsl:choose>
+
+</xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/catelogwithpictures.py b/addons/auction/report/catelogwithpictures.py
new file mode 100644
index 00000000000..c29205b2733
--- /dev/null
+++ b/addons/auction/report/catelogwithpictures.py
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+class catelogwithpictures(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(catelogwithpictures, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+
+        })
+
+report_sxw.report_sxw('report.catelogwithpictures', 'auction.lots', 'addons/auction/report/catelogwithpictures.rml', parser=catelogwithpictures)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/catelogwithpictures.rml b/addons/auction/report/catelogwithpictures.rml
new file mode 100644
index 00000000000..f666a60575d
--- /dev/null
+++ b/addons/auction/report/catelogwithpictures.rml
@@ -0,0 +1,100 @@
+<?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="28.0" width="527" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="6.0" leading="8"/>
+    <paraStyle name="P3" fontName="Times-Roman" alignment="LEFT"/>
+    <paraStyle name="P4" fontName="Courier" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P5" fontName="Times-Roman" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Courier-Bold" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+    <paraStyle name="P9" fontName="Courier-Bold" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">
+      <font face="Times-Roman" size="6.0">[[ repeatIn(objects,'o') ]]</font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font face="Courier-Bold" size="10.0">Document:</font>
+      <font face="Times-Roman"/>
+      <font face="Courier-Bold" size="10.0">[[o.name]]</font>
+    </para>
+    <para style="P3">
+      <font face="Courier-Bold" size="10.0">Description:</font>
+      <font face="Times-Roman"/>
+      <font face="Courier-Bold" size="10.0">[[o.auction_id.name]]</font>
+    </para>
+    <para style="P3">
+      <font face="Courier-Bold" size="10.0">Minimum estimation: [[o.lot_est1]]</font>
+    </para>
+    <para style="P3">
+      <font face="Courier-Bold" size="10.0">Adjudication price:</font>
+      <font face="Courier-Bold" size="10.0">[[o.obj_price]]</font>
+    </para>
+    <para style="P3"><font face="Courier-Bold" size="10.0">Maximum estimation</font>:<font face="Courier-Bold" size="10.0">[[o.lot_est2]]</font></para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <para style="P6">[[ setTag('para','image',{'width':'100.0','height':'80.0','name':str(o.id)}) ]][[ o.image or setTag('image','para') ]]</para>
+    <para style="P7">
+      <font face="Times-Roman"/>
+    </para>
+    <para style="P1">
+      <font face="Times-Roman"/>
+    </para>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <para style="P9">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/content.xml b/addons/auction/report/content.xml
new file mode 100644
index 00000000000..6ac0721c6a7
--- /dev/null
+++ b/addons/auction/report/content.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" office:version="1.0" office:class="text"><office:script/><office:font-decls><style:font-decl style:name="Bitstream Vera Sans" fo:font-family="&apos;Bitstream Vera Sans&apos;" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-decl style:name="Bitstream Vera Sans1" fo:font-family="&apos;Bitstream Vera Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/><style:font-decl style:name="Bitstream Vera Sans2" fo:font-family="&apos;Bitstream Vera Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/></office:font-decls><office:automatic-styles><style:style style:name="Tableau1" style:family="table"><style:properties style:width="16.999cm" table:align="margins"/></style:style><style:style style:name="Tableau1.A" style:family="table-column"><style:properties style:column-width="5.666cm" style:rel-column-width="21844*"/></style:style><style:style style:name="Tableau1.B" style:family="table-column"><style:properties style:column-width="3.366cm" style:rel-column-width="12976*"/></style:style><style:style style:name="Tableau1.C" style:family="table-column"><style:properties style:column-width="3.983cm" style:rel-column-width="15356*"/></style:style><style:style style:name="Tableau1.D" style:family="table-column"><style:properties style:column-width="3.985cm" style:rel-column-width="15359*"/></style:style><style:style style:name="Tableau1.A1" style:family="table-cell"><style:properties fo:padding="0.097cm" fo:border-left="0.002cm solid #000000" fo:border-right="none" fo:border-top="0.002cm solid #000000" fo:border-bottom="0.002cm solid #000000"/></style:style><style:style style:name="Tableau1.D1" style:family="table-cell"><style:properties fo:padding="0.097cm" fo:border="0.002cm solid #000000"/></style:style><style:style style:name="Tableau1.A2" style:family="table-cell"><style:properties fo:padding="0.097cm" fo:border-left="0.002cm solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.002cm solid #000000"/></style:style><style:style style:name="Tableau1.D2" style:family="table-cell"><style:properties fo:padding="0.097cm" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="none" fo:border-bottom="0.002cm solid #000000"/></style:style><style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="Standard"><style:properties fo:text-align="center" style:justify-single-word="false"/></style:style><style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard"><style:properties fo:text-align="center" style:justify-single-word="false"/></style:style><style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard"><style:properties fo:text-align="start" style:justify-single-word="false"/></style:style><style:style style:name="P4" style:family="paragraph" style:parent-style-name="Table Contents"><style:properties fo:text-align="center" style:justify-single-word="false"/></style:style><style:style style:name="P5" style:family="paragraph" style:parent-style-name="Table Contents"><style:properties fo:text-align="start" style:justify-single-word="false"/></style:style><style:style style:name="fr1" style:family="graphics" style:parent-style-name="Graphics"><style:properties style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" style:mirror="none" draw:mirror="false" fo:clip="rect(0cm 0cm 0cm 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="1" draw:color-inversion="false" draw:color-mode="standard" draw:transparency="0%"/></style:style></office:automatic-styles><office:body><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:p text:style-name="P1">[[repeatIn(objects,&apos;o&apos;)]]</text:p><text:p text:style-name="P2">VENTES PUBLIQUES de Auction-in-Europe</text:p><text:p text:style-name="P2">du [[o.auction_id.expo1]] au [[o.auction_id.expo2]]</text:p><text:p text:style-name="P2"/><text:p text:style-name="P3"/><text:p text:style-name="P3"/><text:p text:style-name="P3"/><text:p text:style-name="P3"/><text:p text:style-name="P3"/><table:table table:name="Tableau1" table:style-name="Tableau1"><table:table-column table:style-name="Tableau1.A"/><table:table-column table:style-name="Tableau1.B"/><table:table-column table:style-name="Tableau1.C"/><table:table-column table:style-name="Tableau1.D"/><table:table-row><table:table-cell table:style-name="Tableau1.A1" table:value-type="string"><text:p text:style-name="P4">Ref</text:p></table:table-cell><table:table-cell table:style-name="Tableau1.A1" table:value-type="string"><text:p text:style-name="P4">Photo</text:p></table:table-cell><table:table-cell table:style-name="Tableau1.A1" table:value-type="string"><text:p text:style-name="P4">Description</text:p></table:table-cell><table:table-cell table:style-name="Tableau1.D1" table:value-type="string"><text:p text:style-name="P4">Price</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tableau1.A2" table:value-type="string"><text:p text:style-name="P2">[[ repeatIn(objects, &apos;o&apos;) ]]</text:p><text:p text:style-name="P2"/><text:p text:style-name="P2">[[o.auction_id.name]]</text:p></table:table-cell><table:table-cell table:style-name="Tableau1.A2" table:value-type="string"><text:p text:style-name="P4"/><text:p text:style-name="P4"/></table:table-cell><table:table-cell table:style-name="Tableau1.A2" table:value-type="string"><text:p text:style-name="P5"/><text:p text:style-name="P4">[[o.name]]</text:p></table:table-cell><table:table-cell table:style-name="Tableau1.D2" table:value-type="string"><text:p text:style-name="P2"/><text:p text:style-name="P2">[[o.obj_price]]</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tableau1.A2" table:value-type="string"><text:p text:style-name="P5"/></table:table-cell><table:table-cell table:style-name="Tableau1.A2" table:value-type="string"><text:p text:style-name="P5"/></table:table-cell><table:table-cell table:style-name="Tableau1.A2" table:value-type="string"><text:p text:style-name="P5"/></table:table-cell><table:table-cell table:style-name="Tableau1.D2" table:value-type="string"><text:p text:style-name="P5"/><text:p text:style-name="P5"/><text:p text:style-name="P5"/></table:table-cell></table:table-row></table:table><text:p text:style-name="P4"/><text:p text:style-name="P4">[[o.image]]</text:p><text:p text:style-name="P4"><draw:image draw:style-name="fr1" draw:name="Image1" text:anchor-type="paragraph" svg:x="5.341cm" svg:y="1.614cm" svg:width="6.316cm" svg:height="1.835cm" draw:z-index="0" xlink:href="#Pictures/10000000000000B300000034C1EC39BE.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></text:p></office:body></office:document-content>
\ No newline at end of file
diff --git a/addons/auction/report/deposit.xml b/addons/auction/report/deposit.xml
new file mode 100644
index 00000000000..94f7877ae0c
--- /dev/null
+++ b/addons/auction/report/deposit.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<deposit-form dev="EUR">
+	<city type="data" name="city">Bruxelles</city>
+	<date type="function" name="today"></date>
+	<deposit type="fields" name="id">
+		<deposit-name type="field" name="name"></deposit-name>
+		<deposit-id type="field" name="id"></deposit-id>
+		<deposit-date type="field" name="date_dep"></deposit-date>
+		<deposit-to type="zoom" name="partner_id">
+			<corporation>
+				<title type="field" name="title"/>
+				<name type="field" name="name"/>
+				<vat type="field" name="vat"/>
+			</corporation>
+			<person type="zoom" name="address">
+				<title type="field" name="title"></title>
+				<name type="field" name="name"></name>
+				<address>
+					<street type="field" name="street"/>
+					<street2 type="field" name="street2"/>
+					<postcode type="field" name="zip">2640</postcode>
+					<city type="field" name="city">Mortsel</city>
+					<!--<state type="field" name="state"></state>-->
+				<!--	<country type="field" name="country.name">Belgique</country>-->
+				</address>
+			</person>
+		</deposit-to>
+		<deposit-lines>
+			<deposit-line type="zoom" name="lot_id">
+				<lot-num type="field" name="lot_num"/>
+				<name type="field" name="name"/>
+				<lot-est1 type="field" name="lot_est1"/>
+				<lot-est2 type="field" name="lot_est2"/>
+				<lot-limit type="field" name="vnd_lim"/>
+				<lot-date type="field" name="auction_id.auction1"/>
+			</deposit-line>
+		</deposit-lines>
+	</deposit>
+</deposit-form>
diff --git a/addons/auction/report/deposit.xsl b/addons/auction/report/deposit.xsl
new file mode 100644
index 00000000000..2ca08445726
--- /dev/null
+++ b/addons/auction/report/deposit.xsl
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/rml_template.xsl"/>
+
+	<xsl:template match="/">
+		<xsl:call-template name="rml"/>
+	</xsl:template>
+
+	<xsl:template name="stylesheet">
+		<blockTableStyle id="accounts">
+			<blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
+			<lineStyle kind="LINEABOVE" start="-1,-2" stop="-1,-2"/>
+		</blockTableStyle>
+
+		<paraStyle name="conditions" fontName="Helvetica" fontSize="8" alignment="justify"/>
+		<paraStyle name="name" fontName="Helvetica-Bold"/>
+		<blockTableStyle id="products">
+			 <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
+			 <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
+			 <blockTextColor colorName="white" start="0,0" stop="-1,0"/>
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="RIGHT" start="-2,0" stop="-1,-1"/>
+			 <lineStyle kind="LINEBELOW" colorName="black" start="0,0" stop="-1,0"/>
+		</blockTableStyle>
+	</xsl:template>
+
+	<xsl:template name="story">
+		<xsl:apply-templates select="deposit-form"/>
+	</xsl:template>
+
+	<xsl:template match="deposit-form">
+		<xsl:apply-templates select="deposit"/>
+	</xsl:template>
+
+	<xsl:template match="deposit">
+		<xsl:apply-templates select="deposit-to"/>
+
+		<nextFrame/>
+		<setNextTemplate name="other_pages"/>
+
+		<para>
+			<b t="1">Inventory</b>: <i><xsl:value-of select="deposit-name"/></i>
+		</para><para>
+			<b t="1">Document type</b>: <i t="1">Deposit Form</i>
+		</para><para>
+			<b t="1">Document Number</b>: <i><xsl:value-of select="deposit-id"/></i>
+		</para><para>
+			<b t="1">Date</b>: <i><xsl:value-of select="deposit-date"/></i>
+		</para>
+
+		<spacer length="1cm" width="1mm"/>
+
+		<xsl:apply-templates select="deposit-lines"/>
+
+		<setNextTemplate name="first_page"/>
+		<pageBreak/>
+	</xsl:template>
+
+	<xsl:template match="deposit-to">
+		<para style="name">
+			<xsl:value-of select="corporation/title"/>
+			<xsl:text> </xsl:text>
+			<xsl:value-of select="corporation/name"/>
+		</para>
+		<para style="name">
+			<xsl:value-of select="person/title"/>
+			<xsl:text> </xsl:text>
+			<xsl:value-of select="person/name"/>
+		</para>
+		<para><xsl:value-of select="person/address/street"/></para>
+		<para><xsl:value-of select="person/address/street2"/></para>
+		<para><xsl:value-of select="person/address/postcode"/><xsl:text> </xsl:text><xsl:value-of select="person/address/city"/></para>
+<!--		<para><xsl:value-of select="person/address/state"/></para>-->
+		<para><xsl:value-of select="person/address/country"/></para>
+
+		<spacer length="0.4cm" width="1mm"/>
+
+		<para><b t="1">VAT</b>: <xsl:value-of select="person/vat"/></para>
+	</xsl:template>
+
+	<xsl:template match="deposit-lines">
+		<blockTable colWidths="1.8cm,9cm,2.3cm,1.5cm,2.3cm" style="products">
+			<tr>
+				<td t="1">Num</td>
+				<td t="1">Description</td>
+				<td t="1">Auction</td>
+				<td t="1">Limit</td>
+				<td t="1">Estimate</td>
+			</tr>
+			<xsl:for-each select="deposit-line">
+				<xsl:sort order="ascending" data-type="number" select="lot-num"/>
+				<tr>
+					<td><para><xsl:value-of select="lot-num"/></para></td>
+					<td><para><xsl:value-of select="name"/></para></td>
+					<td><para><xsl:value-of select="lot-date"/></para></td>
+					<td>
+						<xsl:if test="lot-limit != ''">
+							<xsl:value-of select="round(lot-limit)"/>
+						</xsl:if>
+					</td>
+					<td>
+						<xsl:if test="lot-est1 != ''">
+							<xsl:value-of select="round(lot-est1)"/>
+						</xsl:if>
+						<xsl:text> / </xsl:text>
+						<xsl:if test="lot-est2 != ''">
+							<xsl:value-of select="round(lot-est2)"/>
+						</xsl:if>
+					</td>
+				</tr>
+			</xsl:for-each>
+		</blockTable>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/deposit_seller.py b/addons/auction/report/deposit_seller.py
new file mode 100644
index 00000000000..fbaae34cfc1
--- /dev/null
+++ b/addons/auction/report/deposit_seller.py
@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+
+class deposit_seller(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(deposit_seller, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+
+        })
+report_sxw.report_sxw('report.deposit.seller', 'auction.lots', 'addons/auction/report/deposit_seller.rml', parser=deposit_seller)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/deposit_seller.rml b/addons/auction/report/deposit_seller.rml
new file mode 100644
index 00000000000..faed2d9c86c
--- /dev/null
+++ b/addons/auction/report/deposit_seller.rml
@@ -0,0 +1,182 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <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>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="13.0" leftIndent="11.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" rightIndent="13.0" leftIndent="11.0" fontName="Times-Roman" alignment="RIGHT"/>
+    <paraStyle name="P3" rightIndent="13.0" leftIndent="11.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" rightIndent="21.0" leftIndent="12.0" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" rightIndent="21.0" leftIndent="12.0" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" rightIndent="21.0" leftIndent="12.0" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" rightIndent="13.0" leftIndent="11.0" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" rightIndent="13.0" leftIndent="340.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" rightIndent="13.0" leftIndent="11.0" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P10" rightIndent="13.0" leftIndent="11.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER"/>
+    <paraStyle name="P11" rightIndent="13.0" leftIndent="11.0" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" rightIndent="28.0" leftIndent="11.0" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" rightIndent="28.0" leftIndent="11.0" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" rightIndent="28.0" leftIndent="11.0" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P15" rightIndent="5.0" leftIndent="3.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P16" rightIndent="7.0" leftIndent="1.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P17" rightIndent="13.0" leftIndent="11.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P18" rightIndent="20.0" leftIndent="31.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P19" fontName="Times-Roman" fontSize="9.0" leading="11" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P20" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P21" rightIndent="2.0" leftIndent="4.0" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P22" rightIndent="13.0" leftIndent="11.0" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P23" rightIndent="13.0" leftIndent="11.0" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">[[ repeatIn(objects,'o') ]]</para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="323.0,202.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+          <para style="P5">[[o.bord_vnd_id.partner_id.title]]</para>
+          <para style="P5">[[o.bord_vnd_id.partner_id.name]]</para>
+          <para style="P5">[[o.bord_vnd_id.partner_id.address[0].street]]</para>
+          <para style="P5">[[o.bord_vnd_id.partner_id.address[0].zip]],[[o.bord_vnd_id.partner_id.address[0].city]]</para>
+          <para style="P5">[[o.bord_vnd_id.partner_id.address[0].country_id.name]]</para>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <para style="P8">Bruxelles: [[ time.strftime('%Y-%m-%d') ]]</para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P9">
+      <font color="white"> </font>
+    </para>
+    <para style="P10">
+      <font color="white"> </font>
+    </para>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+    <para style="P12"><font color="white"> .........</font>Madame, Monsieur,</para>
+    <para style="P12">
+      <font color="white"> .........</font>
+    </para>
+    <para style="P13"><font color="white"> .........</font>Veuillez trouver ci-dessous la liste des articles que vous avez déposés pour vente publique du [[o.auction_id.auction1]].</para>
+    <para style="P13">Les lots que vous avez déposés mais qui ne sont pas marqués ci-dessous passeront dans une vente prochaine. </para>
+    <para style="P13">En restant à votre disposition, je vous prie d'agréer, Madame, Monsieur, l'assurance de mes sentiments distingués. </para>
+    <para style="P13">
+      <font color="white"> </font>
+    </para>
+    <para style="Signature">
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+      <font face="Times-Roman" size="10.0">Fabien Pinckaers</font>
+    </para>
+    <para style="P13">
+      <font color="white"> </font>
+    </para>
+    <para style="P14">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="29.0,29.0,396.0,48.0" style="Table5">
+      <tr>
+        <td>
+          <para style="P15">Cat.N</para>
+        </td>
+        <td>
+          <para style="P16">List.N</para>
+        </td>
+        <td>
+          <para style="P17">Description</para>
+        </td>
+        <td>
+          <para style="P18">Estimate</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P19">[[o. obj_num ]]</para>
+        </td>
+        <td>
+          <para style="P19">[[o.lot_num ]]</para>
+        </td>
+        <td>
+          <para style="P20">[[o.obj_desc]]</para>
+        </td>
+        <td>
+          <para style="P21">[[o. lot_est1 ]]/[[o.lot_est2]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P22">
+      <font color="white"> </font>
+    </para>
+    <para style="P23">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/huissier.py b/addons/auction/report/huissier.py
new file mode 100644
index 00000000000..9ed3b7092c1
--- /dev/null
+++ b/addons/auction/report/huissier.py
@@ -0,0 +1,80 @@
+# -*- encoding: utf-8 -*-
+# -*-encoding: iso8859-1 -*-
+##############################################################################
+#
+# 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.
+#
+####################################### i#######################################
+
+import pooler
+from osv.osv import osv, orm
+from report.interface import report_rml
+#FIXME: use the one from tools and delete the one from report
+from report.int_to_text import int_to_text
+
+def toxml(val):
+    return val.replace('&', '&amp;').replace('<','&lt;').replace('>','&gt;').decode('utf-8').encode('latin1', 'replace')
+
+class report_custom(report_rml):
+    def __init__(self, name, table, tmpl, xsl):
+        report_rml.__init__(self, name, table, tmpl, xsl)
+
+    def create_xml(self,cr, uid, ids, datas, context={}):
+        pool= pooler.get_pool(cr.dbname)
+        lots = pool.get('auction.lots').browse(cr, uid, ids)
+        auction = lots[0].auction_id
+
+        xml = '''<?xml version="1.0" encoding="ISO-8859-1"?>
+<report>
+    <auction>
+        <name>%s</name>
+        <date-au1>%s</date-au1>
+    </auction>''' % (toxml(auction['name']), toxml(auction['auction1']))
+    
+        i = 0
+        for l in lots:
+#           l['id_cont'] = str(i)
+            if l['obj_price']==0:
+                price_french = 'retiré'
+            else:
+                price_french = int_to_text(int(l['obj_price'] or 0.0))+' eur'
+            i+=1
+            xml += '''  <object>
+        <number>%d</number>
+        <obj_num>%d</obj_num>
+        <lot_desc>%s</lot_desc>
+        <price>%s</price>
+        <obj_price>%s</obj_price>
+    </object>''' % (i, l['obj_num'], toxml(l['name']), price_french, str(l['obj_price'] or '/'))
+        xml += '</report>'
+        
+#       file('/tmp/terp.xml','wb+').write(xml)
+        return xml
+
+report_custom('report.flagey.huissier', 'auction.lots', '', 'addons/auction/report/huissier.xsl')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/huissier.xsl b/addons/auction/report/huissier.xsl
new file mode 100644
index 00000000000..5113fd91f44
--- /dev/null
+++ b/addons/auction/report/huissier.xsl
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+<xsl:template match="/">
+	<xsl:apply-templates select="report"/>
+</xsl:template>
+
+<xsl:template match="report">
+	<document filename="example_5.pdf">
+	<template pageSize="21cm,29.7cm" leftMargin="1.5cm" rightMargin="1.5cm" topMargin="1.5cm" bottomMargin="1.5cm" title="Bordereau acheteur" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+		<pageTemplate id="main">
+			<pageGraphics>
+				<fill color="(0.4,0.4,0.4)"/>
+				<stroke color="(0.4,0.4,0.4)"/>
+				<setFont name="Helvetica" size="8"/>
+				<drawString x="1.8cm" y="1.4cm"><xsl:value-of select="auction/name"/></drawString>
+				<drawRightString x="19.2cm" y="1.4cm"><xsl:value-of select="auction/date-au1"/></drawRightString>
+				<lineMode width="0.2mm"/>
+				<lines>1.8cm 1.8cm 19.2cm 1.8cm</lines>
+			</pageGraphics>
+			<frame id="colmnOne" x1="1.8cm" y1="1.8cm" width="17.4cm" height="26.6cm"/>
+		</pageTemplate>
+	</template>
+	<stylesheet>
+		<paraStyle name="name" fontName="Helvetica-Bold" fontSize="16" alignment="center"/>
+		<blockTableStyle id="result">
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
+			 <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
+			 <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
+			 <blockTextColor colorName="white" start="0,0" stop="-1,0"/>
+		</blockTableStyle>
+	</stylesheet>
+	<story>
+		<blockTable colWidths="1.5cm,1.5cm,6.9cm,5cm,2cm" style="result">
+		<tr>
+			<td t="1">Num</td>
+			<td t="1">Ref.</td>
+			<td t="1">Description</td>
+			<td t="1">Adjudication</td>
+			<td t="1">Price</td>
+		</tr>
+			<xsl:apply-templates select="object"/>
+		</blockTable>
+	</story>
+	</document>
+</xsl:template>
+
+<xsl:template match="object">
+	<tr>
+		<td><para><xsl:value-of select="number"/></para></td>
+		<td><para><xsl:value-of select="obj_num"/></para></td>
+		<td><para><xsl:value-of select="lot_desc"/></para></td>
+		<td><para><xsl:value-of select="price"/></para></td>
+		<td><xsl:value-of select="obj_price"/></td>
+	</tr>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/lots_bids_phone.xml b/addons/auction/report/lots_bids_phone.xml
new file mode 100644
index 00000000000..1e11706570f
--- /dev/null
+++ b/addons/auction/report/lots_bids_phone.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<lots>
+		-<lot type="fields" name="obj_num,id">
+		<number type="field" name="obj_num"/>
+		<artist type="field" name="artist_id.name"/>
+		<title type="field" name="name"/>
+		<desc type="field" name="obj_desc"/>
+		<est1 type="field" name="lot_est1"/>
+		<est2 type="field" name="lot_est2"/>
+		<limit type="field" name="vnd_lim"/>
+		<bid type="zoom" name="bid_lines">
+			<id type="field" name="bid_id.name"/>
+			<name type="field" name="bid_id.partner_id.name"/>
+			<contact type="field" name="bid_id.contact_tel"/>
+			<price type="field" name="price"/>
+			<tocall type="field" name="call"/>
+		</bid>
+</lot>
+</lots>
diff --git a/addons/auction/report/lots_bids_phone.xsl b/addons/auction/report/lots_bids_phone.xsl
new file mode 100644
index 00000000000..715114b20c1
--- /dev/null
+++ b/addons/auction/report/lots_bids_phone.xsl
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:template match="/">
+		<xsl:apply-templates select="lots"/>
+	</xsl:template>
+
+	<xsl:template match="/">
+		<document xmlns:fo="http://www.w3.org/1999/XSL/Format">
+			<template>
+				<pageTemplate id="all">
+						<frame id="list" x1="1.0cm" y1="6.0cm" width="25.7cm" height="17cm"/>
+						<pageGraphics>
+								<xsl:apply-imports/>
+						</pageGraphics>
+				</pageTemplate>
+			</template>
+
+			<stylesheet>
+				<paraStyle name="small" fontName="Courier" fontSize="12" spaceBefore="0mm" spaceAfter="0mm"/>
+				<paraStyle name="verysmall" fontSize="11" fontName="Courier" spaceBefore="0mm" spaceAfter="0mm"/>
+				<paraStyle name="smallest" fontSize="10" fontName="Courier" spaceBefore="-0.5mm" spaceAfter="-0.5mm"/>
+
+				<blockTableStyle id="left">
+					<blockValign value="TOP"/>
+					<blockAlignment value="LEFT"/>
+					<blockFont name="Helvetica-Bold" size="10"/>
+					<blockTextColor colorName="black"/>
+					<lineStyle kind="LINEABOVE" thickness="0.5" colorName="black" start="0,0" stop="-1,0"/>
+					<lineStyle kind="LINEBELOW" thickness="0.5" colorName="black"/>
+					<blockBackground colorName="(1,1,1)" start="0,0" stop="-1,-1"/>
+					<blockBackground colorName="(0.88,0.88,0.88)" start="0,0" stop="-1,0"/>
+				</blockTableStyle>
+			</stylesheet>
+
+			<story>
+				<blockTable repeatRows="1" style="left" colWidths="1.8cm,11.0cm,2.3cm,10.5cm">
+					<tr>
+						<td>
+							<para style="small"><b t="1">Cat. N.</b></para>
+						</td><td>
+							<para style="small"><b t="1">Description</b></para>
+						</td><td>
+							<para style="small"><b t="1">Est.</b></para>
+						</td><td>
+							<para style="small"><b t="1">Orders</b></para>
+						</td>
+					</tr>
+					<xsl:apply-templates select="lots/lot[count(bid[tocall='1'])>0]"/>
+				</blockTable>
+			</story>
+		</document>
+	</xsl:template>
+
+	<xsl:template match="lots/lot[count(bid[tocall='1'])>0]">
+		<tr>
+			<td>
+				<para style="verysmall"><xsl:value-of select="number"/></para>
+			</td><td>
+				<para style="verysmall"><b><xsl:value-of select="artist"/></b></para>
+				<para style="verysmall"><b><xsl:value-of select="title"/></b></para>
+				<para style="verysmall"><xsl:value-of select="substring(desc,0,1024)"/></para>
+			</td><td>
+				<para style="verysmall">
+					<xsl:if test="est1 != ''">
+						<xsl:value-of select="round(est1)"/>
+					</xsl:if>
+					<xsl:text>-</xsl:text>
+					<xsl:if test="est2 != ''">
+						<xsl:value-of select="round(est2)"/>
+					</xsl:if>
+				</para>
+			</td><td>
+				<xsl:for-each select="lots/bid[tocall='1']">
+					<xsl:sort order="descending" data-type="number" select="price"/>
+					<para style="smallest">
+						<xsl:value-of select="name"/>
+
+						<xsl:text>(</xsl:text><xsl:value-of select="id"/><xsl:text>)</xsl:text>
+
+						<xsl:if test="round(price)&gt;0">
+							<xsl:text> </xsl:text><b><xsl:value-of select="round(price)"/><xsl:text> EUR</xsl:text></b>
+						</xsl:if>
+
+						<xsl:if test="tocall='1'">
+							<xsl:text t="1">, TEL:</xsl:text><b><xsl:value-of select="contact"/></b>
+						</xsl:if>
+					</para>
+				</xsl:for-each>
+			</td>
+		</tr>
+	</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/addons/auction/report/lots_bids_phone2.xml b/addons/auction/report/lots_bids_phone2.xml
new file mode 100644
index 00000000000..9a1d5cef7c1
--- /dev/null
+++ b/addons/auction/report/lots_bids_phone2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<lots>
+	<lot type="fields" name="obj_num,id">
+		<number type="field" name="obj_num"/>
+		<bid type="zoom" name="bid_lines">
+			<id type="field" name="bid_id.name"/>
+			<name type="field" name="bid_id.partner_id.name"/>
+			<contact type="field" name="bid_id.contact_tel"/>
+			<price type="field" name="price"/>
+			<tocall type="field" name="call"/>
+		</bid>
+	</lot>
+</lots>
diff --git a/addons/auction/report/lots_bids_phone2.xsl b/addons/auction/report/lots_bids_phone2.xsl
new file mode 100644
index 00000000000..abceb460670
--- /dev/null
+++ b/addons/auction/report/lots_bids_phone2.xsl
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+
+	<xsl:template match="/">
+		<xsl:apply-templates select="lots"/>
+	</xsl:template>
+
+	<xsl:template match="/">
+		<document xmlns:fo="http://www.w3.org/1999/XSL/Format">
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Releve de compte" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20" pageSize="(21cm,29.7cm)">
+
+				<pageTemplate id="all">
+					<frame id="list" x1="1.0cm" y1="1.0cm" height="22.7cm" width="19cm"/>
+
+					<pageGraphics>
+					<xsl:apply-imports/>
+					</pageGraphics>
+				</pageTemplate>
+			</template>
+
+			<stylesheet>
+				<paraStyle name="small" fontName="Courier" fontSize="12" spaceBefore="0mm" spaceAfter="0mm"/>
+				<paraStyle name="verysmall" fontSize="11" fontName="Courier" spaceBefore="0mm" spaceAfter="0mm"/>
+				<paraStyle name="smallest" fontSize="10" fontName="Courier" spaceBefore="-0.5mm" spaceAfter="-0.5mm"/>
+
+				<blockTableStyle id="left">
+					<blockValign value="TOP"/>
+					<blockAlignment value="LEFT"/>
+					<blockFont name="Helvetica-Bold" size="10"/>
+					<blockTextColor colorName="black"/>
+					<lineStyle kind="LINEABOVE" thickness="0.5" colorName="black" start="0,0" stop="-1,0"/>
+					<lineStyle kind="LINEBELOW" thickness="0.5" colorName="black"/>
+					<blockBackground colorName="(1,1,1)" start="0,0" stop="-1,-1"/>
+					<blockBackground colorName="(0.88,0.88,0.88)" start="0,0" stop="-1,0"/>
+				</blockTableStyle>
+
+				<blockTableStyle id="lots">
+					<lineStyle kind="LINEABOVE" thickness="0.5" colorName="black" start="0,0" stop="-1,0"/>
+					<lineStyle kind="LINEBELOW" thickness="0.5" colorName="black" start="0,-1" stop="-1,-1"/>
+				</blockTableStyle>
+			</stylesheet>
+
+			<story>
+				<blockTable repeatRows="1" style="left" colWidths="1.8cm,10.0cm,1.8cm,4.4cm">
+					<tr>
+						<td>
+							<para style="small"><b t="1">Obj.</b></para>
+						</td><td>
+							<para style="small"><b t="1">Name</b></para>
+						</td><td>
+							<para style="small"><b t="1">Bid</b></para>
+						</td><td>
+							<para style="small"><b t="1">Phone</b></para>
+						</td>
+					</tr>
+				</blockTable>
+				<xsl:apply-templates select="lots/lot"/>
+			</story>
+		</document>
+	</xsl:template>
+
+	<xsl:template match="lots/lot[count(bid[tocall='1'])>0]">
+		<xsl:variable name="number" select="number"/>
+		<blockTable colWidths="1.8cm,10.0cm,1.8cm,4.4cm" style="lots">
+			<xsl:for-each select="bid[tocall='1']">
+				<tr>
+					<td>
+						<para style="verysmall"><xsl:value-of select="$number"/></para>
+					</td>
+					<td>
+						<para style="small"><xsl:value-of select="name"/></para>
+					</td><td>
+						<xsl:value-of select="id"/>
+					</td><td>
+						<para><b><xsl:value-of select="contact"/></b></para>
+					</td>
+				</tr>
+			</xsl:for-each>
+		</blockTable>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/lots_deposit.xml b/addons/auction/report/lots_deposit.xml
new file mode 100644
index 00000000000..37dfdff6dad
--- /dev/null
+++ b/addons/auction/report/lots_deposit.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<deposit-form>
+	<date type="function" name="today"/>
+	<auction-date type="field" name="auction_id.auction1"/>
+	<deposit type="fields" name="bord_vnd_id">
+		<deposit-infos type="zoom" name="bord_vnd_id">
+			<deposit-to type="zoom" name="partner_id">
+				<corporation>
+					<title type="field" name="title"/>
+					<name type="field" name="name"/>
+					<vat type="field" name="vat"/>
+				</corporation>
+				<person type="zoom" name="address">
+					<title type="field" name="title"/>
+					<name type="field" name="name"/>
+					<street type="field" name="street"/>
+					<street2 type="field" name="street2"/>
+					<postcode type="field" name="zip"/>
+					<city type="field" name="city"/>
+					<!--<state type="field" name="state.name"/>-->
+					<!--<country type="field" name="country.name"/>-->
+				</person>
+			</deposit-to>
+		</deposit-infos>
+		<deposit-lines>
+			<deposit-line type="fields" name="lot_num,id">
+				<obj-num type="field" name="obj_num"/>
+				<bord-vnd-id type="field" name="bord_vnd_id.name"/>
+				<lot-num type="field" name="lot_num"/>
+				<name type="field" name="name"/>
+				<artist type="field" name="artist_id.name"/>
+				<lot-est1 type="field" name="lot_est1"/>
+				<lot-est2 type="field" name="lot_est2"/>
+			</deposit-line>
+		</deposit-lines>
+	</deposit>
+</deposit-form>
diff --git a/addons/auction/report/lots_deposit.xsl b/addons/auction/report/lots_deposit.xsl
new file mode 100644
index 00000000000..ebf39458393
--- /dev/null
+++ b/addons/auction/report/lots_deposit.xsl
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/rml_template.xsl"/>
+
+	<xsl:template match="/">
+		<xsl:call-template name="rml"/>
+	</xsl:template>
+
+	<xsl:template name="stylesheet">
+		<paraStyle name="date" fontName="Helvetica" fontSize="12" alignment="RIGHT"/>
+		<paraStyle name="text" fontName="Helvetica" fontSize="12" alignment="JUSTIFY"/>
+		<paraStyle name="name" fontName="Helvetica" fontSize="11"/>
+		<paraStyle name="signature" fontName="Helvetica" fontSize="12" alignment="RIGHT"/>
+
+		<blockTableStyle id="products">
+			 <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
+			 <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
+			 <blockTextColor colorName="white" start="0,0" stop="-1,0"/>
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
+			 <lineStyle kind="LINEBELOW" colorName="black" start="0,0" stop="-1,0"/>
+		</blockTableStyle>
+	</xsl:template>
+
+	<xsl:template name="first_page_frames">
+		<frame id="address" x1="11cm" y1="21.5cm" width="6cm" height="4cm"/>
+		<frame id="main" x1="2cm" y1="2.5cm" width="17.0cm" height="19cm"/>
+	</xsl:template>
+
+<!--	<xsl:template name="other_pages_frames">-->
+<!--		<frame id="main" x1="2cm" y1="2.5cm" width="17.0cm" height="23cm"/>-->
+<!--	</xsl:template>-->
+
+	<xsl:template name="story">
+		<xsl:apply-templates select="deposit-form"/>
+
+
+	</xsl:template>
+
+	<xsl:template match="deposit-form">
+		<xsl:apply-templates select="deposit"/>
+
+
+	</xsl:template>
+
+	<xsl:template match="deposit">
+		<xsl:apply-templates select="deposit-infos"/>
+
+		<nextFrame/>
+<!--		<setNextTemplate name="other_pages"/>-->
+
+		<para style="date">Bruxelles, le <xsl:value-of select="//date"/></para>
+
+		<spacer length="2cm" width="1mm"/>
+
+		<para style="text" t="1">Madame, Monsieur</para>
+
+		<spacer length="1cm" width="1mm"/>
+
+		<para style="text"><xsl:text t="1">
+		Veuillez trouver - ci-dessous - la liste des articles que vous avez déposés pour la vente publique du </xsl:text><xsl:value-of select="//auction-date"/>.
+		</para>
+
+		<spacer length="3mm" width="1mm"/>
+
+		<para style="text" t="1">
+		Les lots que vous avez déposés mais qui ne sont pas marqués ci-dessous passeront dans une vente prochaine.</para>
+
+		<spacer length="3mm" width="1mm"/>
+
+		<para style="text" t="1">
+		En restant à votre disposition, je vous prie d'agréer, Madame, Monsieur, l'assurance de mes sentiments distingués.
+		</para>
+
+		<spacer length="1cm" width="1mm"/>
+
+		<para style="signature"><xsl:value-of select="$signature"/></para>
+
+		<spacer length="1cm" width="1mm"/>
+
+		<xsl:apply-templates select="deposit-lines"/>
+
+		<spacer length="0.5cm" width="1mm"/>
+
+<!--		<setNextTemplate name="first_page"/>-->
+<!--		<pageBreak/>-->
+	</xsl:template>
+
+	<xsl:template match="deposit-infos">
+		<xsl:apply-templates select="deposit-to"/>
+	</xsl:template>
+
+	<xsl:template match="deposit-to">
+		<para style="name"><xsl:value-of select="corporation/title"/><xsl:text> </xsl:text><xsl:value-of select="corporation/name"/></para>
+		<para><xsl:value-of select="person/title"/><xsl:text> </xsl:text><xsl:value-of select="person/name"/></para>
+		<para><xsl:value-of select="person/street"/></para>
+		<para><xsl:value-of select="person/street2"/></para>
+		<para><xsl:value-of select="person/postcode"/><xsl:text> </xsl:text><xsl:value-of select="person/city"/></para>
+		<para><xsl:value-of select="person/state"/></para>
+		<para><xsl:value-of select="person/country"/></para>
+		<xsl:if test="corporation/vat != ''">
+			<spacer length="0.4cm" width="1mm"/>
+			<para><b t="1">VAT</b>: <xsl:value-of select="corporation/vat"/></para>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="deposit-lines">
+		<blockTable colWidths="2cm,4cm,2cm,10cm,2cm" style="products" repeatRows="1">
+			<tr>
+				<td t="1">Cat. N.</td>
+				<td t="1">Deposit Inventory</td>
+				<td t="1">List N.</td>
+				<td t="1">Description</td>
+				<td t="1">Estimate</td>
+			</tr>
+			<xsl:for-each select="deposit-line">
+				<xsl:sort order="ascending" data-type="number" select="lot-num"/>
+				<tr>
+					<td><para><xsl:value-of select="obj-num"/></para></td>
+					<td><para><xsl:value-of select="bord-vnd-id"/></para></td>
+					<td><para><xsl:value-of select="lot-num"/></para></td>
+					<td>
+						<para>
+							<xsl:if test="artist != ''">
+								<b><xsl:value-of select="artist"/></b><xsl:text>: </xsl:text>
+							</xsl:if>
+							<xsl:value-of select="name"/>
+						</para>
+					</td>
+					<td>
+						<xsl:value-of select="round(lot-est1)"/>
+						<xsl:text> / </xsl:text>
+						<xsl:value-of select="round(lot-est2)"/>
+					</td>
+				</tr>
+			</xsl:for-each>
+		</blockTable>
+	</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/addons/auction/report/lots_list.py b/addons/auction/report/lots_list.py
new file mode 100644
index 00000000000..c7dcf4e39e3
--- /dev/null
+++ b/addons/auction/report/lots_list.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+class lots_list(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(lots_list, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'bid_line' : self.bid_line
+        })
+    def bid_line(self, lot_id):
+        res = self.pool.get('auction.bid.lines').read(self.cr,self.uid,[lot_id])
+        print res;
+        print "=================================================="
+        return True
+report_sxw.report_sxw('report.lots.list', 'auction.lots', 'addons/auction/report/lots_list.rml', parser=lots_list)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/lots_list.rml b/addons/auction/report/lots_list.rml
new file mode 100644
index 00000000000..97047995281
--- /dev/null
+++ b/addons/auction/report/lots_list.rml
@@ -0,0 +1,109 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="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"/>
+      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Courier" alignment="CENTER"/>
+    <paraStyle name="P2" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P4" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P7" fontName="Courier" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P8" fontName="Courier" fontSize="7.0" leading="9" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P9" fontName="Courier-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P10" fontName="Courier-Bold" fontSize="7.0" leading="9" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P11" fontName="Courier" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P12" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="33.0,289.0,45.0,39.0,132.0,39.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P2">Cat.N</para>
+        </td>
+        <td>
+          <para style="P3">Description and Bids </para>
+        </td>
+        <td>
+          <para style="P2">Est </para>
+        </td>
+        <td>
+          <para style="P4">Limit</para>
+        </td>
+        <td>
+          <para style="P2">Inv,name</para>
+        </td>
+        <td>
+          <para style="P5">Buyer price</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">[[repeatIn(objects,'o')]]</para>
+          <para style="P7">[[o. obj_num]]</para>
+        </td>
+        <td>
+          <para style="P8">[[o.name ]]</para>
+          <para style="P8">[[o.bid_lines and o.bid_lines[0].bid_id.contact_tel or False]]</para>
+        </td>
+        <td>
+          <para style="P7">[[o.lot_est1]] <font face="Times-Roman">/</font>[[o.lot_est2]]</para>
+        </td>
+        <td>
+          <para style="P9">[[o.vnd_lim or 0]]</para>
+          <para style="P10">[[o.vnd_lim_net and 'NET' or False]]</para>
+        </td>
+        <td>
+          <para style="P8">[[ o.bord_vnd_id.name ]]</para>
+          <para style="P8">[[o.bord_vnd_id.partner_id.name ]]</para>
+        </td>
+        <td>
+          <para style="P11">[[o.buyer_price]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P12">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/lots_list.xml b/addons/auction/report/lots_list.xml
new file mode 100644
index 00000000000..1e71c5f0d2f
--- /dev/null
+++ b/addons/auction/report/lots_list.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<lots>
+	<lot type="fields" name="obj_num,id">
+		<lot_num type="field" name="obj_num"></lot_num>
+		<lot_seller type="field" name="bord_vnd_id.partner_id.name"></lot_seller>
+		<lot_seller_ref type="field" name="bord_vnd_id.partner_id.ref"></lot_seller_ref>
+		<lot_limit type="field" name="vnd_lim"/>
+		<lot_limit_net type="field" name="vnd_lim_net"/>
+		<artist type="field" name="artist_id.name"></artist>
+		<lot_est1 type="field" name="lot_est1"></lot_est1>
+		<lot_est2 type="field" name="lot_est2"></lot_est2>
+		<lot_desc type="field" name="obj_desc"></lot_desc>
+		<deposit_num type="field" name="bord_vnd_id.name"></deposit_num>
+		<buyer_login type="field" name="ach_login"></buyer_login>
+		<obj_price type="field" name="obj_price"></obj_price>
+		<bid type="zoom" name="bid_lines">
+			<bid_id type="field" name="bid_id.name"></bid_id>
+			<bid_name type="field" name="bid_id.partner_id.name"></bid_name>
+			<bid_prix type="field" name="price"></bid_prix>
+			<bid_tel type="field" name="bid_id.contact_tel"></bid_tel>
+			<bid_tel_ok type="field" name="call"></bid_tel_ok>
+		</bid>
+	</lot>
+</lots>
diff --git a/addons/auction/report/lots_list.xsl b/addons/auction/report/lots_list.xsl
new file mode 100644
index 00000000000..4da62182d6d
--- /dev/null
+++ b/addons/auction/report/lots_list.xsl
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:template match="/">
+		<xsl:apply-templates select="lots"/>
+	</xsl:template>
+
+	<xsl:template match="/">
+		<document xmlns:fo="http://www.w3.org/1999/XSL/Format">
+			<template >
+				<pageTemplate id="all">
+					<frame id="list" x1="1.0cm" y1="0.0cm" width="19.0cm" height="24cm"/>
+					<pageGraphics>
+						<xsl:apply-imports/>
+					</pageGraphics>
+				</pageTemplate>
+			</template>
+
+			<stylesheet>
+				<paraStyle name="small" fontName="Courier" fontSize="12" spaceBefore="0mm" spaceAfter="0mm"/>
+				<paraStyle name="verysmall" fontSize="10" fontName="Courier" spaceBefore="0mm" spaceAfter="0mm"/>
+				<paraStyle name="smallest" fontSize="8" fontName="Courier" spaceBefore="-1mm" spaceAfter="-1Mm"/>
+
+				<blockTableStyle id="left">
+					<blockValign value="TOP"/>
+					<blockAlignment value="LEFT"/>
+					<blockFont name="Helvetica-Bold" size="10"/>
+					<blockTextColor colorName="black"/>
+					<lineStyle kind="LINEABOVE" thickness="0.5" colorName="black" start="0,0" stop="-1,0"/>
+					<lineStyle kind="LINEABOVE" thickness="0.5" colorName="black" start="0,0" stop="-1,0"/>
+					<lineStyle kind="LINEBELOW" thickness="0.5" colorName="black"/>
+					<lineStyle kind="LINEBEFORE" thickness="0.5" colorName="black" start="0,0" stop="-1,-1"/>
+					<lineStyle kind="LINEBEFORE" thickness="0.5" colorName="black" start="0,0" stop="0,-1"/>
+					<lineStyle kind="LINEAFTER" thickness="0.5" colorName="black" start="-1,0" stop="-1,-1"/>
+					<blockBackground colorName="(1,1,1)" start="0,0" stop="-1,-1"/>
+					<blockBackground colorName="(0.88,0.88,0.88)" start="0,0" stop="-1,0"/>
+				</blockTableStyle>
+			</stylesheet>
+
+			<story>
+				<blockTable repeatRows="1" style="left" colWidths="1.8cm,10.0cm,2.0cm,1.6cm,2.3cm,2cm">
+					<tr>
+						<td>
+							<para style="small"><b t="1">Cat. N.</b></para>
+						</td><td>
+							<para style="small"><b t="1">Description and bids</b></para>
+						</td><td>
+							<para style="small"><b t="1">Est.</b></para>
+						</td><td>
+							<para style="small"><b t="1">Limit</b></para>
+						</td><td>
+							<para style="small"><b t="1">Inv, Name</b></para>
+						</td><td>
+							<para style="small"><b t="1">Buyer, Price</b></para>
+						</td>
+					</tr>
+					<xsl:apply-templates select="lots/lot"/>
+				</blockTable>
+			</story>
+		</document>
+	</xsl:template>
+
+	<xsl:template match="lots/lot">
+		<tr>
+			<td>
+				<para style="verysmall"><xsl:value-of select="lot_num"/></para>
+			</td><td>
+				<para style="verysmall">
+				    <b><xsl:value-of select="artist"/></b>
+				</para>
+				<para style="verysmall">
+				    <xsl:value-of select="lot_desc"/>
+				</para>
+				<xsl:for-each select="bid">
+					<xsl:sort order="descending" select="bid_prix"/>
+					<para style="smallest">
+						<xsl:choose>
+							<xsl:when test="bid_tel_ok='1'">
+								<b t="1">TEL:</b>
+							</xsl:when>
+							<xsl:otherwise t="1">
+								BID:
+							</xsl:otherwise>
+						</xsl:choose>
+
+						<xsl:value-of select="bid_name"/>
+						<xsl:text>(</xsl:text><xsl:value-of select="bid_id"/><xsl:text>)</xsl:text>
+						<xsl:if test="round(bid_prix)&gt;0">
+							<xsl:text> </xsl:text><b><xsl:value-of select="round(bid_prix)"/><xsl:text> EUR</xsl:text></b>
+						</xsl:if>
+						<xsl:if test="bid_tel_ok='1'">
+							<b><xsl:text t="1">, TEL:</xsl:text><xsl:value-of select="bid_tel"/></b>
+						</xsl:if>
+					</para>
+				</xsl:for-each>
+			</td><td>
+				<para style="verysmall">
+					<xsl:if test="lot_est1 != ''">
+						<xsl:value-of select="round(lot_est1)"/>
+					</xsl:if>
+					<xsl:text>-</xsl:text>
+					<xsl:if test="lot_est2 != ''">
+						<xsl:value-of select="round(lot_est2)"/>
+					</xsl:if>
+				</para>
+			</td><td>
+				<xsl:if test="lot_limit != ''">
+					<para style="verysmall">
+						<b><xsl:value-of select="round(lot_limit)"/></b>
+					</para>
+				</xsl:if>
+				<xsl:if test="lot_limit_net != ''">
+					<para style="verysmall">
+						<b t="1">NET</b>
+					</para>
+				</xsl:if>
+			</td><td>
+				<para style="verysmall"><xsl:value-of select="deposit_num"/>
+					<xsl:text> </xsl:text><xsl:value-of select="substring(lot_seller_ref,0,5)"/>
+					<xsl:text> </xsl:text><xsl:value-of select="substring(lot_seller,0,9)"/>
+				</para>
+			</td><td>
+				<para style="verysmall">
+					<xsl:value-of select="buyer_login"/>
+					<xsl:if test="obj_price &gt; 0">
+						<xsl:text>, </xsl:text>
+						<xsl:value-of select="obj_price"/>
+					</xsl:if>
+				</para>
+			</td>
+		</tr>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/addons/auction/report/lots_list_inv.xml b/addons/auction/report/lots_list_inv.xml
new file mode 100644
index 00000000000..1f5619f11ec
--- /dev/null
+++ b/addons/auction/report/lots_list_inv.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<lots>
+	<lot type="fields" name="obj_num,id">
+		<name type="field" name="name"/>
+		<obj_num type="field" name="obj_num"/>
+		<lot_num type="field" name="lot_num"/>
+		<desc type="field" name="obj_desc"/>
+		<deposit_num type="field" name="bord_vnd_id.name"/>
+	</lot>
+</lots>
diff --git a/addons/auction/report/lots_list_inv.xsl b/addons/auction/report/lots_list_inv.xsl
new file mode 100644
index 00000000000..35fc5c80471
--- /dev/null
+++ b/addons/auction/report/lots_list_inv.xsl
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<xsl:template match="/">
+		<xsl:apply-templates select="lots"/>
+	</xsl:template>
+
+	<xsl:template match="lots">
+		<document xmlns:fo="http://www.w3.org/1999/XSL/Format">
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Releve de compte" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+				<pageTemplate id="all">
+					<pageGraphics/>
+					<frame id="list" x1="1.0cm" y1="2.0cm" width="19.0cm" height="27cm"/>
+				</pageTemplate>
+			</template>
+
+			<stylesheet>
+				<paraStyle name="small" fontName="Courier" fontSize="12" spaceBefore="0mm" spaceAfter="0mm"/>
+				<paraStyle name="verysmall" fontSize="10" fontName="Courier" spaceBefore="0mm" spaceAfter="0mm"/>
+				<paraStyle name="smallest" fontSize="8" fontName="Courier" spaceBefore="-1mm" spaceAfter="-1Mm"/>
+
+				<blockTableStyle id="left">
+					<blockValign value="TOP"/>
+					<blockAlignment value="LEFT"/>
+					<blockFont name="Helvetica-Bold" size="10"/>
+					<blockTextColor colorName="black"/>
+					<lineStyle kind="LINEABOVE" thickness="0.5" colorName="black" start="0,0" stop="-1,0"/>
+					<lineStyle kind="LINEABOVE" thickness="0.5" colorName="black" start="0,0" stop="-1,0"/>
+					<lineStyle kind="LINEBELOW" thickness="0.5" colorName="black"/>
+					<lineStyle kind="LINEBEFORE" thickness="0.5" colorName="black" start="0,0" stop="-1,-1"/>
+					<lineStyle kind="LINEBEFORE" thickness="0.5" colorName="black" start="0,0" stop="0,-1"/>
+					<lineStyle kind="LINEAFTER" thickness="0.5" colorName="black" start="-1,0" stop="-1,-1"/>
+					<blockBackground colorName="(1,1,1)" start="0,0" stop="-1,-1"/>
+					<blockBackground colorName="(0.88,0.88,0.88)" start="0,0" stop="-1,0"/>
+				</blockTableStyle>
+			</stylesheet>
+
+			<story>
+				<blockTable repeatRows="1" style="left" colWidths="2.4cm,2.2cm,12.0cm,1.8cm">
+					<tr>
+						<td>
+							<para style="small"><b t="1">Inv.</b></para>
+						</td><td>
+							<para style="small"><b t="1">List N.</b></para>
+						</td><td>
+							<para style="small"><b t="1">Description</b></para>
+						</td><td>
+							<para style="small"><b t="1">Cat. N.</b></para>
+						</td>
+					</tr>
+					<xsl:apply-templates select="lot">
+						<xsl:sort data-type="number" select="deposit_num"/>
+						<xsl:sort data-type="number" select="lot_num"/>
+					</xsl:apply-templates>
+				</blockTable>
+			</story>
+		</document>
+	</xsl:template>
+
+	<xsl:template match="lot">
+		<tr>
+			<td>
+				<para style="verysmall">
+					<xsl:value-of select="deposit_num"/>
+				</para>
+			</td><td>
+				<para style="verysmall">
+					<xsl:value-of select="lot_num"/>
+				</para>
+			</td><td>
+				<para style="verysmall">
+				    <xsl:value-of select="name"/>
+				</para>
+				<para style="verysmall">
+				    <xsl:value-of select="desc"/>
+				</para>
+			</td><td>
+				<para style="verysmall">
+					<xsl:value-of select="obj_num"/>
+				</para>
+			</td>
+		</tr>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/addons/auction/report/lots_list_inventory.py b/addons/auction/report/lots_list_inventory.py
new file mode 100644
index 00000000000..ca5b70bbaa0
--- /dev/null
+++ b/addons/auction/report/lots_list_inventory.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+class lots_list_inventory(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(lots_list_inventory, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'bid_line' : self.bid_line
+        })
+    def bid_line(self, lot_id):
+        res = self.pool.get('auction.bid.lines').read(self.cr,self.uid,[lot_id])
+        print res;
+        print "=================================================="
+        return True
+report_sxw.report_sxw('report.lots.list.inventory', 'auction.lots', 'addons/auction/report/lots_list_inventory.rml', parser=lots_list_inventory)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/lots_list_inventory.rml b/addons/auction/report/lots_list_inventory.rml
new file mode 100644
index 00000000000..5e6f85f3347
--- /dev/null
+++ b/addons/auction/report/lots_list_inventory.rml
@@ -0,0 +1,92 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </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="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>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Times-Roman"/>
+    <paraStyle name="P4" rightIndent="14.0" leftIndent="2.0" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" rightIndent="1.0" leftIndent="-3.0" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" rightIndent="13.0" leftIndent="1.0" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="37.0" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Courier" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P9" fontName="Courier" fontSize="7.0" leading="9" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P10" fontName="Courier" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="34.0,37.0,446.0,45.0" style="Table3">
+      <tr>
+        <td>
+          <para style="P4">Inv</para>
+        </td>
+        <td>
+          <para style="P5">List.N</para>
+        </td>
+        <td>
+          <para style="P6">Description</para>
+        </td>
+        <td>
+          <para style="P7">cat.N.</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P8">
+            <font face="Times-Roman" size="4.0">[[repeatIn(objects,'o')]]</font>
+            <font face="Times-Roman">[[o.bord_vnd_id.name]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="P8">[[o.lot_num]]</para>
+        </td>
+        <td>
+          <para style="P9">[[o.obj_desc]]</para>
+        </td>
+        <td>
+          <para style="P10">[[o.obj_num]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/lots_list_landscape.py b/addons/auction/report/lots_list_landscape.py
new file mode 100644
index 00000000000..11406580e1e
--- /dev/null
+++ b/addons/auction/report/lots_list_landscape.py
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+class lots_list_llandscape(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(lots_list_landscape, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+
+        })
+
+report_sxw.report_sxw('report.lots.list.landscape', 'auction.lots', 'addons/auction/report/lots_list_landscape.rml', parser=lots_list_landscape)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/lots_list_landscape.rml b/addons/auction/report/lots_list_landscape.rml
new file mode 100644
index 00000000000..1b428641f55
--- /dev/null
+++ b/addons/auction/report/lots_list_landscape.rml
@@ -0,0 +1,123 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <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"/>
+      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <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" alignment="CENTER"/>
+    <paraStyle name="P2" fontName="Times-Roman" alignment="LEFT"/>
+    <paraStyle name="P3" rightIndent="13.0" leftIndent="11.0" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" rightIndent="13.0" leftIndent="11.0" fontName="Courier-BoldOblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" rightIndent="17.0" leftIndent="0.0" fontName="Courier-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" rightIndent="17.0" leftIndent="0.0" fontName="Courier-Bold" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" rightIndent="17.0" leftIndent="0.0" fontName="Courier" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <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="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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="36.0,193.0,91.0,52.0,99.0,52.0" style="Table6">
+      <tr>
+        <td>
+          <para style="P3">Cat.N</para>
+        </td>
+        <td>
+          <para style="P4">Description</para>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P3">Est Min/Max</para>
+        </td>
+        <td>
+          <para style="P3">Limit Bid</para>
+        </td>
+        <td>
+          <para style="P4">Inv,Name</para>
+        </td>
+        <td>
+          <para style="P3">Buyer price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="36.0,193.0,91.0,52.0,99.0,52.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P5">[[ repeatIn(objects,'o') ]]</para>
+          <para style="P6">[[o. obj_num ]]</para>
+        </td>
+        <td>
+          <para style="P7">[[o.lot_type]]</para>
+          <para style="P8">[[o. name]]</para>
+        </td>
+        <td>
+          <para style="P6">[[o. lot_est1 ]]-[[o.lot_est2]]</para>
+        </td>
+        <td>
+          <para style="P9">[[o.bid_lines and o.bid_lines[0].price]]</para>
+          <para style="P6">[[o.vnd_lim_net and 'NET' or False]]</para>
+        </td>
+        <td>
+          <para style="P8">[[ o.bord_vnd_id.name ]]</para>
+          <para style="P8">[[o.bord_vnd_id.partner_id.name ]]</para>
+        </td>
+        <td>
+          <para style="P10">[[o.buyer_price]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/lots_list_landscape.xml b/addons/auction/report/lots_list_landscape.xml
new file mode 100644
index 00000000000..2e2ffd83374
--- /dev/null
+++ b/addons/auction/report/lots_list_landscape.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lots>
+	<lot type="fields" name="obj_num,id">
+		<lot_num type="field" name="obj_num"></lot_num>
+		<lot_seller type="field" name="bord_vnd_id.partner_id.name"></lot_seller>
+		<lot_seller_ref type="field" name="bord_vnd_id.partner_id.ref"></lot_seller_ref>
+		<lot_limit type="field" name="vnd_lim"/>
+		<lot_limit_net type="field" name="vnd_lim_net"/>
+		<artist type="field" name="artist_id.name"></artist>
+		<lot_est1 type="field" name="lot_est1"></lot_est1>
+		<lot_est2 type="field" name="lot_est2"></lot_est2>
+		<lot_desc type="field" name="obj_desc"></lot_desc>
+		<lot_desc0 type="field" name="name"></lot_desc0>
+		<deposit_num type="field" name="bord_vnd_id.name"></deposit_num>
+		<buyer_login type="field" name="ach_login"></buyer_login>
+		<obj_price type="field" name="obj_price"></obj_price>
+		<bid type="zoom" name="bid_lines">
+			<bid_id type="field" name="bid_id.name"></bid_id>
+			<bid_name type="field" name="bid_id.partner_id.name"></bid_name>
+			<bid_prix type="field" name="price"></bid_prix>
+			<bid_tel type="field" name="bid_id.contact_tel"></bid_tel>
+			<bid_tel_ok type="field" name="call"></bid_tel_ok>
+		</bid>
+	</lot>
+</lots>
diff --git a/addons/auction/report/lots_list_landscape.xsl b/addons/auction/report/lots_list_landscape.xsl
new file mode 100644
index 00000000000..b3ed6ce5a4d
--- /dev/null
+++ b/addons/auction/report/lots_list_landscape.xsl
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:template match="/">
+		<xsl:apply-templates select="lots"/>
+	</xsl:template>
+
+	<xsl:template match="lots">
+		<document xmlns:fo="http://www.w3.org/1999/XSL/Format">
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="" author="Generated by Tiny ERP" allowSplitting="20" pageSize="29.7cm,21cm">
+
+				<pageTemplate id="all">
+					<pageGraphics/>
+					<frame id="list" x1="1.0cm" y1="1.0cm" width="27.7cm" height="19cm"/>
+				</pageTemplate>
+			</template>
+
+			<stylesheet>
+				<paraStyle name="small" fontName="Courier" fontSize="12" spaceBefore="0mm" spaceAfter="0mm"/>
+				<paraStyle name="verysmall" fontSize="11" fontName="Courier" spaceBefore="0mm" spaceAfter="0mm"/>
+				<paraStyle name="smallest" fontSize="10" fontName="Courier" spaceBefore="-0.5mm" spaceAfter="-0.5mm"/>
+
+				<blockTableStyle id="left">
+					<blockValign value="TOP"/>
+					<blockAlignment value="LEFT"/>
+					<blockFont name="Helvetica-Bold" size="10"/>
+					<blockTextColor colorName="black"/>
+					<lineStyle kind="LINEABOVE" thickness="0.5" colorName="black" start="0,0" stop="-1,0"/>
+					<lineStyle kind="LINEBELOW" thickness="0.5" colorName="black"/>
+					<blockBackground colorName="(1,1,1)" start="0,0" stop="-1,-1"/>
+					<blockBackground colorName="(0.88,0.88,0.88)" start="0,0" stop="-1,0"/>
+				</blockTableStyle>
+			</stylesheet>
+
+			<story>
+				<blockTable repeatRows="1" style="left" colWidths="1.3cm,11.0cm,2.3cm,1.6cm,6.5cm,2.3cm,2cm">
+					<tr>
+						<td>
+							<para style="small"><b t="1">Cat. N.</b></para>
+						</td><td>
+							<para style="small"><b t="1">Description</b></para>
+						</td><td>
+							<para style="small"><b t="1">Est.</b></para>
+						</td><td>
+							<para style="small"><b t="1">Limit</b></para>
+						</td><td>
+							<para style="small"><b t="1">Orders</b></para>
+						</td><td>
+							<para style="small"><b t="1">Inv, Name</b></para>
+						</td><td>
+							<para style="small"><b t="1">Buyer, Price</b></para>
+						</td>
+					</tr>
+					<xsl:apply-templates select="lot"/>
+				</blockTable>
+			</story>
+		</document>
+	</xsl:template>
+
+	<xsl:template match="lot">
+		<tr>
+			<td>
+				<para style="verysmall"><xsl:value-of select="lot_num"/></para>
+			</td><td>
+				<para style="verysmall"><b><xsl:value-of select="artist"/></b></para>
+				<para style="verysmall"><b><xsl:value-of select="lot_desc0"/></b></para>
+				<para style="verysmall"><xsl:value-of select="lot_desc"/></para>
+			</td><td>
+				<para style="verysmall">
+					<xsl:if test="lot_est1 != ''">
+						<xsl:value-of select="round(lot_est1)"/>
+					</xsl:if>
+					<xsl:text>-</xsl:text>
+					<xsl:if test="lot_est2 != ''">
+						<xsl:value-of select="round(lot_est2)"/>
+					</xsl:if>
+				</para>
+			</td><td>
+				<xsl:if test="lot_limit != ''">
+					<para style="verysmall">
+						<b><xsl:value-of select="round(lot_limit)"/></b>
+					</para>
+				</xsl:if>
+				<xsl:if test="lot_limit_net != ''">
+					<para style="verysmall">
+						<b t="1">NET</b>
+					</para>
+				</xsl:if>
+			</td><td>
+				<xsl:for-each select="bid">
+					<xsl:sort order="descending" data-type="number" select="bid_prix"/>
+					<para style="smallest">
+						<xsl:choose>
+							<xsl:when test="bid_tel_ok='1'">
+								<b t="1">TEL:</b>
+							</xsl:when>
+							<xsl:otherwise t="1">
+								BID:
+							</xsl:otherwise>
+						</xsl:choose>
+						<xsl:value-of select="bid_name"/>
+						<xsl:text>(</xsl:text><xsl:value-of select="bid_id"/><xsl:text>)</xsl:text>
+						<xsl:if test="round(bid_prix)&gt;0">
+							<xsl:text> </xsl:text><b><xsl:value-of select="round(bid_prix)"/><xsl:text> EUR</xsl:text></b>
+						</xsl:if>
+						<xsl:if test="bid_tel_ok='1'">
+							<b><xsl:text t="1">, TEL:</xsl:text><xsl:value-of select="bid_tel"/></b>
+						</xsl:if>
+					</para>
+				</xsl:for-each>
+			</td><td>
+				<para style="verysmall">
+					<xsl:value-of select="deposit_num"/>
+					<xsl:text> </xsl:text><xsl:value-of select="substring(lot_seller_ref,0,5)"/>
+					<xsl:text> </xsl:text><xsl:value-of select="substring(lot_seller,0,9)"/>
+				</para>
+			</td><td>
+				<para style="verysmall">
+					<xsl:value-of select="buyer_login"/>
+					<xsl:if test="obj_price &gt; 0">
+						<xsl:text>, </xsl:text>
+						<xsl:value-of select="obj_price"/>
+					</xsl:if>
+				</para>
+			</td>
+		</tr>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/addons/auction/report/lots_with_vat.xml b/addons/auction/report/lots_with_vat.xml
new file mode 100644
index 00000000000..b5173b12dee
--- /dev/null
+++ b/addons/auction/report/lots_with_vat.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<lots>
+	<lot type="fields" name="id">
+		<number type="field" name="obj_num" />
+		<vat type="field" name="product_id.taxes_id.name" />
+		<commission type="field" name="auction_id.seller_costs" args="">
+			<name value="name" />
+			<amount value="amount" />
+		</commission>
+		<adjudicated type="field" name="obj_price" />
+		<expenses type="field" name="auction_id.buyer_costs" args="">
+			<name value="name" />
+			<amount value="amount" />
+		</expenses>
+	</lot>
+</lots>
diff --git a/addons/auction/report/lots_with_vat.xsl b/addons/auction/report/lots_with_vat.xsl
new file mode 100644
index 00000000000..60c262dcee7
--- /dev/null
+++ b/addons/auction/report/lots_with_vat.xsl
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+    <xsl:import href="../../custom/corporate_defaults.xsl"/>
+    <xsl:import href="../../base/report/rml_template.xsl"/>
+    <xsl:variable name="page_format">a4_normal</xsl:variable>
+
+    <xsl:template name="stylesheet">
+        <blockTableStyle id="vat_table">
+            <blockFont name="Helvetica-BoldOblique" size="10" start="0,0" stop="-1,0"/>
+            <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
+            <lineStyle kind="LINEAFTER" colorName="grey" start="0,0" stop="-1,-1"/>
+            <lineStyle kind="LINEBELOW" colorName="grey" start="0,-1" stop="-1,-1"/>
+            <lineStyle kind="LINEBEFORE" colorName="grey" start="0,0" stop="0,-1"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+        <blockTableStyle id="vat_total">
+            <blockBackground colorName="lightgrey" start="0,0" stop="-1,0"/>
+            <blockBackground colorName="lightgrey" start="0,-1" stop="-1,-1"/>
+            <lineStyle kind="LINEAFTER" colorName="grey" start="0,0" stop="-1,-1"/>
+            <lineStyle kind="LINEBELOW" colorName="grey" start="0,-1" stop="-1,-1"/>
+            <lineStyle kind="LINEBEFORE" colorName="grey" start="0,0" stop="0,-1"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+    </xsl:template>
+
+    <xsl:template match="/">
+        <xsl:call-template name="rml" />
+    </xsl:template>
+
+	<xsl:template name="story">
+		<h3>TVA = 6%</h3>
+		<blockTable colWidths="3cm,3cm,3cm,3cm,3cm,3cm" style="vat_table" repeatRows="1">
+			<tr>
+				<td>Lot number</td>
+				<td>Depositer price</td>
+				<td>Commission</td>
+				<td>Adjudicated</td>
+				<td>Expenses</td>
+				<td>Buyer price</td>
+			</tr>
+			<xsl:apply-templates select="/lots/lot[vat='VAT 6%']">
+				<xsl:sort select="number" data-type="number" />
+			</xsl:apply-templates>
+		</blockTable>
+		<blockTable colWidths="3cm,3cm,3cm,3cm,3cm,3cm" style="vat_total">
+			<tr>
+				<td>Total </td>
+				<td>
+
+					<xsl:value-of select="sum(/lots/lot[vat='VAT 6%'][adjudicated != '']/adjudicated) + sum(/lots/lot[vat='VAT 6%']/commission/amount)" />
+				</td>
+				<td>
+					<xsl:value-of select="sum(/lots/lot[vat='VAT 6%']/commission/amount)" />
+				</td>
+				<td>
+					<xsl:value-of select="sum(/lots/lot[vat='VAT 6%'][adjudicated != '']/adjudicated)" />
+				</td>
+				<td>
+					<xsl:value-of select="sum(/lots/lot[vat='VAT 6%']/expenses/amount)" />
+				</td>
+				<td>
+					<xsl:value-of select="sum(/lots/lot[vat='VAT 6%'][adjudicated != '']/adjudicated) + sum(/lots/lot[vat='VAT 6%']/expenses/amount)" />
+				</td>
+			</tr>
+		</blockTable>
+		<h3>VAT = 21%</h3>
+		<blockTable colWidths="3cm,3cm,3cm,3cm,3cm,3cm" style="vat_table" repeatRows="1">
+			<tr>
+				<td>Lot number</td>
+				<td>Depositer price</td>
+				<td>Commission</td>
+				<td>Adjudicated</td>
+				<td>Expenses</td>
+				<td>Buyer price</td>
+			</tr>
+			<xsl:apply-templates select="/lots/lot[vat='VAT 21%']">
+				<xsl:sort select="number" data-type="number"/>
+			</xsl:apply-templates>
+		</blockTable>
+		<blockTable colWidths="3cm,3cm,3cm,3cm,3cm,3cm" style="vat_total">
+			<tr>
+				<td>Total</td>
+				<td>
+					<xsl:value-of select="sum(/lots/lot[vat='VAT 21%'][adjudicated != '']/adjudicated) + sum(/lots/lot[vat='VAT 21%']/commission/amount)" />
+					<xsl:value-of select="vat" />
+				</td>
+				<td>
+					<xsl:value-of select="sum(/lots/lot[vat='VAT 21%']/commission/amount)" />
+				</td>
+				<td>
+					<xsl:value-of select="sum(/lots/lot[vat='VAT 21%'][adjudicated != '']/adjudicated)" />
+				</td>
+				<td>
+					<xsl:value-of select="sum(/lots/lot[vat='VAT 21%']/expenses/amount)" />
+				</td>
+				<td>
+					<xsl:value-of select="sum(/lots/lot[vat='VAT 21%'][adjudicated != '']/adjudicated) + sum(/lots/lot[vat='TVA 21%']/expenses/amount)" />
+				</td>
+			</tr>
+		</blockTable>
+    </xsl:template>
+
+	<xsl:template match="lot">
+		<tr>
+
+			<td><xsl:value-of select="number" /></td>
+			<td>
+				<xsl:choose>
+					<xsl:when test="adjudicated != ''">
+						<xsl:value-of select="number(adjudicated) + sum(commission/amount)" />
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:text name="adj">0</xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</td>
+			<td>
+				<xsl:value-of select="sum(commission/amount)" />
+			</td>
+			<td>
+				<xsl:choose>
+					<xsl:when test="adjudicated != ''">
+						<xsl:value-of select="adjudicated" />
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:text name="adj">0</xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</td>
+			<td>
+				<xsl:value-of select="sum(expenses/amount)" />
+			</td>
+			<td>
+				<xsl:choose>
+					<xsl:when test="adjudicated != ''">
+						<xsl:value-of select="number(adjudicated) + sum(expenses/amount)" />
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:text name="adj">0</xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</td>
+		</tr>
+    </xsl:template>
+</xsl:stylesheet>
+
diff --git a/addons/auction/report/photo_shadow.py b/addons/auction/report/photo_shadow.py
new file mode 100644
index 00000000000..d2dd983590b
--- /dev/null
+++ b/addons/auction/report/photo_shadow.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+
+def convert_catalog(from_file, to_file, size=220) :
+    return __convert(from_file, to_file, size)
+
+def convert(from_file, to_file):
+    size = 95
+    __convert(from_file, to_file, size=95)
+
+def __convert(from_file, to_file, size=95):
+    import Image, ImageDraw, ImageFilter
+    im = Image.open(from_file)
+    if float(im.size[1]/im.size[0])>2:
+        im = im.resize((im.size[0]*size/im.size[1], size))
+    else:
+        im = im.resize((size,im.size[1]*size/im.size[0]))
+    newimg = Image.new('RGB', (im.size[0]+8,im.size[1]+8), (255,255,255) )
+
+    draw = ImageDraw.Draw(newimg)
+    draw.rectangle((6, im.size[1]-5, im.size[0], im.size[1]+5), fill=(90,90,90))
+    draw.rectangle((im.size[0]-5, 6, im.size[0]+5, im.size[1]), fill=(90,90,90))
+    del draw 
+
+    newimg = newimg.filter(ImageFilter.BLUR)
+    newimg = newimg.filter(ImageFilter.BLUR)
+    newimg = newimg.filter(ImageFilter.BLUR)
+
+    newimg.paste(im, (0,0))
+    draw = ImageDraw.Draw(newimg)
+    draw.rectangle((0, 0, im.size[0], im.size[1]), outline=(0,0,0))
+    del draw 
+    to_fp = file(to_file, 'wb')
+    newimg.save(to_fp, "JPEG")
+    to_fp.close()
+    res = newimg.size
+    del im
+    del newimg
+    return res
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/report_lot_bar_code.py b/addons/auction/report/report_lot_bar_code.py
new file mode 100644
index 00000000000..95940cdfab4
--- /dev/null
+++ b/addons/auction/report/report_lot_bar_code.py
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+class auction_code_produit(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(auction_code_produit, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+        })
+report_sxw.report_sxw('report.auction.code_bar_lot', 'auction.lots', 'addons/auction/report/report_lot_bar_code.rml',parser=auction_code_produit,header=False)
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/report_lot_bar_code.rml b/addons/auction/report/report_lot_bar_code.rml
new file mode 100644
index 00000000000..1ca5048cf31
--- /dev/null
+++ b/addons/auction/report/report_lot_bar_code.rml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+<template pageSize="(5.5cm,2.8cm)" title="Test" author="Martin Simon" allowSplitting="20">
+<pageTemplate id="first">
+  <frame id="first" x1="0.1cm" y1="0.1cm" width="5.3cm" height="2.6cm"/>
+</pageTemplate>
+</template>
+<stylesheet>
+<initialize>
+  <paraStyle name="all" alignment="justify"/>
+</initialize>
+	<blockTableStyle id="Tableau1">
+	  <blockAlignment value="LEFT"/>
+	  <blockValign value="TOP"/>
+	  <lineStyle kind="GRID" colorName="black"/>
+	  <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
+	</blockTableStyle>
+	<paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="CENTER"/>
+	<paraStyle name="P2" fontName="Times-Roman" fontSize="8.0" leading="8" alignment="CENTER"/>
+	<paraStyle name="P3" fontName="Times-Roman" fontSize="5.0" leading="8" alignment="CENTER"/>
+	<paraStyle name="P4" fontName="Times-Roman" fontSize="5.0" leading="8" alignment="CENTER"/>
+
+<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="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') ]]
+	<blockTable colWidths="5.3cm" style="Tableau1">
+	  <tr>
+		<td>
+		  <para style="P3">Flagey</para>
+		</td>
+	  </tr>
+	  <tr>
+		<td>
+		  <para style="P2">
+			 Nr. [[o.lot_num]], ID[[ str(o.id) ]]
+		  </para>
+		  <para style="P1">[[ str(o.name[:35]) ]]</para>
+	<barCode code="code128" x="26.9mm" height="68.1mm" quiet="9" fontName="Times-Roman" fontSize="50"  alignment="CENTER">[['ID'+str(o.id)]]</barCode>
+		</td>
+	  </tr>
+	</blockTable>
+</story>
+</document>
diff --git a/addons/auction/report/results.xml b/addons/auction/report/results.xml
new file mode 100644
index 00000000000..8da92636b93
--- /dev/null
+++ b/addons/auction/report/results.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<results>
+	<auction type="zoom" name="auction_id">
+		<date-expo1 type="field" name="expo1"/>
+		<date-expo2 type="field" name="expo2"/>
+		<date-au1 type="field" name="auction1"/>
+		<date-au2 type="field" name="auction2"/>
+		<name type="field" name="name"/>
+	</auction>
+	<lines>
+		<lot type="fields" name="obj_num,id">
+			<lot-number type="field" name="obj_num"/>
+			<lot-info type="field" name="name"/>
+			<lot-price type="field" name="obj_price"/>
+		</lot>
+	</lines>
+</results>
diff --git a/addons/auction/report/results.xsl b/addons/auction/report/results.xsl
new file mode 100644
index 00000000000..abe867e75b8
--- /dev/null
+++ b/addons/auction/report/results.xsl
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+<xsl:variable name="number_columns">6</xsl:variable>
+
+<xsl:variable name="initial_left_pos">1.2</xsl:variable>
+<xsl:variable name="width_increment">3.3</xsl:variable>
+<xsl:variable name="frame_width">3.0cm</xsl:variable>
+
+<xsl:variable name="width_col1">1.2cm</xsl:variable>
+<xsl:variable name="width_col2">1.8cm</xsl:variable>
+
+<xsl:variable name="bottom_pos">2.4cm</xsl:variable>
+<xsl:variable name="frame_height">26cm</xsl:variable>
+
+<xsl:template match="/">
+	<xsl:apply-templates select="results"/>
+</xsl:template>
+
+<xsl:template match="results">
+	<document filename="example_5.pdf">
+	<template pageSize="21cm,29.7cm" leftMargin="1.5cm" rightMargin="1.5cm" topMargin="1.5cm" bottomMargin="1.5cm" title="Bordereau acheteur" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+		<pageTemplate id="main">
+			<pageGraphics>
+				<fill color="(0.4,0.4,0.4)"/>
+				<stroke color="(0.4,0.4,0.4)"/>
+				<setFont name="Helvetica" size="8"/>
+				<drawString x="1.8cm" y="1.4cm"><xsl:value-of select="auction/name"/></drawString>
+				<drawRightString x="19.2cm" y="1.4cm"><xsl:value-of select="auction/date-au1"/></drawRightString>
+				<lineMode width="0.2mm"/>
+				<lines>1.8cm 1.8cm 19.2cm 1.8cm</lines>
+			</pageGraphics>
+			<xsl:apply-templates select="lines/lot" mode="frames"/>
+		</pageTemplate>
+	</template>
+
+	<stylesheet>
+		<paraStyle name="name" fontName="Helvetica-Bold" fontSize="16" alignment="center"/>
+		<blockTableStyle id="result">
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
+			 <blockAlignment value="CENTER" start="0,0" stop="0,-1"/>
+			 <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
+			 <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
+			 <blockTextColor colorName="white" start="0,0" stop="-1,0"/>
+			 <lineStyle kind="LINEBELOW" colorName="red" start="0,0" stop="-1,0"/>
+			 <lineStyle kind="LINEBEFORE" colorName="grey" start="-1,0" stop="-1,-1"/>
+			 <lineStyle kind="LINEBEFORE" colorName="black" start="0,1" stop="0,-1"/>
+			 <lineStyle kind="LINEAFTER" colorName="black" start="-1,1" stop="-1,-1"/>
+		</blockTableStyle>
+	</stylesheet>
+	
+	<story>
+		<xsl:apply-templates select="lines"/>
+	</story>
+	
+	</document>
+</xsl:template>
+
+<xsl:template match="lines/lot" mode="frames">
+	<xsl:if test="position() &lt; $number_columns + 1">
+		<frame>
+			<xsl:attribute name="width">
+				<xsl:value-of select="$frame_width"/>
+			</xsl:attribute>
+			<xsl:attribute name="height">
+				<xsl:value-of select="$frame_height"/>
+			</xsl:attribute>
+			<xsl:attribute name="x1">
+				<xsl:value-of select="$initial_left_pos + (position()-1) * $width_increment"/>
+				<xsl:text>cm</xsl:text>
+			</xsl:attribute>
+			<xsl:attribute name="y1">
+				<xsl:value-of select="$bottom_pos"/>
+			</xsl:attribute>
+		</frame>
+	</xsl:if>
+</xsl:template>
+
+<xsl:template match="lines">
+	<blockTable repeatRows="1" style="result">
+		<xsl:attribute name="colWidths">
+			<xsl:value-of select="$width_col1"/>
+			<xsl:text>, </xsl:text>
+			<xsl:value-of select="$width_col2"/>
+		</xsl:attribute>
+			
+		<tr>
+			<td t="1">Num</td>
+			<td t="1">Adj.</td>
+		</tr>
+		<xsl:apply-templates select="lot" mode="story"/>
+	</blockTable>
+	<pageBreak/>
+</xsl:template>
+
+<xsl:template match="lot" mode="story">
+	<tr>
+		<td>
+			<xsl:value-of select="lot-number"/>
+		</td>
+		<td>
+			<xsl:if test="lot-price!=''">
+				<xsl:value-of select="round(lot-price)"/>
+			</xsl:if>
+		</td>
+	</tr>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/results_buyer.xml b/addons/auction/report/results_buyer.xml
new file mode 100644
index 00000000000..56a09358357
--- /dev/null
+++ b/addons/auction/report/results_buyer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE results SYSTEM "/home/pinky/code/terp/xml/dtd/fiches.dtd">
+<results>
+	<auction type="zoom" name="auction_id">
+		<date-expo1 type="field" name="expo1"/>
+		<date-expo2 type="field" name="expo2"/>
+		<date-au1 type="field" name="auction1"/>
+		<date-au2 type="field" name="auction2"/>
+		<name type="field" name="name"/>
+	</auction>
+	<lines>
+		<lot type="fields" name="obj_num,id">
+			<lot-number type="field" name="obj_num"/>
+			<lot-info type="field" name="name"/>
+			<lot-price type="field" name="obj_price"/>
+			<lot-buyer type="field" name="ach_uid.name" />
+		</lot>
+	</lines>
+</results>
diff --git a/addons/auction/report/results_buyer.xsl b/addons/auction/report/results_buyer.xsl
new file mode 100644
index 00000000000..8c3648b6799
--- /dev/null
+++ b/addons/auction/report/results_buyer.xsl
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+<xsl:variable name="number_columns">2</xsl:variable>
+
+<xsl:variable name="initial_left_pos">1.2</xsl:variable>
+<xsl:variable name="width_increment">9.5</xsl:variable>
+<xsl:variable name="frame_width">9.0cm</xsl:variable>
+
+<xsl:variable name="width_col1">1.2cm</xsl:variable>
+<xsl:variable name="width_col2">1.8cm</xsl:variable>
+<xsl:variable name="width_col3">6cm</xsl:variable>
+
+<xsl:variable name="bottom_pos">2.4cm</xsl:variable>
+<xsl:variable name="frame_height">26cm</xsl:variable>
+
+<xsl:template match="/">
+	<xsl:apply-templates select="results"/>
+</xsl:template>
+
+<xsl:template match="results">
+	<document filename="example_5.pdf">
+	<template pageSize="21cm,29.7cm" leftMargin="1.5cm" rightMargin="1.5cm" topMargin="1.5cm" bottomMargin="1.5cm" title="Bordereau acheteur" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+		<pageTemplate id="main">
+			<pageGraphics>
+				<fill color="(0.4,0.4,0.4)"/>
+				<stroke color="(0.4,0.4,0.4)"/>
+				<setFont name="Helvetica" size="8"/>
+				<drawString x="1.8cm" y="1.4cm"><xsl:value-of select="auction/name"/></drawString>
+				<drawRightString x="19.2cm" y="1.4cm"><xsl:value-of select="auction/date-au1"/></drawRightString>
+				<lineMode width="0.2mm"/>
+				<lines>1.8cm 1.8cm 19.2cm 1.8cm</lines>
+			</pageGraphics>
+			<xsl:apply-templates select="lines/lot" mode="frames"/>
+		</pageTemplate>
+	</template>
+
+	<stylesheet>
+		<paraStyle name="name" fontName="Helvetica-Bold" fontSize="16" alignment="center"/>
+		<blockTableStyle id="result">
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="CENTER" start="0,0" stop="-1,0"/>
+			 <blockAlignment value="RIGHT" start="0,1" stop="-1,-1"/>
+			 <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
+			 <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
+			 <blockTextColor colorName="white" start="0,0" stop="-1,0"/>
+			 <lineStyle kind="LINEBELOW" colorName="red" start="0,0" stop="-1,0"/>
+			 <lineStyle kind="LINEBEFORE" colorName="grey" start="-2,0" stop="-2,-1"/>
+			 <lineStyle kind="LINEBEFORE" colorName="grey" start="-1,0" stop="-1,-1"/>
+			 <lineStyle kind="LINEBEFORE" colorName="black" start="0,1" stop="0,-1"/>
+			 <lineStyle kind="LINEAFTER" colorName="black" start="-1,1" stop="-1,-1"/>
+		</blockTableStyle>
+	</stylesheet>
+	
+	<story>
+		<xsl:apply-templates select="lines"/>
+	</story>
+	
+	</document>
+</xsl:template>
+
+<xsl:template match="lines/lot" mode="frames">
+	<xsl:if test="position() &lt; $number_columns + 1">
+		<frame>
+			<xsl:attribute name="width">
+				<xsl:value-of select="$frame_width"/>
+			</xsl:attribute>
+			<xsl:attribute name="height">
+				<xsl:value-of select="$frame_height"/>
+			</xsl:attribute>
+			<xsl:attribute name="x1">
+				<xsl:value-of select="$initial_left_pos + (position()-1) * $width_increment"/>
+				<xsl:text>cm</xsl:text>
+			</xsl:attribute>
+			<xsl:attribute name="y1">
+				<xsl:value-of select="$bottom_pos"/>
+			</xsl:attribute>
+		</frame>
+	</xsl:if>
+</xsl:template>
+
+<xsl:template match="lines">
+	<blockTable  repeatRows="1" style="result">
+		<xsl:attribute name="colWidths">
+			<xsl:value-of select="$width_col1"/>
+			<xsl:text>, </xsl:text>
+			<xsl:value-of select="$width_col2"/>
+			<xsl:text>, </xsl:text>
+			<xsl:value-of select="$width_col3"/>
+		</xsl:attribute>
+			
+		<tr>
+			<td t="1">Num.</td>
+			<td t="1">Adj.</td>
+			<td t="1">Buyer</td>
+		</tr>
+		<xsl:apply-templates select="lot" mode="story"/>
+	</blockTable>
+	<pageBreak/>
+</xsl:template>
+
+<xsl:template match="lot" mode="story">
+	<tr>
+		<td>
+			<xsl:value-of select="lot-number"/>
+		</td>
+		<td>
+			<xsl:if test="lot-price!=''">
+				<xsl:value-of select="round(lot-price)"/>
+			</xsl:if>
+		</td>
+		<td>
+			<para><xsl:value-of select="lot-buyer"/></para>
+		</td>
+	</tr>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/seller_address.py b/addons/auction/report/seller_address.py
new file mode 100644
index 00000000000..4b684ab0bb7
--- /dev/null
+++ b/addons/auction/report/seller_address.py
@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+from report.interface import report_int
+import netsvc
+
+class auction_seller(report_int):
+    def __init__(self, name):
+        report_int.__init__(self, name)
+
+    def create(self,cr, uid, ids, datas, context):
+        service = netsvc.LocalService("object_proxy")
+        lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', ids, ['bord_vnd_id'])
+
+        bords = {}
+        for l in lots:
+            if l['bord_vnd_id']:
+                bords[l['bord_vnd_id'][0]]=True
+        new_ids = bords.keys()
+
+        parts = {}
+        partners = service.execute(cr.dbname,uid, 'auction.deposit', 'read', new_ids, ['partner_id'])
+        for l in partners:
+            if l['partner_id']:
+                parts[l['partner_id'][0]]=True
+        new_ids = parts.keys()
+        if not len(new_ids):
+            raise 'UserError', 'No seller !'
+
+        datas['ids'] = new_ids
+
+        self._obj_invoice = netsvc.LocalService('report.res.partner.address')
+        return self._obj_invoice.create(cr,uid, new_ids, datas, context)
+
+    def result(self):
+        return self._obj_invoice.result()
+
+auction_seller('report.auction.seller_labels')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/seller_form_report.py b/addons/auction/report/seller_form_report.py
new file mode 100644
index 00000000000..0832a26eb1b
--- /dev/null
+++ b/addons/auction/report/seller_form_report.py
@@ -0,0 +1,104 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 pooler
+import time
+from report import report_sxw
+from osv import osv
+
+class seller_form_report(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(seller_form_report, self).__init__(cr, uid, name, context)
+        lot=self.pool.get('auction.lots').browse(cr,uid,uid)
+        #address=lot.bord_vnd_id.address_get(self.cr,self.uid,[partner.id])
+    #   partner=lot.bord_vnd_id.partner_id
+    #   address=partner.address and partner.address[0] or ""
+    #   street = address and address.street or ""
+
+
+
+        self.localcontext.update({
+            'time': time,
+            'sum_taxes': self.sum_taxes,
+            'sellerinfo' : self.seller_info,
+            'grand_total' : self.grand_seller_total,
+    #       'street':street,
+    #       'address':address,
+})
+
+
+    def sum_taxes(self, lot):
+        taxes=[]
+        print lot.auction_id and lot.auction_id.seller_costs[0].amount or False
+
+        amount=0.0
+        if lot.bord_vnd_id.tax_id:
+            taxes.append(lot.bord_vnd_id.tax_id)
+        elif lot.auction_id and lot.auction_id.seller_costs:
+            taxes += lot.auction_id.seller_costs
+        tax=self.pool.get('account.tax').compute(self.cr,self.uid,taxes,lot.obj_price,1)
+        for t in tax:
+            amount+=t['amount']
+        return amount
+    def seller_info(self):
+        objects = [object for object in self.localcontext.get('objects')]
+        print "OBJECTS",objects
+        ret_dict = {}
+        ret_list = []
+        for object in objects:
+            print "Object :",object
+#           print ret_dict
+
+            partner = ret_dict.get(object.bord_vnd_id.partner_id.id,False)
+            print "seller :",partner
+            if not partner:
+                ret_dict[object.bord_vnd_id.partner_id.id] = {'partner' : object.bord_vnd_id.partner_id or False,'lots':[object]}
+            else:
+                lots = partner.get('lots')
+                print "Lots :",lots
+                lots.append(object)
+#       print 'ret dict :',ret_dict
+#       buyer_ids=self.pool.get(auction.lots).read(cr,uid,lot)
+        print "Return ret_dict.values() :",ret_dict.values()
+        return ret_dict.values()
+    def grand_seller_total(self,o):
+        grand_total = 0
+        for oo in o:
+            print "the value of grand totoal",grand_total
+            print "the value of self.sum_taxes(oo)",self.sum_taxes(oo)
+            print "the value of oo['obj_price']",oo['obj_price']
+            grand_total =grand_total + oo['obj_price']+ self.sum_taxes(oo)
+        return grand_total
+
+
+report_sxw.report_sxw('report.seller_form_report', 'auction.lots', 'addons/auction/report/seller_form_report.rml', parser=seller_form_report)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/seller_form_report.rml b/addons/auction/report/seller_form_report.rml
new file mode 100644
index 00000000000..bf226a41217
--- /dev/null
+++ b/addons/auction/report/seller_form_report.rml
@@ -0,0 +1,179 @@
+<?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="35.0" y1="35.0" width="525" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <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="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" rightIndent="18.0" leftIndent="408.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Times-Roman" fontSize="7.0" leading="9" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" rightIndent="12.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" rightIndent="12.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" rightIndent="12.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" rightIndent="0.0" leftIndent="13.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="2.0"/>
+    <paraStyle name="P11" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="2.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="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" 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-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Text" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P2">[[ repeatIn(sellerinfo(),'o') ]]</para>
+    <blockTable colWidths="354.0,171.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
+          <para style="Addressee">[[o['partner'] and o['partner'].address[0].street or False]]</para>
+          <para style="Addressee">[[o['partner'] and o['partner'].address[0].zip or False]][[o['partner'] and o['partner'].address[0].city or False]]</para>
+          <para style="P11">[[o['partner'] and o['partner'].address[0].country_id.name or False]]</para>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="Table Heading">
+      <font color="white"> </font>
+    </para>
+    <para style="P6">Document:Bordereau de vente </para>
+    <para style="P6">Inventory: </para>
+    <para style="P6">Bank Account: </para>
+    <para style="P6">Customer Contact: </para>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="52.0,64.0,196.0,214.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P1">Cat.N</para>
+        </td>
+        <td>
+          <para style="P1">List.N</para>
+        </td>
+        <td>
+          <para style="P1">Description</para>
+        </td>
+        <td>
+          <para style="P1">Adj(EUR</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="52.0,64.0,196.0,100.0,106.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P8"><font face="Times-Roman" size="7.0">[[ repeatIn(o['lots'],'oo') ]]</font> [[ oo.obj_num ]]</para>
+        </td>
+        <td>
+          <para style="P8">[[ oo.lot_num]] </para>
+        </td>
+        <td>
+          <para style="P7">[[ oo.name ]]</para>
+        </td>
+        <td>
+          <para style="P8">
+            <font color="white"> </font>
+          </para>
+          <para style="P9">Subtotal:</para>
+          <para style="P8">SellerCosts([['%.0f'%((oo.auction_id and oo.auction_id.seller_costs[0].amount) *100) or False]]%):</para>
+          <para style="P8">Total:</para>
+        </td>
+        <td>
+          <para style="P7">
+            <font color="white"> </font>
+          </para>
+          <blockTable colWidths="68.0" style="Table3">
+            <tr>
+              <td>
+                <para style="P10">[[ oo.obj_price ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P10">[[ sum_taxes(oo) ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P10">[[ oo.obj_price + sum_taxes(oo) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="P7">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Text body">
+      <font color="white"> </font>
+    </para>
+    <para style="Text body">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="525.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P12">Grand Total : [[ grand_total(o['lots']) ]] </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/auction/report/seller_list.xml b/addons/auction/report/seller_list.xml
new file mode 100644
index 00000000000..cf0b7e3ba81
--- /dev/null
+++ b/addons/auction/report/seller_list.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<seller-list>
+	<date type="function" name="today"></date>
+	<subject>Listing des vendeurs</subject>
+	
+	<auctions type="fields" name="auction_id">
+		<title type="field" name="auction_id.name">Auction Title</title>
+		
+		<cost-index type="call" name="compute_seller_costs_summed" args="">
+			<type value="type"/>
+			<id value="id"/>
+			<name value="name"/>
+		</cost-index>
+		
+		<sellers type="fields" name="bord_vnd_id">
+			<inventory type="field" name="bord_vnd_id.name"></inventory>
+			<name type="field" name="bord_vnd_id.partner_id.name"></name>
+			<cost type="call" name="compute_seller_costs_summed" args="">
+				<type value="type"/>
+				<id value="id"/>
+				<amount value="amount"/>
+			</cost>
+			<product type="fields" name="obj_num,id">
+				<ref type="field" name="obj_num"></ref>
+				<price type="field" name="obj_price" default="0.0"></price>
+			</product>
+		</sellers>
+	</auctions>
+</seller-list>
diff --git a/addons/auction/report/seller_list.xsl b/addons/auction/report/seller_list.xsl
new file mode 100644
index 00000000000..b81e23b299f
--- /dev/null
+++ b/addons/auction/report/seller_list.xsl
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<xsl:template match="/">
+		<xsl:apply-templates select="seller-list"/>
+	</xsl:template>
+
+	<xsl:template match="seller-list">
+		<document filename="example.pdf">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+<!--
+			<template pageSize="21m,29.7cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+-->
+				<pageTemplate id="first">
+					<pageGraphics>
+						<drawRightString x="19.0cm" y="26.0cm"><xsl:value-of select="date"/></drawRightString>
+					</pageGraphics>
+					<frame id="list" x1="1.0cm" y1="1.0cm" width="27.7cm" height="19cm"/>
+<!--
+					<frame id="list" x1="2.0cm" y1="2.5cm" width="17.0cm" height="22.7cm"/>
+-->
+				</pageTemplate>
+			</template>
+			
+			<stylesheet>
+				<paraStyle name="name" fontName="Helvetica-Bold" fontSize="16" alignment="center"/>
+				<paraStyle name="cost-name" fontName="Helvetica-BoldOblique" fontSize="10" alignment="RIGHT"/>
+				<blockTableStyle id="products">
+					 <blockAlignment value="RIGHT" start="2,0" stop="-1,-1"/>
+					 <lineStyle kind="LINEBELOW" start="0,0" stop="-1,0"/>
+					 <lineStyle kind="LINEABOVE" start="0,-1" stop="-1,-1"/>
+					 <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
+					 <blockValign value="TOP"/>
+				</blockTableStyle>
+			</stylesheet>
+			
+			<story>
+				<xsl:apply-templates select="auctions"/>
+			</story>
+		</document>
+	</xsl:template>
+
+	<xsl:template match="auctions">
+		<para style="name"><xsl:value-of select="title"/></para>
+
+		<spacer length="1cm"/>
+
+		<xsl:variable name="colWidths">
+			<xsl:text>1.5cm,7.5cm,0.5cm,1.8cm</xsl:text>
+			<xsl:for-each select="//cost-index">
+				<xsl:text>,2cm</xsl:text>
+			</xsl:for-each>
+			<xsl:text>,2cm</xsl:text>
+		</xsl:variable>
+		
+		<blockTable style="products" repeatRows="1"> 
+			<xsl:attribute name="colWidths">
+				<xsl:value-of select="$colWidths"/>
+			</xsl:attribute>
+			
+			<tr>
+				<td t="1">Inv.</td>
+				<td t="1">Seller</td>
+				<td t="1">#</td>
+				<td t="1">Adj.</td>
+				<xsl:apply-templates select="cost-index">
+					<xsl:sort select="type" data-type="number"/>
+					<xsl:sort select="name"/>
+				</xsl:apply-templates>
+				<td><para style="cost-name" t="1">To pay</para></td>
+			</tr>
+			<xsl:apply-templates select="sellers">
+				<xsl:sort select="name" order="ascending"/>
+<!--				<xsl:sort select="inventory" order="ascending"/>-->
+			</xsl:apply-templates>
+			<tr>
+				<td><para><b t="1">Total:</b></para></td>
+				<td/>
+				<td><xsl:value-of select="count(sellers/product)"/></td>
+				<td><xsl:value-of select="format-number(sum(sellers/product[price != '']/price), '#,##0.00')"/></td>
+				<xsl:for-each select="//cost-index">
+					<xsl:sort select="type" data-type="number"/>
+					<xsl:sort select="name"/>
+					<xsl:variable name="cost_type" select="type"/>
+					<xsl:variable name="cost_id" select="id"/>
+					<td><xsl:value-of select="format-number(sum(//sellers/cost[id=$cost_id and type=$cost_type]/amount), '#,##0.00')"/></td>
+				</xsl:for-each>
+				<td><xsl:value-of select="format-number(sum(sellers/product[price != '']/price) + sum(sellers/cost/amount), '#,##0.00')"/></td>
+			</tr>
+		</blockTable>
+	</xsl:template>
+	
+	<xsl:template match="cost-index">
+		<td><para style="cost-name"><xsl:value-of select="name"/></para></td>
+	</xsl:template>
+
+	<xsl:template match="sellers">
+		<xsl:variable name="inv" select="inventory"/>
+		<tr>
+			<td><xsl:value-of select="inventory"/></td>
+			<td><xsl:value-of select="name"/></td>
+			<td><xsl:value-of select="count(product)"/></td>
+			<td><xsl:value-of select="sum(product[price != '']/price)"/></td>
+			<xsl:for-each select="//cost-index">
+				<xsl:sort select="type" data-type="number"/>
+				<xsl:sort select="name"/>
+				<xsl:variable name="cost_type" select="type"/>
+				<xsl:variable name="cost_id" select="id"/>
+				<td><xsl:value-of select="//sellers[inventory=$inv]/cost[id=$cost_id and type=$cost_type]/amount"/></td>
+			</xsl:for-each>
+			<td><xsl:value-of select="sum(product[price != '']/price) + sum(cost/amount)"/></td>
+		</tr>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/total.py b/addons/auction/report/total.py
new file mode 100644
index 00000000000..35d64e1350c
--- /dev/null
+++ b/addons/auction/report/total.py
@@ -0,0 +1,155 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 os, time, datetime
+
+import netsvc, tools
+
+import report.print_xml
+import report.render
+import report.common
+from report.interface import report_rml
+
+def toxml(val):
+    return val.replace('&', '&amp;').replace('<','&lt;').replace('>','&gt;').decode('utf-8').encode('latin1')
+
+class report_custom(report_rml):
+    def __init__(self, name, table, tmpl, xsl):
+        report_rml.__init__(self, name, table, tmpl, xsl)
+
+    def create_xml(self,cr, uid, ids, datas, context={}):
+        service = netsvc.LocalService("object_proxy")
+
+#       start_time = time.clock()
+
+#           lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', ids, ['obj_price','ach_pay_id','ach_login','obj_comm','lot_est1','lot_est2','bord_vnd_id','ach_emp','auction_id'])
+        lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', ids, ['obj_price','ach_login','obj_comm','lot_est1','lot_est2','bord_vnd_id','ach_emp','auction_id'])
+        auction = service.execute(cr.dbname,uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
+
+#       mid_time = time.clock()
+
+        unsold = comm = emp = paid = unpaid = 0
+        est1 = est2 = adj = 0
+        paid_ids = []
+        unpaid_ids = []
+        buyer = {}
+        seller = {}
+        debit = 0
+
+        for l in lots:
+            if l['lot_est2']:
+                est2 += l['lot_est2'] or 0.0
+
+            if l['lot_est1']:
+                est1 += l['lot_est1'] or 0.0
+
+            if l['obj_price']:
+                adj += l['obj_price'] or 0.0
+
+            if l['obj_comm']:
+                comm += 1
+
+            if l['ach_emp']:
+                emp += 1
+
+            if l['ach_pay_id']:
+                paid_ids.append(l['id'])
+                paid += l['obj_price']
+            else:
+                unpaid_ids.append(l['id'])
+                unpaid += l['obj_price']
+
+            if l['obj_price']==0:
+                unsold+=1
+
+            buyer[l['ach_login']]=1
+            seller[l['bord_vnd_id']]=1
+
+#       mid_time2 = time.clock()
+
+#       costs = service.execute(cr.dbname,uid, 'auction.lots', 'compute_buyer_costs', paid_ids)
+#       for cost in costs:
+#           paid += cost['amount']
+#
+#       costs = service.execute(cr.dbname,uid, 'auction.lots', 'compute_buyer_costs', unpaid_ids)
+#       for cost in costs:
+#           unpaid += cost['amount']
+
+#       mid_time3 = time.clock()
+
+        debit = adj
+        costs = service.execute(cr.dbname,uid, 'auction.lots', 'compute_seller_costs', ids)
+        for cost in costs:
+            debit += cost['amount']
+
+#       mid_time4 = time.clock()
+
+        xml = '''<?xml version="1.0" encoding="ISO-8859-1"?>
+<report>
+    <date>%s</date>
+    <auction>
+        <title>%s</title>
+        <date>%s</date>
+    </auction>
+    <objects>
+        <obj_nbr>%d</obj_nbr>
+        <est_min>%.2f</est_min>
+        <est_max>%.2f</est_max>
+        <unsold>%d</unsold>
+        <obj_price>%.2f</obj_price>
+    </objects>
+    <buyer>
+        <buy_nbr>%d</buy_nbr>
+        <paid_nbr>%d</paid_nbr>
+        <comm_nbr>%d</comm_nbr>
+        <taken_nbr>%d</taken_nbr>
+        <credit>%.2f</credit>
+        <paid>%.2f</paid>
+    </buyer>
+    <seller>
+        <sell_nbr>%d</sell_nbr>
+        <debit>%.2f</debit>
+    </seller>
+</report>''' % (time.strftime('%d/%m/%Y'), toxml(auction['name']), auction['auction1'], len(lots), est1, est2, unsold, adj, len(buyer), len(paid_ids), comm, emp, unpaid, paid, len(seller), debit)
+
+#       file('/tmp/terp.xml','wb+').write(xml)
+#       end_time = time.clock()
+#       print "db:", mid_time-start_time
+#       print "addition:", mid_time2-mid_time
+#       print "buyer costs:", mid_time3-mid_time2
+#       print "seller costs:", mid_time4-mid_time3
+#       print "rest:", end_time-mid_time4
+#       print "total:", end_time-start_time
+        return self.post_process_xml_data(cr, uid, xml, context)
+
+report_custom('report.auction.total', 'auction.lots', '', 'addons/auction/report/total.xsl')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/report/total.xsl b/addons/auction/report/total.xsl
new file mode 100644
index 00000000000..265c880b71c
--- /dev/null
+++ b/addons/auction/report/total.xsl
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+
+	<xsl:template match="/">
+		<xsl:apply-templates select="report"/>
+  	</xsl:template>
+
+	<xsl:template match="/">
+		<document filename="example_5.pdf">
+		<template >
+			<pageTemplate id="main">
+				<frame id="mainbox" x1="2cm" y1="2cm" width="19cm" height="24cm"/>
+				<pageGraphics>
+					<xsl:apply-imports/>
+				</pageGraphics>
+			</pageTemplate>
+		</template>
+
+
+		<stylesheet>
+			<paraStyle name="section" fontName="Helvetica-Bold" fontSize="16" spaceAfter="0.5cm" spaceBefore="1.5cm"/>
+		</stylesheet>
+		<story>
+			<spacer length="2cm"/>
+			<para t="1">Date printing: <xsl:value-of select="report/date"/></para>
+			<para style="section" t="1">
+				Auction
+			</para>
+			<xsl:apply-templates select="report/auction"/>
+			<para style="section" t="1">
+				Items
+			</para>
+			<xsl:apply-templates select="report/objects"/>
+			<para style="section" t="1">
+				Buyers
+			</para>
+			<xsl:apply-templates select="report/buyer"/>
+			<para style="section" t="1">
+				Sellers
+			</para>
+			<xsl:apply-templates select="report/seller"/>
+		</story>
+		</document>
+	</xsl:template>
+
+	<xsl:template match="report/buyer">
+		<blockTable colWidths="4cm,14.9cm">
+		<tr>
+			<td t="1"># of buyers:</td>
+			<td><xsl:value-of select="buy_nbr"/></td>
+		</tr><tr>
+			<td t="1"># of paid items:</td>
+			<td><xsl:value-of select="paid_nbr"/></td>
+		</tr><tr>
+			<td t="1"># commissions:</td>
+			<td><xsl:value-of select="comm_nbr"/></td>
+		</tr><tr>
+			<td t="1"># of items taken away:</td>
+			<td><xsl:value-of select="taken_nbr"/></td>
+		</tr><tr>
+			<td t="1">Credit:</td>
+			<td><xsl:value-of select="credit"/> EUR</td>
+		</tr><tr>
+			<td t="1">Paid:</td>
+			<td><xsl:value-of select="paid"/> EUR</td>
+		</tr>
+		</blockTable>
+	</xsl:template>
+
+	<xsl:template match="report/auction">
+		<blockTable colWidths="4cm,14.9cm">
+		<tr>
+			<td t="1">Auction:</td>
+			<td><xsl:value-of select="title"/></td>
+		</tr><tr>
+			<td t="1">Date:</td>
+			<td><xsl:value-of select="date"/></td>
+		</tr>
+		</blockTable>
+	</xsl:template>
+
+	<xsl:template match="/report/seller">
+		<blockTable colWidths="4cm,14.9cm">
+		<tr>
+			<td t="1"># of sellers:</td>
+			<td><xsl:value-of select="sell_nbr"/></td>
+		</tr><tr>
+			<td t="1">Debit:</td>
+			<td><xsl:value-of select="debit"/> EUR</td>
+		</tr>
+		</blockTable>
+	</xsl:template>
+
+	<xsl:template match="/report/objects">
+		<blockTable colWidths="4cm,14.9cm">
+		<tr>
+			<td t="1"># of items:</td>
+			<td><xsl:value-of select="obj_nbr"/></td>
+		</tr><tr>
+			<td t="1">Min Estimate:</td>
+			<td><xsl:value-of select="est_min"/></td>
+		</tr><tr>
+			<td t="1">Max Estimate:</td>
+			<td><xsl:value-of select="est_max"/></td>
+		</tr><tr>
+			<td t="1"># of unsold items:</td>
+			<td><xsl:value-of select="unsold"/></td>
+		</tr><tr>
+			<td t="1">Adjudication:</td>
+			<td><xsl:value-of select="obj_price"/> EUR</td>
+		</tr>
+		</blockTable>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/addons/auction/report/vnd_bordereau.xml b/addons/auction/report/vnd_bordereau.xml
new file mode 100644
index 00000000000..7873a19a118
--- /dev/null
+++ b/addons/auction/report/vnd_bordereau.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vente-bordereau-list>
+	<city type="data" name="city">Bruxelles</city>
+	<date type="function" name="today"></date>
+
+	<vente-bordereau type="fields" name="bord_vnd_id.name" order="desc">
+		<title type="field" name="auction_id.name">Vente</title>
+		<subject>Bordereau de vente</subject>
+		<inventory type="field" name="bord_vnd_id.name"/>
+		<client_info type="zoom" name="bord_vnd_id.partner_id">
+			<title type="field" name="title"/>
+			<name type="field" name="name"/>
+			<!--<bank type="field" name="bank"/>-->
+			<street type="field" name="address.street"/>
+			<street2 type="field" name="address.street2"/>
+			<zip type="field" name="address.zip"/>
+			<city type="field" name="address.city"/>
+			<!--<country type="field" name="address.country.name"/>-->
+			<phone type="field" name="address.phone"/>
+			<mobile type="field" name="address.mobile"/>
+		</client_info>
+		<vente-products>
+			<cost type="call" name="compute_seller_costs" args="">
+				<type value="type"/>
+				<id value="id"/>
+
+				<name value="name"/>
+				<amount value="amount"/>
+			</cost>
+			<product type="fields" name="obj_num,id">
+			<ref type="field" name="id"/>
+				<num_catalog type="field" name="obj_num"/>
+				<num_inv type="field" name="lot_num"/>
+				<title type="field" name="name"/>
+				<price type="field" name="obj_price"/>
+			</product>
+		</vente-products>
+	</vente-bordereau>
+</vente-bordereau-list>
diff --git a/addons/auction/report/vnd_bordereau.xsl b/addons/auction/report/vnd_bordereau.xsl
new file mode 100644
index 00000000000..0d297f77b51
--- /dev/null
+++ b/addons/auction/report/vnd_bordereau.xsl
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+		<xsl:import href="../../base/report/rml_template.xsl"/>
+
+	<xsl:template match="/">
+		<xsl:call-template name="rml"/>
+	</xsl:template>
+
+
+<xsl:template name="first_page_frames">
+		<xsl:if test="$page_format='a4_normal'">
+			<frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="22.0cm"/>
+		</xsl:if>
+
+		<xsl:if test="$page_format='a4_letter'">
+			<frame id="address" x1="11cm" y1="21.5cm" width="6cm" height="1cm"/>
+			<frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="21.0cm"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template name="stylesheet">
+		<paraStyle name="name" fontName="Helvetica-Bold" fontSize="16"/>
+		<blockTableStyle id="products">
+			 <blockFont name="Helvetica-Bold" size="12" start="0,0" stop="-1,0"/>
+			 <lineStyle kind="LINEBELOW" start="0,0" stop="-1,0"/>
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
+		</blockTableStyle>
+		<paraStyle name="style1" leftIndent="10cm" fontName="Helvetica-Bold" />
+
+		<blockTableStyle id="product-totals">
+			 <blockValign value="TOP"/>
+			 <blockAlignment value="RIGHT"/>
+			 <lineStyle kind="LINEABOVE" start="-1,0" stop="-1,0"/>
+			 <lineStyle kind="LINEABOVE" start="-1,-1" stop="-1,-1"/>
+		</blockTableStyle>
+	</xsl:template>
+
+	<xsl:template name="story">
+		<xsl:apply-templates select="vente-bordereau-list"/>
+	</xsl:template>
+
+	<xsl:template match="vente-bordereau-list">
+		<xsl:apply-templates select="vente-bordereau">
+			<xsl:sort order="ascending" select="inventory"/>
+		</xsl:apply-templates>
+	</xsl:template>
+	<xsl:template match="vente-bordereau">
+	<nextFrame/>
+		<setNextTemplate name="other_pages"/>
+			<xsl:apply-templates select="client_info"/>
+			<spacer length="0.8cm"/>
+		<para>
+			<b t="1">Document</b>: <xsl:value-of select="subject"/> - <xsl:value-of select="title"/>
+		</para>
+		<para>
+			<b t="1">Inventory</b>: <xsl:value-of select="inventory"/>
+		</para>
+
+		<xsl:if test="client_info">
+		<para>
+				<xsl:value-of select="client_info/phone"/>
+				<xsl:if test="number(string-length(client_info/phone) &gt; 0) + number(string-length(client_info/mobile) &gt; 0) = 2">
+					<xsl:text> - </xsl:text>
+				</xsl:if>
+				<xsl:value-of select="client_info/mobile"/>
+			</para>
+		</xsl:if>
+		<spacer length="0.8cm" width="1cm"/>
+		<xsl:apply-templates select="vente-products"/>
+<!--		<setNextTemplate name="first_page"/>-->
+<!--		<pageBreak/>-->
+	</xsl:template>
+
+	<xsl:template match="client_info">
+		<para style="style1">
+			<b>
+				<xsl:value-of select="title"/>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="name"/>
+			</b>
+		</para>
+		<para style="style1"><xsl:value-of select="street"/></para>
+		<para style="style1"><xsl:value-of select="street2"/></para>
+		<para style="style1">
+			<xsl:value-of select="zip"/>
+			<xsl:text> </xsl:text>
+			<xsl:value-of select="city"/>
+		</para>
+		<para style="style1"><xsl:value-of select="country"/></para>
+				<spacer length="1cm" width="1mm"/>
+	<spacer length="1cm" width="1mm"/>
+	</xsl:template>
+
+	<xsl:template match="vente-products">
+		<blockTable colWidths="2.0cm,1.9cm,1.9cm,11.0cm,2.4cm" style="products">
+			<tr>
+				<td t="1">Lot</td>
+				<td t="1">Cat. N.</td>
+				<td t="1">List N.</td>
+				<td t="1">Description</td>
+				<td t="1">Adj.(EUR)</td>
+			</tr>
+			<xsl:apply-templates select="product">
+				<xsl:sort order="ascending" data-type="number" select="num_catalog"/>
+			</xsl:apply-templates>
+		</blockTable>
+		<condPageBreak height="1.2cm"/>
+		<blockTable colWidths="2.0cm,1.9cm,1.9cm,11.0cm,2.4cm" style="product-totals">
+			<tr>
+				<td/>
+				<td/>
+				<td/>
+				<td t="1">Subtotal:</td>
+				<td><xsl:value-of select="format-number(sum(product[price != '']/price), '#,##0.00')"/></td>
+			</tr>
+			<xsl:apply-templates select="cost">
+				<xsl:sort data-type="number" select="type"/>
+				<xsl:sort data-type="number" select="id"/>
+			</xsl:apply-templates>
+			<tr>
+				<td/>
+				<td/>
+				<td/>
+				<td t="1">Total:</td>
+				<td><xsl:value-of select="format-number(sum(product[price != '']/price) + sum(cost/amount), '#,##0.00')"/></td>
+			</tr>
+		</blockTable>
+	</xsl:template>
+
+	<xsl:template match="cost">
+		<tr>
+			<td/>
+			<td/>
+			<td/>
+			<td><xsl:value-of select="name"/>:</td>
+			<td><xsl:value-of select="format-number(amount, '#,##0.00')"/></td>
+		</tr>
+	</xsl:template>
+
+	<xsl:template match="product">
+		<tr>
+			<td></td>
+			<td><xsl:value-of select="num_catalog"/></td>
+			<td><xsl:value-of select="num_inv"/></td>
+			<td><para><b><xsl:value-of select="title"/></b></para></td>
+			<td>
+				<xsl:choose>
+					<xsl:when test="price!=0.0">
+						<xsl:value-of select="format-number(price, '#,##0.00')"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:text>-</xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</td>
+		</tr>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
new file mode 100644
index 00000000000..977b762661b
--- /dev/null
+++ b/addons/auction/wizard/__init__.py
@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard_aie_send
+import wizard_aie_send_result
+import wizard_lots_buyer_map
+import wizard_lots_cancel
+import wizard_lots_invoice
+import wizard_lots_numerotate
+import wizard_lots_pay
+import wizard_pay
+import wizard_lots_sms
+import wizard_lot_date_move
+import wizard_auction_journal
+import wizard_auction_invoice_buyer
+import wizard_transfer_unsold_object
+import auction_wizard_enable_taken
+import auction_wizard_able_taken
+import auction_catalog_flagey
+#import wizard_lots_barcode
+import wizard_emporte
+import wizard_payer
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_catalog_flagey.py b/addons/auction/wizard/auction_catalog_flagey.py
new file mode 100644
index 00000000000..594adb9d9e6
--- /dev/null
+++ b/addons/auction/wizard/auction_catalog_flagey.py
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+import wizard
+import netsvc
+import pooler
+
+def _wo_check(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    current_auction=pool.get('auction.dates').browse(cr,uid,data['id'])
+    v_lots=pool.get('auction.lots').search(cr,uid,[('auction_id','=',current_auction.id)])
+    v_ids=pool.get('auction.lots').browse(cr,uid,v_lots)
+    for ab in v_ids:
+        print ab.auction_id.id
+        if not ab.auction_id :
+            raise wizard.except_wizard('Error!','No Lots belong to this Auction Date')
+    return 'report'
+
+class wizard_report(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result' : {'type': 'choice', 'next_state': _wo_check }
+        },
+        'report': {
+            'actions': [],
+            'result': {'type':'print', 'report':'auction.cat_flagy', 'state':'end'}
+        }
+    }
+wizard_report('auction.catalog.flagey')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_wizard_able_taken.py b/addons/auction/wizard/auction_wizard_able_taken.py
new file mode 100644
index 00000000000..e7c900f13bf
--- /dev/null
+++ b/addons/auction/wizard/auction_wizard_able_taken.py
@@ -0,0 +1,69 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+import netsvc
+import pooler
+take_form = """<?xml version="1.0"?>
+<form title="Confirm">
+    <separator string="Confirmation set taken away" colspan="4"/>
+    <newline/>
+</form>
+"""
+
+take_fields = {
+#   'confirm_en': {'string':'Catalog Number', 'type':'integer'},
+}
+
+def _confirm_able(self,cr,uid,data,context={}):
+    res={}
+    pool = pooler.get_pool(cr.dbname)
+    pool.get('auction.lots').write(cr,uid,data['ids'],{'ach_emp':True})
+    return {}
+
+class able_take_away(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {
+                    'type' : 'form',
+                    'arch' : take_form,
+                    'fields' : take_fields,
+                    'state' : [('end', 'Cancel'),('go', 'Able Taken away')]}
+        },
+            'go' : {
+            'actions' : [_confirm_able],
+            'result' : {'type' : 'state', 'state' : 'end'}
+        },
+}
+able_take_away('auction.lots.able')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_wizard_enable_taken.py b/addons/auction/wizard/auction_wizard_enable_taken.py
new file mode 100644
index 00000000000..a63af055b2d
--- /dev/null
+++ b/addons/auction/wizard/auction_wizard_enable_taken.py
@@ -0,0 +1,70 @@
+# -*- encoding: utf-8 -*-
+
+##############################################################################
+#
+# 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 wizard
+import netsvc
+import pooler
+#field name="confirm_en"/>
+
+take_form = """<?xml version="1.0"?>
+<form title="Confirm">
+    <separator string="Confirmation enable taken away" colspan="4"/>
+    <newline/>
+</form>
+"""
+
+take_fields = {
+    'confirm_en': {'string':'Catalog Number', 'type':'integer'},
+}
+
+def _confirm_enable(self,cr,uid,data,context={}):
+    pool = pooler.get_pool(cr.dbname)
+    pool.get('auction.lots').write(cr,uid,data['ids'],{'ach_emp':False})
+    return {}
+
+class enable_take_away(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {
+                    'type' : 'form',
+                    'arch' : take_form,
+                    'fields' : take_fields,
+                    'state' : [ ('end', 'Cancel'),('go', 'Enable Taken away')]}
+        },
+            'go' : {
+            'actions' : [_confirm_enable],
+            'result' : {'type' : 'state', 'state' : 'end'}
+        },
+}
+enable_take_away('auction.lots.enable')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_aie_send.py b/addons/auction/wizard/wizard_aie_send.py
new file mode 100644
index 00000000000..7d52bf04202
--- /dev/null
+++ b/addons/auction/wizard/wizard_aie_send.py
@@ -0,0 +1,251 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+#
+# Does not properly work concurently !!!
+#
+import pooler
+import wizard
+import netsvc
+import base64
+import mimetypes
+import httplib
+import threading
+
+login_form = '''<?xml version="1.0"?>
+<form title="Login">
+    <field name="uname"></field>
+    <newline/>
+    <field name="password"></field>
+</form>'''
+
+
+send_form = '''<?xml version="1.0"?>
+<form title="Selection">
+    <field name="uname"></field>
+    <field name="password"></field>
+    <newline/>
+    <field name="objects"></field>
+    <field name="lang"></field>
+    <field name="numerotation"></field>
+    <field name="img_send"></field>
+    <newline/>
+    <field name="dates" colspan="3"></field>
+</form>'''
+
+login_fields = {
+    'uname': {'string':'Login', 'type':'char'},
+    'password': {'string':'Password', 'type':'char'},
+    'numerotation': {'string':'Numerotation', 'type':'selection', 'selection':[('prov','Provisoire'),('definite','Definitive (ordre catalogue)')]},
+    'dates': {'string':'Auction Date', 'type':'selection', 'selection':[]}
+}
+
+send_fields = {
+    'uname': {'string':'Login', 'type':'char', 'readonly':True},
+    'password': {'string':'Password', 'type':'char', 'readonly':True},
+    'objects': {'string':'# of objects', 'type':'integer', 'readonly':True},
+    'lang': {'string':'Langage', 'type':'selection', 'selection':[('fr','fr'),('ned','ned'),('eng','eng'),('de','de')]},
+    'numerotation': {'string':'Numerotation', 'type':'selection', 'selection':[('prov','Provisoire'),('definite','Definitive (ordre catalogue)')]},
+    'dates': {'string':'Auction Date', 'type':'selection', 'selection':[]},
+    'img_send': {'string':'Send Image also ?', 'type':'boolean'}
+}
+
+def _catalog_send(uname, passwd, lang, did, catalog):
+    def post_multipart(host, selector, fields, files):
+        def encode_multipart_formdata(fields, files):
+            BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$'
+            CRLF = '\r\n'
+            L = []
+            for (key, value) in fields:
+                L.append('--' + BOUNDARY)
+                L.append('Content-Disposition: form-data; name="%s"' % key)
+                L.append('')
+                L.append(value)
+            for (key,value) in files:
+                L.append('--' + BOUNDARY)
+                L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, key+'.pickle'))
+                L.append('Content-Type: application/octet-stream')
+                L.append('')
+                L.append(value)
+            L.append('--' + BOUNDARY + '--')
+            L.append('')
+            body = CRLF.join(L)
+            content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
+            return content_type, body
+        content_type, body = encode_multipart_formdata(fields, files)
+        import httplib
+
+        headers = {"Content-type": content_type, "Accept": "*/*"}
+        conn = httplib.HTTPConnection(host)
+        conn.request("POST", '/bin/catalog.cgi', body, headers = headers)
+        response = conn.getresponse()
+        print response.read()
+        val = response.status
+        conn.close()
+        return val
+    print 'catalog_send !!'
+    return post_multipart('auction-in-europe.com', "/bin/catalog.cgi", (('uname',uname),('password',passwd),('did',did),('lang',lang)),(('file',catalog),))
+
+def _photo_bin_send(uname, passwd, ref, did, photo_name, photo_data):
+    def get_content_type(filename):
+        return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
+
+    def post_multipart(host, selector, fields, files):
+        def encode_multipart_formdata(fields, files):
+            BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$'
+            CRLF = '\r\n'
+            L = []
+            for (key, value) in fields:
+                L.append('--' + BOUNDARY)
+                L.append('Content-Disposition: form-data; name="%s"' % key)
+                L.append('')
+                L.append(value)
+            for (key, filename, data) in files:
+                L.append('--' + BOUNDARY)
+                L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, filename))
+                L.append('Content-Type: %s' % get_content_type(filename))
+                L.append('')
+                L.append(data)
+            L.append('--' + BOUNDARY + '--')
+            L.append('')
+            body = CRLF.join(L)
+            content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
+            return content_type, body
+        content_type, body = encode_multipart_formdata(fields, files)
+
+        headers = {"Content-type": content_type, "Accept": "*/*"}
+        conn = httplib.HTTPConnection(host)
+        conn.request("POST", '/bin/photo.cgi', body, headers = headers)
+        response = conn.getresponse()
+        val = response.status
+        conn.close()
+        return val
+    return post_multipart('auction-in-europe.com', "/bin/photo.cgi", (('uname',uname),('ref',ref),('passwd',passwd),('did',did)),(('file',photo_name,photo_data),))
+
+
+def _photos_send(cr,uid, uname, passwd, did, ids):
+    print '_photos_send'
+    print "********************START****************"
+    for (ref,id) in ids:
+        service = netsvc.LocalService("object_proxy")
+#       ids_attach = service.execute(db_name,uid, 'ir.attachment', 'search', [('res_model','=','auction.lots'), ('res_id', '=',id)])
+        datas = service.execute(cr.db_name,uid, 'auction.lots', 'read',[id], ['name','image'])
+        if len(datas):
+            bin = base64.decodestring(datas[0]['image'])
+            fname = datas[0]['name']
+            _photo_bin_send(uname, passwd, ref, did, fname, bin)
+            print 'SENDING PHOTO...............', ref
+        print "***************COMPLETE**********"
+
+def _get_dates(self,cr,uid, datas,context={}):
+    global send_fields
+    import httplib
+    conn = httplib.HTTPConnection('www.auction-in-europe.com')
+    conn.request("GET", "/aie_upload/dates_get.php?uname=%s&passwd=%s" % (datas['form']['uname'], datas['form']['password']))
+    print "FET DATS"
+    response = conn.getresponse()
+    print response.status
+    if response.status == 200:
+        def _date_decode(x):
+            return (x.split(' - ')[0], (' - '.join(x.split(' - ')[1:]).decode('latin1','replace').encode('utf-8','replace')))
+        send_fields['dates']['selection'] = map(_date_decode, response.read().split('\n'))
+    else:
+        raise "Connection to WWW.Auction-in-Europe.com failed !"
+    return {'objects':len(datas['ids'])}
+
+def _send(self,db_name,uid, datas,context={}):
+    import pickle, thread, sql_db
+    #cr = pooler.get_db(cr.dbname).cursor()
+
+#   cr=sql_db.db.cursor()
+    print "...................send function Opened..................."
+    cr = pooler.get_db(db_name).cursor()
+
+    cr.execute('select name,aie_categ from auction_lot_category')
+    vals = dict(cr.fetchall())
+    cr.close()
+    print vals
+
+    service = netsvc.LocalService("object_proxy")
+    lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', datas['ids'],  ['obj_num','lot_num','obj_desc','bord_vnd_id','lot_est1','lot_est2','artist_id','lot_type','aie_categ'])
+    ids = []
+    for l in lots:
+        if datas['form']['numerotation']=='prov':
+            l['ref']='%s%03d' % (l['bord_vnd_id'][1],l['lot_num'])
+            l['ref2']='%s%03d' % (l['bord_vnd_id'][1],l['lot_num'])
+        else:
+            l['ref']='%04d' % (l['obj_num'],)
+            l['ref2']='%s%03d' % (l['bord_vnd_id'][1],l['lot_num'])
+        if l['artist_id']:
+            l['artist_id'] = l['artist_id'][1]
+        else:
+            l['artist_id'] = ''
+        for n in ('obj_desc','artist_id','lot_type'):
+            try:
+                l[n]=l[n].decode('utf-8','replace').encode('latin1','replace')
+            except:
+                l[n]=''
+        del l['lot_num']
+        del l['obj_num']
+        del l['bord_vnd_id']
+        l['aie_categ'] = vals.get(l['lot_type'], False)
+        ids.append((l['ref'], l['id']))
+    args = pickle.dumps(lots)
+    print thread.start_new_thread(_catalog_send, (datas['form']['uname'],datas['form']['password'],datas['form']['lang'],datas['form']['dates'], args))
+    if(datas['form']['img_send']==True):
+        print "SSSSSSSSSSSSSSSSSsss"
+        print thread.start_new_thread(_photos_send, (cr.dbname,uid, datas['form']['uname'],datas['form']['password'],datas['form']['dates'], ids))
+    print "...................send function closed..................."
+    return {}
+
+def _send_pdf(self, cr, uid, data, context):
+    threaded_calculation = threading.Thread(target=_send, args=(self, cr.dbname, uid, data, context))
+    threaded_calculation.start()
+    return {}
+
+class wiz_auc_lots_pay(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':login_form, 'fields': login_fields, 'state':[('date_ask','Continue'),('end','Cancel')]}
+        },
+        'date_ask': {
+            'actions': [_get_dates],
+            'result': {'type': 'form', 'arch':send_form, 'fields': send_fields, 'state':[('send','Send on your website'),('end','Cancel')]}
+        },
+        'send': {
+            'actions': [_send_pdf],
+            'result': {'type': 'state', 'state':'end'}
+        }
+    }
+wiz_auc_lots_pay('auction.lots.send.aie');
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_aie_send_result.py b/addons/auction/wizard/wizard_aie_send_result.py
new file mode 100644
index 00000000000..862dc9b3c81
--- /dev/null
+++ b/addons/auction/wizard/wizard_aie_send_result.py
@@ -0,0 +1,143 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+#
+# Does not properly work concurently !!!
+#
+
+import wizard
+import netsvc
+
+login_form = '''<?xml version="1.0"?>
+<form title="Login">
+    <field name="uname"></field>
+    <newline/>
+    <field name="password"></field>
+</form>'''
+
+
+send_form = '''<?xml version="1.0"?>
+<form title="Selection">
+    <field name="uname"></field>
+    <field name="password"></field>
+    <newline/>
+    <field name="objects"></field>
+    <newline/>
+    <field name="dates" colspan="3"></field>
+</form>'''
+
+login_fields = {
+    'uname': {'string':'Login', 'type':'char'},
+    'password': {'string':'Password', 'type':'char'},
+    'dates': {'string':'Auction Date', 'type':'selection', 'selection':[]}
+}
+
+send_fields = {
+    'uname': {'string':'Login', 'type':'char', 'readonly':True},
+    'password': {'string':'Password', 'type':'char', 'readonly':True},
+    'objects': {'string':'# of objects', 'type':'integer', 'readonly':True},
+    'dates': {'string':'Auction Date', 'type':'selection', 'selection':[]}
+}
+
+def _catalog_send(uname, passwd, did, catalog):
+    def post_multipart(host, selector, fields, files):
+        def encode_multipart_formdata(fields, files):
+            BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$'
+            CRLF = '\r\n'
+            L = []
+            for (key, value) in fields:
+                L.append('--' + BOUNDARY)
+                L.append('Content-Disposition: form-data; name="%s"' % key)
+                L.append('')
+                L.append(value)
+            for (key,value) in files:
+                L.append('--' + BOUNDARY)
+                L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, key+'.pickle'))
+                L.append('Content-Type: application/octet-stream')
+                L.append('')
+                L.append(value)
+            L.append('--' + BOUNDARY + '--')
+            L.append('')
+            body = CRLF.join(L)
+            content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
+            return content_type, body
+        content_type, body = encode_multipart_formdata(fields, files)
+        import httplib
+
+        headers = {"Content-type": content_type, "Accept": "*/*"}
+        conn = httplib.HTTPConnection(host)
+        conn.request("POST", '/bin/catalog_result.cgi', body, headers = headers)
+        response = conn.getresponse()
+        val = response.status
+        conn.close()
+        return val
+    return post_multipart('auction-in-europe.com', "/bin/catalog_result.cgi", (('uname',uname),('password',passwd),('did',did)),(('file',catalog),))
+
+def _get_dates(self,cr,uid, datas, context):
+    global send_fields
+    import httplib
+    conn = httplib.HTTPConnection('www.auction-in-europe.com')
+    conn.request("GET", "/aie_upload/dates_get_result.php?uname=%s&passwd=%s" % (datas['form']['uname'], datas['form']['password']))
+    response = conn.getresponse()
+    if response.status == 200:
+        def _date_decode(x):
+            return (x.split(' - ')[0], (' - '.join(x.split(' - ')[1:]).decode('latin1').encode('utf-8')))
+        send_fields['dates']['selection'] = map(_date_decode, response.read().split('\n'))
+    else:
+        raise "Connection to WWW.Auction-in-Europe.com failed !"
+    return {'objects':len(datas['ids'])}
+
+def _send(self,cr,uid, datas, context):
+    import pickle
+    service = netsvc.LocalService("object_proxy")
+    lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', datas['ids'],  ['obj_num','obj_price'])
+    args = pickle.dumps(lots)
+    _catalog_send(datas['form']['uname'],datas['form']['password'], datas['form']['dates'], args)
+    return {}
+
+class wiz_auc_lots_pay(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':login_form, 'fields': login_fields, 'state':[('date_ask','Continue'),('end','Cancel')]}
+        },
+        'date_ask': {
+            'actions': [_get_dates],
+            'result': {'type': 'form', 'arch':send_form, 'fields': send_fields, 'state':[('send','Send on your website'),('end','Cancel')]}
+        },
+        'send': {
+            'actions': [_send],
+            'result': {'type': 'state', 'state':'end'}
+        }
+    }
+wiz_auc_lots_pay('auction.lots.send.aie.results');
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_auction_invoice_buyer.py b/addons/auction/wizard/wizard_auction_invoice_buyer.py
new file mode 100644
index 00000000000..f1ca2402f8d
--- /dev/null
+++ b/addons/auction/wizard/wizard_auction_invoice_buyer.py
@@ -0,0 +1,90 @@
+# -*- encoding: utf-8 -*-
+
+import wizard
+import netsvc
+import pooler
+
+invoice_form = '''<?xml version="1.0"?>
+<form title="Paid ?">
+    <field name="amount"/>
+    <field name="objects"/>
+    <field name="number"/>
+    <label string="(Keep empty for automatic number)" colspan="2"/>
+    <field name="buyer_id"/>
+</form>'''
+
+invoice_fields = {
+    'amount': {'string':'Invoiced Amount', 'type':'float', 'required':True, 'readonly':True},
+    'objects': {'string':'# of objects', 'type':'integer', 'required':True, 'readonly':True},
+    'number': {'string':'Invoice Number', 'type':'char'},
+    'buyer_id':{'string': 'Buyer', 'type': 'many2one', 'relation':'res.partner'}
+
+}
+
+
+def _values(self,cr,uid, datas,context={}):
+    pool = pooler.get_pool(cr.dbname)
+    lots= pool.get('auction.lots').browse(cr,uid,datas['ids'])
+#   price = 0.0
+    amount_total=0.0
+#   pt_tax=pooler.get_pool(cr.dbname).get('account.tax')
+    for lot in lots:
+        buyer=lot and lot.ach_uid.id or False
+        amount_total+=lot.buyer_price
+#       taxes = lot.product_id.taxes_id
+#       if lot.author_right:
+#           taxes.append(lot.author_right)
+#       if lot.auction_id:
+#           taxes += lot.auction_id.buyer_costs
+#       tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1)
+#       for t in tax:
+#           amount_total+=t['amount']
+#       amount_total+=lot.obj_price
+    #   up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':datas['form']['buyer_id']})
+    invoice_number = False
+    return {'objects':len(datas['ids']), 'amount':amount_total, 'number':invoice_number,'buyer_id':buyer}
+
+
+def _makeInvoices(self, cr, uid, data, context):
+    print "make invoice",data,context
+    order_obj = pooler.get_pool(cr.dbname).get('auction.lots')
+    newinv = []
+    pool = pooler.get_pool(cr.dbname)
+    lots= order_obj.browse(cr,uid,data['ids'])
+    invoice_number=data['form']['number']
+    for lot in lots:
+        up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':data['form']['buyer_id']})
+    ids = order_obj.lots_invoice(cr, uid, data['ids'],context,data['form']['number'])
+#   ids = order_obj.lots_invoice(cr, uid, data['ids'],context,invoice_number)
+    cr.commit()
+    print "avant return"
+    return {
+        'domain': "[('id','in', ["+','.join(map(str,ids))+"])]",
+        'name': 'Buyer invoices',
+        'view_type': 'form',
+        'view_mode': 'tree,form',
+        'res_model': 'account.invoice',
+        'view_id': False,
+        'context': "{'type':'in_refund'}",
+        'type': 'ir.actions.act_window'
+    }
+    return {}
+
+class make_invoice(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [_values],
+            'result' : {'type' : 'form',
+                    'arch' : invoice_form,
+                    'fields' : invoice_fields,
+                    'state' : [('end', 'Cancel'),('invoice', 'Create invoices')]}
+        },
+        'invoice' : {
+            'actions' : [],
+            'result' : {'type' : 'action',
+                    'action' : _makeInvoices}
+        },
+    }
+make_invoice("auction.lots.make_invoice_buyer")
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_auction_journal.py b/addons/auction/wizard/wizard_auction_journal.py
new file mode 100644
index 00000000000..c46f5615adc
--- /dev/null
+++ b/addons/auction/wizard/wizard_auction_journal.py
@@ -0,0 +1,81 @@
+# -*- encoding: utf-8 -*-
+
+import wizard
+import netsvc
+import pooler
+
+
+
+invoice_form = '''<?xml version="1.0"?>
+<form title="Paid ?">
+    <field name="amount"/>
+    <field name="objects"/>
+    <field name="number" colspan="3"/>
+</form>'''
+
+invoice_fields = {
+    'amount': {'string':'Invoiced Amount', 'type':'float', 'required':True, 'readonly':True},
+    'objects': {'string':'# of objects', 'type':'integer', 'required':True, 'readonly':True},
+    'number': {'string':'Invoice Number', 'type':'integer'},
+}
+
+def _values(self,cr,uid, datas,context={}):
+    lots= pooler.get_pool(cr.dbname).get('auction.lots').browse(cr,uid,datas['ids'])
+#   service = netsvc.LocalService("object_proxy")
+#   lots = service.execute(cr,uid, 'auction.lots', 'read', datas['ids'])
+#   auction = service.execute(cr,uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
+    price = 0.0
+    amount_total=0.0
+    pt_tax=pooler.get_pool(cr.dbname).get('account.tax')
+    for lot in lots:
+    #   taxes = lot.product_id.taxes_id
+    #   if lot.bord_vnd_id.tax_id:
+    #       taxes.append(lot.bord_vnd_id.tax_id)
+    #   if lot.auction_id:
+    #       taxes += lot.auction_id.seller_costs
+    #   tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1)
+    #   for t in tax:
+    #       amount_total+=t['amount']
+    #   amount_total+=lot.obj_price
+        amount_total+=lot.seller_price  
+#TODO: recuperer id next invoice (de la sequence)???
+    invoice_number = False
+    return {'objects':len(datas['ids']), 'amount':amount_total, 'number':invoice_number}
+
+def _makeInvoices(self, cr, uid, data, context):
+
+    order_obj = pooler.get_pool(cr.dbname).get('auction.lots')
+    newinv = []
+    ids = order_obj.seller_trans_create(cr, uid, data['ids'],context)
+    cr.commit()
+    return {
+        'domain': "[('id','in', ["+','.join(map(str,ids))+"])]",
+        'name': 'Seller invoices',
+        'view_type': 'form',
+        'view_mode': 'tree,form',
+        'res_model': 'account.invoice',
+        'view_id': False,
+        'context': "{'type':'out_refund'}",
+        'type': 'ir.actions.act_window'
+    }
+    return {}
+
+class make_invoice(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [_values],
+            'result' : {'type' : 'form',
+                    'arch' : invoice_form,
+                    'fields' : invoice_fields,
+                    'state' : [('end', 'Cancel'),('invoice', 'Create invoices')]}
+        },
+        'invoice' : {
+            'actions' : [_makeInvoices],
+            'result' : {'type' : 'action',
+                    'action' : _makeInvoices,
+                    'state' : 'end'}
+        },
+    }
+make_invoice("auction.lots.make_invoice")
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_emporte.py b/addons/auction/wizard/wizard_emporte.py
new file mode 100644
index 00000000000..6a0ae447c5f
--- /dev/null
+++ b/addons/auction/wizard/wizard_emporte.py
@@ -0,0 +1,81 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+import netsvc
+
+import pooler
+from tools.misc import UpdateableStr
+
+
+# Dossier
+
+_lot_arch = """<?xml version="1.0"?>
+<form string="Mark Lots" height="500" width="1000">
+    <label string="Selectionner les lots qui sont livres" colspan="4"/>
+    <field name="lot_ids" nolabel="1" colspan="4" domain="[('state','=','sold')]"/>
+</form>
+"""
+_lot_fields = {
+    'lot_ids': {'string':'Lots Emportes','relation':'auction.lots','type':'many2many'}
+}
+
+def _to_xml(s):
+    return s.replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
+
+def _process(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    lot_obj = pool.get('auction.lots')
+    if data['form']['lot_ids']:
+        lot_obj.write(cr, uid, data['form']['lot_ids'][0][2], {'state':'taken_away'})
+    return {'lot_ids': []}
+
+class wizard_reprint(wizard.interface):
+    states = {
+        'valid': {
+            'actions': [_process],
+            'result': {'type':'state', 'state':'init'}
+        },
+        'init': {
+            'actions': [],
+            'result': {
+                'type':'form', 
+                'arch': _lot_arch,
+                'fields': _lot_fields,
+                'state': [
+                    ('valid','       Valider       ')
+                ],
+            }
+        }
+    }
+wizard_reprint('auction.taken')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_lot_date_move.py b/addons/auction/wizard/wizard_lot_date_move.py
new file mode 100644
index 00000000000..90671b7f25d
--- /dev/null
+++ b/addons/auction/wizard/wizard_lot_date_move.py
@@ -0,0 +1,104 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+import netsvc
+import pooler
+import sql_db
+
+auction_move = '''<?xml version="1.0"?>
+<form string="Change Auction Date">
+    <group col="1" colspan="2">
+    <label string="Warning, this will erase the object adjudication price and its buyer !" colspan="2"/>
+    </group>
+    <newline/>
+    <field name="auction_id"/>
+</form>'''
+
+auction_move_fields = {
+    'auction_id': {'string':'Auction Date', 'type':'many2one', 'required':True, 'relation':'auction.dates'},
+}
+
+#def _auction_move_set(self, uid, datas):
+#   if datas['form']['auction_id']:
+#       cr = sql_db.db.cursor()
+#       cr.execute('update auction_lots set auction_id=%s, obj_price=NULL, ach_login=NULL, ach_uid=NULL, ach_pay_id=NULL, ach_inv_id=NULL, state=%s where id in ('+','.join(map(str, datas['ids']))+')', (str(datas['form']['auction_id']), 'draft'))
+#       cr.execute('delete from auction_bid_line where lot_id in ('+','.join(map(str, datas['ids']))+')')
+#       cr.commit()
+#       cr.close()
+#   return {}
+def _top(self,cr,uid,datas,context={}):
+    refs = pooler.get_pool(cr.dbname).get('auction.lots')
+    rec_ids = refs.browse(cr,uid,datas['ids'])
+    for rec in rec_ids:
+        if not rec.auction_id:
+            raise wizard.except_wizard('Error !','You can not move a lot that has no auction date')
+    return {}
+def _auction_move_set(self,cr,uid,datas,context={}):
+    if not (datas['form']['auction_id'] and len(datas['ids'])) :
+        return {}
+    refs = pooler.get_pool(cr.dbname).get('auction.lots')
+    rec_ids = refs.browse(cr,uid,datas['ids'])
+    
+    line_ids= pooler.get_pool(cr.dbname).get('auction.bid_line').search(cr,uid,[('lot_id','in',datas['ids'])])
+#   pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
+    for rec in rec_ids:
+        new_id=pooler.get_pool(cr.dbname).get('auction.lot.history').create(cr,uid,{
+            'auction_id':rec.auction_id.id,
+            'lot_id':rec.id,
+            'price': rec.obj_ret
+        })
+        up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[rec.id],{
+            'auction_id':datas['form']['auction_id'],
+            'obj_ret':None,
+            'obj_price':None,
+            'ach_login':None,
+            'ach_uid':None,
+            'ach_inv_id':None,
+            'sel_inv_id':None,
+            'obj_num':None,
+            'state':'draft'})
+    return {}
+
+class wiz_auc_lots_auction_move(wizard.interface):
+    states = {
+        'init': {
+            'actions': [_top],
+            'result': {'type': 'form', 'arch':auction_move, 'fields': auction_move_fields, 'state':[('set_date', 'Move to Auction date'),('end','Cancel')]}
+        },
+        'set_date': {
+            'actions': [_auction_move_set],
+            'result': {'type': 'state', 'state':'end'}
+        }
+    }
+
+wiz_auc_lots_auction_move('auction.lots.auction_move')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_lots_buyer_map.py b/addons/auction/wizard/wizard_lots_buyer_map.py
new file mode 100644
index 00000000000..6e33acfe56b
--- /dev/null
+++ b/addons/auction/wizard/wizard_lots_buyer_map.py
@@ -0,0 +1,115 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+import netsvc
+import pooler
+import sql_db
+
+buyer_map = '''<?xml version="1.0"?>
+<form title="Buyer Map">
+    <field name="ach_login"/>
+    <newline/>
+    <field name="ach_uid"/>
+</form>'''
+
+buyer_map_fields = {
+    'ach_login': {'string':'Buyer Username', 'type':'char', 'size':64, 'required':True},
+    'ach_uid': {'string':'Buyer', 'type':'many2one', 'required':True, 'relation':'res.partner'},
+}
+
+
+#
+# Try to find an object not mapped
+#
+def _state_check(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    cr.execute('select id from auction_lots where (ach_uid is null and ach_login is not null)  ')
+    v_ids=[x[0] for x in cr.fetchall()]
+    #ids_not_mapped=pool.get('auction.lots').search(cr,uid,[('rec.ach_uid','=',False)])
+    for rec in pool.get('auction.lots').browse(cr,uid,v_ids,context):
+    #   if not rec.ach_uid and not rec.ach_login:
+    #       raise wizard.except_wizard ('Error','No username is associated to this lot!')
+        if (not rec.ach_uid or not rec.ach_login):
+            return 'check'
+    return 'done'
+
+def _start(self,cr,uid,datas,context):
+    pool = pooler.get_pool(cr.dbname)
+    for rec in pool.get('auction.lots').browse(cr,uid,datas['ids'],context):
+        if (len(datas['ids'])==1) and (not rec.ach_uid and not rec.ach_login):
+            raise wizard.except_wizard('Error', 'No buyer setted for this lot')
+        if not rec.ach_uid and rec.ach_login:
+            return {'ach_login': rec.ach_login}
+
+    for rec in pool.get('auction.lots').browse(cr,uid,datas['ids'],context):
+        if (not rec.ach_uid and rec.ach_login):
+            return {'ach_login': rec.ach_login}
+    return {}
+
+def _buyer_map_set(self,cr, uid, datas,context):
+    pool = pooler.get_pool(cr.dbname)
+    recs=pool.get('auction.lots').browse(cr,uid,datas['ids'],context)
+    for rec in recs:
+        if rec.ach_login==datas['form']['ach_login']:
+            pool.get('auction.lots').write(cr, uid, [rec.id], {'ach_uid':  datas['form']['ach_uid']}, context=context)
+            cr.commit()
+    return {'ach_login':False, 'ach_uid':False}
+
+class wiz_auc_lots_buyer_map(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'choice', 'next_state':_state_check}
+        },
+        'check': {
+            'actions': [_start],
+            'result': {'type': 'form', 'arch':buyer_map, 'fields': buyer_map_fields, 'state':[('end','Exit'),('set_buyer', 'Update')]}
+        },
+        'set_buyer': {
+            'actions': [_buyer_map_set],
+            'result': {'type': 'state', 'state':'init'}
+        },
+        'done': {
+            'actions': [_start],
+            'result': {
+                'type': 'form',
+                'arch':'''<?xml version="1.0"?>
+                <form title="Mapping result">
+                    <label string="All objects are assigned to buyers !"/>
+                </form>''',
+                'fields': {},
+                'state':[('end','Close')]}
+        }
+    }
+
+wiz_auc_lots_buyer_map('auction.lots.buyer_map')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_lots_cancel.py b/addons/auction/wizard/wizard_lots_cancel.py
new file mode 100644
index 00000000000..c8aaa291609
--- /dev/null
+++ b/addons/auction/wizard/wizard_lots_cancel.py
@@ -0,0 +1,100 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+import netsvc
+import pooler
+
+paid_form = '''<?xml version="1.0"?>
+<form string="Cancel Payment">
+    <label string="Are you sure you want to refund this invoice ?"/>
+</form>'''
+fields_ask = {
+}
+#
+#def _get_value(self,cr,uid, datas,context={}):
+##  service = netsvc.LocalService("object_proxy")
+#   lots=pool.get('auction.lots').browse(cr,uid,data['id'],context)
+#
+#   
+##  lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', datas['ids'])
+#
+#   ids = []
+#   pay_ids = {}
+#   price = 0.0
+#   price_paid = 0.0
+#   uid = False
+#
+##TODO: refuse if several payments?
+#   for lot in lots:
+#           price += lot['obj_price']
+#
+#           # add all the buyer costs
+#           costs = service.execute(cr.dbname,uid, 'auction.lots', 'compute_buyer_costs', [lot['id']])
+#           for cost in costs:
+#               price += cost['amount']
+#
+##TODO: pr bien faire, faudrait leur poser la question: continue anyway?
+#   if len(ids)<len(datas['ids']):
+##      print ids, datas['ids']
+#       raise wizard.except_wizard('UserError', ('Some object(s) are not paid !', 'init'))
+#
+#   return {'objects':len(ids), 'amount_total':price, 'amount_paid':price_paid}
+#
+#def _cancel(self, uid, datas):
+#   service = netsvc.LocalService("object_proxy")
+#   lots = service.execute(cr.dbname,uid, 'auction.lots', 'lots_cancel_payment', datas['ids'])
+#   return {}
+#
+
+def _cancel(self,cr,uid,data,context):
+    pool = pooler.get_pool(cr.dbname)
+    lot = pool.get('auction.lots').browse(cr,uid,data['id'],context)
+    if lot.ach_inv_id:
+        p=pool.get('account.invoice').refund(['lot.ach_inv_id.id'],context)
+    if lot.vnd_inv_id:
+        p=pool.get('account.invoice').refund(['lot.vnd_inv_id.id'],context)
+    return {}
+
+class wiz_auc_lots_cancel(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':paid_form, 'fields': fields_ask, 'state':[('make_cancel','Cancel Payment'), ('end','Cancel')]}
+        },
+        'make_cancel': {
+            'actions': [_cancel],
+            'result': {'type': 'state', 'state':'end'}
+        }
+    }
+wiz_auc_lots_cancel('auction.lots.cancel');
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_lots_invoice.py b/addons/auction/wizard/wizard_lots_invoice.py
new file mode 100644
index 00000000000..d5b327c00f6
--- /dev/null
+++ b/addons/auction/wizard/wizard_lots_invoice.py
@@ -0,0 +1,114 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+import netsvc
+
+invoice_form = '''<?xml version="1.0"?>
+<form title="Paid ?">
+    <field name="amount"/>
+    <field name="objects"/>
+    <field name="amount_topay"/>
+    <field name="amount_paid"/>
+    <!--field name= "tax_applied"/>-->
+    <newline/>
+    <field name="ach_uid" colspan="3"/>
+    <field name="number" colspan="3"/>
+    <field label="Let this invoice's number "/>
+</form>'''
+
+invoice_fields = {
+    'amount': {'string':'Invoiced Amount', 'type':'float', 'required':True, 'readonly':True},
+    'amount_topay': {'string':'Amount to pay', 'type':'float', 'required':True, 'readonly':True},
+    'amount_paid': {'string':'Amount paid', 'type':'float', 'readonly':True},
+    'objects': {'string':'# of objects', 'type':'integer', 'required':True, 'readonly':True},
+    'ach_uid': {'string':'Buyer Name', 'type':'many2one', 'required':True, 'relation':'res.partner'},
+    'number': {'string':'Invoice Number', 'type':'integer'},
+        #'tax_applied':{'string':'Tax Applied', 'type':'float', 'readonly':True},
+}
+
+def _get_value(self,cr,uid, datas,context={}):
+    service = netsvc.LocalService("object_proxy")
+    lots = service.execute(cr,uid, 'auction.lots', 'read', datas['ids'])
+    auction = service.execute(cr,uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
+
+    price = 0.0
+    price_topay = 0.0
+    price_paid = 0.0
+    #tax=data['form']['tax_applied']
+    uid = False
+    for lot in lots:
+        price_lot = lot['obj_price'] or 0.0
+
+        costs = service.execute(uid, 'auction.lots', 'compute_buyer_costs', [lot['id']])
+        for cost in costs:
+            price_lot += cost['amount']
+
+        price += price_lot
+
+        if lot['ach_uid']:
+            if uid and (lot['ach_uid'][0]<>uid):
+                raise wizard.except_wizard('UserError', ('Two different buyers for the same invoice !\nPlease correct this problem before invoicing', 'init'))
+            uid = lot['ach_uid'][0]
+        elif lot['ach_login']:
+            refs = service.execute(uid, 'res.partner', 'search', [('ref','=',lot['ach_login'])])
+            if len(refs):
+                uid = refs[-1]
+        if lot['ach_pay_id']:
+            price_paid += price_lot
+            #*tax
+        else:
+            price_topay += price_lot
+            #*tax
+
+#TODO: recuperer id next invoice (de la sequence)???
+    invoice_number = False
+    return {'objects':len(datas['ids']), 'amount':price, 'ach_uid':uid, 'amount_topay':price_topay, 'amount_paid':price_paid, 'number':invoice_number}
+
+def _invoice(self, uid, datas):
+    service = netsvc.LocalService("object_proxy")
+    service.execute(uid, 'auction.lots', 'lots_invoice_and_cancel_old_invoice', datas['ids'], datas['form']['number'], datas['form']['ach_uid'], 'invoice_open')
+    return {}
+
+class wiz_auc_lots_invoice(wizard.interface):
+    states = {
+        'init': {
+            'actions': [_get_value],
+            'result': {'type': 'form', 'arch':invoice_form, 'fields': invoice_fields, 'state':[('invoice','Create Invoice'), ('end','Cancel')]}
+        },
+        'invoice': {
+            'actions': [_invoice],
+            'result': {'type': 'print', 'report':'auction.invoice', 'state':'end'}
+        }
+    }
+wiz_auc_lots_invoice('auction.lots.invoice');
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_lots_numerotate.py b/addons/auction/wizard/wizard_lots_numerotate.py
new file mode 100644
index 00000000000..06dada16428
--- /dev/null
+++ b/addons/auction/wizard/wizard_lots_numerotate.py
@@ -0,0 +1,162 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+import netsvc
+import pooler
+import sql_db
+
+numerotate_form_cont = '''<?xml version="1.0"?>
+<form title="%s">
+    <field name="number" string="%s"/>
+</form>''' % ('Continuous Numerotation','First Number')
+
+numerotate_fields_cont = {
+    'number': {'string':'First Number', 'type':'integer', 'required':True}
+}
+
+numerotate_not_exist = '''<?xml version="1.0"?>
+<form title="%s">
+    <label string="This lot does not exist !" colspan="4"/>
+</form>''' % ('Catalog Numerotation',)
+
+
+numerotate_form = '''<?xml version="1.0"?>
+<form title="%s">
+    <separator string="%s" colspan="4"/>
+    <field name="bord_vnd_id"/>
+    <newline/>
+    <field name="lot_num"/>
+</form>''' % ('Catalog Numerotation','Object Reference')
+
+numerotate_fields = {
+    'bord_vnd_id': {'string':'Depositer Inventory', 'type':'many2one', 'required':True, 'relation':'auction.deposit'},
+    'lot_num': {'string':'Lot Number', 'type':'integer', 'required':True},
+}
+
+numerotate_form2 = '''<?xml version="1.0"?>
+<form title="%s">
+    <group>
+        <separator string="%s" colspan="4"/>
+        <field name="bord_vnd_id" readonly="1"/>
+        <field name="lot_num" readonly="1"/>
+        <field name="name" readonly="1" colspan="3"/>
+        <field name="obj_desc" readonly="1" colspan="3"/>
+        <field name="lot_est1" readonly="1"/>
+        <field name="lot_est2" readonly="1"/>
+        <separator string="%s" colspan="4"/>
+        <field name="obj_num"/>
+    </group>
+</form>''' % ('Catalog Numerotation','Object Reference','Object Reference')
+
+numerotate_fields2 = {
+    'bord_vnd_id': {'string':'Object Inventory', 'type':'many2one', 'relation':'auction.deposit', 'readonly':True},
+    'lot_num': {'string':'Inventory Number', 'type':'integer', 'readonly':True},
+    'lot_est1': {'string':'Minimum Estimation', 'type':'float', 'readonly':True},
+    'lot_est2': {'string':'Maximum Estimation', 'type':'float', 'readonly':True},
+    'name': {'string':'Short Description', 'type':'char', 'size':64, 'readonly':True},
+    'obj_desc': {'string':'Description', 'type':'text', 'readonly':True},
+    'obj_num': {'string':'Catalog Number', 'type':'integer', 'required':True}
+}
+
+def _read_record(self,cr,uid,datas,context={}):
+    form = datas['form']
+    res = pooler.get_pool(cr.dbname).get('auction.lots').search(cr,uid,[('bord_vnd_id','=',form['bord_vnd_id']), ('lot_num','=',int(form['lot_num']))])
+    found = [r for r in res if r in datas['ids']]
+    if len(found)==0:
+        raise wizard.except_wizard('UserError', 'This record does not exist !')
+    datas = pooler.get_pool(cr.dbname).get('auction.lots').read(cr,uid,found,['obj_num', 'name', 'lot_est1', 'lot_est2', 'obj_desc'])
+    return datas[0]
+
+def _test_exist(self,cr,uid,datas,context={}):
+    form = datas['form']
+    res = pooler.get_pool(cr.dbname).get('auction.lots').search(cr,uid,[('bord_vnd_id','=',form['bord_vnd_id']), ('lot_num','=',int(form['lot_num']))])
+    found = [r for r in res if r in datas['ids']]
+    if len(found)==0:
+        return 'not_exist'
+    return 'search'
+
+def _numerotate(self,cr,uid,datas,context={}):
+    form = datas['form']
+    res = pooler.get_pool(cr.dbname).get('auction.lots').search(cr,uid,[('bord_vnd_id','=',form['bord_vnd_id']), ('lot_num','=',int(form['lot_num']))])
+    found = [r for r in res if r in datas['ids']]
+    if len(found)==0:
+        raise wizard.except_wizard('UserError', 'This record does not exist !')
+    pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,found,{'obj_num':int(form['obj_num'])} )
+    return {'lot_inv':'', 'lot_num':''}
+
+def _numerotate_cont(self,cr,uid,datas,context={}):
+    nbr = int(datas['form']['number'])
+    refs = pooler.get_pool(cr.dbname).get('auction.lots')
+    rec_ids = refs.browse(cr,uid,datas['ids'])
+    for rec_id in rec_ids:
+        refs.write(cr,uid,[rec_id.id],{'obj_num':nbr})
+        nbr+=1
+    return {}
+
+class wiz_auc_lots_numerotate(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':numerotate_form, 'fields': numerotate_fields, 'state':[('end','Cancel'),('choice','Continue')]}
+        },
+        'search': {
+            'actions': [_read_record],
+            'result': {'type': 'form', 'arch':numerotate_form2, 'fields': numerotate_fields2, 'state':[('end','Exit'),('init','Back'),('set_number','Numerotate')]}
+        },
+        'choice' : {
+            'actions' : [],
+            'result' : {'type' : 'choice', 'next_state': _test_exist }
+        },
+        'not_exist' : {
+            'actions': [],
+            'result': {'type': 'form', 'arch':numerotate_not_exist, 'fields': {}, 'state':[('end','Exit'),('init','Retry')]}
+        },
+        'set_number': {
+            'actions': [_numerotate],
+            'result': {'type': 'state', 'state':'init'}
+        }
+    }
+wiz_auc_lots_numerotate('auction.lots.numerotate');
+
+
+class wiz_auc_lots_numerotate(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':numerotate_form_cont, 'fields': numerotate_fields_cont, 'state':[('end','Exit'),('set_number','Numerotation')]}
+        },
+        'set_number': {
+            'actions': [_numerotate_cont],
+            'result': {'type': 'state', 'state':'end'}
+        }
+    }
+wiz_auc_lots_numerotate('auction.lots.numerotate_cont');
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_lots_pay.py b/addons/auction/wizard/wizard_lots_pay.py
new file mode 100644
index 00000000000..458dbc0bed9
--- /dev/null
+++ b/addons/auction/wizard/wizard_lots_pay.py
@@ -0,0 +1,84 @@
+# -*- encoding: utf-8 -*-
+
+import wizard
+import netsvc
+import netsvc
+import osv
+import time
+import pooler
+
+invoice_form = '''<?xml version="1.0"?>
+<form string="Pay invoice">
+    <field name="amount"/>
+    <field name="dest_account_id"/>
+    <field name="journal_id"/>
+    <field name="period_id"/>
+</form>'''
+
+invoice_fields = {
+    'amount': {'string': 'Amount paid', 'type':'float', 'required':True},
+    'dest_account_id': {'string':'Payment to Account', 'type':'many2one', 'required':True, 'relation':'account.account', 'domain':[('type','=','cash')]},
+    'journal_id': {'string': 'Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
+    'period_id': {'string': 'Period', 'type': 'many2one', 'relation':'account.period', 'required':True},
+}
+#def pay_n_check(self, cr, uid, data, context):
+#
+#   auction = pool.get('auction.lots').browse(cr,uid,data['id'],context)
+#   try:
+#       
+#       for lot in auction:
+#                            
+#           if not lot.auction_id :
+#               raise osv.except_osv("Error","No payment defined for this auction.")
+#           i=1
+#           tot= 0
+#           for payment in auction:
+#               if not payment.journal_id :
+#                   raise osv.except_osv("Error","No journal defined for the payment line %d" % (i,))
+#               if not payment.ach_inv_id.amount :
+#                   raise osv.except_osv("Error","No amount defined for the payment line %d." % (i,))
+#               i+=1
+#               tot+= payment.ach_inv_id.amount
+#           if abs(float(tot)) - abs(float(lot.obj_ret)) > 10**-6:
+#               raise osv.except_osv("Error","The amount paid does not match the total amount")
+#       else:
+#           for lot in auction:
+#              if not lot.journal_id :
+#               raise osv.except_osv("Error","Please choose a journal for the auction ("+lot.name+").")
+#           pool.get('auction.lots').create(cr,uid,{
+#               'auction_id': lot.auction.id,
+#               'journal_id': lot.journal_id,
+#
+#               })
+#   except osv.except_osv, e:
+#       raise wizard.except_wizard(e.name, e.name)
+#   return True
+def _pay_and_reconcile(self, cr, uid, data, context):
+
+    pool = pooler.get_pool(cr.dbname)
+    lot = pool.get('auction.lots').browse(cr,uid,data['id'],context)
+    form = data['form']
+    account_id = form.get('writeoff_acc_id', False)
+    period_id = form.get('period_id', False)
+    journal_id = form.get('journal_id', False)
+    if lot.sel_inv_id:
+        p=pool.get('account.invoice').pay_and_reconcile(['lot.sel_inv_id.id'], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
+#   lots.sel_inv_id.pay_and_reconcile(cr,uid,data[id], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
+    return {}
+
+
+class wiz_auc_lots_pay(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':invoice_form, 'fields': invoice_fields, 'state':[ ('pay','Pay'), ('end','Cancel')]}
+        },
+            'pay': {
+            'actions': [_pay_and_reconcile],
+            'result': {'type': 'state', 'state':'end'}
+        }}
+wiz_auc_lots_pay('auction.pay.sel');
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_lots_sms.py b/addons/auction/wizard/wizard_lots_sms.py
new file mode 100644
index 00000000000..723f1e56d53
--- /dev/null
+++ b/addons/auction/wizard/wizard_lots_sms.py
@@ -0,0 +1,158 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+import netsvc
+
+import urllib
+
+sms_send_form = '''<?xml version="1.0"?>
+<form title="%s">
+    <separator string="%s" colspan="4"/>
+    <field name="app_id"/>
+    <newline/>
+    <field name="user"/>
+    <field name="password"/>
+    <newline/>
+    <field name="text" colspan="3"/>
+</form>''' % ('SMS - Gateway: clickatell', 'Bulk SMS send')
+
+sms_send_fields = {
+    'app_id': {'string':'API ID', 'type':'char', 'required':True},
+    'user': {'string':'Login', 'type':'char', 'required':True},
+    'password': {'string':'Password', 'type':'char', 'required':True},
+    'text': {'string':'SMS Message', 'type':'text', 'required':True, 'value':'Les lots [lots] vous ont etes adjuges. -- Rops'}
+}
+##############################################################################
+#
+# Copyright (c) 2004-2006 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 wizard
+import netsvc
+import pooler
+
+sms_send_form = '''<?xml version="1.0"?>
+<form string="%s">
+    <separator string="%s" colspan="4"/>
+    <field name="app_id"/>
+    <newline/>
+    <field name="user"/>
+    <field name="password"/>
+    <newline/>
+    <field name="text" colspan="3"/>
+</form>''' % ('SMS - Gateway: clickatell','Bulk SMS send')
+
+sms_send_fields = {
+    'app_id': {'string':'API ID', 'type':'char', 'required':True},
+    'user': {'string':'Login', 'type':'char', 'required':True},
+    'password': {'string':'Password', 'type':'char', 'required':True},
+    'text': {'string':'SMS Message', 'type':'text', 'required':True}
+}
+
+def _sms_send(self, cr, uid, data, context):
+    service = netsvc.LocalService("object_proxy")
+    lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', data['ids'], ['obj_num','obj_price','ach_uid'])
+    res = service.execute(cr.dbname,uid, 'res.partner', 'read', [l['ach_uid'] for l in lots if l['ach_uid']], ['gsm'])
+    #res = service.execute(cr.dbname, uid, 'res.partner', 'read', data['ids'], ['gsm'])
+#   service = netsvc.LocalService("object_proxy")
+#   pool=pooler.get_pool(cr.dbname)
+#   lots=pool.get('auction.lots').browse(cr,uid,data['id'],context)
+#   r=lots.ach_uid.id
+    nbr = 0
+    for r in res:
+        to = r['mobile']
+        if to:
+            tools.smssend(data['form']['user'], data['form']['password'], data['form']['app_id'], unicode(data['form']['text'], 'utf-8').encode('latin1'), to)
+            nbr += 1
+    return {'sms_sent': nbr}
+
+    if to:
+        tools.smssend(data['form']['user'], data['form']['password'], data['form']['app_id'], unicode(data['form']['text'], 'utf-8').encode('latin1'), to)
+        nbr += 1
+    return {'sms_sent': nbr}
+#
+#def _sms_send(self, uid, datas):
+#   service = netsvc.LocalService("object_proxy")
+#   pool=pooler.ger_pool(cr.dbname)
+#   lots=pool.get('auction.lots').browse(cr,uid,datas['ids'],context)
+#   #lots = service.execute(uid, 'auction.lots', 'read', datas['ids'], ['obj_num','obj_price','ach_uid'])
+#   #part = service.execute(uid, 'res.partner', 'read', [l['ach_uid'] for l in lots if l['ach_uid']], ['gsm'])
+#   
+#   part =ach_uid.id
+#   part = map(lambda x: (x.id,x.mobile), part)
+#   for l in lots:
+#       part.append(str(l.obj_num)+'-%dEUR' % int(l.obj_price))
+#
+#   for p in part.values():
+#       to = p.mobile
+#       if to:
+#           params = urllib.urlencode({'user': datas['form']['user'], 'password': datas['form']['password'], 'api_id': datas['form']['app_id'], 'text':unicode(datas['form']['text'].replace('[lots]',', '.join(p['lots'])), 'utf-8').encode('latin1'), 'to':to})
+#           f = urllib.urlopen("http://196.7.150.220/http/sendmsg", params)
+#           nbr+=1
+#   return {'sms_sent':nbr}
+
+class lots_sms(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':sms_send_form, 'fields': sms_send_fields, 'state':[('send','Send SMS'), ('end','Cancel')]}
+        },
+        'send': {
+            'actions': [_sms_send],
+            'result': {'type': 'state', 'state':'end'}
+        }
+    }
+lots_sms('auction.lots.sms_send');
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_pay.py b/addons/auction/wizard/wizard_pay.py
new file mode 100644
index 00000000000..886fad7e333
--- /dev/null
+++ b/addons/auction/wizard/wizard_pay.py
@@ -0,0 +1,114 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+import netsvc
+import netsvc
+import osv
+import time
+import pooler
+pay_form = '''<?xml version="1.0"?>
+<form string="Pay objects">
+    <field name="amount"/>
+    <field name="statement_id1" domain="[('state','=','draft')]"/>
+    <field name="amount2"/>
+    <field name="statement_id2"  domain="[('state','=','draft')]"/>
+    <field name="amount3"/>
+    <field name="statement_id3"  domain="[('state','=','draft')]"/>
+    <newline/>
+    <field name="buyer_id"/>
+    <field name="total"/>
+</form>'''
+
+def _start(self,cr,uid,data,context):
+    pool = pooler.get_pool(cr.dbname)
+    rec=pool.get('auction.lots').browse(cr,uid,data['ids'],context)
+    amount1=0.0
+    for r in rec:
+        amount1+=r.buyer_price
+        buyer= r and r.ach_uid.id or False
+        if r.is_ok:
+            raise wizard.except_wizard('Error !', 'Some lots of the selection are already paid.')
+    return {'amount':amount1, 'total':amount1,'buyer_id':buyer}
+
+pay_fields = {
+    'amount': {'string': 'Amount paid', 'type':'float'},
+    'buyer_id': {'string': 'Buyer', 'type': 'many2one', 'relation':'res.partner'},
+    'statement_id1': {'string':'Statement', 'type':'many2one', 'required':True, 'relation':'account.bank.statement'},
+    'amount2': {'string': 'Amount paid', 'type':'float'},
+    'statement_id2': {'string':'Statement', 'type':'many2one', 'relation':'account.bank.statement'},
+    'amount3': {'string': 'Amount paid', 'type':'float'},
+    'statement_id3': {'string':'Statement', 'type':'many2one', 'relation':'account.bank.statement'},
+    'total': {'string': 'Amount to paid', 'type':'float','readonly':True}
+}
+
+def _pay_and_reconcile(self, cr, uid, data, context):
+    if not abs(data['form']['total'] - (data['form']['amount']+data['form']['amount2']+data['form']['amount3']))<0.01:
+        rest=data['form']['total']-(data['form']['amount']+data['form']['amount2']+data['form']['amount3'])
+        raise wizard.except_wizard('Payment aborted !', 'You should pay all the total: "%.2f" are missing to accomplish the payment.' %(round(rest,2)))
+    pool = pooler.get_pool(cr.dbname)
+    lots = pool.get('auction.lots').browse(cr,uid,data['ids'],context)
+    ref_bk_s=pooler.get_pool(cr.dbname).get('account.bank.statement.line')
+    for lot in lots:
+        if data['form']['buyer_id']:
+            pool.get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':data['form']['buyer_id']})
+        if not lot.auction_id:
+            raise wizard.except_wizard('Error !', 'No auction date for "%s": Please set one.'%(lot.name))
+        pool.get('auction.lots').write(cr,uid,[lot.id],{'is_ok':True})
+    for st,stamount in [('statement_id1','amount'),('statement_id2','amount2'),('statement_id3','amount3')]:
+        if data['form'][st]:
+            new_id=ref_bk_s.create(cr,uid,{
+                'name':'Buyer:'+str(lot.ach_login or '')+', auction:'+ lots[0].auction_id.name,
+                'date': time.strftime('%Y-%m-%d'),
+                'partner_id':data['form']['buyer_id'] or False,
+                'type':'customer',
+                'statement_id':data['form'][st],
+                'account_id':lot.auction_id.acc_income.id,
+                'amount':data['form'][stamount]
+            })
+            for lot in lots:
+                pool.get('auction.lots').write(cr,uid,[lot.id],{'statement_id':[(4,new_id)]})
+    return {}
+
+
+class wiz_auc_lots_pay(wizard.interface):
+    states = {
+        'init': {
+            'actions': [_start],
+            'result': {'type': 'form', 'arch':pay_form, 'fields': pay_fields, 'state':[('end','Cancel'),('pay','Pay')]}
+        },
+        'pay': {
+        'actions': [_pay_and_reconcile],
+        'result': {'type': 'state', 'state':'end'}
+        }}
+wiz_auc_lots_pay('auction.pay.buy')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_payer.py b/addons/auction/wizard/wizard_payer.py
new file mode 100644
index 00000000000..6ee908b7620
--- /dev/null
+++ b/addons/auction/wizard/wizard_payer.py
@@ -0,0 +1,87 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+import netsvc
+import netsvc
+import osv
+import time
+import pooler
+
+pay_form = '''<?xml version="1.0"?>
+<form string="Check payment for buyer">
+</form>'''
+pay_fields = {
+}
+
+
+pay_form1 = '''<?xml version="1.0"?>
+<form string="Check payment for seller">
+</form>'''
+pay_fields1 = {
+}
+def _payer(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    pool.get('auction.lots').write(cr,uid,data['ids'],{'is_ok':True, 'state':'paid'})
+    return {}
+
+
+def _payer_sel(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    pool.get('auction.lots').write(cr,uid,data['ids'],{'paid_vnd':True})
+    return {}
+
+
+class wiz_auc_pay(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':pay_form, 'fields': pay_fields, 'state':[('end','Cancel'),('pay','Pay')]}
+        },
+        'pay': {
+        'actions': [_payer],
+        'result': {'type': 'state', 'state':'end'}
+        }}
+wiz_auc_pay('auction.payer')
+
+
+class wiz_auc_pay_sel(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':pay_form1, 'fields': pay_fields1, 'state':[('end','Cancel'),('pay2','Pay')]}
+        },
+        'pay2': {
+        'actions': [_payer_sel],
+        'result': {'type': 'state', 'state':'end'}
+        }}
+wiz_auc_pay_sel('auction.payer.sel')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/wizard_transfer_unsold_object.py b/addons/auction/wizard/wizard_transfer_unsold_object.py
new file mode 100644
index 00000000000..d2bd771df76
--- /dev/null
+++ b/addons/auction/wizard/wizard_transfer_unsold_object.py
@@ -0,0 +1,102 @@
+# -*- encoding: utf-8 -*-
+#############################################################################
+#
+# 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 time
+import wizard
+import netsvc
+import pooler
+from osv.orm import browse_record
+import sql_db
+
+transfer_unsold_object_form = """<?xml version="1.0"?>
+<form string="Draft To Posted">
+    <group col="1" colspan="2">
+    <separator colspan="4" string="Transfer unsold Object: Current auction date to another " />
+    </group>
+    <newline/>
+    <field name="auction_id_from"/>
+    <newline/>
+    <field name="auction_id_to"/>
+</form>
+"""
+
+transfer_unsold_object_fields = {
+         'auction_id_from': {'string':'From Auction Date', 'type':'many2one', 'required':True, 'relation':'auction.dates'},
+         'auction_id_to': {'string':'To Auction Date', 'type':'many2one', 'required':True, 'relation':'auction.dates'},
+}
+
+def _start(self,cr,uid,data,context):
+    pool = pooler.get_pool(cr.dbname)
+    rec=pool.get('auction.lots').browse(cr,uid,data['id'],context)
+    auction_from= rec and rec.auction_id.id or False
+    return {'auction_id_from':auction_from}
+
+def _transfer_unsold_object(self, cr, uid, data, context):
+    #if not (data['form']['auction_id_to']) :
+    #   return {}
+#Historique de l objet + changement de l auction date + supp des bid line
+    line_ids= pooler.get_pool(cr.dbname).get('auction.bid_line').search(cr,uid,[('lot_id','in',data['ids'])])
+    pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
+    
+    obj_pool = pooler.get_pool(cr.dbname).get('auction.lots')
+    ids= obj_pool.search(cr,uid,[('auction_id','=',data['form']['auction_id_from']),('state','=','unsold')])
+    for rec in obj_pool.browse(cr, uid, ids, context):
+    #   print "rec.auction_id",rec.auction_id
+        new_id=pooler.get_pool(cr.dbname).get('auction.lot.history').create(cr,uid,{'auction_id':rec.auction_id.id,'lot_id':rec.id,'price': rec.obj_ret, 'name': 'reasons'+rec.auction_id.auction1})
+    #   print new_id
+        up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[rec.id],{'auction_id':data['form']['auction_id_to'],
+                                                                                        'obj_ret':None,
+                                                                                        'obj_price':None,
+                                                                                        'ach_login':None,
+                                                                                        'ach_uid':None,
+                                                                                        'ach_inv_id':None,
+                                                                                        'sel_inv_id':None,
+                                                                                        'state':'draft'})
+
+        #   new_id = self.pool.get('auction.lot.history').copy(cr, uid, m.id, {'price': recs.obj_ret, 'name': 'reasons'+recs.auction_id.name})
+    #           new_id=pooler.get_pool(cr.dbname).get('auction.lot.history').create(cr,uid,{'auction_id':rec.auction_id,'lot_id':rec.name,'price': rec.obj_ret, 'name': 'reasons'+rec.auction_id.auction1})
+    return {}
+
+class transfer_object(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [_start],
+            'result' : {'type' : 'form',
+                    'arch' : transfer_unsold_object_form,
+                    'fields' :transfer_unsold_object_fields,
+                    'state' : [('transfer', 'Transfer'),('end', 'Cancel') ]}
+        },
+        'transfer' : {
+            'actions' : [_transfer_unsold_object],
+            'result' : {'type' : 'state','state' : 'end'}
+        },
+    }
+transfer_object('auction.lots.transfer.unsold.object')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_contact/__init__.py b/addons/base_contact/__init__.py
new file mode 100644
index 00000000000..4a4071cd498
--- /dev/null
+++ b/addons/base_contact/__init__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 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 base_contact
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py
new file mode 100644
index 00000000000..6ec41c49644
--- /dev/null
+++ b/addons/base_contact/__terp__.py
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Base Contact",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com",
+    "category" : "Generic Modules/Base Contact",
+    "description": """
+        This module allows you to manage entirely your contacts. 
+
+    It lets you define 
+        *contacts unrelated to a partner,
+        *contacts working at several adresses (possibly for different partners), 
+        *contacts with possibly different functions for each of its job's addresses
+
+    It also add a new menuitem located in 
+        Partners \ Contacts
+
+
+    Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.
+    """,
+    "depends" : ["base"],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ['base_contact_view.xml'],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
new file mode 100644
index 00000000000..ce0296d884c
--- /dev/null
+++ b/addons/base_contact/base_contact.py
@@ -0,0 +1,125 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2007 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 netsvc
+from osv import fields, osv
+
+
+class res_partner_contact(osv.osv):
+    _name = "res.partner.contact"
+    _description = "res.partner.contact"
+
+    def _title_get(self,cr, user, context={}):
+        obj = self.pool.get('res.partner.title')
+        ids = obj.search(cr, user, [])
+        res = obj.read(cr, user, ids, ['shortcut', 'name','domain'], context)
+        res = [(r['shortcut'], r['name']) for r in res if r['domain']=='contact']
+        return res
+
+    _columns = {
+        'name': fields.char('Last Name', size=30,required=True),
+        'first_name': fields.char('First Name', size=30),
+        'mobile':fields.char('Mobile',size=30),
+        'title': fields.selection(_title_get, 'Title'),
+        'website':fields.char('Website',size=120),
+        'lang_id':fields.many2one('res.lang','Language'),
+        'job_ids':fields.one2many('res.partner.job','contact_id','Functions'),
+        'country_id':fields.many2one('res.country','Nationality'),
+        'birthdate':fields.date('Birth Date'),
+        'active' : fields.boolean('Active'),
+    }
+    _defaults = {
+        'active' : lambda *a: True,
+    }
+    def name_get(self, cr, user, ids, context={}):
+        #will return name and first_name.......
+        if not len(ids):
+            return []
+        res = []
+        for r in self.read(cr, user, ids, ['name','first_name']):
+            addr = str(r['name'] or '')
+            if r['name'] and r['first_name']:
+                addr += ' '
+            addr += str(r['first_name'] or '')
+            res.append((r['id'], addr))
+        return res
+res_partner_contact()
+
+class res_partner_address(osv.osv):
+
+    #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):
+            return []
+        res = []
+        for r in self.read(cr, user, ids, ['zip','city','partner_id', 'street']):
+            if context.get('contact_display', 'contact')=='partner':
+                res.append((r['id'], r['partner_id'][1]))
+            else:
+                addr = str('')
+                addr += str(r['street'] or '') + ' ' + str(r['zip'] or '') + ' ' + str(r['city'] or '')
+                res.append((r['id'], addr.strip() or '/'))
+        return res
+
+    _name = 'res.partner.address'
+    _inherit='res.partner.address'
+    _description ='Partner Contact'
+    _columns = {
+        'job_ids':fields.one2many('res.partner.job', 'address_id', 'Contacts'),
+    }
+res_partner_address()
+
+class res_partner_job(osv.osv):
+
+    def _get_partner_name(self, cr, uid, ids, *a):
+        res={}
+        for id in self.browse(cr, uid, ids):
+            res[id.id] = id.address_id.partner_id.id
+        return res
+
+    _name = 'res.partner.job'
+    _description ='Contact Function'
+    _order = 'sequence_contact'
+    _columns = {
+        'name': fields.function(_get_partner_name, method=True, type='many2one', relation='res.partner', string='Partner'),
+        'address_id':fields.many2one('res.partner.address','Address', required=True),
+        'contact_id':fields.many2one('res.partner.contact','Contact', required=True),
+        'function_id': fields.many2one('res.partner.function','Function', required=True),
+        'sequence_contact':fields.integer('Sequence (Contact)',help='order of importance of this address in the list of addresses of the linked contact'),
+        'email': fields.char('E-Mail', size=240),
+        'phone': fields.char('Phone', size=64),
+    }
+
+    _defaults = {
+        'sequence_contact' : lambda *a: 0,
+    }
+res_partner_job()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
new file mode 100644
index 00000000000..d88f2c84832
--- /dev/null
+++ b/addons/base_contact/base_contact_view.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" ?>
+<terp>
+<data>
+
+    <!-- Views for Contacts -->
+    <record model="ir.ui.view" id="view_partner_contact_tree">
+        <field name="name">res.partner.contact.tree</field>
+        <field name="model">res.partner.contact</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Partner Contact">
+                <field name="name"/>
+                <field name="first_name"/>
+                <field name="mobile"/>
+                <field name="lang_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_partner_contact_form">
+        <field name="name">res.partner.contact.form</field>
+        <field name="model">res.partner.contact</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Partner Contact">
+                <notebook>
+                    <page string="General">
+                            <field name="name" select="1"/>
+                            <field name="first_name" select="1"/>
+                            <newline/>
+                            <separator string="General Information" colspan="4"/>
+                            <field name="mobile" select="2"/>
+                            <field name="title" select="1" />
+                            <field name="website"/>
+                            <field name="lang_id"/>
+                            <field name="active"/>
+                            <separator string="Functions" colspan="4"/>
+                            <field name="job_ids" colspan="4" nolabel="1" mode="tree, form">
+                                <form string="Functions">
+                                    <field name="sequence_contact"/>
+                                    <field name="function_id"/>
+                                    <field name="name"/>
+                                    <field name="address_id"/>
+                                    <field name="phone"/>
+                                    <field name="email"/>
+                                </form>
+                                <tree string="Functions">
+                                    <field name="sequence_contact"/>
+                                    <field name="function_id"/>
+                                    <field name="name"/>
+                                    <field name="address_id"/>
+                                    <field name="phone"/>
+                                    <field name="email"/>
+                                </tree>
+                            </field>
+                    </page>
+                    <page string="Extra Information">
+                            <field name="country_id"/>
+                            <field name="birthdate" select="1" />
+                    </page>
+                </notebook>
+            </form>
+        </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>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_partner_contact_tree"/>
+    </record>
+    <menuitem name="Partners/" id="menu_partner_contact_form" action="action_partner_contact_form"/>
+    <menuitem name="Partners/Addresses"  id="base.menu_partner_address_form"/>
+
+
+    <!-- Views for Partners -->
+    <record model="ir.ui.view" id="view_partner_tree_inherited1">
+        <field name="name">Partner tree inherited</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_tree"/>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <field name="address" position="replace">
+                <field name='address' string='# of Addresses'/>
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_partner_form_inherit">
+        <field name="name">Partner form inherited</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1" position="replace">
+                <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1">
+                    <form string="Address">
+                        <field name="type" select="2" colspan="4"/>
+                        <newline/>
+                        <field name="street" select="2"/>
+                        <field name="street2"/>
+                        <newline/>
+                        <field name="zip" select="2"/>
+                        <field name="city" select="2"/>
+                        <newline/>
+                        <field name="country_id" select="2" completion="1"/>
+                        <field name="state_id" select="2"/>
+                        <newline/>
+                        <field name="phone"/>
+                        <field name="fax"/>
+                        <newline/>
+                        <field name="job_ids" mode="tree, form" colspan="4">
+                            <tree string="Contacts" editable="top">
+                                <field name="contact_id"/>
+                                <field name="function_id"/>
+                                <field name="phone"/>
+                                <field name="email"/>
+                            </tree>
+                            <form string="Contacts">
+                                <field name="contact_id"/>
+                                <field name="function_id"/>
+                                <field name="phone"/>
+                                <field name="email"/>
+                            </form>
+                        </field>
+                    </form>
+                    <tree string="Addresses">
+                        <field name="type"/>
+                        <field name="zip"/>
+                        <field name="city"/>
+                        <field name="country_id"/>
+                        <field name="phone"/>
+                        <field name="job_ids"/>
+                    </tree>
+                </field>
+            </field>
+        </field>
+    </record>
+
+    <!-- Views for Addresses -->
+    <record model="ir.ui.view" id="view_partner_address_tree_inherited1">
+        <field name="name">Partner addresses inherited</field>
+        <field name="model">res.partner.address</field>
+        <field name="inherit_id" ref="base.view_partner_address_tree"/>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <field name="name" position="replace">
+                <field name='job_ids' string='# of Contacts'/>
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_partner_address_form_inherited0">
+        <field name='name'>res.partner.address.form.inherited0</field>
+        <field name='model'>res.partner.address</field>
+        <field name="inherit_id" ref="base.view_partner_address_form1"/>
+        <field name='type'>form</field>
+        <field name='arch' type='xml'>
+            <field name="type" position="replace">
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_partner_address_form_inherited1">
+        <field name='name'>res.partner.address.form.inherited1</field>
+        <field name='model'>res.partner.address</field>
+        <field name="inherit_id" ref="base.view_partner_address_form1"/>
+        <field name='type'>form</field>
+        <field name='arch' type='xml'>
+            <field name="name" position="replace">
+            </field>
+        </field>
+    </record>
+
+    <record id='view_partner_address_form_inherited2' model='ir.ui.view'>
+        <field name='name'>res.partner.address.form.inherited2</field>
+        <field name='model'>res.partner.address</field>
+        <field name="inherit_id" ref="base.view_partner_address_form1"/>
+        <field name='type'>form</field>
+        <field name='arch' type='xml'>
+            <field name="title" position="replace">
+            </field>
+        </field>
+    </record>
+
+    <record id='view_partner_address_form_inherited3' model='ir.ui.view'>
+        <field name='name'>res.partner.address.form.inherited3</field>
+        <field name='model'>res.partner.address</field>
+        <field name="inherit_id" ref="base.view_partner_address_form1"/>
+        <field name='type'>form</field>
+        <field name='arch' type='xml'>
+            <field name="function" position="replace">
+            </field>
+        </field>
+    </record>
+
+    <record id='view_partner_address_form_inherited4' model='ir.ui.view'>
+        <field name='name'>res.partner.address.form.inherited4</field>
+        <field name='model'>res.partner.address</field>
+        <field name="inherit_id" ref="base.view_partner_address_form1"/>
+        <field name='type'>form</field>
+        <field name='arch' type='xml'>
+            <field name='mobile' position="replace">
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_partner_address_form_inherited6">
+        <field name='name'>res.partner.address.form.inherited6</field>
+        <field name='model'>res.partner.address</field>
+        <field name="inherit_id" ref="base.view_partner_address_form1"/>
+        <field name='type'>form</field>
+        <field name='arch' type='xml'>
+            <field name="partner_id" position="replace">
+                <field name='partner_id' select='1'/>
+                <field name='type' select='2'/>
+            </field>
+        </field>
+    </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>
+        <field name="inherit_id" ref="base.view_partner_address_form1"/>
+        <field name='type'>form</field>
+        <field name='arch' type='xml'>
+            <field name="email" position="replace">
+                <field name="job_ids" mode="tree, form" colspan="4">
+                    <tree string="Contacts" editable="top">
+                        <field name="contact_id"/>
+                        <field name="function_id"/>
+                        <field name="phone"/>
+                        <field name="email"/>
+                    </tree>
+                    <form string="Contacts">
+                        <field name="contact_id"/>
+                        <field name="function_id"/>
+                        <field name="phone"/>
+                        <field name="email"/>
+                    </form>
+                </field>
+            </field>
+        </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>
+        <field name="model">res.partner.job</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Contact Functions">
+                <field name="name"/>
+                <field name="address_id"/>
+                <field name="contact_id"/>
+                <field name="function_id"/>
+                <field name="email"/>
+                <field name="phone"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_partner_job_form">
+        <field name="name">res.partner.job.form</field>
+        <field name="model">res.partner.job</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Contact Functions">
+                <notebook>
+                    <page string="General">
+                        <field name="name" select="1"/>
+                        <field name="address_id" select="1"/>
+                        <field name="contact_id" select="1"/>
+                        <field name="function_id" select="1"/>
+                        <field name="email" select="2"/>
+                        <field name="phone" select="2"/>
+                        <field name="sequence_contact" select="2"/>
+                    </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+
+<!-- Menuitem for res.partner.job -->
+        <record model="ir.actions.act_window" id="action_res_partner_job">
+            <field name="name">Functions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.partner.job</field>
+            <field name="view_type">form</field>
+        </record>
+        <menuitem name="Partners/Functions" action="action_res_partner_job" id="menu_action_res_partner_job"/>
+<!-- Act window defining a shorcut on partners to open all his contacts -->
+        <act_window name="Open all Partner's Function"
+            domain="[('name', '=', active_id)]"
+            res_model="res.partner.job"
+            src_model="res.partner"
+            view_mode='tree,form'
+            id="act_res_partner_jobs"/>
+</data>
+</terp>
diff --git a/addons/base_module_record/__init__.py b/addons/base_module_record/__init__.py
new file mode 100644
index 00000000000..e7a1641507b
--- /dev/null
+++ b/addons/base_module_record/__init__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 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 base_module_record
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__terp__.py
new file mode 100644
index 00000000000..cb5754af64a
--- /dev/null
+++ b/addons/base_module_record/__terp__.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Module Recorder",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com",
+    "category" : "Generic Modules/Base",
+    "description": """
+This module allows you to create a new module without any development.
+It records all operations on objects during the recording session and
+produce a .ZIP module. So you can create your own module directly from
+the Tiny ERP client.
+
+This version works for creating and updating existing records. It recomputes
+dependencies and links for all types of widgets (many2one, many2many, ...).
+It also support workflows and demo/update data.
+
+This should help you to easily create reuseable and publishable modules
+for custom configurations and demo/testing data.
+
+How to use it:
+1. Start the recording
+2. Do stuff in your Tiny ERP client
+3. Stop the recording session
+4. Export to a reusable module
+    """,
+    "depends" : ["base"],
+    "init_xml" : [ ],
+    "demo_xml" : [ ],
+    "update_xml" : [ "base_module_record_wizard.xml" ],
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
new file mode 100644
index 00000000000..6c130549f64
--- /dev/null
+++ b/addons/base_module_record/base_module_record.py
@@ -0,0 +1,234 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 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.
+#
+##############################################################################
+
+from xml.dom import minidom
+from osv import fields,osv
+import netsvc
+import pooler
+import string
+
+class base_module_record(osv.osv):
+    _name = "ir.module.record"
+    _columns = {
+
+    }
+    def __init__(self, pool, cr=None):
+        if super(base_module_record, self).__init__.func_code.co_argcount ==3:
+            super(base_module_record, self).__init__(pool,cr)
+        else:
+            super(base_module_record, self).__init__(pool)
+        self.recording = 0
+        self.recording_data = []
+        self.depends = {}
+
+    # To Be Improved
+    def _create_id(self, cr, uid, model, data):
+        i = 0
+        while True:
+            name = filter(lambda x: x in string.letters, (data.get('name','') or '').lower())
+            val = model.replace('.','_')+'_'+name+ str(i)
+            i+=1
+            if val not in self.ids.values():
+                break
+        return val
+
+    def _get_id(self, cr, uid, model, id):
+        if (model,id) in self.ids:
+            return self.ids[(model,id)], False
+        dt = self.pool.get('ir.model.data')
+        dtids = dt.search(cr, uid, [('model','=',model), ('res_id','=',id)])
+        if not dtids:
+            return None, None
+        obj = dt.browse(cr, uid, dtids[0])
+        self.depends[obj.module] = True
+        return obj.module+'.'+obj.name, obj.noupdate
+
+    def _create_record(self, cr, uid, doc, model, data, record_id, noupdate=False):
+        record = doc.createElement('record')
+        record.setAttribute("id", record_id)
+        record.setAttribute("model", model)
+        lids  = self.pool.get('ir.model.data').search(cr, uid, [('model','=',model)])
+        res = self.pool.get('ir.model.data').read(cr, uid, lids[:1], ['module'])
+        if res:
+            self.depends[res[0]['module']]=True
+        record_list = [record]
+        fields = self.pool.get(model).fields_get(cr, uid)
+        for key,val in data.items():
+            if not (val or (fields[key]['type']=='boolean')):
+                continue
+            if fields[key]['type'] in ('integer','float'):
+                field = doc.createElement('field')
+                field.setAttribute("name", key)
+                field.setAttribute("eval", val and str(val) or 'False' )
+                record.appendChild(field)
+            elif fields[key]['type'] in ('boolean',):
+                field = doc.createElement('field')
+                field.setAttribute("name", key)
+                field.setAttribute("eval", val and '1' or '0' )
+                record.appendChild(field)
+            elif fields[key]['type'] in ('many2one',):
+                field = doc.createElement('field')
+                field.setAttribute("name", key)
+                if type(val) in (type(''),type(u'')):
+                    id = val
+                else:
+                    id,update = self._get_id(cr, uid, fields[key]['relation'], val)
+                    noupdate = noupdate or update
+                if not id:
+                    field.setAttribute("model", fields[key]['relation'])
+                    name = self.pool.get(fields[key]['relation']).browse(cr, uid, val).name
+                    print name
+                    field.setAttribute("search", "[('name','=','"+name+"')]")
+                else:
+                    field.setAttribute("ref", id)
+                record.appendChild(field)
+            elif fields[key]['type'] in ('one2many',):
+                for valitem in (val or []):
+                    if valitem[0]==0:
+                        fname = self.pool.get(model)._columns[key]._fields_id
+                        valitem[2][fname] = record_id
+                        newid = self._create_id(cr, uid, fields[key]['relation'], valitem[2])
+                        childrecord, update = self._create_record(cr, uid, doc, fields[key]['relation'],valitem[2], newid)
+                        noupdate = noupdate or update
+                        record_list += childrecord
+                        self.ids[(fields[key]['relation'],newid)] = newid
+                    else:
+                        pass
+            elif fields[key]['type'] in ('many2many',):
+                res = []
+                for valitem in (val or []):
+                    if valitem[0]==6:
+                        for id2 in valitem[2]:
+                            id,update = self._get_id(cr, uid, fields[key]['relation'], id2)
+                            self.ids[(fields[key]['relation'],id)] = id
+                            noupdate = noupdate or update
+                            res.append(id)
+                        field = doc.createElement('field')
+                        field.setAttribute("name", key)
+                        field.setAttribute("eval", "[(6,0,["+','.join(map(lambda x: "ref('%s')" % (x,), res))+'])]')
+                        record.appendChild(field)
+            else:
+                field = doc.createElement('field')
+                field.setAttribute("name", key)
+
+                if not isinstance(val, basestring):
+                    val = str(val)
+
+                val = val and ('"""%s"""' % val.replace('\\', '\\\\').replace('"', '\"')) or 'False'
+                if isinstance(val, basestring):
+                    val = val.decode('utf8')
+
+                field.setAttribute(u"eval",  val)
+                record.appendChild(field)
+        return record_list, noupdate
+
+    def _generate_object_xml(self, cr, uid, rec, recv, doc, result=None):
+        record_list = []
+        noupdate = False
+        if rec[4]=='write':
+            for id in rec[5]:
+                id,update = self._get_id(cr, uid, rec[3], id)
+                noupdate = noupdate or update
+                if not id:
+                    continue
+                record,update = self._create_record(cr, uid, doc, rec[3], rec[6], id)
+                noupdate = noupdate or update
+                record_list += record
+        elif rec[4]=='create':
+            id = self._create_id(cr, uid, rec[3],rec[5])
+            record,noupdate = self._create_record(cr, uid, doc, rec[3], rec[5], id)
+            self.ids[(rec[3],result)] = id
+            record_list += record
+        return record_list,noupdate
+    def _generate_assert_xml(self, rec, doc):
+        pass
+    def generate_xml(self, cr, uid):
+        # Create the minidom document
+        self.ids = {}
+        doc = minidom.Document()
+        terp = doc.createElement("terp")
+        doc.appendChild(terp)
+        for rec in self.recording_data:
+            if rec[0]=='workflow':
+                rec_id,noupdate = self._get_id(cr, uid, rec[1][3], rec[1][5])
+                if not rec_id:
+                    continue
+                data = doc.createElement("data")
+                terp.appendChild(data)
+                wkf = doc.createElement('workflow')
+                data.appendChild(wkf)
+                wkf.setAttribute("model", rec[1][3])
+                wkf.setAttribute("action", rec[1][4])
+                if noupdate:
+                    data.setAttribute("noupdate", "1")
+                wkf.setAttribute("ref", rec_id)
+            if rec[0]=='query':
+                res_list,noupdate = self._generate_object_xml(cr, uid, rec[1], rec[2], doc, rec[3])
+                data = doc.createElement("data")
+                if noupdate:
+                    data.setAttribute("noupdate", "1")
+                if res_list:
+                    terp.appendChild(data)
+                for res in res_list:
+                    data.appendChild(res)
+            elif rec[0]=='assert':
+                pass
+        res = doc.toprettyxml(indent="\t")
+        return  doc.toprettyxml(indent="\t").encode('utf8')
+base_module_record()
+
+def fnct_call(fnct):
+    def execute(*args, **argv):
+        res = fnct(*args, **argv)
+        pool = pooler.get_pool(args[0])
+        mod = pool.get('ir.module.record')
+        if mod and mod.recording:
+            if args[4] not in ('default_get','read','fields_view_get','fields_get','search','name_search','name_get','get','request_get', 'get_sc'):
+                mod.recording_data.append(('query', args, argv,res))
+        return res
+    return execute
+
+def fnct_call_workflow(fnct):
+    def exec_workflow(*args, **argv):
+        res = fnct(*args, **argv)
+        pool = pooler.get_pool(args[0])
+        mod = pool.get('ir.module.record')
+        if mod and mod.recording:
+            mod.recording_data.append(('workflow', args, argv))
+        return res
+    return exec_workflow
+
+obj  = netsvc._service['object']
+obj.execute = fnct_call(obj.execute)
+obj.exportMethod(obj.execute)
+obj.exec_workflow = fnct_call_workflow(obj.exec_workflow)
+obj.exportMethod(obj.exec_workflow)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_record/base_module_record_wizard.xml b/addons/base_module_record/base_module_record_wizard.xml
new file mode 100644
index 00000000000..b98d4f0479e
--- /dev/null
+++ b/addons/base_module_record/base_module_record_wizard.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+		<wizard
+			id="wizard_base_module_record"
+			string="Record module"
+			model="ir.module.module"
+			multi="True"
+			name="base_module_record.module_record"/>
+
+		<menuitem
+			parent="base.menu_management"
+			name="Module Recording"
+			id="menu_wizard_base_mod_rec"/>
+		<menuitem
+			parent="menu_wizard_base_mod_rec"
+			name="Start Recording"
+			type="wizard"
+			action="wizard_base_module_record"
+			id="menu_wizard_base_module_record"/>
+
+		<menuitem
+			parent="menu_wizard_base_mod_rec"
+			name="Stop Recording"
+			type="wizard"
+			action="wizard_base_module_record"
+			id="menu_wizard_base_module_record_stop"/>
+
+
+		<wizard
+			id="wizard_base_module_save"
+			string="Save Recorded Module"
+			model="ir.module.module"
+			multi="True"
+			name="base_module_record.module_save"/>
+
+		<menuitem
+			parent="menu_wizard_base_mod_rec"
+			name="Save Recorded Module"
+			type="wizard"
+			action="wizard_base_module_save"
+			id="menu_wizard_base_module_save"/>
+
+	</data>
+</terp>
diff --git a/addons/base_module_record/wizard/__init__.py b/addons/base_module_record/wizard/__init__.py
new file mode 100644
index 00000000000..4e8cd690285
--- /dev/null
+++ b/addons/base_module_record/wizard/__init__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 base_module_record
+import base_module_save
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_record/wizard/base_module_record.py b/addons/base_module_record/wizard/base_module_record.py
new file mode 100644
index 00000000000..421caafb7a2
--- /dev/null
+++ b/addons/base_module_record/wizard/base_module_record.py
@@ -0,0 +1,116 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 osv
+import pooler
+
+intro_stop_form = '''<?xml version="1.0"?>
+<form string="Module Recording">
+    <separator string="Recording Information" colspan="4"/>
+    <label string="Tiny ERP recording is stopped. Don't forget to save the recorded module." colspan="4" align="0.0"/>
+    <label string="You can continue the recording session by relauching the 'start recording' wizard." colspan="4" align="0.0"/>
+</form>'''
+
+intro_start_form = '''<?xml version="1.0"?>
+<form string="Recording Stopped">
+    <separator string="Recording information" colspan="4"/>
+    <label string="The module recorder allows you to record every operation made in the Tiny ERP client and save them as a module. You will be able to install this module on any database to reuse and/or publish it." colspan="4" align="0.0"/>
+    <field name="continue"/>
+</form>'''
+
+intro_start_fields = {
+    'continue': {'string':'Continue Previous Session', 'type':'boolean'}
+}
+
+def _stop_recording(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    mod = pool.get('ir.module.record')
+    mod.recording = 0
+    return {}
+
+def _start_recording(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    mod = pool.get('ir.module.record')
+    mod.recording = 1
+    if not data['form']['continue']:
+        mod.recording_data = []
+        mod.depends = {}
+    return {}
+
+def _check_recording(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    mod = pool.get('ir.module.record')
+    if mod.recording:
+        return 'stop'
+    return 'start'
+
+class base_module_publish(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type':'choice',
+                'next_state':_check_recording,
+            }
+        },
+        'start': {
+            'actions': [],
+            'result': {
+                'type':'form',
+                'arch':intro_start_form,
+                'fields': intro_start_fields,
+                'state':[
+                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('start_confirm', 'Start Recording', 'gtk-ok'),
+                ]
+            }
+        },
+        'start_confirm': {
+            'actions': [_start_recording],
+            'result': {
+                'type':'state',
+                'state': 'end'
+            }
+        },
+        'stop': {
+            'actions': [_stop_recording],
+            'result': {
+                'type':'form',
+                'arch':intro_stop_form,
+                'fields': {},
+                'state':[
+                    ('end', 'Continue', 'gtk-ok'),
+                ]
+            }
+        }
+    }
+base_module_publish('base_module_record.module_record')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_module_record/wizard/base_module_save.py b/addons/base_module_record/wizard/base_module_save.py
new file mode 100644
index 00000000000..1b26c34ea65
--- /dev/null
+++ b/addons/base_module_record/wizard/base_module_save.py
@@ -0,0 +1,196 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 osv
+import pooler
+
+info_start_form = '''<?xml version="1.0"?>
+<form string="Module Recording">
+    <separator string="Recording Information" colspan="4"/>
+    <field name="info_status"/>
+    <field name="info_text" colspan="4" nolabel="1"/>
+</form>'''
+
+info_start_fields = {
+    'info_text': {'string':'Information', 'type':'text', 'readonly':True},
+    'info_status': {'string':'Status','type':'selection', 'selection':[('no','Not Recording'),('record','Recording')], 'readonly':True}
+}
+
+
+
+intro_start_form = '''<?xml version="1.0"?>
+<form string="Module Recording">
+    <separator string="Module Information" colspan="4"/>
+    <field name="name"/>
+    <field name="directory_name"/>
+    <field name="version"/>
+    <field name="author"/>
+    <field name="website" colspan="4"/>
+    <field name="category" colspan="4"/>
+    <field name="data_kind"/>
+    <newline/>
+    <field name="description" colspan="4"/>
+</form>'''
+
+intro_start_fields = {
+    'name': {'string':'Module Name', 'type':'char', 'size':64, 'required':True},
+    'directory_name': {'string':'Directory Name', 'type':'char', 'size':32, 'required':True},
+    'version': {'string':'Version', 'type':'char', 'size':16, 'required':True},
+    'author': {'string':'Author', 'type':'char', 'size':64, 'default': lambda *args: 'Tiny', 'required':True},
+    'category': {'string':'Category', 'type':'char', 'size':64, 'default': lambda *args: 'Vertical Modules/Parametrization', 'required':True},
+    'website': {'string':'Documentation URL', 'type':'char', 'size':64, 'default': lambda *args: 'http://tinyerp.com', 'required':True},
+    'description': {'string':'Full Description', 'type':'text', 'required':True},
+    'data_kind': {'string':'Type of Data', 'type':'selection', 'selection':[('demo','Demo Data'),('update','Normal Data')], 'required':True, 'default': lambda *args:'update'},
+}
+
+intro_save_form = '''<?xml version="1.0"?>
+<form string="Module Recording">
+    <separator string="Module successfully created !" colspan="4"/>
+    <field name="module_filename"/>
+    <newline/>
+    <field name="module_file"/>
+    <separator string="Information" colspan="4"/>
+    <label string="If you think your module could interrest others people, we'd like you to publish it on TinyERP.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." colspan="4" align="0.0"/>
+    <label string="Thanks in advance for your contribution." colspan="4" align="0.0"/>
+</form>'''
+
+intro_save_fields = {
+    'module_file': {'string': 'Module .zip File', 'type':'binary', 'readonly':True},
+    'module_filename': {'string': 'Filename', 'type':'char', 'size': 64, 'readonly':True},
+}
+
+import zipfile
+import StringIO
+import base64
+
+def _info_default(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    mod = pool.get('ir.module.record')
+    result = {}
+    info = "Details of "+str(len(mod.recording_data))+" Operation(s):\n\n"
+    for line in mod.recording_data:
+        result.setdefault(line[0],{})
+        result[line[0]].setdefault(line[1][3], {})
+        result[line[0]][line[1][3]].setdefault(line[1][4], 0)
+        result[line[0]][line[1][3]][line[1][4]]+=1
+    for key1,val1 in result.items():
+        info+=key1+"\n"
+        for key2,val2 in val1.items():
+            info+="\t"+key2+"\n"
+            for key3,val3 in val2.items():
+                info+="\t\t"+key3+" : "+str(val3)+"\n"
+    return {'info_text': info, 'info_status':mod.recording and 'record' or 'no'}
+
+def _create_module(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    mod = pool.get('ir.module.record')
+    res_xml = mod.generate_xml(cr, uid)
+
+    s=StringIO.StringIO()
+    zip = zipfile.ZipFile(s, 'w')
+    dname = data['form']['directory_name']
+    data['form']['update_name'] = ''
+    data['form']['demo_name'] = ''
+    if data['form']['data_kind'] =='demo':
+        data['form']['demo_name'] = '"%(directory_name)s_data.xml"' % data['form']
+    else:
+        data['form']['update_name'] = '"%(directory_name)s_data.xml"' % data['form']
+    data['form']['depends'] = ','.join(map(lambda x: '"'+x+'"',mod.depends.keys()))
+    _terp = """{
+        "name" : "%(name)s",
+        "version" : "%(version)s",
+        "author" : "%(author)s",
+        "website" : "%(website)s",
+        "category" : "%(category)s",
+        "description": \"\"\"%(description)s\"\"\",
+        "depends" : [%(depends)s],
+        "init_xml" : [ ],
+        "demo_xml" : [ %(demo_name)s],
+        "update_xml" : [%(update_name)s],
+        "installable": True
+} """ % data['form']
+    filewrite = {
+        '__init__.py':'#\n# Generated by the Tiny ERP module recorder !\n#\n',
+        '__terp__.py':_terp,
+        dname+'_data.xml': res_xml
+    }
+    for name,datastr in filewrite.items():
+        info = zipfile.ZipInfo(dname+'/'+name)
+        info.compress_type = zipfile.ZIP_DEFLATED
+        info.external_attr = 2175008768
+        zip.writestr(info, datastr)
+    zip.close()
+    print data['form']
+    return {
+        'module_file': base64.encodestring(s.getvalue()),
+        'module_filename': data['form']['directory_name']+'-'+data['form']['version']+'.zip'
+    }
+
+class base_module_publish(wizard.interface):
+    states = {
+        'init': {
+            'actions': [_info_default],
+            'result': {
+                'type':'form',
+                'arch':info_start_form,
+                'fields': info_start_fields,
+                'state':[
+                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('info', 'Continue', 'gtk-ok'),
+                ]
+            }
+        },
+        'info': {
+            'actions': [],
+            'result': {
+                'type':'form',
+                'arch':intro_start_form,
+                'fields': intro_start_fields,
+                'state':[
+                    ('end', 'Cancel', 'gtk-cancel'),
+                    ('save', 'Continue', 'gtk-ok'),
+                ]
+            }
+        },
+        'save': {
+            'actions': [_create_module],
+            'result': {
+                'type':'form',
+                'arch':intro_save_form,
+                'fields': intro_save_fields,
+                'state':[
+                    ('end', 'Close', 'gtk-ok'),
+                ]
+            }
+        }
+    }
+base_module_publish('base_module_record.module_save')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_creator/__init__.py b/addons/base_report_creator/__init__.py
new file mode 100644
index 00000000000..3fcef186df1
--- /dev/null
+++ b/addons/base_report_creator/__init__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 base_report_creator
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__terp__.py
new file mode 100644
index 00000000000..d2194245de1
--- /dev/null
+++ b/addons/base_report_creator/__terp__.py
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Report Creator",
+    "version" : "1.0",
+    "author" : "Tiny & Axelor",
+    "website" : "",
+    "category" : "Generic Modules/Base",
+    "description": """This modules allows you to create any statistic
+report on several object. It's a SQL query builder and browser
+for and users.
+
+After installing the module, it adds a menu to define custom report in
+the "Dashboard" menu.
+""",
+    "depends" : ["base","board"],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ["base_report_creator_wizard.xml","base_report_creator_view.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
new file mode 100644
index 00000000000..4d37483579a
--- /dev/null
+++ b/addons/base_report_creator/base_report_creator.py
@@ -0,0 +1,382 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 string
+import time
+import tools
+from osv import fields,osv,orm
+
+#class ir_model_fields(osv.osv):
+#   _inherit = 'ir.model.fields'
+#   def _get_models(self, cr, uid, model_name, level=1):
+#       if not level:
+#           return []
+#       result = [model_name]
+#       print model_name
+#       for field,data in self.pool.get(model_name).fields_get(cr, uid).items():
+#           if data.get('relation', False):
+#               result += self._get_models(cr, uid, data['relation'], level-1)
+#       return result
+#   def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None):
+#       if context and ('model_id' in context):
+#           model_name = self.pool.get("ir.model").browse(cr, uid, context['model_id'], context).model
+#           models = self._get_models(cr, uid, model_name, context.get('model_level',2))
+#           models = map(lambda x: self.pool.get('ir.model').search(cr, uid, [('model','=',x)])[0], models)
+#           args.append(('model_id','in',models))
+#           print args
+#       return super(ir_model_fields, self).search(cr, uid, args, offset, limit, order, context)
+#ir_model_fields()
+
+class report_creator(osv.osv):
+    _name = "base_report_creator.report"
+    _description = "Report"
+
+    #
+    # Should request only used fields
+    #
+    def fields_get(self, cr, user, fields=None, context=None):
+        if (not context) or 'report_id' not in context:
+            return super(report_creator, self).fields_get(cr, user, fields, context)
+        report = self.browse(cr, user, context['report_id'])
+        models = {}
+        for model in report.model_ids:
+            models[model.model] = self.pool.get(model.model).fields_get(cr, user, context=context)
+        fields = {}
+        i = 0
+        for f in report.field_ids:
+            fields['field'+str(i)] = models[f.field_id.model][f.field_id.name]
+            i+=1
+        return fields
+
+    #
+    # Should Call self.fields_get !
+    #
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False):
+        if (not context) or 'report_id' not in context:
+            return super(report_creator, self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
+        report = self.browse(cr, user, context['report_id'])
+        models = {}
+        for model in report.model_ids:
+            models[model.model] = self.pool.get(model.model).fields_get(cr, user, context=context)
+        fields = {}
+        i = 0
+        for f in report.field_ids:
+            fields['field'+str(i)] = models[f.field_id.model][f.field_id.name]
+            i+=1
+        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)
+            for val in ('x','y'):
+                i = 0
+                for f in report.field_ids:
+                    if f.graph_mode==val:
+                        arch += '<field name="%s" select="1"/>' % ('field'+str(i),)
+                    i+=1
+        elif view_type=='calendar':
+            required_types = ['date_start','date_delay','color']
+            set_dict = {'view_type':view_type,'string':report.name}
+            temp_list = []
+            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
+                    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
+            arch += '''<%(view_type)s string="%(string)s" date_start="%(date_start)s" date_delay="%(date_delay)s" color="%(color)s">''' %set_dict
+            arch += ''.join(temp_list)
+        else:
+            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
+        arch += '</%s>' % (view_type,)
+        result = {
+            'arch': arch,
+            'fields': fields
+        }
+        result['toolbar'] = {
+            'print': [],
+            'action': [],
+            'relate': []
+        }
+        return result
+
+    def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
+        if (not context) or 'report_id' not in context:
+            return super(report_creator, self).read(cr, user, ids, fields, context, load)
+        ctx = context or {}
+        wp = [self._id_get(cr, user, context['report_id'], context)+(' in (%s)' % (','.join(map(lambda x: "'"+str(x)+"'",ids))))]
+        report = self._sql_query_get(cr, user, [context['report_id']], 'sql_query', None, ctx, where_plus = wp)
+        sql_query = report[context['report_id']]
+        cr.execute(sql_query)
+        res = cr.dictfetchall()
+        fields_get = self.fields_get(cr,user,None,context)
+        for r in res:
+            for k in r:
+                r[k] = r[k] or False
+                field_dict = fields_get.get(k)
+                field_type = field_dict and field_dict.get('type',False) or False 
+                if field_type and field_type == 'many2one':
+                    if r[k]==False:
+                        continue
+                    related_name = self.pool.get(field_dict.get('relation')).name_get(cr,user,[r[k]],context)[0]
+                    r[k] = related_name 
+        return res
+
+    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        if (not context) or 'report_id' not in context:
+            return super(report_creator, self).search(cr, user, args, offset, limit, order, context, count)
+        report = self.browse(cr, user, context['report_id'])
+        i = 0
+        fields = {}
+        for f in report.field_ids:
+            fields['field'+str(i)] = (f.field_id.model, f.field_id.name)
+            i+=1
+        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]
+        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)
+        query = report[context['report_id']]
+        cr.execute(query, newargs2)
+        result = cr.fetchall()
+        return map(lambda x: x[0], result)
+
+    def _path_get(self,cr, uid, models, filter_ids=[]):
+#       ret_str = """   sale_order_line
+#   left join sale_order on (sale_order_line.order_id=sale_order.id)
+#   left join res_partner on (res_partner.id=sale_order.partner_id)"""
+#       where_list = []
+#       for filter_id in filter_ids:
+#           where_list.append(filter_id.expression)
+#       if where_list:
+#           ret_str+="\nwhere\n\t"+" and\n\t".join(where_list)
+        self.model_set_id=False
+        model_dict = {}
+        from_list = []
+        where_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:
+            from_list.append(model_dict.get(model))
+            rest_list = model_dict.keys()
+            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',fields_get.items()))
+            if fields_filter:
+                model in model_list and model_list.remove(model)
+            model_count = reference_model_dict.get(model,False)
+            if model_count:
+                reference_model_dict[model] = model_count +1
+            else:
+                reference_model_dict[model] = 1
+            for k,v in fields_filter.items():
+                v.get('relation') in model_list and model_list.remove(v.get('relation'))
+                relation_count = reference_model_dict.get(v.get('relation'),False)
+                if relation_count:
+                    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 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:
+            raise osv.except_osv("No Related Models!!",'These is/are model(s) (%s) in selection which is/are not related to any other model'%','.join(model_list) )
+        if filter_ids and where_list<>[]:
+            where_list.append('and')
+            where_list.append(' ')
+        for filter_id in filter_ids:
+            where_list.append(filter_id.expression)
+            where_list.append(' ')
+            where_list.append(filter_id.condition)
+        ret_str = ",\n".join(from_list)
+        if where_list:
+            ret_str+="\n where \n"+"\n".join(where_list)
+            ret_str = ret_str.strip()
+            if ret_str.endswith('and'):
+                ret_str = ret_str[0:len(ret_str)-3]
+            if ret_str.endswith('or'):
+                ret_str = ret_str[0:len(ret_str)-2]
+        return ret_str
+
+    def _id_get(self, cr, uid, id, context):
+#       return 'min(sale_order_line.id)'
+        return self.model_set_id and 'min('+self.model_set_id+'.id)'
+
+    def _sql_query_get(self, cr, uid, ids, prop, unknow_none, context, where_plus=[], limit=None, offset=None):
+        result = {}
+        for obj in self.browse(cr, uid, ids):
+            fields = []
+            groupby = []
+            i = 0
+            for f in obj.field_ids:
+                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))
+                i+=1
+            models = self._path_get(cr, uid, obj.model_ids, obj.filter_ids)
+            check=self._id_get(cr, uid, ids[0], context)
+            if check<>False:
+                fields.insert(0,(check+' as id'))
+            result[obj.id] = """select
+%s
+from
+%s
+            """ % (',\n'.join(fields), models)
+            if groupby:
+                result[obj.id] += "group by\n\t"+', '.join(groupby)
+            if where_plus:
+                result[obj.id] += "\nhaving \n\t"+"\n\t and ".join(where_plus)
+            if limit:
+                result[obj.id] += " limit "+str(limit)
+            if offset:
+                result[obj.id] += " offset "+str(offset)
+        return result
+    _columns = {
+        'name': fields.char('Report Name',size=64, required=True),
+        'type': fields.selection([('list','Rows And Columns Report'),], 'Report Type',required=True),#('sum','Summation Report')
+        'active': fields.boolean('Active'),
+        'view_type1': fields.selection([('tree','Tree'),('graph','Graph'),('calendar','Calendar')], 'First View', required=True),
+        'view_type2': fields.selection([('','/'),('tree','Tree'),('graph','Graph'),('calendar','Calendar')], 'Second View'),
+        'view_type3': fields.selection([('','/'),('tree','Tree'),('graph','Graph'),('calendar','Calendar')], 'Third View'),
+        'view_graph_type': fields.selection([('pie','Pie Chart'),('bar','Bar Chart')], 'Graph Type', required=True),
+        'view_graph_orientation': fields.selection([('horz','Horizontal'),('vert','Vertical')], 'Graph Orientation', required=True),
+        'model_ids': fields.many2many('ir.model', 'base_report_creator_report_model_rel', 'report_id','model_id', 'Reported Objects'),
+        'field_ids': fields.one2many('base_report_creator.report.fields', 'report_id', 'Fields to Display'),
+        'filter_ids': fields.one2many('base_report_creator.report.filter', 'report_id', 'Filters'),
+        'state': fields.selection([('draft','Draft'),('valid','Valid')], 'Status', required=True),
+        'sql_query': fields.function(_sql_query_get, method=True, type="text", string='SQL Query', store=True),
+        'group_ids': fields.many2many('res.groups', 'base_report_creator_group_rel','report_id','group_id','Authorized Groups'),
+    }
+    _defaults = {
+        'type': lambda *args: 'list',
+        'state': lambda *args: 'draft',
+        'active': lambda *args: True,
+        'view_type1': lambda *args: 'tree',
+        'view_type2': lambda *args: 'graph',
+        'view_graph_type': lambda *args: 'bar',
+        'view_graph_orientation': lambda *args: 'horz',
+    }
+    def _function_field(self, cr, uid, ids):
+        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]
+                if isinstance(model_column,fields.function) and not model_column.store:
+                    return False 
+        return True
+    
+    def _aggregation_error(self, cr, uid, ids):
+        aggregate_columns = ('int','float')
+        apply_functions = ('sum','min','max','avg')
+        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]                
+                if model_column._type not in aggregate_columns and fld.group_method in apply_functions:
+                    return False 
+        return True
+    
+    def _calander_view_error(self, cr, uid, ids):
+#       required_types = ['date_start','date_delay','color'] 
+        required_types = []
+        this_objs = self.browse(cr, uid, ids)
+        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:
+                    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
+                    elif fld.calendar_mode=='date_delay' and model_column._type not in ('int','float'):
+                        return False
+                    else:
+                        required_types.append(fld.calendar_mode)
+                if 'date_start' not in required_types:
+                    return False     
+        return True
+    
+    _constraints = [
+        (_function_field, 'You can not display field which are not stored in Database.', ['field_ids']),
+        (_aggregation_error, 'You can apply agregate function to the non calculated field.', ['field_ids']),
+        (_calander_view_error, "You must have to give calander view's color,start date and delay.", ['field_ids']),
+    ]
+report_creator()
+
+class report_creator_field(osv.osv):
+    _name = "base_report_creator.report.fields"
+    _description = "Display Fields"
+    _rec_name = 'field_id'
+    _order = "sequence,id"
+    _columns = {
+        'sequence': fields.integer('Sequence'),
+        'field_id': fields.many2one('ir.model.fields', 'Field'),
+        'report_id': fields.many2one('base_report_creator.report','Report', on_delete='cascade'),
+        'group_method': fields.selection([('group','Grouped'),('sum','Sum'),('min','Minimum'),('max','Maximum'),('avg','Average')], 'Grouping Method', required=True),
+        'graph_mode': fields.selection([('','/'),('x','X Axis'),('y','Y Axis')], 'Graph Mode'),
+        'calendar_mode': fields.selection([('','/'),('date_start','Starting Date'),('date_end','Ending Date'),('date_delay','Delay'),('color','Uniq Colors')], 'Calendar Mode'),
+    }
+    _defaults = {
+        'group_method': lambda *args: 'group',
+        'graph_mode': lambda *args: '',
+    }
+report_creator_field()
+
+class report_creator_filter(osv.osv):
+    _name = "base_report_creator.report.filter"
+    _description = "Report Filters"
+    _columns = {
+        'name': fields.char('Filter Name',size=64, required=True),
+        'expression': fields.text('Value', required=True),
+        'report_id': fields.many2one('base_report_creator.report','Report', on_delete='cascade'),
+        'condition' : fields.selection([('and','AND'),('or','OR')], 'Condition')
+    }
+    _defaults = {
+        'condition': lambda *args: 'and',
+    }
+report_creator_filter()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_creator/base_report_creator_demo.xml b/addons/base_report_creator/base_report_creator_demo.xml
new file mode 100644
index 00000000000..b5339e3b843
--- /dev/null
+++ b/addons/base_report_creator/base_report_creator_demo.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+		<record id="base_report_creator_report_salesanalysis0" model="base_report_creator.report">
+			<field model="ir.model" search="[('model','in',('sale.order','sale.order.line','res.partner'))]" name="model_ids"/>
+			<field eval="&quot;Sales Analysis&quot;" name="name"/>
+			<field eval="&quot;bar&quot;" name="view_graph_type"/>
+			<field eval="&quot;graph&quot;" name="view_type2"/>
+			<field eval="&quot;1&quot;" name="active"/>
+			<field eval="&quot;tree&quot;" name="view_type1"/>
+			<field eval="&quot;list&quot;" name="type"/>
+			<field eval="&quot;horz&quot;" name="view_graph_orientation"/>
+			<field eval="&quot;valid&quot;" name="state"/>
+		</record>
+		<record id="base_report_creator_report_fields_0" model="base_report_creator.report.fields">
+			<field name="report_id" ref="base_report_creator_report_salesanalysis0"/>
+			<field model="ir.model.fields" name="field_id" search="[('name','=','partner_id'),('model','=','sale.order')]"/>
+			<field eval="1" name="sequence"/>
+			<field name="graph_mode">x</field>
+		</record>
+		<record id="base_report_creator_report_fields_1" model="base_report_creator.report.fields">
+			<field name="report_id" ref="base_report_creator_report_salesanalysis0"/>
+			<field model="ir.model.fields" name="field_id" search="[('name','=','product_id'),('model','=','sale.order.line')]"/>
+			<field eval="2" name="sequence"/>
+		</record>
+		<record id="base_report_creator_report_fields_2" model="base_report_creator.report.fields">
+			<field name="report_id" ref="base_report_creator_report_salesanalysis0"/>
+			<field model="ir.model.fields" name="field_id" search="[('name','=','product_uom'),('model','=','sale.order.line')]"/>
+			<field eval="3" name="sequence"/>
+		</record>
+		<record id="base_report_creator_report_fields_3" model="base_report_creator.report.fields">
+			<field name="report_id" ref="base_report_creator_report_salesanalysis0"/>
+			<field model="ir.model.fields" name="field_id" search="[('name','=','price_unit'),('model','=','sale.order.line')]"/>
+			<field eval="4" name="sequence"/>
+			<field name="graph_mode">y</field>
+		</record>
+		<record id="base_report_creator_report_fields_4" model="base_report_creator.report.fields">
+			<field name="report_id" ref="base_report_creator_report_salesanalysis0"/>
+			<field model="ir.model.fields" name="field_id" search="[('name','=','product_uom_qty'),('model','=','sale.order.line')]"/>
+			<field eval="5" name="sequence"/>
+			<field name="graph_mode">y</field>
+		</record>
+	</data>
+</terp>
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
new file mode 100644
index 00000000000..87a49180e3b
--- /dev/null
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+	<record model="ir.ui.view" id="base.view_model_fields_tree">
+		<field name="name">ir.model.fields.tree</field>
+		<field name="model">ir.model.fields</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Fields">
+				<field name="model_id"/>
+				<field name="name"/>
+				<field name="field_description"/>
+			</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>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Report Creator">
+				<field name="name"/>
+				<field name="type"/>
+				<field name="state"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="base_report_creator_form">
+		<field name="name">base_report_creator.report.form</field>
+		<field name="model">base_report_creator.report</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Report Creator">
+				<notebook>
+				<page string="General Configuration">
+					<field name="name" select="1" colspan="4"/>
+					<field name="type" select="2"/>
+					<field name="active" select="2"/>
+					<newline/>
+					<field name="model_ids" colspan="4"/>
+					<separator string="State"  colspan="4"/>
+					<field name="state"/>
+					<button string="Create Menu" name="%(wizard_menu_create)d" type="action" colspan="2"/>
+				</page><page string="View parameters">
+					<separator string="Used View" colspan="4"/>
+					<field name="view_type1"/>
+					<field name="view_type2"/>
+					<field name="view_type3"/>
+					<separator string="Graph View" colspan="4"/>
+					<field name="view_graph_type"/>
+					<field name="view_graph_orientation"/>
+				</page><page string="Fields to Display">
+					<field name="field_ids" nolabel="1" colspan="4">
+						<form string="Fields">
+							<field name="sequence"/>
+							<field name="field_id" domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2])] or []">
+								<tree string="Field List">
+									<field name="model_id"/>
+									<field name="name"/>
+									<field name="field_description"/>
+								</tree>
+							</field>
+							<field name="group_method"/>
+							<field name="graph_mode"/>
+							<field name="calendar_mode"/>
+						</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])] or []"/>
+							<field name="group_method"/>
+							<field name="graph_mode"/>
+							<field name="calendar_mode"/>
+						</tree>
+					</field>
+				</page><page string="Filters on Fields">
+					<button string="Add filter" name="%(wizard_set_filter_fields)d" type="action"/>
+					<field name="filter_ids" nolabel="1" colspan="4">
+						<tree string="Filters">
+							<field name="name"/>
+							<field name="condition"/>
+						</tree>
+						<form string="Filters">
+							<field name="name" colspan="4"/>
+							<field name="expression" colspan="4"/>
+							<field name="condition"/>
+						</form>
+					</field>
+				</page><page string="Security">
+					<separator string="Authorized Groups (empty for all)" colspan="4"/>
+					<field name="group_ids" colspan="4" nolabel="1"/>
+				</page><page string="SQL Query">
+					<field name="sql_query" colspan="4" nolabel="1"/>
+				</page>
+				</notebook>
+			</form>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="base_report_creator_action">
+		<field name="res_model">base_report_creator.report</field>
+		<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" 
+		action="base_report_creator_action"/>
+
+	<record model="ir.ui.view" id="base_report_creator_tree_simple">
+		<field name="name">base_report_creator.report.simple.tree</field>
+		<field name="model">base_report_creator.report</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Reports">
+				<field name="name"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="base_report_creator_action_tree">
+		<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" 
+		action="base_report_creator_action_tree"/>
+
+	<wizard
+		id="wizard_report_open"
+		string="Open Report"
+		name="base_report_creator.report.open"/>
+
+	<record model="ir.values" id="ir_open_report">
+		<field name="key2" eval="'tree_but_open'"/>
+		<field name="model" eval="'base_report_creator.report'"/>
+		<field name="name">Browse Report</field>
+		<field name="value" eval="'ir.actions.wizard,%d'%wizard_report_open"/>
+		<field name="object" eval="True"/>
+	</record>
+	<record model="ir.values" id="ir_open_report_multi">
+		<field name="key2" eval="'client_action_multi'"/>
+		<field name="model" eval="'base_report_creator.report'"/>
+		<field name="name">Browse Report</field>
+		<field name="value" eval="'ir.actions.wizard,%d'%wizard_report_open"/>
+		<field name="object" eval="True"/>
+	</record>
+
+
+
+	</data>
+</terp>
diff --git a/addons/base_report_creator/base_report_creator_wizard.xml b/addons/base_report_creator/base_report_creator_wizard.xml
new file mode 100644
index 00000000000..031ea8bc05b
--- /dev/null
+++ b/addons/base_report_creator/base_report_creator_wizard.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+	<wizard
+			id="wizard_set_filter_fields"
+			string="Set Filter Fields"
+			name="base_report_creator.report_filter.fields"/>
+	<wizard
+			id="wizard_menu_create"
+			string="Create Menu for Report"
+			name="base_report_creator.report.menu.create"/>
+</data>
+</terp>
diff --git a/addons/base_report_creator/wizard/__init__.py b/addons/base_report_creator/wizard/__init__.py
new file mode 100644
index 00000000000..a2441efdee8
--- /dev/null
+++ b/addons/base_report_creator/wizard/__init__.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wiz_set_filter_fields
+import base_report_creator_open
+import report_menu_create
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_creator/wizard/base_report_creator_open.py b/addons/base_report_creator/wizard/base_report_creator_open.py
new file mode 100644
index 00000000000..3b970dd457e
--- /dev/null
+++ b/addons/base_report_creator/wizard/base_report_creator_open.py
@@ -0,0 +1,71 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: sign_in_out.py 2871 2006-04-25 14:08:22Z ged $
+#
+# 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 netsvc
+import time
+import pooler
+from osv import osv
+
+
+
+
+class report_creator_open(wizard.interface):
+    def _open_report(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        rep = pool.get('base_report_creator.report').browse(cr, uid, data['id'], context)
+        view_mode = rep.view_type1
+        if rep.view_type2:
+            view_mode += ','+rep.view_type2
+        if rep.view_type3:
+            view_mode += ','+rep.view_type3
+        value = {
+            'name': rep.name,
+            'view_type': 'form',
+            'view_mode': view_mode,
+            'res_model': 'base_report_creator.report',
+            'context': {'report_id': data['id']},
+            'view_id': False,
+            'type': 'ir.actions.act_window'
+        }
+        return value
+
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type':'action', 'action':_open_report, 'state':'end'}
+        }
+    }
+report_creator_open('base_report_creator.report.open')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
new file mode 100644
index 00000000000..d30607f6903
--- /dev/null
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -0,0 +1,88 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 osv
+import pooler
+
+section_form = '''<?xml version="1.0"?>
+<form string="Create Menu For This Report">
+    <separator string="Menu Information" colspan="4"/>
+    <field name="menu_name"/>
+    <field name="menu_parent_id"/>
+</form>'''
+
+section_fields = {
+    'menu_name': {'string':'Menu Name', 'type':'char', 'required':True, 'size':64},
+    'menu_parent_id': {'string':'Parent Menu', 'type':'many2one', 'relation':'ir.ui.menu', 'required':True},
+}
+
+def report_menu_create(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    board = pool.get('base_report_creator.report').browse(cr, uid, data['id'])
+
+    view = board.view_type1
+    if board.view_type2:
+        view+=','+board.view_type2
+    if board.view_type3:
+        view+=','+board.view_type3
+    action_id = pool.get('ir.actions.act_window').create(cr, uid, {
+        'name': board.name,
+        'view_type':'form',
+        'view_mode':view,
+        'context': "{'report_id':%d}" % (board.id,),
+        'res_model': 'base_report_creator.report'
+    })
+    pool.get('ir.ui.menu').create(cr, uid, {
+        'name': data['form']['menu_name'],
+        'parent_id': data['form']['menu_parent_id'],
+        'icon': 'STOCK_SELECT_COLOR',
+        'action': 'ir.actions.act_window,'+str(action_id)
+    }, context)
+    return {}
+
+class wizard_section_menu_create(wizard.interface):
+    states = {
+        'init': {
+            'actions': [], 
+            'result': {'type':'form', 'arch':section_form, 'fields':section_fields, 'state':[('end','Cancel'),('create_menu','Create Menu')]}
+        },
+        'create_menu': {
+            'actions': [report_menu_create], 
+            'result': {
+                'type':'state', 
+                'state':'end'
+            }
+        }
+    }
+wizard_section_menu_create('base_report_creator.report.menu.create')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_creator/wizard/wiz_set_filter_fields.py b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
new file mode 100644
index 00000000000..2a7f6813dc3
--- /dev/null
+++ b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
@@ -0,0 +1,225 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+import netsvc
+import pooler
+
+relation_type=['one2many','many2one','many2many']
+char_type = ['char','text','selection']
+date_type = ['date','datetime']
+int_type = ['float','integer']
+remaining_type = ['binary','boolean','reference']
+
+
+select_field_form = """<?xml version="1.0"?>
+<form string="Select Field to filter">
+    <field name="field_id" nolabel="1">
+    </field>
+</form>
+"""
+select_field_fields = {
+                       "field_id":{'string':'Filter Field','type':'many2one', 'relation':'ir.model.fields','required':True}
+                       }
+set_value_form = """<?xml version="1.0"?>
+<form string="Set Filter Values">
+    <separator colspan="4" string="Filter Values" />
+    <field name="field_id" />
+    <field name="operator" />
+    <field name="value" colspan="4"/>
+    <field name="condition" />
+</form>
+"""
+
+mapping_fields = {'$': 'End With', 'not in': 'Not Contains', '<>': 'Not Equals', 'is': 'Is Empty', 'in': 'Contains', '>': 'Bigger', '=': 'Equals', '<': 'Smaller', 'is not': 'Is Not Empty', '^': 'Start With'}
+
+set_value_fields = {
+                    'field_id':{'type':'many2one', 'relation':'ir.model.fields','string':'Field Name','required':True,'readonly':True},
+                    'operator':{'type':'selection','selection':[],'string':'Operator'},
+                    'value':{'type':'char','string':'Values','size':256},
+                    'condition' : {'type':'selection','string':'Condition', 'selection':[('and','AND'),('or','OR')]}
+                }
+def _set_field_domain(self,cr,uid,data,context):
+    this_model = data.get('model')
+    this_pooler = pooler.get_pool(cr.dbname).get(this_model)
+    this_data = this_pooler.read(cr,uid,data.get('ids'),['model_ids'],context)[0]
+    select_field_fields['field_id']['domain'] = [('model_id','in',this_data.get('model_ids')),('ttype','<>','many2many'),('ttype','<>','one2many')] 
+    return {'field_id':False}
+
+def set_field_operator(self,field_name,field_type,search_operator,search_value):
+        field_search = [field_name,search_operator,search_value]        
+        if search_operator == '=':
+            if field_type=='many2one':
+                field_search[1]='in'
+                field_search[2] = "("+','.join([str(x) for x in search_value])+")"
+            elif field_type in char_type or field_type in date_type:
+                field_search[2] = "'"+field_search[2]+"'"
+        elif search_operator == '<>':
+            if field_type=='many2one':
+                field_search[1]='not in'
+                field_search[2] = "("+','.join([str(x) for x in search_value])+")"
+            elif field_type in char_type or field_type in date_type:
+                field_search[2] = "'"+field_search[2]+"'"
+        elif search_operator == 'in':
+            if field_type=='many2one':
+                field_search[2] = "("+','.join([str(x) for x in search_value])+")"
+            else:
+                field_search[1] = 'ilike'
+                field_search[2] = "'%"+str(search_value)+"%'"
+        elif search_operator == 'not in':
+            if field_type=='many2one':
+                field_search[2] = "("+','.join([str(x) for x in search_value])+")"
+            else:
+                field_search[1] = 'not ilike'
+                field_search[2] = "'%"+str(search_value)+"%'"
+        elif search_operator == '^':
+            if field_type in char_type:
+                field_search[1]='~'
+                field_search[2]="'"+str(search_operator)+str(search_value)+"'"
+            else:
+                return False
+        elif search_operator == '$':
+            if field_type in char_type:
+                field_search[1]='~'
+                field_search[2]="'"+search_value+search_operator+"'"
+            else:
+                return False
+            #end if field_type in char_type:
+        elif search_operator in ('is','is not'):
+            field_search[2] = 'null'
+        elif search_operator in ('<','>'):
+            if field_type in date_type:
+                field_search[2] = "'"+field_search[2]+"'"
+            elif field_type not in int_type:
+                return False
+        return field_search
+def _set_filter_value(self, cr, uid, data, context):
+    form_data = data['form']
+    value_data = form_data.get('value',False)
+    value_field = set_value_fields.get('value')
+    field_type = value_field.get('type',False)
+    field_data = pooler.get_pool(cr.dbname).get('ir.model.fields').read(cr,uid,[form_data.get('field_id')],fields=['ttype','relation','model_id','name','field_description'])[0]
+    model_name = field_data['model_id'][1]
+    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 == 'many2many' and value_data and len(value_data):
+            fields_list = set_field_operator(self,table_name+"."+field_data['name'],field_data['ttype'],form_data['operator'],value_data[0][2])
+        else:
+            fields_list = set_field_operator(self,table_name+"."+field_data['name'],field_data['ttype'],form_data['operator'],value_data)
+            
+        if fields_list and value_data:
+            create_dict = {
+                           'name':model_name + "/" +field_data['field_description'] +" "+ mapping_fields[form_data['operator']] + " " + str(fields_list[2]),
+                           'expression':' '.join(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)
+        #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:
+    return {}
+
+def _set_form_value(self, cr, uid, data, context):
+    field_id = data['form']['field_id']
+    field_data = pooler.get_pool(cr.dbname).get('ir.model.fields').read(cr,uid,[field_id])[0]
+    fields_dict = pooler.get_pool(cr.dbname).get(field_data.get('model_id')[1]).fields_get(cr,uid,fields=[field_data.get('name')])
+    value_field = set_value_fields.get('value')
+#   print "fields_dict :",fields_dict.get(field_data.get('name'))
+#   set_value_fields['value']= fields_dict.get(field_data.get('name'))
+    for k,v in value_field.items():
+        if k in ('size','relation','type'):
+            del value_field[k]
+    field_type = field_data.get('ttype',False)
+    if field_type in ('one2many','many2many','many2one'):
+        value_field['type'] = 'many2many'
+        value_field['relation'] = field_data.get('relation')
+    else:
+        value_field['type'] = field_type
+        if field_type == 'selection':
+            selection_data = pooler.get_pool(cr.dbname).get(field_data['model']).fields_get(cr,uid,[field_data['name']])
+            value_field['selection'] = selection_data.get(field_data['name']).get('selection')
+    ret_dict={'field_id':field_id,'operator':'=', 'condition':'and','value':False}  
+    return ret_dict
+
+def _set_operator(self, cr, uid, data, context):
+    field = pooler.get_pool(cr.dbname).get('ir.model.fields').browse(cr, uid, data['form']['field_id'])
+    print field.ttype
+    operator = set_value_fields['operator']['selection']
+    while operator: 
+        operator.pop(operator.__len__()-1)
+        
+    if field.ttype == 'many2one':
+        operator.append(('in','Equals'))
+        operator.append(('in','Contains'))
+        operator.append(('not in','Not Contains'))
+        operator.append(('is','Is Empty'))
+        operator.append(('is not','Is Not Empty'))
+    elif field.ttype in ('char', 'text'):
+        operator.append(('=','Equals'))
+        operator.append(('in','Contains'))
+        operator.append(('<>','Not Equals'))
+        operator.append(('not in','Not Contains'))
+        operator.append(('^','Start With'))
+        operator.append(('$','End With'))
+        operator.append(('is','Is Empty'))
+        operator.append(('is not','Is Not Empty'))
+    elif field.ttype in ('date', 'datetime', 'integer', 'float'):
+        operator.append(('=','Equals'))
+        operator.append(('<>','Not Equals'))
+        operator.append(('is','Is Empty'))
+        operator.append(('is not','Is Not Empty'))
+        operator.append(('<','Smaller'))
+        operator.append(('>','Bigger'))
+    elif field.ttype in ('boolean', 'selection'):
+        operator.append(('=','Equals'))
+        operator.append(('<>','Not Equals'))
+    return {}
+
+class set_filter_fields(wizard.interface):
+    states = {
+        'init': {
+            'actions': [_set_field_domain],
+            'result': {'type':'form', 'arch':select_field_form, 'fields':select_field_fields, 'state':[('end','Cancel'),('set_value_select_field','Continue')]}         
+        },
+        'set_value_select_field':{
+            'actions': [_set_form_value, _set_operator],
+            'result': {'type' : 'form', 'arch' : set_value_form, 'fields' : set_value_fields, 'state' : [('end', 'Cancel'),('set_value', 'Confirm Filter') ]}
+        },
+        'set_value':{
+            'actions': [_set_filter_value],
+            'result': {'type': 'state', 'state': 'end'}
+        }
+    }
+set_filter_fields("base_report_creator.report_filter.fields")
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_designer/__init__.py b/addons/base_report_designer/__init__.py
new file mode 100644
index 00000000000..58f07d9ede5
--- /dev/null
+++ b/addons/base_report_designer/__init__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 base_report_designer
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__terp__.py
new file mode 100644
index 00000000000..ff0640f204e
--- /dev/null
+++ b/addons/base_report_designer/__terp__.py
@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Report designer interface module",
+    "description" : """
+This module adds wizards to import/export documents to be edited in
+OpenOffice.
+""",
+    "version" : "0.1",
+    "depends" : ["base"],
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com",
+    "category" : "Generic Modules/Base",
+    "init_xml" : [ ],
+    "demo_xml" : [ ],
+    "update_xml" : [ "base_report_designer_wizard.xml" ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
new file mode 100644
index 00000000000..803e8a297df
--- /dev/null
+++ b/addons/base_report_designer/base_report_designer.py
@@ -0,0 +1,74 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2007 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.
+#
+##############################################################################
+
+from osv import fields,osv
+from wizard.tiny_sxw2rml import sxw2rml
+from StringIO import StringIO
+from report import interface
+import base64
+import pooler
+import tools
+
+class report_xml(osv.osv):
+    _inherit = 'ir.actions.report.xml'
+
+    def sxwtorml(self,cr, uid, file_sxw):
+        '''
+        The use of this function is to get rml file from sxw file.
+        '''
+        sxwval = StringIO(base64.decodestring(file_sxw))
+        fp = tools.file_open('normalized_oo2rml.xsl',
+                subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
+        return  {'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read()))}
+
+    def upload_report(self, cr, uid, report_id, file_sxw, context):
+        '''
+        Untested function
+        '''
+        pool = pooler.get_pool(cr.dbname)
+        sxwval = StringIO(base64.decodestring(file_sxw))
+        fp = tools.file_open('normalized_oo2rml.xsl',
+                subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
+        report = pool.get('ir.actions.report.xml').write(cr, uid, [report_id], {
+            'report_sxw_content': base64.decodestring(file_sxw),
+            'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read()))
+        })
+        cr.commit()
+        db = pooler.get_db_only(cr.dbname)
+        interface.register_all(db)
+        return True
+    def report_get(self, cr, uid, report_id, context={}):
+        report = self.browse(cr, uid, report_id, context)
+        return {
+            'report_sxw_content': report.report_sxw_content and base64.encodestring(report.report_sxw_content) or False,
+            'report_rml_content': report.report_rml_content and base64.encodestring(report.report_rml_content) or False
+        }
+report_xml()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
new file mode 100644
index 00000000000..c0b83fc9f50
--- /dev/null
+++ b/addons/base_report_designer/base_report_designer_wizard.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+		<wizard
+			string="Modify an existing report"
+			model="ir.actions.report.xml"
+			name="base_report_designer.modify"
+			id="wizard_report_designer_modify"/>
+
+		<menuitem
+			parent="base.menu_custom"
+			name="Report Designer"
+			action="wizard_report_designer_modify"
+			type="wizard"
+			id="menu_wizard_report_designer_modify"/>
+
+
+
+	</data>
+</terp>
+
+
diff --git a/addons/base_report_designer/wizard/__init__.py b/addons/base_report_designer/wizard/__init__.py
new file mode 100644
index 00000000000..1a8b094d399
--- /dev/null
+++ b/addons/base_report_designer/wizard/__init__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 base_report_designer_modify
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
new file mode 100644
index 00000000000..4e6a761ea68
--- /dev/null
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -0,0 +1,233 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2007 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 osv
+import pooler
+import urllib
+import base64
+import tools
+
+intro_form = '''<?xml version="1.0"?>
+<form string="Report designer">
+    <separator string="Report designer introduction" colspan="4"/>
+    <field name="text" colspan="4" nolabel="1"/>
+</form>'''
+
+intro_fields = {
+    'text': {
+        'string': 'Introduction',
+        'type': 'text',
+        'readonly': True,
+        'default': lambda *args: """This system must be used with the Tiny OpenOffice plugin. If you
+did not installed yet, you can find this package on:
+    http://tinyerp.com
+
+This wizard will provide you the .SXW report that you can modify
+in OpenOffice. After having modified it, you will be able to reupload
+it to the Tiny ERP server.
+"""},
+    'operation': {
+        'string': 'Operation',
+        'type': 'selection',
+        'selection': [
+            ('create','Create a new report'),
+            ('modify','Modify an existing report')
+            ],
+        'size': 32,
+        'required': True,
+        'default': lambda *args: 'create',
+    },
+}
+
+get_form = '''<?xml version="1.0"?>
+<form string="Get a report">
+    <separator string="Select your report" colspan="4"/>
+    <field name="report_id"/>
+</form>'''
+
+get_fields = {
+    'report_id': {
+        'string': 'Report',
+        'type': 'many2one',
+        'relation': 'ir.actions.report.xml',
+        'required': True,
+        'domain': [('report_sxw_content','<>',False)],
+    },
+}
+
+get_form_result = '''<?xml version="1.0"?>
+<form string="Get a report">
+    <separator string="The .SXW report" colspan="4"/>
+    <field name="report_id"/>
+    <newline/>
+    <field name="file_sxw"/>
+    <newline/>
+    <label colspan="4" string="This is the template of your requested report.\nSave it as a .SXW file and open it with OpenOffice.\nDon't forget to install the Tiny OpenOffice package to modify it.\nOnce it is modified, re-upload it in Tiny ERP using this wizard." align="0.0"/>
+</form>'''
+
+get_form_fields = {
+    'report_id': {
+        'string': 'Report',
+        'type': 'many2one',
+        'relation': 'ir.actions.report.xml',
+        'readonly': True,
+    },
+    'file_sxw': {
+        'string': 'Your .SXW file',
+        'type': 'binary',
+        'readonly': True,
+    }
+}
+
+
+send_form_result_arch = '''<?xml version="1.0"?>
+<form string="Report modified">
+    <separator string="Report modified" colspan="4"/>
+    <label string="Your report has been modified."/>
+</form>'''
+
+send_form_result_fields = {
+}
+
+
+send_form_arch = '''<?xml version="1.0"?>
+<form string="Get a report">
+    <separator string="Upload your modified report" colspan="4"/>
+    <field name="report_id"/>
+    <newline/>
+    <field name="file_sxw"/>
+</form>'''
+
+send_form_fields = {
+    'report_id': {
+        'string': 'Report',
+        'type': 'many2one',
+        'relation': 'ir.actions.report.xml',
+        'required': True,
+        'domain': [('report_sxw_content','<>',False)]
+    },
+    'file_sxw': {
+        'string': 'Your .SXW file',
+        'type': 'binary',
+        'required': True
+    }
+}
+
+def _get_default(obj, cursor, user, data, context):
+    return {'report_id': data['id']}
+
+
+class base_report_designer_modify(wizard.interface):
+    def _upload_report_clear(self, cr, uid, data, context):
+        return {'file_sxw': False}
+
+    def _upload_report(self, cr, uid, data, context):
+        import tiny_sxw2rml
+        import StringIO
+        pool = pooler.get_pool(cr.dbname)
+        sxwval = StringIO.StringIO(base64.decodestring(data['form']['file_sxw']))
+        fp = tools.file_open('normalized_oo2rml.xsl',subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
+        report = pool.get('ir.actions.report.xml').write(cr, uid, [data['form']['report_id']], {
+            'report_sxw_content': base64.decodestring(data['form']['file_sxw']),
+            'report_rml_content': str(tiny_sxw2rml.sxw2rml(sxwval, xsl=fp.read()))
+        })
+        return {}
+
+    def _get_report(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        report = pool.get('ir.actions.report.xml').browse(cr, uid, data['form']['report_id'], context)
+        return {'file_sxw': base64.encodestring(report.report_sxw_content)}
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': intro_form,
+                'fields': intro_fields,
+                'state': [
+                    ('end','Cancel'),
+                    ('get_form','Modify a report')
+                ]
+            }
+        },
+        'get_form': {
+            'actions': [_get_default],
+            'result': {
+                'type': 'form',
+                'arch': get_form,
+                'fields': get_fields,
+                'state': [
+                    ('end','Cancel'),
+                    ('get_form_result', 'Continue'),
+                ]
+            }
+        },
+        'get_form_result': {
+            'actions': [_get_report],
+            'result': {
+                'type': 'form',
+                'arch': get_form_result,
+                'fields': get_form_fields,
+                'state': [
+                    ('end','Close'),
+                    ('send_form', 'Upload the modified report'),
+                ]
+            }
+        },
+        'send_form': {
+            'actions': [_upload_report_clear],
+            'result': {
+                'type': 'form',
+                'arch': send_form_arch,
+                'fields': send_form_fields,
+                'state': [
+                    ('end','Close'),
+                    ('send_form_result', 'Update the report'),
+                ]
+            }
+        },
+        'send_form_result': {
+            'actions': [_upload_report],
+            'result': {
+                'type': 'form',
+                'arch': send_form_result_arch,
+                'fields': send_form_result_fields,
+                'state': [
+                    ('end','Close'),
+                ]
+            }
+        },
+    }
+
+base_report_designer_modify('base_report_designer.modify')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py b/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
new file mode 100644
index 00000000000..f2223a0d9c8
--- /dev/null
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+from tiny_sxw2rml import sxw2rml
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
new file mode 100644
index 00000000000..b4961234af0
--- /dev/null
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
@@ -0,0 +1,681 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:fo="http://www.w3.org/1999/XSL/Format"
+  xmlns:office="http://openoffice.org/2000/office"
+  xmlns:style="http://openoffice.org/2000/style"
+  xmlns:text="http://openoffice.org/2000/text"
+  xmlns:table="http://openoffice.org/2000/table"
+  xmlns:draw="http://openoffice.org/2000/drawing"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:number="http://openoffice.org/2000/datastyle"
+  xmlns:svg="http://www.w3.org/2000/svg"
+  xmlns:chart="http://openoffice.org/2000/chart"
+  xmlns:dr3d="http://openoffice.org/2000/dr3d"
+  xmlns:math="http://www.w3.org/1998/Math/MathML"
+  xmlns:form="http://openoffice.org/2000/form"
+  xmlns:script="http://openoffice.org/2000/script"
+  office:class="text" office:version="1.0"
+  exclude-result-prefixes = "xsl fo office style text table draw xlink number svg chart dr3d math form script">
+
+  <!--TODO's: indent, picture cache (trml2pdf) -->
+
+<xsl:output method="xml" indent="yes" />
+<xsl:strip-space elements="*"/>
+
+<xsl:key name="text_style" match="style:style[@style:family='text']" use="@style:name" />
+<xsl:key name="page_break_before" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-before='page']" use="@style:name" />
+<xsl:key name="page_break_after" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-after='page']" use="@style:name" />
+<xsl:key name="table_column_style" match="style:style[@style:family='table-column']" use="@style:name" />
+<xsl:key name="table_cell_style" match="style:style[@style:family='table-cell']" use="@style:name" />
+<xsl:key name="paragraph_style" match="style:style[@style:family='paragraph']" use="@style:name" />
+
+<xsl:template match="office:document-content">
+  <document filename="test.pdf">
+    <xsl:apply-templates select="office:automatic-styles" />
+    <xsl:apply-templates select="office:body" />
+  </document>
+</xsl:template>
+
+<xsl:template name="page_size">
+  <xsl:attribute name="pageSize">
+    <xsl:text>(</xsl:text>
+    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+    <xsl:text>,</xsl:text>
+    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
+    <xsl:text>)</xsl:text>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="fixed_frame">
+	<xsl:for-each select="//draw:text-box">
+		<frame>
+			<xsl:attribute name="id"><xsl:value-of select="./@draw:name" /></xsl:attribute>
+			<xsl:attribute name="x1"><xsl:value-of select="./@svg:x" /></xsl:attribute>
+			<xsl:attribute name="y1">
+				<xsl:value-of
+					select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height - ./@svg:y - ./@fo:min-height" />
+			</xsl:attribute>
+			<xsl:attribute name="width">
+				<xsl:value-of select="./@svg:width" />
+			</xsl:attribute>
+			<xsl:attribute name="height">
+				<xsl:value-of select="./@fo:min-height" />
+			</xsl:attribute>
+		</frame>
+	</xsl:for-each>
+</xsl:template>
+
+<xsl:template name="margin_sizes">
+  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
+  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
+  <xsl:variable name="margin_top" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-top" />
+  <xsl:variable name="margin_bottom" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-bottom" />
+  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+  <xsl:variable name="page_height" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
+  <xsl:attribute name="x1"><xsl:value-of select="$margin_left" /></xsl:attribute>
+  <xsl:attribute name="y1"><xsl:value-of select="$margin_bottom" /></xsl:attribute>
+  <xsl:attribute name="width"><xsl:value-of select="$page_width - $margin_left - $margin_right"/></xsl:attribute>
+  <xsl:attribute name="height"><xsl:value-of select="$page_height - $margin_bottom - $margin_top"/></xsl:attribute>
+</xsl:template>
+
+<xsl:template name="text_width">
+  <!-- You need this for the workaround to make primitive outlines-->
+  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
+  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
+  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+  <xsl:value-of select="$page_width - $margin_left - $margin_right - 18"/>
+</xsl:template>
+
+
+
+<xsl:template match="office:automatic-styles">
+  <!--<template pageSize="(21cm, 29.7cm)" leftMargin="1.0cm" rightMargin="2.0cm" topMargin="1.0cm" bottomMargin="1.0cm" title="Test" author="Martin Simon" allowSplitting="20">-->
+  <template pageSize="(21cm, 29.7cm)" title="Test" author="Martin Simon" allowSplitting="20">
+    <xsl:call-template name="page_size" />
+    <pageTemplate id="first">
+	  <xsl:call-template name="fixed_frame" />
+      <frame id="first" x1="2cm" y1="2cm" width="17cm" height="26cm">
+        <xsl:call-template name="margin_sizes" />
+      </frame>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <!--A table style to simulate primitive outlines -till the <addOutline> tag is implemented in trml2pdf -->
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <!--use two standard table grid styles like PyOpenOffice "Old Way": with and without a grid-->
+    <!--TODO insert table cell colors here, not within the <td> tag - otherwise
+         it will not work with flowables as cell content-->
+    <xsl:call-template name="make_blocktablestyle" />
+    <initialize>
+      <paraStyle name="all" alignment="justify" />
+    </initialize>
+    <xsl:apply-templates select="style:style" />
+  </stylesheet>
+</xsl:template>
+
+<xsl:template name="make_blocktablestyle">
+  <xsl:for-each select="//table:table">
+    <xsl:variable name="test">
+      <xsl:value-of select="./@table:name" />
+    </xsl:variable>
+    <xsl:if test="not(boolean(count(preceding-sibling::table:table[@table:name=$test])))">
+      <!--Test if this is the first table with this style, nested tables not counted-->
+      <blockTableStyle id="{@table:name}">
+	    <xsl:if test=".//draw:image">
+	      <blockTopPadding value="0"/>
+	      <blockBottomPadding value="0"/>
+	    </xsl:if>
+        <blockAlignment value="LEFT" />
+        <blockValign value="TOP" />
+        <xsl:call-template name="make_linestyle" />
+        <xsl:call-template name="make_tablebackground" />
+      </blockTableStyle>
+    </xsl:if>
+  </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="make_linestyle">
+	<xsl:for-each select=".//table:table-row">
+		<xsl:variable name="row" select="position() - 1"/>
+		<xsl:for-each select=".//table:table-cell">
+			<xsl:variable name="col" select="position() - 1"/>
+			<xsl:variable name="linebefore">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-left"/>
+			</xsl:variable>
+			<xsl:if test="not($linebefore='') and not($linebefore='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($linebefore,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+			</xsl:if>
+			<xsl:variable name="lineafter">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-right"/>
+			</xsl:variable>
+			<xsl:if test="not($lineafter='') and not($lineafter='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($lineafter,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+			</xsl:if>
+			<xsl:variable name="lineabove">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-top"/>
+			</xsl:variable>
+			<xsl:if test="not($lineabove='') and not($lineabove='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($lineabove,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
+			</xsl:if>
+			<xsl:variable name="linebelow">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-bottom"/>
+			</xsl:variable>
+			<xsl:if test="not($linebelow='') and not($linebelow='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($linebelow,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+			</xsl:if>
+			<xsl:variable name="grid">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border"/>
+			</xsl:variable>
+			<xsl:if test="not($grid='') and not($grid='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($grid,'#')"/>
+				</xsl:variable>
+				<!-- Don't use grid because we don't need a line between each rows -->
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+			</xsl:if>
+		</xsl:for-each>
+	</xsl:for-each>
+</xsl:template>
+
+<!-- Was needed to simulate bulleted lists:
+<xsl:template match="text:ordered-list|text:unordered-list">
+  <xsl:variable name = "text_width">
+    <xsl:call-template name="text_width" />
+  </xsl:variable>
+  <blockTable style="Standard_Outline" colWidths="18,{$text_width}">
+  <xsl:apply-templates match="text:list-item" />
+</blockTable>
+</xsl:template>
+
+<xsl:template match="text:list-item">
+  <tr>
+    <td><para><font face="Helvetica-Bold" size="10">*</font></para></td>
+    <td>
+      <xsl:apply-templates />
+    </td>
+  </tr>
+</xsl:template>
+
+-->
+
+
+<xsl:template match="office:body">
+  <story>
+    <xsl:apply-templates />
+	<xsl:for-each select="//draw:text-box">
+		<currentFrame>
+			<xsl:attribute name="name">
+				<xsl:value-of select="./@draw:name" />
+			</xsl:attribute>
+		</currentFrame>
+		<xsl:apply-templates>
+			<xsl:with-param name="skip_draw" select="0" />
+		</xsl:apply-templates>
+		<frameEnd />
+	</xsl:for-each>
+  </story>
+</xsl:template>
+
+<xsl:template match="table:table">
+  <blockTable>
+    <xsl:attribute name="colWidths">
+      <xsl:call-template name="make_columns" />
+    </xsl:attribute>
+    <xsl:call-template name="make_tableheaders" />
+    <xsl:attribute name="style">
+      <xsl:value-of select="@table:name" />
+    </xsl:attribute>
+    <xsl:apply-templates />
+  </blockTable>
+</xsl:template>
+
+<xsl:template name="make_tableheaders">
+  <xsl:if test="boolean(count(table:table-header-rows))">
+    <xsl:attribute name="repeatRows">1</xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_tablebackground">
+  <xsl:for-each select=".//table:table-row">
+    <!--Be careful when there are table:table-header-rows as
+         parent node of table:table-row -->
+    <xsl:variable name="row" select="position() - 1" />
+    <xsl:for-each select="./table:table-cell">
+      <xsl:variable name="col" select="position() - 1" />
+      <xsl:variable name="background">
+        <xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:background-color" />
+      </xsl:variable>
+      <xsl:if test="not($background='') and boolean(key('table_cell_style',@table:style-name)/style:properties/@fo:background-color) and starts-with($background,'#')">
+        <!--only RGB hexcolors are accepted -->
+		<blockBackground colorName="{$background}" start="{$col},{$row}" stop="{$col},-1" />
+      </xsl:if>
+     </xsl:for-each>
+   </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="make_columns">
+  <xsl:variable name="columns" >
+    <xsl:for-each select="table:table-column">
+      <xsl:value-of select="key('table_column_style',@table:style-name)/style:properties/@style:column-width" />
+      <xsl:text>,</xsl:text>
+    </xsl:for-each>
+  </xsl:variable>
+  <xsl:value-of select="substring($columns,1,string-length($columns) - 1)" />
+  <!--strip the last comma-->
+</xsl:template>
+
+<xsl:template match="table:table-row">
+  <tr>
+    <xsl:apply-templates />
+  </tr>
+</xsl:template>
+
+<xsl:template match="table:table-cell">
+  <td>
+    <xsl:apply-templates />
+  </td>
+</xsl:template>
+
+<xsl:template match="text:section">
+  <section>
+    <xsl:apply-templates />
+  </section>
+</xsl:template>
+
+
+<xsl:template match="text:span">
+  <font>
+    <xsl:call-template name="make_fontnames_span" />
+    <xsl:call-template name="make_fontsize_span" />
+    <xsl:apply-templates />
+  </font>
+</xsl:template>
+
+<xsl:template name="make_fontsize_span">
+  <xsl:variable name ="fontsize">
+    <xsl:value-of select="key('text_style',@text:style-name)/style:properties/@fo:font-size" />
+  </xsl:variable>
+  <xsl:if test="not($fontsize='') and boolean(key('text_style',@text:style-name)/style:properties/@fo:font-size)" >
+    <xsl:attribute name="size">
+      <xsl:value-of select="$fontsize" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontnames_span">
+  <xsl:attribute name="face">
+    <xsl:call-template name="make_fontnames">
+      <xsl:with-param name="fontName" select="key('text_style',@text:style-name)/style:properties/@style:font-name"  />
+      <xsl:with-param name="fontWeight" select="key('text_style',@text:style-name)/style:properties/@fo:font-weight"  />
+      <xsl:with-param name="fontStyle" select="key('text_style',@text:style-name)/style:properties/@fo:font-style" />
+    </xsl:call-template>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="make_image">
+  <illustration height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}">
+    <image x="0" y="0" file="{substring-after(.//draw:image/@xlink:href,'#Pictures/')}" height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}" />
+  </illustration>
+</xsl:template>
+
+<xsl:template name="empty_paragraph">
+  <xsl:if test="not(boolean(count(descendant::node())))">
+    <xsl:call-template name="distance_point">
+      <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
+    </xsl:call-template>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="distance_point">
+  <xsl:param name="background" />
+  <xsl:param name="tab_stop"></xsl:param>
+  <xsl:variable name="local_back">
+    <xsl:choose>
+      <xsl:when test="not(boolean($background)) or not(contains($background,'#'))">
+        <!-- Do not accept OO colors like "transparent", only hex-colors -->
+        <xsl:text>white</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$background" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <font color="{$local_back}">
+    <xsl:text> </xsl:text>
+    <xsl:if test="boolean($tab_stop)">
+      <!-- simulate a tabstop with white/background-color points -->
+      <xsl:text>.........</xsl:text>
+    </xsl:if>
+  </font>
+</xsl:template>
+
+<xsl:template match="text:ordered-list">
+  <xsl:apply-templates />
+  <para><seqreset id="ordered_list" /></para>
+  <!-- Reset the counter. seqreset is not a trml2pdf tag, but a Platypus Intra Paragraph Markup,
+       so it needs a dummy paragraph to enclose it -->
+</xsl:template>
+
+<xsl:template name="make_listitem">
+  <xsl:if test="(name(..)='text:list-item')">
+    <xsl:attribute name="leftIndent">15</xsl:attribute>
+    <xsl:attribute name="bulletIndent">0</xsl:attribute>
+    <xsl:choose>
+      <xsl:when test="(name(../..)='text:unordered-list')">
+        <xsl:variable name="fontsize">
+          <xsl:value-of select="number(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)" />
+        </xsl:variable>
+        <xsl:choose>
+          <xsl:when test="$fontsize='NaN'">
+            <!-- you should exclude non-numerical values for bulletFontSize. <== Sometimes the preprocessing went wrong.-->
+            <!--use a default bullet font size-->
+            <xsl:attribute name="bulletFontSize">6</xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="bulletFontSize"><xsl:value-of select="floor(($fontsize div 2) + 1)" /></xsl:attribute>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:attribute name="bulletFontName">ZapfDingbats</xsl:attribute>
+        <xsl:attribute name="bulletText">l</xsl:attribute>        
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- Generate the numbers for an ordered list -->
+        <xsl:variable name="size">
+          <xsl:value-of select="key('paragraph_style',@text:style-name)/style:properties/@fo:font-size" />
+        </xsl:variable>
+        <!-- For ordered lists we use the bullet tag from Platypus Intra Paragraph Markup -->
+        <bullet>
+          <xsl:if test="not($size='') and boolean(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)">
+            <xsl:attribute name="size">
+              <!-- adapt the fontsize to the fontsize of the current paragraph -->
+              <xsl:value-of select="$size" />
+            </xsl:attribute>
+          </xsl:if>
+          <seq id="ordered_list" />.</bullet>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="text:drop-down">
+    <xsl:value-of select="text:label[2]/@text:value" />
+</xsl:template>
+
+
+<xsl:template match="text:p|text:h">
+	<xsl:param name="skip_draw" select="1" />
+  <xsl:if test="boolean(key('page_break_before',@text:style-name))" >
+    <pageBreak />
+  </xsl:if>
+  <xsl:choose>
+    <xsl:when test="boolean(.//draw:image)">
+      <xsl:call-template name="make_image" />
+    </xsl:when>
+	<xsl:when test="boolean(name(..) = 'draw:text-box') and boolean($skip_draw)">
+	</xsl:when>
+    <xsl:otherwise>
+      <para>
+        <xsl:attribute name="style">
+          <xsl:value-of select="@text:style-name" />
+        </xsl:attribute>
+        <xsl:call-template name="make_listitem" />
+        <xsl:apply-templates />
+        <xsl:call-template name="empty_paragraph" />
+      </para>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:if test="boolean(key('page_break_after',@text:style-name))" >
+    <pageBreak />
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="text:p/text:tab-stop">
+  <!-- simulate a tabstop -->
+  <xsl:call-template name="distance_point">
+    <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
+    <xsl:with-param name="tab_stop">yes</xsl:with-param>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- experimental - switched off
+<xsl:template match="text:h">
+  <para>
+    <xsl:attribute name="style">
+      <xsl:value-of select="@text:style-name" />
+    </xsl:attribute>
+    <xsl:call-template name="make_number" />
+    <xsl:apply-templates />
+    <xsl:call-template name="empty_paragraph" />
+  </para>
+</xsl:template>
+
+<xsl:template name="make_number">
+  <xsl:choose>
+    <xsl:when test="@text:level='1'">
+      <xsl:number format="1. " />
+    </xsl:when>
+    <xsl:when test="@text:level='2'">
+      <xsl:number count="text:h[@text:level='1']|text:h[text:level='2']" level="any" format="1.1." />
+    </xsl:when>
+  </xsl:choose>
+</xsl:template>
+
+-->
+            
+<xsl:template match="style:style[@style:family='paragraph']">
+  <paraStyle>
+    <xsl:attribute name="name">
+      <xsl:value-of select="@style:name" />
+    </xsl:attribute>
+    <xsl:call-template name="make_indent_paragraph" />
+    <xsl:call-template name="make_fontnames_paragraph" />
+    <xsl:call-template name="make_fontsize" />
+    <!--<xsl:call-template name="make_parent" /> not necessary -
+         parent styles processed by PyOpenOffice -->
+    <xsl:call-template name="make_alignment" />
+    <xsl:call-template name="make_background" />
+    <xsl:call-template name="make_space_beforeafter" />
+  </paraStyle>
+</xsl:template>
+
+<xsl:template name="make_indent_paragraph">
+  <xsl:variable name="right_indent"><xsl:value-of select="style:properties/@fo:margin-right" /></xsl:variable>
+  <xsl:variable name="left_indent"><xsl:value-of select="style:properties/@fo:margin-left" /></xsl:variable>
+  <xsl:if test="not($right_indent='') and boolean(style:properties/@fo:margin-right)">
+    <xsl:attribute name="rightIndent">
+      <xsl:value-of select="$right_indent" />
+    </xsl:attribute>      
+  </xsl:if>
+  <xsl:if test="not($left_indent='') and boolean(style:properties/@fo:margin-left)">
+    <xsl:attribute name="leftIndent">
+      <xsl:value-of select="$left_indent" />
+    </xsl:attribute>      
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_background">
+  <xsl:variable name="background">
+    <xsl:value-of select="style:properties/@fo:background-color" />
+  </xsl:variable>
+  <xsl:if test="not($background='') and boolean(style:properties/@fo:background-color) and starts-with($background,'#')" >
+    <xsl:attribute name="backColor">
+      <xsl:value-of select="$background" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_space_beforeafter">
+  <xsl:variable name="before">
+    <xsl:value-of select="style:properties/@fo:margin-top" />
+  </xsl:variable>
+  <xsl:variable name="after">
+    <xsl:value-of select="style:properties/@fo:margin-bottom" />
+  </xsl:variable>
+  <xsl:if test="not($before='') and boolean(style:properties/@fo:margin-top)" >
+    <xsl:attribute name="spaceBefore">
+      <xsl:value-of select="$before" />
+    </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="not($after='') and boolean(style:properties/@fo:margin-bottom)" >
+    <xsl:attribute name="spaceAfter">
+      <xsl:value-of select="$after" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontsize">
+  <xsl:variable name="fontSize">       
+    <xsl:value-of select="style:properties/@fo:font-size" />
+  </xsl:variable>
+  <xsl:if test="not($fontSize='') and boolean(style:properties/@fo:font-size)">
+    <xsl:attribute name="fontSize">
+      <xsl:value-of select="$fontSize" />
+    </xsl:attribute>
+    <xsl:attribute name="leading">
+      <xsl:value-of select="$fontSize + floor($fontSize div 5) + 1" />
+      <!--use a standard leading related to the font size -->
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!--this template is not needed anymore for "normalized" sxw files -->
+<xsl:template name="make_parent">
+  <xsl:variable name="parent">       
+    <xsl:value-of select="@style:parent-style-name" />
+  </xsl:variable>
+  <xsl:if test="not($parent='') and boolean(@style:parent-style-name)">    
+    <xsl:attribute name="parent">
+      <xsl:value-of select="$parent" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_alignment">
+  <xsl:variable name="alignment">
+    <xsl:value-of select="style:properties/@fo:text-align" />
+  </xsl:variable>
+  <xsl:if test="not($alignment='') and boolean(style:properties/@fo:text-align)">
+    <xsl:choose>
+      <xsl:when test="$alignment='start'">
+        <xsl:attribute name="alignment">LEFT</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='center'">
+        <xsl:attribute name="alignment">CENTER</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='end'">
+        <xsl:attribute name="alignment">RIGHT</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='justify'">
+        <xsl:attribute name="alignment">JUSTIFY</xsl:attribute>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontnames_paragraph">
+  <xsl:attribute name="fontName">
+    <xsl:call-template name="make_fontnames">
+      <xsl:with-param name="fontName" select="style:properties/@style:font-name" />
+      <xsl:with-param name="fontWeight" select="style:properties/@fo:font-weight" />
+      <xsl:with-param name="fontStyle" select="style:properties/@fo:font-style" />
+    </xsl:call-template>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="make_fontnames">
+  <!--much too verbose, needs improvement-->
+<xsl:param name="fontName" />
+<xsl:param name="fontWeight" />
+<xsl:param name="fontStyle" />
+<xsl:choose>
+<xsl:when test="not($fontName='') and boolean($fontName)">
+  <xsl:choose>
+    <xsl:when test="contains($fontName,'Courier')">
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Courier-BoldOblique</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Courier-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Courier-Oblique</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Courier</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:when test="contains($fontName,'Helvetica') or contains($fontName,'Arial') or contains($fontName,'Sans')">
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Helvetica-BoldOblique</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Helvetica-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Helvetica-Oblique</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Helvetica</xsl:text>
+        </xsl:otherwise>        
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Times-BoldItalic</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Times-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Times-Italic</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Times-Roman</xsl:text>
+        </xsl:otherwise>        
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:when>
+<xsl:otherwise>
+  <!--Use this as default -->
+  <xsl:text>Times-Roman</xsl:text>   
+</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
+<!--
+This stylesheet is part of:
+PyOpenOffice Version 0.4
+Copyright (C) 2005: Martin Simon
+Homepage: www.bezirksreiter.de
+
+GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
+-->
+
+</xsl:stylesheet>
+
+
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/office.dtd b/addons/base_report_designer/wizard/tiny_sxw2rml/office.dtd
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
new file mode 100644
index 00000000000..0d847c93027
--- /dev/null
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
@@ -0,0 +1,368 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+#coding: utf-8
+
+##############################################################################
+#
+# Copyright (c):
+#
+#     2005 pyopenoffice.py Martin Simon (http://www.bezirksreiter.de)
+#     2005 Fabien Pinckaers, TINY SPRL. (http://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 contact 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.
+#
+##############################################################################
+
+"""
+Tiny SXW2RML - The Tiny ERP's report engine
+
+Tiny SXW2RMLis part of the Tiny report project.
+Tiny Report is a module that allows you to render high quality PDF document
+from an OpenOffice template (.sxw) and any relationnal database.
+
+The whole source code is distributed under the terms of the
+GNU Public Licence.
+
+(c) 2005 pyopenoffice.py Martin Simon (http://www.bezirksreiter.de)
+(c) 2005-TODAY, Fabien Pinckaers - Tiny sprl
+"""
+__version__ = '0.9'
+
+
+import re
+import string
+import os
+import zipfile
+import xml.dom.minidom
+from reportlab.lib.units import toLength
+import base64
+
+class DomApiGeneral:
+    """General DOM API utilities."""
+    def __init__(self,content_string="",file=""):
+        self.content_string = content_string
+        self.re_digits = re.compile(r"(.*?\d)(pt|cm|mm|inch|in)")
+
+    def _unitTuple(self,string):
+        """Split values and units to a tuple."""
+        temp = self.re_digits.findall(string)
+        if not temp:
+            return (string,"")
+        else:
+            return (temp[0])
+
+    def stringPercentToFloat(self,string):
+        temp = string.replace("""%""","")
+        return float(temp)/100
+
+    def findChildrenByName(self,parent,name,attr_dict={}):
+        """Helper functions. Does not work recursively.
+        Optional: also test for certain attribute/value pairs."""
+        children = []
+        for c in parent.childNodes:
+            if c.nodeType == c.ELEMENT_NODE and c.nodeName == name:
+                children.append(c)
+        if attr_dict == {}:
+            return children
+        else:
+            return self._selectForAttributes(nodelist=children,attr_dict=attr_dict)
+
+    def _selectForAttributes(self,nodelist,attr_dict):
+        "Helper function."""
+        selected_nodes = []
+        for n in nodelist:
+            check = 1
+            for a in attr_dict.keys():
+                if n.getAttribute(a) != attr_dict[a]:
+                    # at least one incorrect attribute value?
+                    check = 0
+            if check:
+                selected_nodes.append(n)
+        return selected_nodes
+
+    def _stringToTuple(self,s):
+        """Helper function."""
+        try:
+            temp = string.split(s,",")
+            return int(temp[0]),int(temp[1])
+        except:
+            return None
+
+    def _tupleToString(self,t):
+        try:
+            return self.openOfficeStringUtf8("%s,%s" % (t[0],t[1]))
+        except:
+            return None
+
+    def _lengthToFloat(self,value):
+        v = value
+        if not self.re_digits.search(v):
+            return v
+        try:
+            if v[-4:] == "inch":
+                # OO files use "inch" instead of "in" in Reportlab units
+                v = v[:-2]
+        except:
+            pass
+        try:
+            c = round(toLength(v))
+            return c
+        except:
+            return v
+
+    def openOfficeStringUtf8(self,string):
+        if type(string) == unicode:
+            return string.encode("utf-8")
+        tempstring = unicode(string,"cp1252").encode("utf-8")
+        return tempstring
+
+class DomApi(DomApiGeneral):
+    """This class provides a DOM-API for XML-Files from an SXW-Archive."""
+    def __init__(self,xml_content,xml_styles):
+        DomApiGeneral.__init__(self)
+        self.content_dom = xml.dom.minidom.parseString(xml_content)
+        self.styles_dom = xml.dom.minidom.parseString(xml_styles)
+        body = self.content_dom.getElementsByTagName("office:body")
+        self.body = body and body[0]
+
+        # TODO:
+        self.style_dict = {}
+        self.style_properties_dict = {}
+
+        # ******** always use the following order:
+        self.buildStyleDict()
+        self.buildStylePropertiesDict()
+        if self.styles_dom.getElementsByTagName("style:page-master").__len__()<>0:
+            self.page_master = self.styles_dom.getElementsByTagName("style:page-master")[0]
+        self.document = self.content_dom.getElementsByTagName("office:document-content")[0]
+
+    def buildStylePropertiesDict(self):
+        for s in self.style_dict.keys():
+            self.style_properties_dict[s] = self.getStylePropertiesDict(s)
+
+    def updateWithPercents(self,dict,updatedict):
+        """Sometimes you find values like "115%" in the style hierarchy."""
+        if not updatedict:
+            # no style hierarchies for this style? =>
+            return
+        new_updatedict = copy.copy(updatedict)
+        for u in new_updatedict.keys():
+            try:
+                if new_updatedict[u].find("""%""") != -1 and dict.has_key(u):
+                    number = float(self.re_digits.search(dict[u]).group(1))
+                    unit = self.re_digits.search(dict[u]).group(2)
+                    new_number = self.stringPercentToFloat(new_updatedict[u]) * number
+                    if unit == "pt":
+                        new_number = int(new_number)
+                        # no floats allowed for "pt"
+                        # OOo just takes the int, does not round (try it out!)
+                    new_updatedict[u] = "%s%s" % (new_number,unit)
+                else:
+                    dict[u] = new_updatedict[u]
+            except:
+                dict[u] = new_updatedict[u]
+        dict.update(new_updatedict)
+
+    def normalizeStyleProperties(self):
+        """Transfer all style:style-properties attributes from the
+        self.style_properties_hierarchical dict to the automatic-styles
+        from content.xml. Use this function to preprocess content.xml for
+        XSLT transformations etc.Do not try to implement this function
+        with XSlT - believe me, it's a terrible task..."""
+        styles_styles = self.styles_dom.getElementsByTagName("style:style")
+        automatic_styles = self.content_dom.getElementsByTagName("office:automatic-styles")[0]
+        for s in styles_styles:
+            automatic_styles.appendChild(s.cloneNode(deep=1))
+        content_styles = self.content_dom.getElementsByTagName("style:style")
+        # these are the content_styles with styles_styles added!!!
+        for s in content_styles:
+            c = self.findChildrenByName(s,"style:properties")
+            if c == []:
+                # some derived automatic styles do not have "style:properties":
+                temp = self.content_dom.createElement("style:properties")
+                s.appendChild(temp)
+                c = self.findChildrenByName(s,"style:properties")
+            c = c[0]
+            dict = self.style_properties_dict[(s.getAttribute("style:name")).encode("latin-1")] or {}
+            for attribute in dict.keys():
+                c.setAttribute(self.openOfficeStringUtf8(attribute),self.openOfficeStringUtf8(dict[attribute]))
+
+    def transferStylesXml(self):
+        """Transfer certain sub-trees from styles.xml to the normalized content.xml
+        (see above). It is not necessary to do this - for example - with paragraph styles.
+        the "normalized" style properties contain all information needed for
+        further processing."""
+        # TODO: What about table styles etc.?
+        outline_styles = self.styles_dom.getElementsByTagName("text:outline-style")
+        t = self.content_dom.createElement("transferredfromstylesxml")
+        self.document.insertBefore(t,self.body)
+        t_new = self.body.previousSibling
+        try:
+            page_master = self.page_master
+            t_new.appendChild(page_master.cloneNode(deep=1))
+            t_new.appendChild(outline_styles[0].cloneNode(deep=1))
+        except:
+            pass
+
+    def normalizeLength(self):
+        """Normalize all lengthes to floats (i.e: 1 inch = 72).
+        Always use this after "normalizeContent" and "transferStyles"!"""
+        # TODO: The complex attributes of table cell styles are not transferred yet.
+        #all_styles = self.content_dom.getElementsByTagName("style:properties")
+        #all_styles += self.content_dom.getElementsByTagName("draw:image")
+        all_styles = self.content_dom.getElementsByTagName("*")
+        for s in all_styles:
+            for x in s._attrs.keys():
+                v = s.getAttribute(x)
+                s.setAttribute(x,"%s" % self._lengthToFloat(v))
+                # convert float to string first!
+
+    def normalizeTableColumns(self):
+        """Handle this strange table:number-columns-repeated attribute."""
+        columns = self.content_dom.getElementsByTagName("table:table-column")
+        for c in columns:
+            if c.hasAttribute("table:number-columns-repeated"):
+                number = int(c.getAttribute("table:number-columns-repeated"))
+                c.removeAttribute("table:number-columns-repeated")
+                for i in range(number-1):
+                    (c.parentNode).insertBefore(c.cloneNode(deep=1),c)
+
+    def buildStyleDict(self):
+        """Store all style:style-nodes from content.xml and styles.xml in self.style_dict.
+        Caution: in this dict the nodes from two dom apis are merged!"""
+        for st in (self.styles_dom,self.content_dom):
+            for s in st.getElementsByTagName("style:style"):
+                name = s.getAttribute("style:name").encode("latin-1")
+                self.style_dict[name] = s
+        return True
+
+    def toxml(self):
+        return self.content_dom.toxml(encoding="utf-8")
+
+    def getStylePropertiesDict(self,style_name):
+        res = {}
+
+        if self.style_dict[style_name].hasAttribute("style:parent-style-name"):
+            parent = self.style_dict[style_name].getAttribute("style:parent-style-name").encode("latin-1")
+            res = self.getStylePropertiesDict(parent)
+
+        childs = self.style_dict[style_name].childNodes
+        for c in childs:
+            if c.nodeType == c.ELEMENT_NODE and c.nodeName == "style:properties":
+                for attr in c._attrs.keys():
+                    res[attr] = c.getAttribute(attr).encode("latin-1")
+        return res
+
+class PyOpenOffice(object):
+    """This is the main class which provides all functionality."""
+    def __init__(self, path='.', save_pict=False):
+        self.path = path
+        self.save_pict = save_pict
+        self.images = {}
+
+    def oo_read(self,fname):
+        z = zipfile.ZipFile(fname,"r")
+        content = z.read('content.xml')
+        style = z.read('styles.xml')
+        all = z.namelist()
+        for a in all:
+            if a[:9]=='Pictures/' and len(a)>10:
+                pic_content = z.read(a)
+                self.images[a[9:]] = pic_content
+                if self.save_pict:
+                    f=open(os.path.join(self.path, os.path.basename(a)),"wb")
+                    f.write(pic_content)
+                    f.close()
+        z.close()
+        return content,style
+
+    def oo_replace(self,content):
+        regex = [
+            (r"<para[^>]*/>", ""),
+            #(r"<text:ordered-list.*?>(.*?)</text:ordered-list>", "$1"),
+            #(r"<text:unordered-list.*?>(.*?)</text:unordered-list>", "$1"),
+            (r"<para(.*)>(.*?)<text:line-break[^>]*/>", "<para$1>$2</para><para$1>"),
+        ]
+        for key,val in regex:
+            content = re.sub(key, val, content)
+        return content
+
+    def unpackNormalize(self,sourcefile):
+        c,s = self.oo_read(sourcefile)
+        c = self.oo_replace(c)
+        dom = DomApi(c,s)
+        dom.normalizeStyleProperties()
+        dom.transferStylesXml()
+        dom.normalizeLength()
+        dom.normalizeTableColumns()
+        new_c = dom.toxml()
+        return new_c
+
+def sxw2rml(sxw_file, xsl, output='.', save_pict=False):
+    import libxslt
+    import libxml2
+    tool = PyOpenOffice(output, save_pict = save_pict)
+    res = tool.unpackNormalize(sxw_file)
+    styledoc = libxml2.parseDoc(xsl)
+    style = libxslt.parseStylesheetDoc(styledoc)
+    doc = libxml2.parseMemory(res,len(res))
+    result = style.applyStylesheet(doc, None)
+
+    root = result.xpathEval("/document/stylesheet")
+    if root:
+        root=root[0]
+        images = libxml2.newNode("images")
+        for img in tool.images:
+            node = libxml2.newNode('image')
+            node.setProp('name', img)
+            node.setContent( base64.encodestring(tool.images[img]))
+            images.addChild(node)
+        root.addNextSibling(images)
+    try:
+        xml = style.saveResultToString(result)
+        return xml
+    except:
+        return result
+
+if __name__ == "__main__":
+    import optparse
+    parser = optparse.OptionParser(
+        version="Tiny Report v%s" % __version__,
+        usage = 'tiny_sxw2rml.py [options] file.sxw')
+    parser.add_option("-v", "--verbose", default=False, dest="verbose", help="enable basic debugging")
+    parser.add_option("-o", "--output", dest="output", default='.', help="directory of image output")
+    (opt, args) = parser.parse_args()
+    if len(args) != 1:
+        parser.error("incorrect number of arguments")
+
+    import sys
+    import StringIO
+
+    fname = sys.argv[1]
+    f = StringIO.StringIO(file(fname).read())
+
+    xsl = file(os.path.join(os.getcwd(), os.path.dirname(sys.argv[0]), 'normalized_oo2rml.xsl')).read()
+    result = sxw2rml(f, xsl, output=opt.output, save_pict=False)
+
+    print result
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index a395190a299..ce512679722 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -38,13 +38,13 @@ view_form_profit = """<?xml version="1.0"?>
 <form string="Setup">
     <image name="gtk-dialog-info"/>
     <group>
-        <separator string="Select a profile" colspan="2"/>
+        <separator string="Select a Profile" colspan="2"/>
         <newline/>
         <field align="0.0" name="profile"/>
         <newline/>
-        <label string="A profile sets a pre-selection of modules for enterprise needs." colspan="2" align="0.0"/>
+        <label string="A profile sets a pre-selection of modules for specific needs. These profiles have been setup to help you discover the different aspects of OpenERP. This is just an overview, we have 300+ available modules." colspan="2" align="0.0"/>
         <newline/>
-        <label string="You'll be able to install others modules later through the Administration menu." colspan="2" align="0.0"/>
+        <label string="You'll be able to install more modules later through the Administration menu." colspan="2" align="0.0"/>
     </group>
 </form>"""
 
@@ -52,13 +52,13 @@ view_form_charts = """<?xml version="1.0"?>
 <form string="Setup">
     <image name="gtk-dialog-info" colspan="2"/>
     <group>
-        <separator string="Select a chart of accounts" colspan="2"/>
+        <separator string="Select a Chart of Accounts" colspan="2"/>
         <newline/>
         <field name="charts" align="0.0"/>
         <newline/>
-        <label string="There are many other chart of accounts available on the OpenERP website." colspan="2" align="0.0"/>
+        <label string="There are much more charts of accounts available on the OpenERP website." colspan="2" align="0.0"/>
         <newline/>
-        <label string="If you don't select one now, you'll be able to install an other one through the Administration menu." colspan="2" align="0.0"/>
+        <label string="If you don't select one now, you'll be able to install another one through the Administration menu." colspan="2" align="0.0"/>
     </group>
 </form>"""
 
@@ -66,7 +66,7 @@ view_form_company = """<?xml version="1.0"?>
 <form string="Setup">
     <image name="gtk-dialog-info" colspan="2"/>
     <group>
-        <separator string="Define main company" colspan="4"/>
+        <separator string="Define Main Company" colspan="4"/>
         <newline/>
         <field name="name" align="0.0" colspan="4" required="True"/>
         <newline/>
@@ -187,10 +187,10 @@ class wizard_base_setup(wizard.interface):
         form=data['form']
         if 'profile' in data['form'] and data['form']['profile'] > 0:
             module_obj=pool.get('ir.module.module')
-            module_obj.state_change(cr, uid, [data['form']['profile']], 'to install', context)
+            module_obj.state_update(cr, uid, [data['form']['profile']], 'to install', ['uninstalled'], context)
         if 'charts' in data['form'] and data['form']['charts'] > 0:
             module_obj=pool.get('ir.module.module')
-            module_obj.state_change(cr, uid, [data['form']['charts']], 'to install', context)
+            module_obj.state_update(cr, uid, [data['form']['charts']], 'to install', ['uninstalled'], context)
 
         company_obj=pool.get('res.company')
         partner_obj=pool.get('res.partner')
@@ -432,8 +432,8 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
             'actions': [_update],
             'result': {'type': 'form', 'arch': view_form_finish, 'fields': {},
                 'state': [
-                    ('menu', 'Use Directly'),
-                    ('config', 'Start Configuration', 'gtk-ok', True)
+                    ('menu', 'Use Directly', 'gtk-ok'),
+                    ('config', 'Start Configuration', 'gtk-go-forward', True)
                 ]
             }
         },
diff --git a/addons/base_vat/__init__.py b/addons/base_vat/__init__.py
index 17a3025038f..af7847dfb9d 100644
--- a/addons/base_vat/__init__.py
+++ b/addons/base_vat/__init__.py
@@ -28,7 +28,7 @@
 #
 ##############################################################################
 
-
+import partner
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_vat/__terp__.py b/addons/base_vat/__terp__.py
index 1397e504ba1..0536c097a50 100644
--- a/addons/base_vat/__terp__.py
+++ b/addons/base_vat/__terp__.py
@@ -28,6 +28,7 @@
 ###############################################################################
 {
     "name" : "VAT",
+    "description": "Enable the VAT Number for the partner. Check the validity of that VAT Number.",
     "version" : "1.0",
     "author" : "Tiny",
     "category" : "Generic Modules/Base",
diff --git a/addons/base_vat/base_vat_data.xml b/addons/base_vat/base_vat_data.xml
index df6980ba3c0..fcbebe2bd4b 100644
--- a/addons/base_vat/base_vat_data.xml
+++ b/addons/base_vat/base_vat_data.xml
@@ -8,10 +8,13 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="after">
-                    <field name="vat"/>
+                    <group colspan="2">
+                        <field name="vat_subject"/>
+                        <field name="vat"/>
+                    </group>
                 </field>
             </field>
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/base_vat/partner.py b/addons/base_vat/partner.py
new file mode 100644
index 00000000000..4c815bd7243
--- /dev/null
+++ b/addons/base_vat/partner.py
@@ -0,0 +1,1035 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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.
+###############################################################################
+#
+# The methods "check_vat_[a-z]{2}" are copyrighted:
+#    - Cedric Krier.
+#    - Bertrand Chenal
+#    - B2CK
+# 
+
+from osv import osv
+
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    
+    def check_vat(self, cr, uid, ids):
+        '''
+        Check the VAT number depending of the country.
+        http://sima-pc.com/nif.php
+        '''
+        for partner in self.browse(cr, uid, ids):
+            if not partner.vat_subject:
+                continue
+            if not partner.vat:
+                continue    #FIXME return False? empty vat numbre is invalid?
+
+            vat_country, vat_number = partner.vat[:2].lower(), partner.vat[2:]
+            
+            check = getattr(self, 'check_vat_' + vat_country, lambda vn: False)
+            if not check(vat_number):
+                return False
+
+        return True
+
+    _constraints = [(check_vat, "The VAT doesn't seem to be correct.", ["vat"])]
+    
+    # code from the following methods come from Tryton (B2CK)
+    # http://www.tryton.org/hgwebdir.cgi/modules/relationship/file/544d1de586d9/party.py 
+    def check_vat_at(self, vat):
+        '''
+        Check Austria VAT number.
+        '''
+        if len(vat) != 9:
+            return False
+        if vat[0] != 'U':
+            return False
+        num = vat[1:]
+        try:
+            int(num)
+        except:
+            return False
+        sum = int(num[0]) + mult_add(2, int(num[1])) + \
+                int(num[2]) + mult_add(2, int(num[3])) + \
+                int(num[4]) + mult_add(2, int(num[5])) + \
+                int(num[6])
+        check = 10 - ((sum + 4) % 10)
+        if check == 10:
+            check = 0
+        if int(vat[-1:]) != check:
+            return False
+        return True
+
+    def check_vat_be(self, vat):
+        '''
+        Check Belgium VAT number.
+        '''
+        if len(vat) != 10:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        if int(vat[-2:]) != \
+                97 - (int(vat[:8]) % 97):
+            return False
+        return True
+
+    def check_vat_bg(self, vat):
+        '''
+        Check Bulgaria VAT number.
+        '''
+        if len(vat) != 10:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        if int(vat[0]) in (2, 3) and \
+                int(vat[1:2]) != 22:
+            return False
+        sum = 4 * int(vat[0]) + 3 * int(vat[1]) + 2 * int(vat[2]) + \
+                7 * int(vat[3]) + 6 * int(vat[4]) + 5 * int(vat[5]) + \
+                4 * int(vat[6]) + 3 * int(vat[7]) + 2 * int(vat[8])
+        check = 11 - (sum % 11)
+        if check == 11:
+            check = 0
+        if check == 10:
+            return False
+        if check != int(vat[9]):
+            return False
+        return True
+
+    def check_vat_cy(self, vat):
+        '''
+        Check Cyprus VAT number.
+        '''
+        if len(vat) != 9:
+            return False
+        try:
+            int(vat[:8])
+        except:
+            return False
+        n0 = int(vat[0])
+        n1 = int(vat[1])
+        n2 = int(vat[2])
+        n3 = int(vat[3])
+        n4 = int(vat[4])
+        n5 = int(vat[5])
+        n6 = int(vat[6])
+        n7 = int(vat[7])
+
+        def conv(x):
+            if x == 0:
+                return 1
+            elif x == 1:
+                return 0
+            elif x == 2:
+                return 5
+            elif x == 3:
+                return 7
+            elif x == 4:
+                return 9
+            elif x == 5:
+                return 13
+            elif x == 6:
+                return 15
+            elif x == 7:
+                return 17
+            elif x == 8:
+                return 19
+            elif x == 9:
+                return 21
+            return x
+        n0 = conv(n0)
+        n2 = conv(n2)
+        n4 = conv(n4)
+        n6 = conv(n6)
+
+        sum = n0 + n1 + n2 + n3 + n4 + n5 + n6 + n7
+        check = chr(sum % 26 + 65)
+        if check != vat[8]:
+            return False
+        return True
+
+    def check_vat_cz(self, vat):
+        '''
+        Check Czech Republic VAT number.
+        '''
+        if len(vat) not in (8, 9, 10):
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+
+        if len(vat) == 8:
+            if int(vat[0]) not in (0, 1, 2, 3, 4, 5, 6, 7, 8):
+                return False
+            sum = 8 * int(vat[0]) + 7 * int(vat[1]) + 6 * int(vat[2]) + \
+                    5 * int(vat[3]) + 4 * int(vat[4]) + 3 * int(vat[5]) + \
+                    2 * int(vat[6])
+            check = 11 - (sum % 11)
+            if check == 10:
+                check = 0
+            if check == 11:
+                check = 1
+            if check != int(vat[7]):
+                return False
+        elif len(vat) == 9 and int(vat[0]) == 6:
+            sum = 8 * int(vat[1]) + 7 * int(vat[2]) + 6 * int(vat[3]) + \
+                    5 * int(vat[4]) + 4 * int(vat[5]) + 3 * int(vat[6]) + \
+                    2 * int(vat[7])
+            check = 9 - ((11 - (sum % 11)) % 10)
+            if check != int(vat[8]):
+                return False
+        elif len(vat) == 9:
+            if int(vat[0:2]) > 53 and int(vat[0:2]) < 80:
+                return False
+            if int(vat[2:4]) < 1:
+                return False
+            if int(vat[2:4]) > 12 and int(vat[2:4]) < 51:
+                return False
+            if int(vat[2:4]) > 62:
+                return False
+            if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 > 0:
+                if int(vat[4:6]) < 1:
+                    return False
+                if int(vat[4:6]) > 28:
+                    return False
+            if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 == 0:
+                if int(vat[4:6]) < 1:
+                    return False
+                if int(vat[4:6]) > 29:
+                    return False
+            if int(vat[2:4]) in (4, 6, 9, 11, 54, 56, 59, 61):
+                if int(vat[4:6]) < 1:
+                    return False
+                if int(vat[4:6]) > 30:
+                    return False
+            if int(vat[2:4]) in (1, 3, 5, 7, 8, 10, 12, 51,
+                    53, 55, 57, 58, 60, 62):
+                if int(vat[4:6]) < 1:
+                    return False
+                if int(vat[4:6]) > 31:
+                    return False
+        elif len(vat) == 10:
+            if int(vat[0:2]) < 54:
+                return False
+            if int(vat[2:4]) < 1:
+                return False
+            if int(vat[2:4]) > 12 and int(vat[2:4]) < 51:
+                return False
+            if int(vat[2:4]) > 62:
+                return False
+            if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 > 0:
+                if int(vat[4:6]) < 1:
+                    return False
+                if int(vat[4:6]) > 28:
+                    return False
+            if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 == 0:
+                if int(vat[4:6]) < 1:
+                    return False
+                if int(vat[4:6]) > 29:
+                    return False
+            if int(vat[2:4]) in (4, 6, 9, 11, 54, 56, 59, 61):
+                if int(vat[4:6]) < 1:
+                    return False
+                if int(vat[4:6]) > 30:
+                    return False
+            if int(vat[2:4]) in (1, 3, 5, 7, 8, 10, 12, 51,
+                    53, 55, 57, 58, 60, 62):
+                if int(vat[4:6]) < 1:
+                    return False
+                if int(vat[4:6]) > 31:
+                    return False
+            if (int(vat[0:2]) + int(vat[2:4]) + int(vat[4:6]) + int(vat[6:8]) +
+                    int(vat[8:10])) % 11 != 0:
+                return False
+            if int(vat[0:10]) % 11 != 0:
+                return False
+        return True
+
+    def check_vat_de(self, vat):
+        '''
+        Check Germany VAT number.
+        '''
+        if len(vat) != 9:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        if int(vat[0:7]) <= 0:
+            return False
+        sum = 0
+        for i in range(8):
+            sum = (2 * ((int(vat[i]) + sum + 9) % 10 + 1)) % 11
+        check = 11 - sum
+        if check == 10:
+            check = 0
+        if int(vat[8]) != check:
+            return False
+        return True
+
+    def check_vat_dk(self, vat):
+        '''
+        Check Denmark VAT number.
+        '''
+        if len(vat) != 8:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        if int(vat[0]) <= 0:
+            return False
+        sum = 2 * int(vat[0]) + 7 * int(vat[1]) + 6 * int(vat[2]) + \
+                5 * int(vat[3]) + 4 * int(vat[4]) + 3 * int(vat[5]) + \
+                2 * int(vat[6]) + int(vat[7])
+        if sum % 11 != 0:
+            return False
+        return True
+
+    def check_vat_ee(self, vat):
+        '''
+        Check Estonia VAT number.
+        '''
+        if len(vat) != 9:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        sum = 3 * int(vat[0]) + 7 * int(vat[1]) + 1 * int(vat[2]) + \
+                3 * int(vat[3]) + 7 * int(vat[4]) + 1 * int(vat[5]) + \
+                3 * int(vat[6]) + 7 * int(vat[7])
+        check = 10 - (sum % 10)
+        if check == 10:
+            check = 0
+        if check != int(vat[8]):
+            return False
+        return True
+
+    def check_vat_es(self, vat):
+        '''
+        Check Spain VAT number.
+        '''
+        if len(vat) != 9:
+            return False
+
+        conv = {
+            1: 'T',
+            2: 'R',
+            3: 'W',
+            4: 'A',
+            5: 'G',
+            6: 'M',
+            7: 'Y',
+            8: 'F',
+            9: 'P',
+            10: 'D',
+            11: 'X',
+            12: 'B',
+            13: 'N',
+            14: 'J',
+            15: 'Z',
+            16: 'S',
+            17: 'Q',
+            18: 'V',
+            19: 'H',
+            20: 'L',
+            21: 'C',
+            22: 'K',
+            23: 'E',
+        }
+
+        if vat[0] in ('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'):
+            try:
+                int(vat[1:])
+            except:
+                return False
+            sum = mult_add(2, int(vat[1])) + int(vat[2]) + \
+                    mult_add(2, int(vat[3])) + int(vat[4]) + \
+                    mult_add(2, int(vat[5])) + int(vat[6]) + \
+                    mult_add(2, int(vat[7]))
+            check = 10 - (sum % 10)
+            if check == 10:
+                check = 0
+            if check != int(vat[8]):
+                return False
+            return True
+        elif vat[0] in ('N', 'P', 'Q', 'S'):
+            try:
+                int(vat[1:8])
+            except:
+                return False
+            sum = mult_add(2, int(vat[1])) + int(vat[2]) + \
+                    mult_add(2, int(vat[3])) + int(vat[4]) + \
+                    mult_add(2, int(vat[5])) + int(vat[6]) + \
+                    mult_add(2, int(vat[7]))
+            check = 10 - (sum % 10)
+            check = chr(check + 64)
+            if check != vat[8]:
+                return False
+            return True
+        elif vat[0] in ('K', 'L', 'M', 'X'):
+            try:
+                int(vat[1:8])
+            except:
+                return False
+            check = 1 + (int(vat[1:8]) % 23)
+
+            check = conv[check]
+            if check != vat[8]:
+                return False
+            return True
+        else:
+            try:
+                int(vat[:8])
+            except:
+                return False
+            check = 1 + (int(vat[:8]) % 23)
+
+            check = conv[check]
+            if check != vat[8]:
+                return False
+            return True
+
+    def check_vat_fi(self, vat):
+        '''
+        Check Finland VAT number.
+        '''
+        if len(vat) != 8:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        sum = 7 * int(vat[0]) + 9 * int(vat[1]) + 10 * int(vat[2]) + \
+                5 * int(vat[3]) + 8 * int(vat[4]) + 4 * int(vat[5]) + \
+                2 * int(vat[6])
+        check = 11 - (sum % 11)
+        if check == 11:
+            check = 0
+        if check == 10:
+            return False
+        if check != int(vat[7]):
+            return False
+        return True
+
+    def check_vat_fr(self, vat):
+        '''
+        Check France VAT number.
+        '''
+        if len(vat) != 11:
+            return False
+
+        try:
+            int(vat[2:11])
+        except:
+            return False
+
+        system = None
+        try:
+            int(vat[0:2])
+            system = 'old'
+        except:
+            system = 'new'
+
+        if system == 'old':
+            check = ((int(vat[2:11]) * 100) + 12) % 97
+            if check != int(vat[0:2]):
+                return False
+            return True
+        else:
+            conv = ['0', '1', '2', '3', '4', '5', '6', '7',
+                '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+                'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T',
+                'U', 'V', 'W', 'X', 'Y', 'Z']
+            if vat[0] not in conv \
+                    or vat[1] not in conv:
+                return False
+            c1 = conv.index(vat[0])
+            c2 = conv.index(vat[1])
+
+            if c1 < 10:
+                sum = c1 * 24 + c2 - 10
+            else:
+                sum = c1 * 34 + c2 - 100
+
+            x = sum % 11
+            sum = (int(sum) / 11) + 1
+            y = (int(vat[2:11]) + sum) % 11
+            if x != y:
+                return False
+            return True
+
+    def check_vat_gb(self, vat):
+        '''
+        Check United Kingdom VAT number.
+        '''
+
+        if len(vat) == 5:
+            try:
+                int(vat[2:5])
+            except:
+                return False
+
+            if vat[0:2] == 'GD':
+                if int(vat[2:5]) >= 500:
+                    return False
+                return True
+            if vat[0:2] == 'HA':
+                if int(vat[2:5]) < 500:
+                    return False
+                return True
+            return False
+        elif len(vat) in (9, 10):
+            try:
+                int(vat)
+            except:
+                return False
+
+            if int(vat[0:7]) < 1:
+                return False
+            if int(vat[0:7]) > 19999 and int(vat[0:7]) < 1000000:
+                return False
+            if int(vat[7:9]) > 97:
+                return False
+            if len(vat) == 10 and int(vat[9]) != 3:
+                return False
+
+            sum = 8 * int(vat[0]) + 7 * int(vat[1]) + 6 * int(vat[2]) + \
+                    5 * int(vat[3]) + 4 * int(vat[4]) + 3 * int(vat[5]) + \
+                    2 * int(vat[6]) + 10 * int(vat[7]) + int(vat[8])
+            if sum % 97 != 0:
+                return False
+            return True
+        elif len(vat) in (12, 13):
+            try:
+                int(vat)
+            except:
+                return False
+
+            if int(vat[0:3]) not in (0, 1):
+                return False
+
+            if int(vat[3:10]) < 1:
+                return False
+            if int(vat[3:10]) > 19999 and int(vat[3:10]) < 1000000:
+                return False
+            if int(vat[10:12]) > 97:
+                return False
+            if len(vat) == 13 and int(vat[12]) != 3:
+                return False
+
+            sum = 8 * int(vat[3]) + 7 * int(vat[4]) + 6 * int(vat[5]) + \
+                    5 * int(vat[6]) + 4 * int(vat[7]) + 3 * int(vat[8]) + \
+                    2 * int(vat[9]) + 10 * int(vat[10]) + int(vat[11])
+            if sum % 97 != 0:
+                return False
+            return True
+        return False
+
+    def check_vat_gr(self, vat):
+        '''
+        Check Greece VAT number.
+        '''
+        try:
+            int(vat)
+        except:
+            return False
+        if len(vat) == 8:
+            sum = 128 * int(vat[0]) + 64 * int(vat[1]) + 32 * int(vat[2]) + \
+                    16 * int(vat[3]) + 8 * int(vat[4]) + 4 * int(vat[5]) + \
+                    2 * int(vat[6])
+            check = sum % 11
+            if check == 10:
+                check = 0
+            if check != int(vat[7]):
+                return False
+            return True
+        elif len(vat) == 9:
+            sum = 256 * int(vat[0]) + 128 * int(vat[1]) + 64 * int(vat[2]) + \
+                    32 * int(vat[3]) + 16 * int(vat[4]) + 8 * int(vat[5]) + \
+                    4 * int(vat[6]) + 2 * int(vat[7])
+            check = sum % 11
+            if check == 10:
+                check = 0
+            if check != int(vat[8]):
+                return False
+            return True
+        return False
+
+    def check_vat_el(self, vat):
+        return self.check_vat_gr(vat)
+
+    def check_vat_hu(self, vat):
+        '''
+        Check Hungary VAT number.
+        '''
+        if len(vat) != 8:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        if int(vat[0]) <= 0:
+            return False
+        sum = 9 * int(vat[0]) + 7 * int(vat[1]) + 3 * int(vat[2]) + \
+                1 * int(vat[3]) + 9 * int(vat[4]) + 7 * int(vat[5]) + \
+                3 * int(vat[6])
+        check = 10 - (sum % 10)
+        if check == 10:
+            check = 0
+        if check != int(vat[7]):
+            return False
+        return True
+
+    def check_vat_ie(self, vat):
+        '''
+        Check Ireland VAT number.
+        '''
+        if len(vat) != 8:
+            return False
+        if (ord(vat[1]) >= 65 and ord(vat[1]) <= 90) \
+                or vat[1] in ('+', '*'):
+            try:
+                int(vat[0])
+                int(vat[2:7])
+            except:
+                return False
+
+            if int(vat[0]) <= 6:
+                return False
+
+            sum = 7 * int(vat[2]) + 6 * int(vat[3]) + 5 * int(vat[4]) + \
+                    4 * int(vat[5]) + 3 * int(vat[6]) + 2 * int(vat[0])
+            check = sum % 23
+            if check == 0:
+                check = 'W'
+            else:
+                check = chr(check + 64)
+            if check != vat[7]:
+                return False
+            return True
+        else:
+            try:
+                int(vat[0:7])
+            except:
+                return False
+
+            sum = 8 * int(vat[0]) + 7 * int(vat[1]) + 6 * int(vat[2]) + \
+                    5 * int(vat[3]) + 4 * int(vat[4]) + 3 * int(vat[5]) + \
+                    2 * int(vat[6])
+            check = sum % 23
+            if check == 0:
+                check = 'W'
+            else:
+                check = chr(check + 64)
+            if check != vat[7]:
+                return False
+            return True
+
+    def check_vat_it(self, vat):
+        '''
+        Check Italy VAT number.
+        '''
+        if len(vat) != 11:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        if int(vat[0:7]) <= 0:
+            return False
+        if int(vat[7:10]) <= 0:
+            return False
+        if int(vat[7:10]) > 100 and int(vat[7:10]) < 120:
+            return False
+        if int(vat[7:10]) > 121:
+            return False
+
+        sum = int(vat[0]) + mult_add(2, int(vat[1])) + int(vat[2]) + \
+                mult_add(2, int(vat[3])) + int(vat[4]) + \
+                mult_add(2, int(vat[5])) + int(vat[6]) + \
+                mult_add(2, int(vat[7])) + int(vat[8]) + \
+                mult_add(2, int(vat[9]))
+        check = 10 - (sum % 10)
+        if check == 10:
+            check = 0
+        if check != int(vat[10]):
+            return False
+        return True
+
+    def check_vat_lt(self, vat):
+        '''
+        Check Lithuania VAT number.
+        '''
+        try:
+            int(vat)
+        except:
+            return False
+
+        if len(vat) == 9:
+            if int(vat[7]) != 1:
+                return False
+            sum = 1 * int(vat[0]) + 2 * int(vat[1]) + 3 * int(vat[2]) + \
+                    4 * int(vat[3]) + 5 * int(vat[4]) + 6 * int(vat[5]) + \
+                    7 * int(vat[6]) + 8 * int(vat[7])
+            if sum % 11 == 10:
+                sum = 3 * int(vat[0]) + 4 * int(vat[1]) + 5 * int(vat[2]) + \
+                        6 * int(vat[3]) + 7 * int(vat[4]) + 8 * int(vat[5]) + \
+                        9 * int(vat[6]) + 1 * int(vat[7])
+            check = sum % 11
+            if check == 10:
+                check = 0
+            if check != int(vat[8]):
+                return False
+            return True
+        elif len(vat) == 12:
+            if int(vat[10]) != 1:
+                return False
+            sum = 1 * int(vat[0]) + 2 * int(vat[1]) + 3 * int(vat[2]) + \
+                    4 * int(vat[3]) + 5 * int(vat[4]) + 6 * int(vat[5]) + \
+                    7 * int(vat[6]) + 8 * int(vat[7]) + 9 * int(vat[8]) + \
+                    1 * int(vat[9]) + 2 * int(vat[10])
+            if sum % 11 == 10:
+                sum = 3 * int(vat[0]) + 4 * int(vat[1]) + 5 * int(vat[2]) + \
+                        6 * int(vat[3]) + 7 * int(vat[4]) + 8 * int(vat[5]) + \
+                        9 * int(vat[6]) + 1 * int(vat[7]) + 2 * int(vat[8]) + \
+                        3 * int(vat[9]) + 4 * int(vat[10])
+            check = sum % 11
+            if check == 10:
+                check = 0
+            if check != int(vat[11]):
+                return False
+            return True
+        return False
+
+    def check_vat_lu(self, vat):
+        '''
+        Check Luxembourg VAT number.
+        '''
+        if len(vat) != 8:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        if int(vat[0:6]) <= 0:
+            return False
+        check = int(vat[0:6]) % 89
+        if check != int(vat[6:8]):
+            return False
+        return True
+
+    def check_vat_lv(self, vat):
+        '''
+        Check Latvia VAT number.
+        '''
+        if len(vat) != 11:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        if int(vat[0]) >= 4:
+            sum = 9 * int(vat[0]) + 1 * int(vat[1]) + 4 * int(vat[2]) + \
+                    8 * int(vat[3]) + 3 * int(vat[4]) + 10 * int(vat[5]) + \
+                    2 * int(vat[6]) + 5 * int(vat[7]) + 7 * int(vat[8]) + \
+                    6 * int(vat[9])
+            if sum % 11 == 4 and int(vat[0]) == 9:
+                sum = sum - 45
+            if sum % 11 == 4:
+                check = 4 - (sum % 11)
+            elif sum % 11 > 4:
+                check = 14 - (sum % 11)
+            elif sum % 11 < 4:
+                check = 3 - (sum % 11)
+            if check != int(vat[10]):
+                return False
+            return True
+        else:
+            if int(vat[2:4]) == 2 and int(vat[4:6]) % 4 > 0:
+                if int(vat[0:2]) < 1 or int(vat[0:2]) > 28:
+                    return False
+            if int(vat[2:4]) == 2 and int(vat[4:6]) % 4 == 0:
+                if int(vat[0:2]) < 1 or int(vat[0:2]) > 29:
+                    return False
+            if int(vat[2:4]) in (4, 6, 9, 11):
+                if int(vat[0:2]) < 1 or int(vat[0:2]) > 30:
+                    return False
+            if int(vat[2:4]) in (1, 3, 5, 7, 8, 10, 12):
+                if int(vat[0:2]) < 1 or int(vat[0:2]) > 31:
+                    return False
+            if int(vat[2:4]) < 1 or int(vat[2:4]) > 12:
+                return False
+            return True
+
+    def check_vat_mt(self, vat):
+        '''
+        Check Malta VAT number.
+        '''
+        if len(vat) != 8:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+
+        if int(vat[0:6]) < 100000:
+            return False
+
+        sum = 3 * int(vat[0]) + 4 * int(vat[1]) + 6 * int(vat[2]) + \
+                7 * int(vat[3]) + 8 * int(vat[4]) + 9 * int(vat[5])
+        check = 37 - (sum % 37)
+        if check != int(vat[6:8]):
+            return False
+        return True
+
+    def check_vat_nl(self, vat):
+        '''
+        Check Netherlands VAT number.
+        '''
+        if len(vat) != 12:
+            return False
+        try:
+            int(vat[0:9])
+            int(vat[10:12])
+        except:
+            return False
+        if int(vat[0:8]) <= 0:
+            return False
+        if vat[9] != 'B':
+            return False
+
+        sum = 9 * int(vat[0]) + 8 * int(vat[1]) + 7 * int(vat[2]) + \
+                6 * int(vat[3]) + 5 * int(vat[4]) + 4 * int(vat[5]) + \
+                3 * int(vat[6]) + 2 * int(vat[7])
+
+        check = sum % 11
+        if check == 10:
+            return False
+        if check != int(vat[8]):
+            return False
+        return True
+
+    def check_vat_pl(self, vat):
+        '''
+        Check Poland VAT number.
+        '''
+        if len(vat) != 10:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+
+        sum = 6 * int(vat[0]) + 5 * int(vat[1]) + 7 * int(vat[2]) + \
+                2 * int(vat[3]) + 3 * int(vat[4]) + 4 * int(vat[5]) + \
+                5 * int(vat[6]) + 6 * int(vat[7]) + 7 * int(vat[8])
+        check = sum % 11
+        if check == 10:
+            return False
+        if check != int(vat[9]):
+            return False
+        return True
+
+    def check_vat_pt(self, vat):
+        '''
+        Check Portugal VAT number.
+        '''
+        if len(vat) != 9:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+
+        if int(vat[0]) <= 0:
+            return False
+
+        sum = 9 * int(vat[0]) + 8 * int(vat[1]) + 7 * int(vat[2]) + \
+                6 * int(vat[3]) + 5 * int(vat[4]) + 4 * int(vat[5]) + \
+                3 * int(vat[6]) + 2 * int(vat[7])
+        check = 11 - (sum % 11)
+        if check == 10:
+            check = 0
+        if check != int(vat[8]):
+            return False
+        return True
+
+    def check_vat_ro(self, vat):
+        '''
+        Check Romania VAT number.
+        '''
+        try:
+            int(vat)
+        except:
+            return False
+
+        if len(vat) == 10:
+            sum = 7 * int(vat[0]) + 5 * int(vat[1]) + 3 * int(vat[2]) + \
+                    2 * int(vat[3]) + 1 * int(vat[4]) + 7 * int(vat[5]) + \
+                    5 * int(vat[6]) + 3 * int(vat[7]) + 2 * int(vat[8])
+            check = (sum * 10) % 11
+            if check == 10:
+                check = 0
+            if check != int(vat[9]):
+                return False
+            return True
+        elif len(vat) == 13:
+            if int(vat[0]) not in (1, 2, 3, 4, 6):
+                return False
+            if int(vat[3:5]) < 1 or int(vat[3:5]) > 12:
+                return False
+            if int(vat[3:5]) == 2 and int(vat[1:3]) % 4 > 0:
+                if int(vat[5:7]) < 1 or int(vat[5:7]) > 28:
+                    return False
+            if int(vat[3:5]) == 2 and int(vat[1:3]) % 4 == 0:
+                if int(vat[5:7]) < 1 or int(vat[5:7]) > 29:
+                    return False
+            if int(vat[3:5]) in (4, 6, 9, 11):
+                if int(vat[5:7]) < 1 or int(vat[5:7]) > 30:
+                    return False
+            if int(vat[3:5]) in (1, 3, 5, 7, 8, 10, 12):
+                if int(vat[5:7]) < 1 or int(vat[5:7]) > 31:
+                    return False
+
+            sum = 2 * int(vat[0]) + 7 * int(vat[1]) + 9 * int(vat[2]) + \
+                    1 * int(vat[3]) + 4 * int(vat[4]) + 6 * int(vat[5]) + \
+                    3 * int(vat[6]) + 5 * int(vat[7]) + 8 * int(vat[8]) + \
+                    2 * int(vat[9]) + 7 * int(vat[10]) + 9 * int(vat[11])
+            check = sum % 11
+            if check == 10:
+                check = 1
+            if check != int(vat[12]):
+                return False
+            return True
+        return False
+
+    def check_vat_se(self, vat):
+        '''
+        Check Sweden VAT number.
+        '''
+        if len(vat) != 12:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        if int(vat[9:11]) <= 0:
+            return False
+
+        sum = mult_add(2, int(vat[0])) + int(vat[1]) + \
+                mult_add(2, int(vat[2])) + int(vat[3]) + \
+                mult_add(2, int(vat[4])) + int(vat[5]) + \
+                mult_add(2, int(vat[6])) + int(vat[7]) + \
+                mult_add(2, int(vat[8]))
+        check = 10 - (sum % 10)
+        if check == 10:
+            check = 0
+        if check != int(vat[9]):
+            return False
+        return True
+
+    def check_vat_si(self, vat):
+        '''
+        Check Slovenia VAT number.
+        '''
+        if len(vat) != 8:
+            return False
+        try:
+            int(vat)
+        except:
+            return False
+        if int(vat[0:7]) <= 999999:
+            return False
+
+        sum = 8 * int(vat[0]) + 7 * int(vat[1]) + 6 * int(vat[2]) + \
+                5 * int(vat[3]) + 4 * int(vat[4]) + 3 * int(vat[5]) + \
+                2 * int(vat[6])
+        check = 11 - (sum % 11)
+        if check == 10:
+            check = 0
+        if check == 11:
+            check = 1
+        if check != int(vat[7]):
+            return False
+        return True
+
+    def check_vat_sk(self, vat):
+        '''
+        Check Slovakia VAT number.
+        '''
+        try:
+            int(vat)
+        except:
+            return False
+        if len(vat) not in(9, 10):
+            return False
+
+        if int(vat[0:2]) == 0 and len(vat) == 10:
+            return True
+
+        if len(vat) == 10:
+            if int(vat[0:2]) < 54 or int(vat[0:2]) > 99:
+                return False
+
+        if len(vat) == 9:
+            if int(vat[0:2]) > 53 :
+                return False
+
+        if int(vat[2:4]) < 1:
+            return False
+        if int(vat[2:4]) > 12 and int(vat[2:4]) < 51:
+            return False
+        if int(vat[2:4]) > 62:
+            return False
+        if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 > 0:
+            if int(vat[4:6]) < 1 or int(vat[4:6]) > 28:
+                return False
+        if int(vat[2:4]) in (2, 52) and int(vat[0:2]) % 4 == 0:
+            if int(vat[4:6]) < 1 or int(vat[4:6]) > 29:
+                return False
+        if int(vat[2:4]) in (4, 6, 9, 11, 54, 56, 59, 61):
+            if int(vat[4:6]) < 1 or int(vat[4:6]) > 30:
+                return False
+        if int(vat[2:4]) in (1, 3, 5, 7, 8, 10, 12,
+                51, 53, 55, 57, 58, 60, 62):
+            if int(vat[4:6]) < 1 or int(vat[4:6]) > 31:
+                return False
+        return True
+
+res_partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/multi_company_account/__init__.py b/addons/board_association/__init__.py
similarity index 90%
rename from addons/multi_company_account/__init__.py
rename to addons/board_association/__init__.py
index 3cb4097616b..f3762e3825f 100644
--- a/addons/multi_company_account/__init__.py
+++ b/addons/board_association/__init__.py
@@ -1,9 +1,8 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
-#
-# $Id$
+# Copyright (c) 2006 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
@@ -25,8 +24,8 @@
 # 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 multi_company_account
+#
+##############################################################################
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/board_association/__terp__.py b/addons/board_association/__terp__.py
new file mode 100644
index 00000000000..a85834fffeb
--- /dev/null
+++ b/addons/board_association/__terp__.py
@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+{
+    "name":"Dashboard for Associations",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Board/Associations",
+    "depends":["event","membership","board"],
+    "demo_xml":["board_association_demo.xml"],
+    "update_xml":["board_association_view.xml"],
+    "description": """
+This module implements a dashboard for associations.
+    """,
+    "active":False,
+    "installable":True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/board_association/board_association_demo.xml b/addons/board_association/board_association_demo.xml
new file mode 100644
index 00000000000..76d9e89ddeb
--- /dev/null
+++ b/addons/board_association/board_association_demo.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<terp>
+	<data noupdate="1">
+
+		<!--
+			Administrator shortcut
+			Demo user startup menu
+		-->
+		<record model="ir.ui.view_sc" id="sc_association_dash">
+			<field name="name">Dashboard</field>
+			<field name="user_id" ref="base.user_admin"/>
+			<field name="resource">ir.ui.menu</field>
+			<field name="sequence">1</field>
+			<field name="res_id" ref="menu_board_associations_manager"/>
+		</record>
+		<record model="res.users" id="base.user_admin">
+			<field name="action_id" ref="open_board_associations_manager"/>
+		</record>
+	</data>
+</terp>
+
diff --git a/addons/board_association/board_association_view.xml b/addons/board_association/board_association_view.xml
new file mode 100644
index 00000000000..1d91a72f6f6
--- /dev/null
+++ b/addons/board_association/board_association_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+		<record model="board.note.type" id="note_association_type">
+			<field name="name">associations</field>
+		</record>
+
+		<record model="ir.ui.view" id="board_associations_manager_form">
+			<field name="name">board.associations.manager.form</field>
+			<field name="model">board.board</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Association Dashboard">
+					<hpaned position="100">
+						<child1>
+							<action string="Next Events"
+								name="%(event.action_event_registration)d"
+								colspan="4"/>
+							<action
+								string="My tasks"
+								name="%(project.action_view_task5)d"
+								colspan="4"
+								height="200"
+								width="510"/>
+							<action
+								string="Unpaid Invoices"
+								name="%(account.action_invoice_tree7)d"
+								colspan="4"/>
+						</child1>
+
+						<child2>
+							<action
+								string="New members"
+								name="%(membership.action_report_partner_member_year_tree)d"
+								view_mode="graph,tree" colspan="4"/>
+							<action 
+								string="Registrations by Events"
+								name="%(event.action_event_type_registration)d"
+								view_mode="graph,tree"
+								colspan="4"/>
+						</child2>
+					</hpaned>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="open_board_associations_manager">
+			<field name="name">Association Dashboard</field>
+			<field name="res_model">board.board</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="view_id" ref="board_associations_manager_form"/>
+		</record>
+
+		<menuitem
+			name="Associations" parent="board.dashboard_menu"
+			action="open_board_associations_manager"
+			sequence="1"
+			id="menu_board_associations_manager"
+			icon="terp-graph"/>
+
+	</data>
+</terp>
diff --git a/addons/board_auction/__init__.py b/addons/board_auction/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/board_auction/__terp__.py b/addons/board_auction/__terp__.py
new file mode 100644
index 00000000000..d779cc18f7f
--- /dev/null
+++ b/addons/board_auction/__terp__.py
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+{
+    "name":"Board for Auction",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Board",
+    "depends":[
+        "board",
+        "auction",
+#       "report_auction",
+    ],
+    "demo_xml":["board_auction_demo.xml"],
+    "update_xml":["board_auction_view.xml","board_auction_manager_view.xml"],
+    "description": """
+    This module creates a dashboards for auction that includes:
+
+    """,
+    "active":False,
+    "installable":True,
+}
+
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/board_auction/board_auction_demo.xml b/addons/board_auction/board_auction_demo.xml
new file mode 100644
index 00000000000..b63cb1d2d7b
--- /dev/null
+++ b/addons/board_auction/board_auction_demo.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<terp>
+	<data noupdate="1">
+	<record model="ir.ui.view_sc" id="sc_auction_dash">
+			<field name="name">Auction dashboard</field>
+			<field name="user_id" ref="base.user_admin"/>
+			<field name="resource">ir.ui.menu</field>
+			<field name="sequence">4</field>
+			<field name="res_id" ref="menu_board_auction"/>
+		</record>
+		<record model="res.users" id="base.user_demo">
+			<field name="action_id" ref="open_board_auction"/>
+		</record>
+
+	</data>
+</terp>
\ No newline at end of file
diff --git a/addons/board_auction/board_auction_manager_view.xml b/addons/board_auction/board_auction_manager_view.xml
new file mode 100644
index 00000000000..21d3e39e755
--- /dev/null
+++ b/addons/board_auction/board_auction_manager_view.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+		<record model="board.note.type" id="note_auction_type1">
+			<field name="name">Auction manager</field>
+		</record>
+
+		<record model="ir.ui.view" id="board_auction_manager_form1">
+			<field name="name">board.auction.manager.form</field>
+			<field name="model">board.board</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Auction manager ">
+					<hpaned position="100">
+						<child1>
+
+						
+							<action
+								string="Latest objects"
+								name="%(auction.action_report_latest_objects_manager_tree)d"
+								height="200"
+								width="510"	/>
+							<action string="Latest deposits"
+								name="%(auction.action_report_latest_doposit_manager_tree)d"/>
+							<action
+								string="Summary pointing by user"
+								name="%(auction.action_report_auction_sign_in_out_manager_tree1)d"
+								view_mode="tree,graph"
+							/>
+							<action string="Objects statistics"
+								name="%(auction.action_report_object_encoded_manager_tree)d"
+								/>
+</child1>
+
+						<child2>
+							<button
+								string="My board"
+								name="%(open_board_auction)d"
+								icon="gtk-ok"
+								type="action"
+								colspan="4"
+								/>
+							<action
+								string="Total Adjudications"
+								name="%(auction.action_report_auction_adjudication_tree)d"
+								view_mode="graph,tree"
+								colspan="4"/>
+							<action
+								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>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="open_board_auction_manager">
+			<field name="name">Auction manager board</field>
+			<field name="res_model">board.board</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="usage">menu</field>
+			<field name="view_id" ref="board_auction_manager_form1"/>
+		</record>
+
+		<menuitem
+			name="Dashboards/Auction/Auction Manager"
+			action="open_board_auction_manager"
+			sequence="1"
+			id="menu_board_auction_manager"/>
+
+	</data>
+</terp>
diff --git a/addons/board_auction/board_auction_view.xml b/addons/board_auction/board_auction_view.xml
new file mode 100644
index 00000000000..afb1b3826a1
--- /dev/null
+++ b/addons/board_auction/board_auction_view.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+		<record model="board.note.type" id="note_auction_type">
+			<field name="name">Auction</field>
+		</record>
+
+		<record model="ir.ui.view" id="board_auction_manager_form">
+			<field name="name">board.auction.manager.form</field>
+			<field name="model">board.board</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Auction manager ">
+					<hpaned position="100">
+						<child1>
+							<action
+								string="My Latest Objects"
+								name="%(auction.action_report_latest_objects_tree)d"
+								height="200"
+								width="510"/>
+							<action string="My Latest Deposits"
+								name="%(auction.action_report_latest_doposit_tree)d"
+								/>
+							<action string="Objects statistics"
+								name="%(auction.action_report_object_encoded_member_tree)d"
+								/>
+							</child1>
+
+						<child2>
+							<button
+								string="Menu"
+								name="%(base.action_menu_admin)d"
+								icon="gtk-ok"
+								type="action"
+								colspan="4"/>
+
+							<action
+								string="My objects By Day"
+								name="%(auction.action_report_auction_object_date_tree_my)d"
+								view_mode="graph,tree" colspan="4"/>
+						<action
+								string="Estimations/Adjudication"
+								name="%(auction.action_report_auction_estimation_adj_category_member_tree)d"
+								view_mode="graph,tree" colspan="4"/>
+						</child2>
+					</hpaned>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="open_board_auction">
+			<field name="name">Auction member board</field>
+			<field name="res_model">board.board</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="usage">menu</field>
+			<field name="view_id" ref="board_auction_manager_form"/>
+		</record>
+
+		<menuitem
+			name="Dashboards/Auction/Auction Member"
+			action="open_board_auction"
+			sequence="1"
+			id="menu_board_auction"/>
+
+</data>
+</terp>
+
diff --git a/addons/board_crm_configuration/__init__.py b/addons/board_crm_configuration/__init__.py
new file mode 100644
index 00000000000..02387509d23
--- /dev/null
+++ b/addons/board_crm_configuration/__init__.py
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 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.
+#
+##############################################################################
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm_configuration/__terp__.py
new file mode 100644
index 00000000000..981be53f534
--- /dev/null
+++ b/addons/board_crm_configuration/__terp__.py
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+{
+    "name":"Dashboard for CRM Configuration",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Board",
+    "depends":["board","crm_configuration"],
+    "demo_xml":["board_crm_demo.xml"],
+    "update_xml":["board_crm_statistical_view.xml",
+                  "board_crm_view.xml"
+                  ],
+    "description": """
+This module implements a dashboard for CRM that includes:
+    * My Leads (list)
+    * Leads by Stage (graph)
+    * My Meetings (list)
+    * Sales Pipeline by Stage (graph)
+    * My Cases (list)
+    * Jobs Tracking (graph)
+    """,
+    "active":False,
+    "installable":True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/board_crm_configuration/board_crm_demo.xml b/addons/board_crm_configuration/board_crm_demo.xml
new file mode 100644
index 00000000000..f6c4a233cd0
--- /dev/null
+++ b/addons/board_crm_configuration/board_crm_demo.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<terp>
+	<data noupdate="1">
+
+		<!--
+		 Administrator shortcut
+		 Demo user startup menu
+		 -->
+		<record model="ir.ui.view_sc" id="sc_crm_dash">
+			<field name="name">CRM Dashboard</field>
+			<field name="user_id" ref="base.user_demo"/>
+			<field name="resource">ir.ui.menu</field>
+			<field name="sequence">3</field>
+			<field name="res_id" ref="menu_board_crm"/>
+		</record>
+		<record model="res.users" id="base.user_admin">
+			<field name="action_id" ref="open_board_crm"/>
+		</record>
+
+	</data>
+</terp>
\ No newline at end of file
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm_configuration/board_crm_statistical_view.xml
new file mode 100644
index 00000000000..7bcb440cb98
--- /dev/null
+++ b/addons/board_crm_configuration/board_crm_statistical_view.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+		<!--
+		 Board for statistical view of the sections
+		 -->
+		<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="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="Leads By Stage" type="pie">
+					<field name="stage_id"/>
+					<field name="nbr" operator="+"/>
+					<field name="state" group="True"/>
+				</graph>
+			</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>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="Cases 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="Opportunities By Categories"
+			domain="[('section_id', '=', 'Opportunities'),('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_oppor_categ"/>		 
+			
+		<record model="ir.actions.act_window" id="act_leads_state">
+			<field name="res_model">report.crm.case.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>
+		</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"
+			view_type="form"
+			view_mode="graph,tree,form"
+			id="act_leads_month_user"/>
+			
+		<record model="ir.ui.view" id="board_crm_statistical_form">
+			<field name="name">CRM - Statistical Dashboard Form</field>
+			<field name="model">board.board</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Statistics Dashboard">
+					<hpaned>
+						<child1>
+							<action
+								string="Opportunities By Categories"
+								name="%(act_oppor_categ)d"
+								colspan="4"
+								height="200"
+								width="250"/>
+
+							<action
+								string="Leads By Stage"
+								name="%(act_leads_state)d"
+								height="200"
+								colspan="4"/>
+							
+						</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"
+								name="%(act_leads_month_user)d"
+								colspan="4"/>
+
+						</child2>
+					</hpaned>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="open_board_statistical_dash">
+			<field name="name">CRM - Statistics Dashboard</field>
+			<field name="res_model">board.board</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="usage">menu</field>
+			<field name="view_id" ref="board_crm_statistical_form"/>
+		</record>
+
+		<menuitem 
+			name="CRM Configuration" parent="board.dashboard_menu"
+			id="menu_board_crm_config" />
+		<menuitem
+			name="Statistics Dashboard" parent="menu_board_crm_config"
+			action="open_board_statistical_dash"
+			sequence="2"
+			id="menu_board_statistics_dash"
+			icon="terp-graph"/>
+
+	</data>
+</terp>
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml
new file mode 100644
index 00000000000..86e10c17274
--- /dev/null
+++ b/addons/board_crm_configuration/board_crm_view.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+		<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>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="Cases by User and Section" type="pie">
+					<field name="state"/>
+					<field name="nbr" operator="+"/>
+				</graph>
+			</field>
+		</record>	
+
+		<record model="ir.actions.act_window" id="act_my_leads">
+			<field name="res_model">crm.case</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="view_id" ref="crm_configuration.crm_case_tree_view_leads"/>
+			<field name="domain">[('section_id', '=', 'Leads'),('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="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="view_id" ref="crm_configuration.crm_case_tree_view_meet"/>
+			<field name="domain">[('section_id', '=', 'Meetings'),('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"
+				view_type="form"
+				view_mode="tree,form"
+				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="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'),('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="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', '=', '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','=','Jobs'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+		</record>
+					
+		<record model="ir.ui.view" id="board_crm_form">
+			<field name="name">CRM - Dashboard Form</field>
+			<field name="model">board.board</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Connecting Dashboard">
+					<hpaned>
+
+						<child1>
+
+							<action
+								string="My Leads"
+								name="%(act_my_leads)d"
+								colspan="4"
+								height="150"
+								width="510"/>
+
+							<action
+								string="My Meetings"
+								name="%(act_my_meetings)d"
+								height="150"
+								colspan="4"/>
+
+							<action
+								string="My Cases"
+								name="%(act_my_cases)d"
+								colspan="4"
+								height="200"/>
+
+						</child1>
+
+						<child2>
+							<action
+								string="My Leads By Stage"
+								name="%(act_my_leads_stage)d"
+								colspan="4"/>
+
+							<action
+								string="My Sales Pipeline"
+								name="%(act_sales_pipeline)d"
+								colspan="4"/>
+
+							<action
+								string="My Jobs Requests"
+								name="%(act_jobs_requests)d"
+								colspan="4"/>
+
+						</child2>
+					</hpaned>
+				</form>
+			</field>
+		</record>
+		<record model="ir.actions.act_window" id="open_board_crm">
+			<field name="name">CRM Dashboard</field>
+			<field name="res_model">board.board</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="usage">menu</field>
+			<field name="view_id" ref="board_crm_form"/>
+		</record>
+
+		<menuitem 
+			name="Connecting Dashboard" parent="menu_board_crm_config"
+			action="open_board_crm"
+			sequence="1"
+			id="menu_board_crm" icon="terp-graph"/>
+
+
+	</data>
+</terp>
diff --git a/addons/board_document/__init__.py b/addons/board_document/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/board_document/__terp__.py b/addons/board_document/__terp__.py
new file mode 100644
index 00000000000..d378effd90d
--- /dev/null
+++ b/addons/board_document/__terp__.py
@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+{
+    "name":"Dashboard for Document Management",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Board/Document",
+    "depends":["board","document", "report_document"],
+    "demo_xml":["board_document_demo.xml"],
+    "update_xml":["board_document_view.xml"],
+    "description": """
+This module implements a dashboard for Document
+    """,
+    "active":False,
+    "installable":True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/board_document/board_document_demo.xml b/addons/board_document/board_document_demo.xml
new file mode 100644
index 00000000000..5e8050acf19
--- /dev/null
+++ b/addons/board_document/board_document_demo.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<terp>
+	<data noupdate="1">
+
+		<!--
+			Administrator shortcut
+			Demo user startup menu
+		-->
+ 		<record model="ir.ui.view_sc" id="sc_document_dash">
+			<field name="name">Documents dashboard</field>
+ 			<field name="user_id" ref="base.user_admin"/>
+ 			<field name="resource">ir.ui.menu</field>
+ 			<field name="sequence">1</field>
+			<field name="res_id" ref="menu_board_document_manager"/>
+ 		</record>
+ 		<record model="res.users" id="base.user_demo">
+			<field name="action_id" ref="open_board_document_manager"/>
+ 		</record>
+ 	</data>
+ </terp>
\ No newline at end of file
diff --git a/addons/board_document/board_document_view.xml b/addons/board_document/board_document_view.xml
new file mode 100644
index 00000000000..6d0cbfc645b
--- /dev/null
+++ b/addons/board_document/board_document_view.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+ <terp>
+ 	<data>
+		<record model="board.note.type" id="note_document_type">
+			<field name="name">Document</field>
+ 		</record>
+
+		<record model="ir.ui.view" id="board_document_manager_form">
+			<field name="name">board.document.manager.form</field>
+ 			<field name="model">board.board</field>
+ 			<field name="type">form</field>
+ 			<field name="arch" type="xml">
+				<form string="Document board">
+ 					<hpaned position="100">
+						<child1>
+							<action
+								string="New Files"
+								name="%(report_document.action_view_all_document_tree)d"
+								view_mode="tree"/>
+	 							
+							<action
+								string="File Size by Month"
+								name="%(report_document.action_view_size_month)d"
+								view_mode="graph,tree"/>
+						</child1>
+						<child2>
+							<action
+								string="Files by Resource Type"
+								name="%(report_document.action_view_document_by_resourcetype_graph)d"
+								view_mode="graph,tree"/>			
+								
+							<action
+								string="Files by Partner"
+								name="%(report_document.action_view_files_by_partner)d"
+								view_mode="graph,tree"/>
+						</child2>
+ 					</hpaned>
+ 				</form>
+ 			</field>
+ 		</record>
+
+
+		<record model="ir.actions.act_window" id="open_board_document_manager">
+			<field name="name">Document Dashboard</field>
+ 			<field name="res_model">board.board</field>
+ 			<field name="view_type">form</field>
+ 			<field name="view_mode">form</field>
+
+			<field name="view_id" ref="board_document_manager_form"/>
+ 		</record>
+
+ 		<menuitem
+			name="Dashboards/Document/Document Manager"
+			action="open_board_document_manager"
+ 			sequence="1"
+			id="menu_board_document_manager"
+ 			icon="terp-graph"/>
+
+	<record model="ir.ui.view" id="board_document_manager_form1">
+			<field name="name">board.document.manager.form1</field>
+ 			<field name="model">board.board</field>
+ 			<field name="type">form</field>
+ 			<field name="arch" type="xml">
+				<form string="Document board">
+ 					<hpaned position="100">
+						<child1>
+							<action
+								string="Wall of Shame"
+								name="%(report_document.action_view_wall)d"
+								view_mode="tree"/>
+								
+						</child1>
+						<child2>
+							<action
+								string="Files by Users"
+								name="%(report_document.action_view_user_graph)d"
+								view_mode="graph,tree"/>
+
+							<action
+								string="Files by Month"
+								name="%(report_document.action_view_files_by_month_graph)d"
+								view_mode="graph,tree"/>
+								
+						</child2>
+ 					</hpaned>
+ 				</form>
+ 			</field>
+ 		</record>
+
+
+		<record model="ir.actions.act_window" id="open_board_document_manager1">
+			<field name="name">Document Dashboard</field>
+ 			<field name="res_model">board.board</field>
+ 			<field name="view_type">form</field>
+ 			<field name="view_mode">form</field>
+			<field name="view_id" ref="board_document_manager_form1"/>
+ 		</record>
+
+ 		<menuitem
+			name="Dashboards/Document/Wall of Shame"
+			action="open_board_document_manager1"
+ 			sequence="1"
+			id="menu_board_document_manager1"
+ 			icon="terp-graph"/>
+ 	</data>
+ </terp>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 6513ca19a32..ce79cd20ebd 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -340,7 +340,7 @@ class crm_case(osv.osv):
         'user_id': fields.many2one('res.users', 'User Responsible'),
         'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication'),
         'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History'),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'ref' : fields.reference('Reference', selection=_links_get, size=128),
         'ref2' : fields.reference('Reference 2', selection=_links_get, size=128),
 
@@ -379,7 +379,7 @@ class crm_case(osv.osv):
         'priority': lambda *a: AVAILABLE_PRIORITIES[2][0],
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
-    _order = 'priority, date_deadline desc, id desc'
+    _order = 'priority, date_deadline desc, date desc,id desc'
 
     def _action(self, cr, uid, cases, state_to, scrit=None, context={}):
         if not scrit:
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 2fbaf4f0317..931ac8fceed 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        
+
         <!--
 	Case Sections
 	-->
-        
+
         <record id="section_support" model="crm.case.section">
             <field name="name">Helpdesk and Support</field>
             <field name="code">support</field>
@@ -18,11 +18,11 @@
             <field name="name">Supplier complaints</field>
             <field name="code">purchase</field>
         </record>
-        
+
         <!--
 	Case Categories
 	-->
-        
+
         <record id="categ1" model="crm.case.categ">
             <field name="name">Computer Crashed</field>
             <field name="section_id" ref="section_support"/>
@@ -47,9 +47,9 @@
             <field name="name">Furnitures</field>
             <field name="section_id" ref="section_purchase"/>
         </record>
-        
+
         <!-- Specific menus -->
-        
+
         <!--
 	<record model="ir.actions.act_window" id="crm_case_categ2-act">
 		<field name="name">crm.case.form</field>
@@ -60,11 +60,9 @@
 	</record>
 	<menuitem name="CRM &amp; SRM/Helpdesk/Helpdesk Cases" id="menu_crm_case_categ2-act" action="crm_case_categ2-act"/>
 	-->
-        
-        <function eval="([section_support], 'Helpdesk', ref('menu_crm'))" model="crm.case.section" name="menu_create"/>
-        
+
         <!-- Demo Cases -->
-        
+
         <record model="crm.case">
             <field name="name">Think about Tiny ERP</field>
             <field name="priority">3</field>
@@ -81,7 +79,7 @@
             <field eval="time.strftime('%Y-%m-24')" name="date_deadline"/>
             <field model="res.partner.canal" name="canal_id" search="[]"/>
         </record>
-        
+
         <record id="case1" model="crm.case">
             <field name="name">Need a new eCommerce Website</field>
             <field name="priority">4</field>
@@ -105,7 +103,7 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case1')]" model="crm.case"/>
         </function>
-        
+
         <record id="case2" model="crm.case">
             <field name="name">Hdd Crashed unexpectedly</field>
             <field name="priority">3</field>
@@ -121,7 +119,7 @@
             <field eval="time.strftime('%Y-%m-10')" name="date_deadline"/>
             <field model="res.partner.canal" name="canal_id" search="[]"/>
         </record>
-        
+
         <record id="case3" model="crm.case">
             <field name="name">Need a new eCommerce Website</field>
             <field name="priority">3</field>
@@ -145,7 +143,7 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case3')]" model="crm.case"/>
         </function>
-        
+
         <record id="case4" model="crm.case">
             <field name="name">Need a new eCommerce Website</field>
             <field name="priority">3</field>
@@ -169,7 +167,7 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case4')]" model="crm.case"/>
         </function>
-        
+
         <record id="case5" model="crm.case">
             <field name="name">Bug in program</field>
             <field name="priority">3</field>
@@ -188,7 +186,7 @@
         <function model="crm.case" name="case_open">
             <value eval="[ref('case5')]" model="crm.case"/>
         </function>
-        
+
         <record id="case6" model="crm.case">
             <field name="name">Server is down</field>
             <field name="priority">3</field>
@@ -216,7 +214,7 @@
         <function model="crm.case" name="case_pending">
             <value eval="[ref('case6')]" model="crm.case"/>
         </function>
-        
+
         <record id="case7" model="crm.case">
             <field name="name">Disk failure</field>
             <field name="priority">2</field>
@@ -238,7 +236,7 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case7')]" model="crm.case"/>
         </function>
-        
+
         <record id="case8" model="crm.case">
             <field name="name">Missing hardware</field>
             <field name="priority">3</field>
@@ -260,7 +258,7 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case8')]" model="crm.case"/>
         </function>
-        
+
         <record id="case9" model="crm.case">
             <field name="name">Need a new eCommerce Website</field>
             <field name="priority">4</field>
@@ -284,7 +282,7 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case9')]" model="crm.case"/>
         </function>
-        
+
         <record id="case10" model="crm.case">
             <field name="name">Need a new module</field>
             <field name="priority">3</field>
@@ -313,7 +311,7 @@
         <function model="crm.case" name="case_close">
             <value eval="[ref('case10')]" model="crm.case"/>
         </function>
-        
+
         <record id="case11" model="crm.case">
             <field name="name">Need support on module</field>
             <field name="priority">1</field>
@@ -335,7 +333,7 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case11')]" model="crm.case"/>
         </function>
-        
+
         <record id="case12" model="crm.case">
             <field name="name">Bad packing</field>
             <field name="priority">2</field>
@@ -356,7 +354,7 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case12')]" model="crm.case"/>
         </function>
-        
+
         <record id="case13" model="crm.case">
             <field name="name">Need quotation</field>
             <field name="priority">3</field>
@@ -383,7 +381,7 @@
         <function model="crm.case" name="case_close">
             <value eval="[ref('case13')]" model="crm.case"/>
         </function>
-        
+
         <record id="case14" model="crm.case">
             <field name="name">New server</field>
             <field name="priority">1</field>
@@ -404,7 +402,7 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case14')]" model="crm.case"/>
         </function>
-        
+
         <record id="case15" model="crm.case">
             <field name="name">Formation</field>
             <field name="priority">4</field>
@@ -431,7 +429,7 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case15')]" model="crm.case"/>
         </function>
-        
+
         <record id="case16" model="crm.case">
             <field name="name">Need new specific reports</field>
             <field name="priority">3</field>
@@ -453,15 +451,15 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case16')]" model="crm.case"/>
         </function>
-        
+
         <record id="case17" model="crm.case">
             <field name="name">Server down</field>
             <field name="priority">3</field>
             <field name="description">Server is down, doesn't answser to pingz
                 Should check if still running, and if network still up (need to be in front of the server)
-                
+
                 Very very very high priority, as I cannot svn up/ci/st without the server
-                
+
                 (btw : this is only demo data. no stress dear sysadmin :))
             </field>
             <field name="section_id" ref="section_support"/>
@@ -481,6 +479,6 @@
         <function model="crm.case" name="case_log">
             <value eval="[ref('case17')]" model="crm.case"/>
         </function>
-        
+
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index 1399a02acb0..dd6fd77f18a 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -45,7 +45,7 @@ class crm_segmentation(osv.osv):
         'description': fields.text('Description'),
         'categ_id': fields.many2one('res.partner.category', 'Partner Category', required=True, help='The partner category that will be added to partners that match the segmentation criterions after computation.'),
         'exclusif': fields.boolean('Exclusive', help='Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn\'t match segmentation criterions'),
-        'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution State', readonly=True),
+        'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution Status', readonly=True),
         'partner_id': fields.integer('Max Partner ID processed'),
         '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 functionnality for recurring businesses."),
diff --git a/addons/crm_configuration/__init__.py b/addons/crm_configuration/__init__.py
new file mode 100644
index 00000000000..e5fff24af67
--- /dev/null
+++ b/addons/crm_configuration/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+import crm_config
+import report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
new file mode 100644
index 00000000000..84395d3c033
--- /dev/null
+++ b/addons/crm_configuration/__terp__.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Customer Relationship Management",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com/module_crm.html",
+    "category" : "Generic Modules/CRM & SRM",
+    "description": """ The Tiny ERP case and request tracker enables a group of
+                   people to intelligently and efficiently manage tasks, issues,
+                   and requests. It manages key tasks such as communication, 
+                   identification, prioritization, assignment, resolution and notification.""",
+    "depends" : ["crm","report_crm"],
+    "init_xml" : [
+                    "crm_bugs_view.xml",
+                    "crm_jobs_view.xml",
+                    "crm_lead_view.xml",
+                    "crm_meeting_view.xml",
+                    "crm_opportunity_view.xml",
+                    "crm_fund_view.xml"
+                 ],
+    "demo_xml" : [
+                    "crm_bugs_data.xml",
+                    "crm_jobs_data.xml",
+                    "crm_meeting_data.xml",
+                    "crm_lead_data.xml",
+                    "crm_opportunity_data.xml"
+                  ],
+    "update_xml" : [
+                    "crm_bugs_demo.xml",
+                    "crm_jobs_demo.xml",
+                    "crm_lead_demo.xml",
+                    "crm_meeting_demo.xml",
+                    "crm_opportunity_demo.xml",
+                    "crm_report_view.xml"
+                    ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_configuration/crm_bugs_data.xml b/addons/crm_configuration/crm_bugs_data.xml
new file mode 100644
index 00000000000..24aa183d6ce
--- /dev/null
+++ b/addons/crm_configuration/crm_bugs_data.xml
@@ -0,0 +1,276 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+	<!-- 
+		((((((((((( Demo Cases ))))))))))) 
+	-->
+<!--For Bug Tracking-->
+	<record id="crm_case_buginaccountsmodule0" model="crm.case">
+		<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="crm_configuration.category1"/>
+		<field eval="&quot;5&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_agrolait"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage1"/>
+		<field eval="15.0" name="duration"/>
+		<field eval="&quot;Bug in Accounts module&quot;" name="name"/>
+		<field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
+	</record>
+	<record id="crm_case_log_takecorrectiveactions0" model="crm.case.log">
+		<field eval="time.strftime('%Y-%m-08')" name="date"/>
+		<field name="case_id" ref="crm_case_buginaccountsmodule0"/>
+		<field name="som" ref="base.som_normal"/>
+		<field eval="&quot;Take corrective actions&quot;" name="name"/>
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','website')]"/>
+	</record>
+
+	<record id="crm_case_programnotgivingproperoutput0" model="crm.case">
+		<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="crm_configuration.category2"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_asus"/>
+		<field eval="&quot;done&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="3.5" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage2"/>
+		<field eval="&quot;Program not giving proper output&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_outputincorrect0" model="crm.case">
+		<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="crm_configuration.category1"/>
+		<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="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="2.3" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage3"/>
+		<field eval="&quot;Output incorrect&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_problemloadingpage0" model="crm.case">
+		<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="crm_configuration.category1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_14"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="4.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage4"/>
+		<field eval="&quot;Problem loading page&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_pagenotfound0" model="crm.case">
+		<field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+		<field eval="&quot;draft&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="1.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Page not Found&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_programmingerror0" model="crm.case">
+		<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="crm_configuration.category2"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_5"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="4.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage6"/>
+		<field eval="&quot;Programming Error&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_logicalerrorinprogram0" model="crm.case">
+		<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="crm_configuration.category1"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="2.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage7"/>
+		<field eval="&quot;Logical Error in Program&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_constrainterror0" model="crm.case">
+		<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="crm_configuration.category1"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="7.3" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Constraint Error&quot;" name="name"/>
+	</record>
+	
+	<record id="crm_case_errorinprogram0" model="crm.case">
+		<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="crm_configuration.category2"/>
+		<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="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="1.3" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ2"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Error in Program&quot;" name="name"/>
+	</record>
+	
+	<record id="crm_case_patcheserrorinprogram0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_9"/>
+		<field eval="time.strftime('%Y-%m-30  16:30:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category2"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_2"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="13.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ2"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Patches Error in Program&quot;" name="name"/>
+	</record>
+	
+	<record id="crm_case_newfeaturestobeadded0" model="crm.case">
+		<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="crm_configuration.category1"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_maxtor"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="3.2" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage1"/>
+		<field eval="&quot;New Features To Be Added&quot;" name="name"/>
+	</record>
+	
+	<record id="crm_case_addmenustothemodule0" model="crm.case">
+		<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="crm_configuration.category2"/>
+		<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="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="3.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage2"/>
+		<field eval="&quot;Add menus to the module&quot;" name="name"/>
+		<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+	</record>
+	
+	<record id="crm_case_includeattendancesheetinproject0" model="crm.case">
+		<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="crm_configuration.category1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_10"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="2.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage3"/>
+		<field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
+		<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+	</record>
+	
+	<record id="crm_case_createnewobject0" model="crm.case">
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
+		<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="crm_configuration.category1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field eval="&quot;draft&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="2.45" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Create new object&quot;" name="name"/>
+	</record>
+	
+	<record id="crm_case_improvereportsinhrms0" model="crm.case">
+		<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="crm_configuration.category1"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="partner_id" ref="base.res_partner_11"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="15.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage7"/>
+		<field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
+	</record>
+	
+	<record id="crm_case_improvereportsinpms0" model="crm.case">
+		<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="crm_configuration.category1"/>
+		<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="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="06.15" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
+	</record>
+	
+</data>
+</terp>
\ No newline at end of file
diff --git a/addons/crm_configuration/crm_bugs_demo.xml b/addons/crm_configuration/crm_bugs_demo.xml
new file mode 100644
index 00000000000..99e5fc274dd
--- /dev/null
+++ b/addons/crm_configuration/crm_bugs_demo.xml
@@ -0,0 +1,694 @@
+<?xml version="1.0"?>
+<terp>
+<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
+	-->
+         <!--	For Bugs	-->
+         
+	<record model="crm.case.categ" id="categ1">
+		<field name="name">Bugs</field>
+		<field name="section_id" ref="section_support"/>
+	</record>
+	<record model="crm.case.categ" id="categ2">
+		<field name="name">Patches</field>
+		<field name="section_id" ref="section_support"/>
+	</record>
+	<record model="crm.case.categ" id="categ3">
+		<field name="name">Feature Requests</field>
+		<field name="section_id" ref="section_support"/>
+	</record>
+
+	<!--
+	Case Category2
+	-->
+         <!--	For Bugs	-->
+	<record model="crm.case.category2" id="category1">
+		<field name="name">Version 4.2</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.category2" id="category2">
+		<field name="name">Version 4.4</field>
+		<field name="section_id" ref="section_support"/>
+	</record>
+
+	<!--
+	Case Stage
+	-->
+         <!--	For Bugs	-->
+         
+	<record model="crm.case.stage" id="stage1">
+		<field name="name">Accepted as Bug</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage2">
+		<field name="name">Fixed</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage3">
+		<field name="name">Won't fix</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage4">
+		<field name="name">Invalid</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage5">
+		<field name="name">Awaiting Response</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage6">
+		<field name="name">Works For Me</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage7">
+		<field name="name">Future</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	
+	######################## BUG TRACKING (menu) ###########################
+	<!-- 
+		ALL BUGS
+	-->
+	<record model="ir.actions.act_window" id="crm_case_categ_act0">
+		<field name="name">All Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
+	</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 model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_categ_act0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view0">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_categ_act0"/>
+	</record>
+	<menuitem name="Bug Tracking" id="menu_crm_case_bug_track"  parent="crm.menu_crm"/>
+	<menuitem  id="menu_crm_case_categ_act0" action="crm_case_categ_act0" parent="menu_crm_case_bug_track"/>
+
+	<record model="ir.actions.act_window" id="crm_case_categ_act_new">
+		<field name="name">New Bug</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form,tree</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view1_new">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_categ_act_new"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view1_new">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_categ_act_new"/>
+	</record>	
+	<menuitem  id="menu_crm_case_categ_act_new" action="crm_case_categ_act_new" parent="menu_crm_case_categ_act0"/>
+	
+	<record model="ir.actions.act_window" id="crm_case_category_act_all1">
+		<field name="name">Bugs Waiting Approval</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all1">
+		<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_category_act_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all1"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all1" action="crm_case_category_act_all1" parent="menu_crm_case_categ_act0"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all2">
+		<field name="name">Open Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'&lt;&gt;\','+str(stage7)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all2">
+		<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_category_act_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all2"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all2" action="crm_case_category_act_all2" parent="menu_crm_case_categ_act0"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all3">
+		<field name="name">Bugs With Patches Waiting Approval</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'categ_id\',\'=\','+str(categ2)+'), (\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all3">
+		<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_category_act_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all3"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all3" action="crm_case_category_act_all3" parent="menu_crm_case_categ0_act_all2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all4">
+		<field name="name">Bugs Not Fixed</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'), (\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'categ_id\',\'=\','+str(categ1)+'), (\'stage_id\',\'&lt;&gt;\','+str(stage2)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all4">
+		<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_category_act_all4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all4">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all4">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all4"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all4" action="crm_case_category_act_all4" parent="menu_crm_case_categ0_act_all2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all5">
+		<field name="name">Pending Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all5">
+		<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_category_act_all5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all5">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all5">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all5"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all5" action="crm_case_category_act_all5" parent="menu_crm_case_categ_act0"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all6">
+		<field name="name">Planned For Future Release</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'=\','+str(stage7)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all6">
+		<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_category_act_all6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all6">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all6">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all6"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all6" action="crm_case_category_act_all6" parent="menu_crm_case_categ0_act_all5"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all7">
+		<field name="name">Waiting For Reporter Response</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all7">
+		<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_category_act_all7"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all7">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all7"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all7">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all7"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all7" action="crm_case_category_act_all7" parent="menu_crm_case_categ0_act_all5"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all8">
+		<field name="name">Old Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'&lt;&gt;\',\'draft\'),(\'state\',\'&lt;&gt;\',\'open\'),(\'state\',\'&lt;&gt;\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all8">
+		<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_category_act_all8"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all8">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all8"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all8">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all8"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all8" action="crm_case_category_act_all8" parent="menu_crm_case_categ_act0"/>	<!-- 
+		MY BUGS
+	-->
+	<record model="ir.actions.act_window" id="crm_case_category_act_my0">
+		<field name="name">My Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my0">
+		<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_category_act_my0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my0">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my0">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my0"/>
+	</record>
+	<menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_categ0_act_my0" action="crm_case_category_act_my0"/>
+	
+	<record model="ir.actions.act_window" id="crm_case_category_act_my1">
+		<field name="name">My Open Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my1">
+		<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_category_act_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my1"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_my0" id="menu_crm_case_categ0_act_my1" action="crm_case_category_act_my1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_my2">
+		<field name="name">My Bugs With Patches</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'categ_id\',\'=\','+str(categ2)+'), (\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my2">
+		<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_category_act_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my2" action="crm_case_category_act_my2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_my3">
+		<field name="name">My Bugs Not Fixed</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'categ_id\',\'=\','+str(categ1)+'), (\'stage_id\',\'&lt;&gt;\','+str(stage2)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my3">
+		<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_category_act_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my3"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my3" action="crm_case_category_act_my3"/>
+
+	<!-- 
+		ALL FEATURE REQUESTS 
+	-->
+	<record model="ir.actions.act_window" id="crm_case_category_act_f0">
+		<field name="name">All Feature Request</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f0">
+		<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_category_act_f0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f0">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f0">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f0"/>
+	</record>
+	<menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_category_act_f0" action="crm_case_category_act_f0"/>
+	
+	<record model="ir.actions.act_window" id="crm_case_category_act_f1">
+		<field name="name">New Feature Request</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form,tree</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f1"/>
+	</record>
+	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_f2">
+		<field name="name">Feature Requests Waiting Approval</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'), (\'categ_id\',\'=\','+str(categ3)+'), (\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f2">
+		<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_category_act_f2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f2"/>
+	</record>
+	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f2" action="crm_case_category_act_f2"/>
+	<record model="ir.actions.act_window" id="crm_case_category_act_f3">
+		<field name="name">Open Feature Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'stage_id\',\'&lt;&gt;\','+str(stage7)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f3">
+		<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_category_act_f3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f3"/>
+	</record>
+	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f3" action="crm_case_category_act_f3"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_f4">
+		<field name="name">Pending Feature Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f4">
+		<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_category_act_f4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f4">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f4">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f4"/>
+	</record>
+	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f4" action="crm_case_category_act_f4"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_f5">
+		<field name="name">Planned For Future Release</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\'),(\'stage_id\',\'=\','+str(stage7)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f5">
+		<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_category_act_f5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f5">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f5">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f5"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f5" action="crm_case_category_act_f5"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_f6">
+		<field name="name">Waiting For Reporter Response</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\'),(\'stage_id\',\'=\','+str(stage5)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f6">
+		<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_category_act_f6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f6">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f6">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f6"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f6" action="crm_case_category_act_f6"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_f7">
+		<field name="name">Old Feature Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'&lt;&gt;\',\'draft\'),(\'state\',\'&lt;&gt;\',\'open\'),(\'state\',\'&lt;&gt;\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f7">
+		<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_category_act_f7"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f7">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f7"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f7">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f7"/>
+	</record>
+	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7"/>
+	
+</data>
+</terp>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
new file mode 100644
index 00000000000..cb8408e71c5
--- /dev/null
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+<!--	<menuitem name="CRM &amp; SRM" icon="terp-crm" id="menu_crm1"/>	-->
+
+	# ------------------------------------------------------
+	# Bug Tracking
+	# ------------------------------------------------------
+
+
+	<record model="ir.ui.view" id="crm_case_form_view">
+		<field name="name">CRM - Bug Tracker Form</field>
+		<field name="model">crm.case</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Bug Tracker Form">
+				<notebook>
+				<page string="General">
+						<field name="name" string="Title" colspan="2"/>
+						<field name="section_id" colspan="1"/>
+						<newline/>
+						<field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+						<field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+						<newline/>
+						<field name="email_from"  colspan="2"/>
+						<field name="user_id" />
+						<separator colspan="4"/>
+						<field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
+						<field name="priority" string="Severity"/>
+						<newline/>
+						<field name="stage_id" string="Resolution" colspan="2"/>
+						<field name="category2_id" string="Version"/>
+
+					<separator colspan="4"/>
+					<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
+						<form string="Resolution history">
+							<group col="6" colspan="4">
+								<field name="date"/>
+								<field name="email" />
+								<field name="canal_id" />
+							</group>
+							<newline/>
+							<field name="description" colspan="4" nolabel="1" />
+						</form>
+						<tree string="Resolution history">
+							<field name="description"/>
+							<field name="email"/>
+							<field name="date"/>
+						</tree>
+					</field>
+					<group col="2" colspan="2" expand="1">
+						<field name="date" string="Next Meeting"/>
+						<field name="duration" string="Meeting Duration"/>
+						<button name="add_reply" string="Add Last Mail for Replying"
+							states="open" type="object" colspan="2"/>
+						<field name="description" colspan="2" nolabel="1"/>
+						<button name="case_log_reply"
+							string="Send Partner &amp; Historize" states="open"
+							type="object"/>
+						<button name="case_log" string="Historize" states="open"
+							type="object"/>
+					</group>
+
+					<separator colspan="4"/>
+					<group col="8" colspan="4">
+						<field name="state" />
+					 	<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+						<button name="case_open" string="Open" states="draft,pending" type="object"/>
+						<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
+						<button name="case_pending" string="Pending" states="draft,open" type="object"/>
+						<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+						<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+					</group>
+				</page>
+				<page string="Internal Notes">
+					<separator string= "Notes" colspan="4"/>
+					<field name="note" nolabel="1"/>
+				</page>
+				<page string="Extra Info">
+					<field name="id" />
+					<field name="active" />
+					<field name="email_cc" colspan="4"/>
+					<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 name="ref" colspan="4"/>
+					<field name="ref2" colspan="4"/>
+				</page>
+				<page string="History">
+					<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>
+				</notebook>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="crm_case_tree_view">
+		<field name="name">CRM - Bug Tracker Tree</field>
+		<field name="model">crm.case</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Bugs Tree"  colors="red:state=='open'">
+				<field name="id"/>
+				<field name="name" string="Title"/>
+				<field name="partner_id"/>
+				<field name="priority" string="Severity"/>
+				<field name="categ_id"/>
+				<field name="stage_id" string="Resolution"/>
+				<field name="category2_id" string="Version"/>
+				<field name="user_id"/>
+				<field name="state"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="crm_case_calendar_view">
+		<field name="name">CRM - Bug Tracker Calendar</field>
+		<field name="model">crm.case</field>
+		<field name="type">calendar</field>
+		<field name="priority" eval="2"/>
+		<field name="arch" type="xml">
+			<calendar string="Bugs" date_start="date" color="user_id" date_delay="duration">
+				<field name="name"/>
+				<field name="state"/>
+			</calendar>
+		</field>
+	</record>
+	</data>
+</terp>
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
new file mode 100644
index 00000000000..4a7167fb2b1
--- /dev/null
+++ b/addons/crm_configuration/crm_config.py
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+import time
+import tools
+from osv import fields,osv,orm
+
+import mx.DateTime
+import base64
+
+#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),
+        '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'
+    _columns = {
+        'name': fields.char('Stage Name', size=64, required=True),
+        'section_id': fields.many2one('crm.case.section', 'Case Section'),
+    }
+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'),
+        'note': fields.text('Note'),
+        'partner_name': fields.char('Employee Name', size=64),
+        'partner_name2': fields.char('Employee Email', size=64),
+        'partner_phone': fields.char('Phone', size=16),
+        'partner_mobile': fields.char('Mobile', size=16),
+    }
+
+crm_cases()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
new file mode 100644
index 00000000000..46ad404a327
--- /dev/null
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+
+	# ------------------------------------------------------ 
+	# Fund Raising
+	# ------------------------------------------------------ 
+	<record model="ir.ui.view" id="crm_case_tree_view_fund">
+		<field name="name">CRM - Funds Tree</field>
+		<field name="model">crm.case</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Funds Tree"  colors="red:state=='open'">
+				<field name="id"/>
+				<field name="name" string="Funds"/>
+				<field name="categ_id"/>
+				<field name="category2_id" string="Payment Mode"/>
+				<field name="planned_cost" string="Amount"/>
+				<field name="probability"/>
+				<field name="user_id"/>
+				<field name="state"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="crm_case_form_view_fund">
+		<field name="name">CRM - Funds Form</field>
+		<field name="model">crm.case</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Funds Form">
+				<notebook>
+				<page string="Funds">
+					<field name="name" select="1" string="Name" colspan="2"/>
+					<field name="section_id" colspan="1"/>
+					<newline/>
+					<field name="date" string="Next Meeting"/>
+					<field name="duration" string="Meeting Duration"/>
+					<field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+					<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+					<newline/>
+					<field name="email_from" colspan="2"/>
+					<field name="user_id" select="2" string="Responsible"/>
+					<separator colspan="4"/>
+					<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)"/>
+					<field name="category2_id" select="1" string="Payment Mode"/>
+					<newline/>
+					<separator colspan="4" string="Estimates"/>
+					<field name="planned_cost" string="Amount"/>
+					<field name="probability"/>
+					<separator colspan="4" string="Description Information"/>
+						<field name="note" nolabel="1" colspan="4"/>
+
+					<separator colspan="4"/>
+					<group col="8" colspan="4">
+						<field name="state" select="2"/> 
+					 	<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+						<button name="case_open" string="Open" states="draft,pending" type="object"/>
+						<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
+						<button name="case_pending" string="Pending" states="draft,open" type="object"/>
+						<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+						<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+					</group>
+				</page>
+
+				<page string="Extra Info">
+					<field name="id"/>
+					<field name="active"/>
+					<field name="email_cc"/>
+					<field name="priority" string="Priority"/>
+					<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"/>
+					<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
+						<form string="Communication history">
+							<group col="6" colspan="4">
+								<field name="date"/>
+								<field name="email"/>
+								<field name="canal_id"/>
+							</group>
+							<newline/>
+							<field name="description" colspan="4" nolabel="1"/>
+						</form>
+						<tree string="Communication history">
+							<field name="description"/>
+							<field name="email"/>
+							<field name="date"/>
+						</tree>
+					</field>
+					<group col="2" colspan="2" expand="1">
+						<field name="canal_id"/>
+						<field name="som"/>
+						<button name="add_reply" string="Add Last Mail for Replying"
+							states="open" type="object" colspan="2"/>
+						<field name="description" colspan="2" nolabel="1"/>
+						<button name="case_log_reply"
+							string="Send Partner &amp; Historize" states="open"
+							type="object"/>
+						<button name="case_log" string="Historize" states="open"
+							type="object"/>
+					</group>
+
+					<separator colspan="4" string="References"/>
+					<field name="ref" colspan="4"/>
+					<field name="ref2" colspan="4"/>
+				</page>
+				<page string="History">
+					<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>
+				</notebook>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="crm_case_calendar_view_fund">
+		<field name="name">CRM - Funds Calendar</field>
+		<field name="model">crm.case</field>
+		<field name="type">calendar</field>
+		<field name="priority" eval="2"/>
+		<field name="arch" type="xml">
+			<calendar string="Funds" date_start="date" color="user_id" date_delay="duration">
+				<field name="name"/>
+				<field name="section_id"/>
+			</calendar>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="crm_case_graph_view_fund">
+		<field name="name">CRM - Funds Graph</field>
+		<field name="model">crm.case</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Funds by Categories" type="bar" orientation="horizontal">
+				<field name="categ_id"/>
+				<field name="planned_cost" operator="+"/>
+				<field name="state" group="True"/>
+			</graph>
+		</field>
+	</record>
+</data>
+</terp>
diff --git a/addons/crm_configuration/crm_jobs_data.xml b/addons/crm_configuration/crm_jobs_data.xml
new file mode 100644
index 00000000000..1cfb63b3a7b
--- /dev/null
+++ b/addons/crm_configuration/crm_jobs_data.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+	<!-- 
+		((((((((((( Demo Cases ))))))))))) 
+	-->
+
+	<!--For Jobs Requests-->
+	<record id="crm_case_salesman0" model="crm.case">
+		<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_configuration.category_job1"/>
+		<field name="partner_id" ref="base.res_partner_asus"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field eval="&quot;Enrique Jones&quot;" name="partner_name"/>
+		<field eval="&quot;draft&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support0"/>
+		<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_configuration.categ_job1"/>
+		<field name="stage_id" ref="crm_configuration.stage_job1"/>
+		<field eval="&quot;Salesman&quot;" name="name"/>
+		<field eval="&quot;1236547890&quot;" name="partner_phone"/>
+	</record>
+	<record id="crm_case_traineemca0" model="crm.case">
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
+		<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_configuration.category_job3"/>
+		<field name="partner_id" ref="base.res_partner_15"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<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_configuration.section_support0"/>
+		<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_configuration.categ_job2"/>
+		<field name="stage_id" ref="crm_configuration.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"/>
+	</record>
+	<record id="crm_case_fresher0" model="crm.case">
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','direct')]"/>
+		<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_configuration.category_job2"/>
+		<field name="partner_id" ref="base.res_partner_5"/>
+		<field eval="&quot;1&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<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_configuration.section_support0"/>
+		<field eval="&quot;jose@timesgroup.com&quot;" name="partner_name2"/>
+		<field eval="1" name="active"/>
+		<field name="categ_id" ref="crm_configuration.categ_job1"/>
+		<field name="stage_id" ref="crm_configuration.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.case">
+		<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_configuration.categ_job2"/>
+		<field name="category2_id" ref="crm_configuration.category_job3"/>
+		<field name="partner_id" ref="base.res_partner_10"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field eval="1.35" name="duration"/>
+		<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_configuration.section_support0"/>
+		<field eval="1" name="active"/>
+		<field name="stage_id" ref="crm_configuration.stage_job6"/>
+		<field eval="&quot;More than 5 yrs Experience in PHP&quot;" name="name"/>
+	</record>
+	<record id="crm_case_marketingjob0" model="crm.case">
+		<field eval="time.strftime('%Y-%m-29 17:15:32')" name="date"/>
+		<field eval="time.strftime('%Y-%m-30')" name="date_deadline"/>
+		<field name="category2_id" ref="crm_configuration.category_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_configuration.section_support0"/>
+		<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_configuration.categ_job1"/>
+		<field name="stage_id" ref="crm_configuration.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.case">
+		<field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
+		<field eval="time.strftime('%Y-%m-29')" name="date_deadline"/>
+		<field name="category2_id" ref="crm_configuration.category_job2"/>
+		<field name="partner_id" ref="base.res_partner_11"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field eval="&quot;David Armstrong&quot;" name="partner_name"/>
+		<field eval="&quot;done&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support0"/>
+		<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_configuration.categ_job1"/>
+		<field name="stage_id" ref="crm_configuration.stage_job5"/>
+		<field eval="&quot;Finance Job&quot;" name="name"/>
+		<field eval="&quot;33968745&quot;" name="partner_phone"/>
+	</record>	
+	<record id="crm_case_traineemca1" model="crm.case">
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
+		<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_configuration.category_job3"/>
+		<field name="partner_id" ref="base.res_partner_15"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<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_configuration.section_support0"/>
+		<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_configuration.categ_job2"/>
+		<field name="stage_id" ref="crm_configuration.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"/>
+	</record>
+	
+</data>
+</terp>
\ No newline at end of file
diff --git a/addons/crm_configuration/crm_jobs_demo.xml b/addons/crm_configuration/crm_jobs_demo.xml
new file mode 100644
index 00000000000..fc1421a64ab
--- /dev/null
+++ b/addons/crm_configuration/crm_jobs_demo.xml
@@ -0,0 +1,404 @@
+<?xml version="1.0"?>
+<terp>
+<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>
+
+	######################## JOB OPPORTUNITIES (menu) ###########################
+	<menuitem name="Jobs Requests" id="menu_crm_case_job_req_main" parent="crm.menu_crm"/>	
+
+	<!-- 
+		MY JOBS REQUESTS 
+	-->
+	<record model="ir.actions.act_window" id="crm_case_categ0_act11">
+		<field name="name">My Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act11"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act11"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act11"/>
+	</record>
+	<menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act11" action="crm_case_categ0_act11"/>
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_my3">
+		<field name="name">My Unclosed Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my3"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs3" action="crm_case_categ0_act_my3"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_my2">
+		<field name="name">My Jobs Propositions to Review</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs2" action="crm_case_categ0_act_my2"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_my1">
+		<field name="name">My Pending Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my1"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs1" action="crm_case_categ0_act_my1"/>		
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_my0">
+		<field name="name">My Open Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my0">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my0">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my0">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my0"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs0" action="crm_case_categ0_act_my0"/>	
+		
+	
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_myjobs">
+		<field name="name">Calendar Of Jobs Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myjobs">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_myjobs">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_myjobs">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
+	</record>	
+	<menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs"/>		
+	
+	<!-- 
+		ALL JOBS REQUESTS 
+	-->
+	<record model="ir.actions.act_window" id="crm_case_categ0_act111">
+		<field name="name">All Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act111"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act111"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act111"/>
+	</record>
+	<menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act111" action="crm_case_categ0_act111"/>	
+	
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_all3">
+		<field name="name">All Unclosed Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all3"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_all3" action="crm_case_categ0_act_all3"/>
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_all2">
+		<field name="name">All Jobs Propositions</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all2" action="crm_case_categ0_act_all2"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_all1">
+		<field name="name">All Pending Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all1"/>
+	</record>
+	<menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all1" action="crm_case_categ0_act_all1"/>	
+
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_all0">
+		<field name="name">All Open Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all0">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all0">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all0">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all0"/>
+	</record>
+	<menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all0" action="crm_case_categ0_act_all0"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_alljobs">
+		<field name="name">Calendar Of Jobs Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'done\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_alljobs">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_alljobs">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_alljobs">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs"/>	
+</data>
+</terp>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
new file mode 100644
index 00000000000..00aa271b7af
--- /dev/null
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+	# ------------------------------------------------------ 
+	# Jobs
+	# ------------------------------------------------------ 
+
+	<record model="ir.ui.view" id="crm_case_tree_view11">
+		<field name="name">CRM - Jobs Requests Tree</field>
+		<field name="model">crm.case</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Jobs - Recruitment Tree"  colors="red:state=='open'">
+				<field name="id"/>
+				<field name="name" string="Jobs Description"/>
+				<field name="partner_name" string="Employee Name"/>
+				<field name="partner_phone"/>
+				<field name="categ_id" string="Applied Job" select="1"/>
+				<field name="category2_id" string="Degree" select="1"/>
+				<field name="stage_id"/>
+				<field name="user_id"/>
+				<field name="state"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="crm_case_form_view11">
+		<field name="name">CRM - Jobs Requests Form</field>
+		<field name="model">crm.case</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Jobs - Recruitment Form">
+				<notebook>
+				<page string="Job Info">
+						<field name="name" string="Jobs Description" colspan="2"/>
+						<field name="section_id" colspan="1"/>
+						<newline/>
+						<field name="partner_name"/>
+						<field name="partner_name2"/>
+						<newline/>
+						<field name="partner_phone"/>
+						<field name="partner_mobile"/>
+						<newline/>
+						<field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+						<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+						<newline/>
+						<separator colspan="4"/>
+						<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="priority" string="Quality"/>
+						<field name="probability" string="Availability (weeks)"/>
+						<newline/>
+						<field name="planned_cost" string="Expected Salary"/>
+						<field name="planned_revenue" string="Proposed Salary"/>
+						<field name="stage_id" colspan="2"/>
+						<field name="user_id" string="Responsible" select="2"/>
+						<field name="date" string="Next Meeting"/>
+						<field name="duration" string="Meeting Duration" widget="float_time"/>
+						
+						<newline/>
+						<separator colspan="4"/>
+						<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
+							<form string="Communication history">
+								<group col="6" colspan="4">
+									<field name="date"/>
+									<field name="email"/>
+									<field name="canal_id"/>
+								</group>
+								<newline/>
+								<field name="description" colspan="4" nolabel="1"/>
+							</form>
+							<tree string="Communication history">
+								<field name="description"/>
+								<field name="email"/>
+								<field name="date"/>
+							</tree>
+						</field>
+						<group col="2" colspan="2" expand="1">
+							<field name="som"/>
+							<button name="add_reply" string="Add Last Mail for Replying"
+								states="open" type="object" colspan="2"/>
+							<field name="description" colspan="2" nolabel="1"/>
+							<button name="case_log_reply"
+								string="Send Partner &amp; Historize" states="open"
+								type="object"/>
+							<button name="case_log" string="Historize" states="open"
+								type="object"/>
+						</group>
+
+						<separator colspan="4"/>
+						<group col="8" colspan="4">
+							<field name="state" select="1"/> 
+					 		<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+							<button name="case_open" string="Open" states="draft,pending" type="object"/>
+							<button name="case_cancel" string="Refuse Job" states="draft,open,pending" type="object"/>
+							<button name="case_pending" string="Pending" states="draft,open" type="object"/>
+							<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+						</group>
+				</page>
+				<page string="Internal Notes">
+					<separator string= "Notes" colspan="4"/>
+					<field name="note" nolabel="1"/>
+				</page>
+				<page string="Extra Info">
+					<field name="id"/>
+					<field name="active"/>
+					<field name="email_cc"/>
+					<field name="canal_id"/>
+					<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="References"/>
+					<field name="ref" colspan="4"/>
+					<field name="ref2" colspan="4"/>
+				</page>
+				<page string="History">
+					<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>
+				</notebook>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="crm_case_calendar_view11">
+		<field name="name">CRM - Jobs Requests Calendar</field>
+		<field name="model">crm.case</field>
+		<field name="type">calendar</field>
+		<field name="priority" eval="2"/>
+		<field name="arch" type="xml">
+			<calendar string="Meeting With Future Employees" date_start="date" color="user_id" date_delay="duration">
+				<field name="name"/>
+				<field name="partner_name"/>
+				<field name="partner_name2"/>
+			</calendar>
+		</field>
+	</record>
+	</data>
+</terp>
diff --git a/addons/crm_configuration/crm_lead_data.xml b/addons/crm_configuration/crm_lead_data.xml
new file mode 100644
index 00000000000..0857d2a769c
--- /dev/null
+++ b/addons/crm_configuration/crm_lead_data.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+	<!-- 
+		((((((((((( Demo Cases ))))))))))) 
+	-->
+
+	<!--For Leads-->
+		<record id="crm_case_itisatelesalescampaign0" model="crm.case">
+			<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_configuration.category_lead1"/>
+			<field name="partner_id" ref="base.res_partner_11"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;Faustino Speegle&quot;" name="name"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;info.hr.phone@example.com&quot;" name="partner_name2"/>
+			<field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
+			<field eval="1" name="active"/>
+			<field eval="16.1" name="duration"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead5"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead1"/>
+			<field eval="&quot;President&quot;" name="partner_name"/>
+			<field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
+		</record>
+		<record id="crm_case_electonicgoodsdealer0" model="crm.case">
+			<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_configuration.category_lead7"/>
+			<field name="partner_id" ref="base.res_partner_6"/>
+			<field eval="&quot;4&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="22.25" name="duration"/>
+			<field eval="&quot;Jesse Denning&quot;" name="name"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;hr70@example.name&quot;" name="partner_name2"/>
+			<field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
+			<field eval="1" name="active"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead2"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead2"/>
+			<field eval="&quot;IT Developer&quot;" name="partner_name"/>
+			<field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
+		</record>
+		<record id="crm_case_developingwebapplications0" model="crm.case">
+			<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_configuration.category_lead5"/>
+			<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="12.45" name="duration"/>
+			<field eval="&quot;Taylor Mullane&quot;" name="name"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;qa.phone@example.us&quot;" name="partner_name2"/>
+			<field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
+			<field eval="1" name="active"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead4"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead4"/>
+			<field eval="&quot;VP Operations&quot;" name="partner_name"/>
+			<field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
+			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+		</record>
+		<record id="crm_case_qrecorp0" model="crm.case">
+			<field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
+			<field name="category2_id" ref="crm_configuration.category_lead8"/>
+			<field name="partner_id" ref="base.res_partner_tinyatwork"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;Diego Barga&quot;" name="name"/>
+			<field eval="&quot;draft&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;kid.support.the@example.it&quot;" name="partner_name2"/>
+			<field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
+			<field eval="1" name="active"/>
+			<field eval="8.00" name="duration"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead1"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead1"/>
+			<field eval="&quot;Director Sales&quot;" name="partner_name"/>
+			<field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
+		</record>
+		<record id="crm_case_itdeveloper0" model="crm.case">
+			<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_configuration.category_lead4"/>
+			<field name="partner_id" ref="base.res_partner_5"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;Carrie Helle&quot;" name="name"/>
+			<field eval="&quot;pending&quot;" name="state"/>
+			<field eval="8" name="duration"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;info.qa.info@example.co.uk&quot;" name="partner_name2"/>
+			<field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
+			<field eval="1" name="active"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead6"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead3"/>
+			<field eval="&quot;IT Developer&quot;" name="partner_name"/>
+			<field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/>
+		</record>
+		<record id="crm_case_mgroperations0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_1"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_lead3"/>
+			<field eval="3.15" 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_admin"/>
+			<field eval="&quot;Tina Pinero&quot;" name="name"/>
+			<field eval="&quot;cancel&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;beans.beans@example.com &quot;" name="partner_name2"/>
+			<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_configuration.categ_lead8"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead6"/>
+			<field eval="&quot;Mgr Operations&quot;" name="partner_name"/>
+			<field eval="&quot;(373) 907-1009&quot;" name="partner_phone"/>
+			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+		</record>
+		<record id="crm_case_vpoperations0" model="crm.case">
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_lead8"/>
+			<field name="partner_id" ref="base.res_partner_seagate"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;Wendi Baltz&quot;" name="name"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;beans69@example.biz&quot;" name="partner_name2"/>
+			<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_configuration.categ_lead4"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead4"/>
+			<field eval="&quot;VP Operations&quot;" name="partner_name"/>
+			<field eval="7.15" name="duration"/>
+			<field eval="&quot;(282) 603-7489&quot;" name="partner_phone"/>
+		</record>
+	</data>
+</terp>
\ No newline at end of file
diff --git a/addons/crm_configuration/crm_lead_demo.xml b/addons/crm_configuration/crm_lead_demo.xml
new file mode 100644
index 00000000000..b53ec379400
--- /dev/null
+++ b/addons/crm_configuration/crm_lead_demo.xml
@@ -0,0 +1,555 @@
+<?xml version="1.0"?>
+<terp>
+<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"/>
+	</record>
+	<record model="crm.case.categ" id="categ_lead2">
+		<field name="name">Self Generated</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_lead3">
+		<field name="name">Employee</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.categ" id="categ_lead4">
+		<field name="name">Partner</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.categ" id="categ_lead5">
+		<field name="name">Campaign</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_lead6">
+		<field name="name">Website</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_lead7">
+		<field name="name">Word of mouth</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_lead8">
+		<field name="name">Other</field>
+		<field name="section_id" ref="section_support2"/>
+	</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"/>
+	</record>
+	<record model="crm.case.stage" id="stage_lead2">
+		<field name="name">Assigned</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.stage" id="stage_lead3">
+		<field name="name">In Process</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.stage" id="stage_lead4">
+		<field name="name">Converted</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.stage" id="stage_lead5">
+		<field name="name">Recycled</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.stage" id="stage_lead6">
+		<field name="name">Dead</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+
+<!--		CASE CATEGORY2(category2_id)		-->	
+	<record model="crm.case.category2" id="category_lead1">
+		<field name="name">Telesales</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>		
+	<record model="crm.case.category2" id="category_lead2">
+		<field name="name">Mail</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.category2" id="category_lead3">
+		<field name="name">Email</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.category2" id="category_lead4">
+		<field name="name">Print</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>		
+	<record model="crm.case.category2" id="category_lead5">
+		<field name="name">Web</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.category2" id="category_lead6">
+		<field name="name">Radio</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.category2" id="category_lead7">
+		<field name="name">Television</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.category2" id="category_lead8">
+		<field name="name">Newsletter</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	
+	
+<!--		MENU		-->
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads">
+		<field name="name">Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form,tree</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads"/>
+	</record>
+	<menuitem parent="crm.menu_crm" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
+		<field name="name">All Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<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_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_all" action="crm_case_category_act_leads_all"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
+		<field name="name">All Unclosed Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all1" action="crm_case_category_act_leads_all1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
+		<field name="name">All Draft Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all2" action="crm_case_category_act_leads_all2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
+		<field name="name">All Open Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all3" action="crm_case_category_act_leads_all3"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
+		<field name="name">All Pending Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all4">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all4">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all4">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all4" action="crm_case_category_act_leads_all4"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all5">
+		<field name="name">All Cancelled Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'cancel\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all5">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all5">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all5">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all5"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all5" action="crm_case_category_act_leads_all5"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all6">
+		<field name="name">Calendar Of All Leads Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="domain" eval="[('section_id','=',section_support2),('date','>=',time.strftime('%Y-%m-%d'))]"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all6">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all6">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all6">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all6"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all6" action="crm_case_category_act_leads_all6"/>
+
+<!-- =================================================================== -->
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
+		<field name="name">My Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_my" action="crm_case_category_act_leads_my"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my1">
+		<field name="name">My Unclosed Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my1" action="crm_case_category_act_leads_my1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my2">
+		<field name="name">My Draft Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my2" action="crm_case_category_act_leads_my2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
+		<field name="name">My Open Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my3" action="crm_case_category_act_leads_my3"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
+		<field name="name">My Pending Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my4">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my4">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my4">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my4" action="crm_case_category_act_leads_my4"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my5">
+		<field name="name">My Cancelled Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'cancel\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my5">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my5">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my5">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my5"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my5" action="crm_case_category_act_leads_my5"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my6">
+		<field name="name">Calendar Of My Leads Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="domain" eval="[('section_id','=',section_support2),('user_id','=','admin'),('date','>=',time.strftime('%Y-%m-%d'))]"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my6">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my6">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my6">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my6"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_category_act_leads_my6" action="crm_case_category_act_leads_my6"/>
+
+
+
+<!--		REPORTS		-->
+	<menuitem name="Leads"  id="menu_action_report_crm_case_lead" parent="report_crm.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)+')]'"/>
+	</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="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</record>
+	<menuitem parent="menu_action_report_crm_case_lead" name="Cases by Leads and Category2" action="action_report_crm_case_lead_categ" id="menu_action_report_crm_case_lead_categ"/>
+
+	<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="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</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"/>
+
+	<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="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</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"/>
+
+	<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="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</record>
+	<menuitem name="Cases by Section, Category and Category2" 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>
+</terp>
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
new file mode 100644
index 00000000000..66f9666bce5
--- /dev/null
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+
+	# ------------------------------------------------------ 
+	# Leads
+	# ------------------------------------------------------ 
+
+	<record model="ir.ui.view" id="crm_case_form_view_leads">
+		<field name="name">CRM - Leads Form</field>
+		<field name="model">crm.case</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Leads Form">
+				<notebook>
+				 <page string="Leads">
+				 	<field name="name" select="1" string="Name"/>
+				 	<field name="section_id" colspan="1"/>
+				 	<newline/>
+				 	<field name="partner_name" string="Designation"/>
+					<field name="partner_name2" string="Email"/>
+					<newline/>
+					<field name="partner_phone"/>
+					<field name="partner_mobile"/>
+					<newline/>
+					<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
+					<field name="user_id" select="2" string="Responsible"/>
+					<newline/>
+					<field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)"/>
+					<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
+					<field name="stage_id" string="Status" select="1"/>
+					<field name="email_from"/>
+					<field name="priority" string="Priority"/>
+					<field name="category2_id" string="Campaign Type" select="1"/>
+					<field name="date" string="Next Meeting"/>
+					<field name="duration" string="Meeting Duration" widget="float_time"/>
+					<newline/>
+					<separator colspan="4" string="Description Information"/>
+						<field name="note" nolabel="1" colspan="4"/>
+
+					<separator colspan="4"/>
+					<group col="8" colspan="4">
+						<field name="state" select="2"/> 
+					 	<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+						<button name="case_open" string="Open" states="draft,pending" type="object"/>
+						<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
+						<button name="case_pending" string="Pending" states="draft,open" type="object"/>
+						<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+						<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+					</group>
+				 </page>
+
+				 <page string="Extra Info">
+					<field name="id"/>
+					<field name="active" select="2"/>
+					<field name="email_cc" colspan="2"/>
+					<field name="probability"/>
+					<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"/>
+					<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
+						<form string="Communication history">
+							<group col="6" colspan="4">
+								<field name="date"/>
+								<field name="email"/>
+								<field name="canal_id"/>
+							</group>
+							<newline/>
+							<field name="description" colspan="4" nolabel="1"/>
+						</form>
+						<tree string="Communication history">
+							<field name="description"/>
+							<field name="email"/>
+							<field name="date"/>
+						</tree>
+					</field>
+					<group col="2" colspan="2" expand="1">
+						<field name="canal_id"/>
+						<field name="som"/>
+						<button name="add_reply" string="Add Last Mail for Replying"
+							states="open" type="object" colspan="2"/>
+						<field name="description" colspan="2" nolabel="1"/>
+						<button name="case_log_reply"
+							string="Send Partner &amp; Historize" states="open"
+							type="object"/>
+						<button name="case_log" string="Historize" states="open"
+							type="object"/>
+					</group>
+
+					<separator colspan="4" string="References"/>
+					<field name="ref" colspan="4"/>
+					<field name="ref2" colspan="4"/>
+				 </page>
+				 <page string="History">
+					<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>
+				</notebook>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="crm_case_tree_view_leads">
+		<field name="name">CRM - Leads Tree</field>
+		<field name="model">crm.case</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Leads Tree"  colors="red:state=='open'">
+				<field name="id"/>
+				<field name="name" string="Name"/>
+				<field name="partner_phone"/>
+				<field name="partner_name2" string="Email"/>
+				<field name="stage_id"  string="Status"/>
+				<field name="categ_id" string="Lead Source"/>
+				<field name="category2_id" string="Campaign Type"/>
+				<field name="user_id"/>
+				<field name="state"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="crm_case_calendar_view_leads">
+		<field name="name">CRM - Leads Calendar</field>
+		<field name="model">crm.case</field>
+		<field name="type">calendar</field>
+		<field name="priority" eval="2"/>
+		<field name="arch" type="xml">
+			<calendar string="Meeting For Leads Generation" date_start="date" color="user_id" date_delay="duration">
+				<field name="name"/>
+				<field name="partner_name"/>
+				<field name="partner_name2"/>
+			</calendar>
+		</field>
+	</record>
+</data>
+</terp>
diff --git a/addons/crm_configuration/crm_meeting_data.xml b/addons/crm_configuration/crm_meeting_data.xml
new file mode 100644
index 00000000000..e7a1dd2f6ec
--- /dev/null
+++ b/addons/crm_configuration/crm_meeting_data.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+	<!-- 
+		((((((((((( Demo Cases ))))))))))) 
+	-->
+
+	<!--For Meetings-->
+		<record id="crm_case_followuponproposal0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_wong"/>
+			<field eval="1" name="active"/>
+			<field name="partner_id" ref="base.res_partner_maxtor"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="note"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet2"/>
+			<field name="stage_id" ref="crm_configuration.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"/>
+		</record>
+	
+		<record id="crm_case_initialdiscussion0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_2"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.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_admin"/>
+			<field eval="&quot;draft&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet3"/>
+			<field name="stage_id" ref="crm_configuration.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"/>
+		</record>
+	
+		<record id="crm_case_discusspricing0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.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_admin"/>
+			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="note"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet1"/>
+			<field name="stage_id" ref="crm_configuration.stage_meet1"/>
+			<field eval="&quot;Discuss pricing&quot;" name="name"/>
+			<field eval="time.strftime('%Y-%m-20')" name="date_deadline"/>
+		</record>
+	
+		<record id="crm_case_reviewneeds0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_15"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.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_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet3"/>
+			<field name="stage_id" ref="crm_configuration.stage_meet5"/>
+			<field eval="&quot;Review needs&quot;" name="name"/>
+			<field eval="time.strftime('%Y-%m-25')" name="date_deadline"/>
+		</record>
+	
+		<record id="crm_case_changesindesigning0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_1"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.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_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet2"/>
+			<field name="stage_id" ref="crm_configuration.stage_meet2"/>
+			<field eval="&quot;Changes in Designing&quot;" name="name"/>
+			<field eval="time.strftime('%Y-%m-30')" name="date_deadline"/>
+			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+		</record>
+	
+		<record id="crm_case_updatethedata0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_7"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.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_admin"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet2"/>
+			<field name="stage_id" ref="crm_configuration.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"/>
+		</record>
+	</data>
+</terp>
\ No newline at end of file
diff --git a/addons/crm_configuration/crm_meeting_demo.xml b/addons/crm_configuration/crm_meeting_demo.xml
new file mode 100644
index 00000000000..cccfb96e6a0
--- /dev/null
+++ b/addons/crm_configuration/crm_meeting_demo.xml
@@ -0,0 +1,280 @@
+<?xml version="1.0"?>
+<terp>
+<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">Sales 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">Training</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>	
+	
+        <!--	CASE CATEGORY2(category2_id)	-->
+         
+	<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>
+	
+         <!--	CASE STAGE(stage_id)	-->
+         
+	<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>	
+	
+	######################## MEETINGS (menu) ###########################
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetings">
+		<field name="name">Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form,tree</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetings">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetings"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetings">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetings"/>
+	</record>
+	<menuitem parent="crm.menu_crm" id="menu_crm_case_category_act_meetings" action="crm_case_category_act_meetings"/>
+
+	<!-- 
+		MY MEETINGS 
+	-->
+	<record model="ir.actions.act_window" id="crm_case_categ_meetmy">
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="domain" eval="'[(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_my">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_categ_meetmy"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_my">
+		<field name="sequence" eval="2"/>
+		<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_meetmy"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_my">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_categ_meetmy"/>
+	</record>
+	<menuitem name="My Meetings" id="menu_crm_case_categ_meet_my" action="crm_case_categ_meetmy" parent="menu_crm_case_category_act_meetings"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetmy1">
+		<field name="name">Draft Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_my1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetmy1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetmy1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy1"/>
+	</record>
+	<menuitem name="Draft Meetings" id="menu_crm_case_categ0_act_meetmy1" action="crm_case_category_act_meetmy1" parent="menu_crm_case_categ_meet_my"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetmy2">
+		<field name="name">Confirmed Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'done\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetmy2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetmy2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetmy2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy2"/>
+	</record>
+	<menuitem  parent="menu_crm_case_categ_meet_my" name="Confirmed Meetings" id="menu_crm_case_categ0_act_meetmy2" action="crm_case_category_act_meetmy2"/>
+
+
+	<!-- 
+		ALL MEETINGS 
+	-->
+	<record model="ir.actions.act_window" id="crm_case_categ_meet">
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_categ_meet"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet">
+		<field name="sequence" eval="2"/>
+		<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 model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_categ_meet"/>
+	</record>
+	<menuitem name="All Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_crm_case_category_act_meetings"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetall1">
+		<field name="name">Draft Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="domain" eval="'[(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall1"/>
+	</record>
+	<menuitem name="Draft Meetings" id="menu_crm_case_categ0_act_meetall1" action="crm_case_category_act_meetall1" parent="menu_crm_case_categ_meet"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetall2">
+		<field name="name">Confirmed Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="domain" eval="'[(\'state\',\'=\',\'done\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall2"/>
+	</record>
+	<menuitem name="Confirmed Meetings" parent="menu_crm_case_categ_meet" id="menu_crm_case_categ0_act_meetall2" action="crm_case_category_act_meetall2"/>
+	
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
+		<field name="name">Next Deadlines</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="domain" eval="[('state','!=','done'),('date','>=',time.strftime('%Y-%m-%d'))]"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall3"/>
+	</record>
+	<menuitem name="Next Deadlines" parent="menu_crm_case_categ_meet" id="menu_crm_case_categ0_act_meetall3" action="crm_case_category_act_meetall3"/>
+</data>
+</terp>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
new file mode 100644
index 00000000000..65db5944731
--- /dev/null
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+	# ------------------------------------------------------ 
+	# Meetings
+	# ------------------------------------------------------ 
+
+	<record model="ir.ui.view" id="crm_case_form_view_meet">
+		<field name="name">CRM - Meetings Form</field>
+		<field name="model">crm.case</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Meetings Form">
+				<notebook>
+				<page string="Meeting">
+					<field name="name" select="1" string="Title"/>
+					<field name="section_id"/>
+					<newline/>
+					<field name="date" string="Next Meeting"/>
+					<field name="duration" colspan="1" string="Meeting Duration"/>
+					<newline/>
+					<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)"/>
+					<newline/>
+					<field name="user_id" select="2" string="Responsible"/>
+					<field name="email_from"/>
+					<newline/>
+					<field name="categ_id" select="2" on_change="onchange_categ_id(categ_id)"/>
+					<field name="priority" select="2"/>
+					<newline/>
+					<field name="stage_id" select="1"/>
+					<field name="category2_id" select="1" string="Location"/>
+					<newline/>
+					<separator string="Description" colspan="4"/>
+						<field name="note"  nolabel="1" colspan="4" />
+
+					<separator colspan="4"/>
+					<group col="8" colspan="4">
+						<field name="state" select="2"/> 
+						<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+						<button name="case_open" string="Open" states="draft,pending" type="object"/>
+						<button name="case_cancel" string="Cancel Meeting" states="draft,open,pending" type="object"/>
+						<button name="case_pending" string="Pending" states="draft,open" type="object"/>
+						<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+						<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+					</group>
+				</page>
+				<page string="Extra Info">
+					<group colspan="4">
+						<field name="id"/>
+						<field name="active" select="2"/>
+						<newline/>
+						<field name="email_cc" colspan="1"/>
+						<field name="date_deadline" select="2" string="Deadlines"/>
+						<newline/>
+						<separator colspan="4" string="Dates"/>
+						<field name="create_date"/>
+						<field name="date_closed"/>
+						<field name="date_action_last"/>
+						<field name="date_action_next"/>
+					</group>
+					<separator colspan="4"/>
+					<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
+						<form string="Communication history">
+							<group col="6" colspan="4">
+								<field name="date"/>
+								<field name="email"/>
+								<field name="canal_id"/>
+							</group>
+							<newline/>
+							<field name="description" colspan="4" nolabel="1"/>
+						</form>
+						<tree string="Communication history">
+							<field name="description"/>
+							<field name="email"/>
+							<field name="date"/>
+						</tree>
+					</field>
+					<group col="2" colspan="2" expand="1">
+						<field name="canal_id"/>
+						<field name="som"/>
+						<button name="add_reply" string="Add Last Mail for Replying"
+							states="open" type="object" colspan="2"/>
+						<field name="description" colspan="2" nolabel="1"/>
+						<button name="case_log_reply"
+							string="Send Partner &amp; Historize" states="open"
+							type="object"/>
+						<button name="case_log" string="Historize" states="open"
+							type="object"/>
+					</group>
+					
+					<separator colspan="4" string="References"/>
+					<field name="ref" colspan="4"/>
+					<field name="ref2" colspan="4"/>
+				</page>
+				<page string="History">
+					<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>
+				</notebook>
+			</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.case</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Meetings Tree"  colors="red:state=='open'">
+				<field name="id"/>
+				<field name="name" string="Title"/>
+				<field name="date" string="Next Meeting"/>
+				<field name="section_id"/>
+				<field name="priority"/>
+				<field name="stage_id"/>
+				<field name="categ_id"/>
+				<field name="category2_id" string="Type"/>
+				<field name="user_id"/>
+				<field name="state"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="crm_case_calendar_view_meet">
+		<field name="name">CRM - Meetings Calendar</field>
+		<field name="model">crm.case</field>
+		<field name="type">calendar</field>
+		<field name="priority" eval="2"/>
+		<field name="arch" type="xml">
+			<calendar string="Meetings" date_start="date" color="user_id" date_delay="duration">
+				<field name="name"/>
+				<field name="section_id"/>
+			</calendar>
+		</field>
+	</record>
+	</data>
+</terp>
diff --git a/addons/crm_configuration/crm_opportunity_data.xml b/addons/crm_configuration/crm_opportunity_data.xml
new file mode 100644
index 00000000000..c4a3248077f
--- /dev/null
+++ b/addons/crm_configuration/crm_opportunity_data.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+	<!-- 
+		((((((((((( Demo Cases ))))))))))) 
+	-->
+
+	<!--For Opportunity-->
+
+		<record id="crm_case_construstazunits0" model="crm.case">
+			<field eval="0.6" name="probability"/>
+			<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_configuration.category_oppor1"/>
+			<field name="partner_id" ref="base.res_partner_3"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field eval="75000.0" name="planned_cost"/>
+			<field name="section_id" ref="crm_configuration.section_support3"/>
+			<field eval="time.strftime('%Y-%m-07 10:05:15')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_oppor1"/>
+			<field name="stage_id" ref="crm_configuration.stage_oppor3"/>
+			<field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
+		</record>
+		<record id="crm_case_rdroundfundingunits0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_15"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_oppor2"/>
+			<field name="partner_id" ref="base.res_partner_11"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;draft&quot;" name="state"/>
+			<field eval="30000.0" name="planned_cost"/>
+			<field eval="0.5" name="probability"/>
+			<field eval="8.0" name="duration"/>
+			<field name="section_id" ref="crm_configuration.section_support3"/>
+			<field eval="time.strftime('%Y-%m-05 12:25:15')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_oppor5"/>
+			<field name="stage_id" ref="crm_configuration.stage_oppor1"/>
+			<field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
+		</record>
+		<record id="crm_case_mediapoleunits0" model="crm.case">
+			<field eval="0.1" name="probability"/>
+			<field name="partner_address_id" ref="base.res_partner_address_3"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_oppor1"/>
+			<field name="partner_id" ref="base.res_partner_8"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;pending&quot;" name="state"/>
+			<field eval="50000.0" name="planned_cost"/>
+			<field eval="0.75" name="probability"/>
+			<field eval="10.0" name="duration"/>
+			<field name="section_id" ref="crm_configuration.section_support3"/>
+			<field eval="time.strftime('%Y-%m-14 13:55:10')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_oppor7"/>
+			<field name="stage_id" ref="crm_configuration.stage_oppor5"/>
+			<field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
+			<field eval="&quot;info@mediapole.net&quot;" name="email_from"/>
+		</record>
+		<record id="crm_case_abcfuelcounits0" model="crm.case">
+			<field eval="0.4" name="probability"/>
+			<field name="partner_address_id" ref="base.res_partner_address_1"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_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"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field eval="50000.0" name="planned_cost"/>
+			<field eval="24.0" name="duration"/>
+			<field name="section_id" ref="crm_configuration.section_support3"/>
+			<field eval="time.strftime('%Y-%m-23 16:32:23')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_oppor5"/>
+			<field name="stage_id" ref="crm_configuration.stage_oppor4"/>
+			<field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
+			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+		</record>
+		<record id="crm_case_dirtminingltdunits0" model="crm.case">
+			<field eval="0.8" name="probability"/>
+			<field name="partner_address_id" ref="base.res_partner_address_wong"/>
+			<field eval="1" name="active"/>
+			<field eval="2.25" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_maxtor"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_admin"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field eval="25000.0" name="planned_cost"/>
+			<field name="section_id" ref="crm_configuration.section_support3"/>
+			<field eval="time.strftime('%Y-%m-25 16:05:15')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_oppor2"/>
+			<field name="stage_id" ref="crm_configuration.stage_oppor6"/>
+			<field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
+		</record>
+	</data>
+</terp>
\ No newline at end of file
diff --git a/addons/crm_configuration/crm_opportunity_demo.xml b/addons/crm_configuration/crm_opportunity_demo.xml
new file mode 100644
index 00000000000..63f38f849c8
--- /dev/null
+++ b/addons/crm_configuration/crm_opportunity_demo.xml
@@ -0,0 +1,318 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+	<record model="crm.case.section" id="section_support3">
+		<field name="name">Opportunities</field>
+		<field name="code">oppor</field>
+	</record>
+
+<!--		CASE CATEGORY(categ_id)		-->	
+	<record model="crm.case.categ" id="categ_oppor1">
+		<field name="name">Existing Customer</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.categ" id="categ_oppor2">
+		<field name="name">Self Generated</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_oppor3">
+		<field name="name">Employee</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.categ" id="categ_oppor4">
+		<field name="name">Partner</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.categ" id="categ_oppor5">
+		<field name="name">Campaign</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_oppor6">
+		<field name="name">Website</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_oppor7">
+		<field name="name">Word of mouth</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_oppor8">
+		<field name="name">Other</field>
+		<field name="section_id" ref="section_support3"/>
+	</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"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor2">
+		<field name="name">Needs Analysis</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor3">
+		<field name="name">Value Proposition</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor4">
+		<field name="name">Proposal/Price Quote</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor5">
+		<field name="name">Negotiation/Review</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor6">
+		<field name="name">Closed Won</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor7">
+		<field name="name">Closed Lost</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+
+<!--		CASE CATEGORY2(category2_id)		-->
+	<record model="crm.case.category2" id="category_oppor1">
+		<field name="name">Existing Business</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>	
+	<record model="crm.case.category2" id="category_oppor2">
+		<field name="name">New Business</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+
+<menuitem name="Opportunities" id="menu_crm_case_opp" parent="crm.menu_crm"/>
+
+
+<!--		MENU		-->
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
+		<field name="name">All Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor11">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+	</record>
+	<menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor">
+		<field name="name">Opportunity</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form,tree</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor"/>
+	</record>
+	<menuitem name="New Opportunity" parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor" action="crm_case_category_act_oppor"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor1">
+		<field name="name">All Open Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor1"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor1" action="crm_case_category_act_oppor1"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor_all2">
+		<field name="name">All Pending Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor_all2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor_all2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor_all2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor_all2" action="crm_case_category_act_oppor_all2"/>
+
+
+<!-- ======================================================== -->
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor22">
+		<field name="name">My Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor22">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor22"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor22">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor22"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor22">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor22"/>
+	</record>
+	<menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor22" action="crm_case_category_act_oppor22"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor2">
+		<field name="name">My Open Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor2" action="crm_case_category_act_oppor2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor_my2">
+		<field name="name">My Pending Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'pending\'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor_my2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor_my2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor_my2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor_my2" action="crm_case_category_act_oppor_my2"/>
+
+<!--		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)+')]'"/>
+	</record>
+	  <menuitem name="Opportunity" 	parent="report_crm.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"/>
+
+	<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="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	<menuitem name="Cases by Opportunities and Category2"  parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ" id="menu_action_report_crm_case_oppor_categ"/>
+
+	<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="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</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"/>
+
+	<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="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	<menuitem name="Cases by Section, 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"/>
+
+	<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="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	<menuitem name="Cases by Section, Category and Category2" 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>
+</terp>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
new file mode 100644
index 00000000000..e294d8b1c64
--- /dev/null
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+
+	# ------------------------------------------------------ 
+	# Opportunities
+	# ------------------------------------------------------ 
+
+	<record model="ir.ui.view" id="crm_case_form_view_oppor">
+		<field name="name">CRM - Opportunities Form</field>
+		<field name="model">crm.case</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Opportunities Form">
+				<notebook>
+				<page string="Opportunities">
+					<field name="name" select="1" string="Name" colspan="2"/>
+					<field name="section_id" colspan="1"/>
+					<newline/>
+					<field name="date" string="Next Meeting"/>
+					<field name="duration" string="Meeting Duration"/>
+					<field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+					<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+					<newline/>
+					<field name="email_from" colspan="2"/>
+					<field name="user_id" select="2" string="Responsible"/>
+					<separator colspan="4"/>
+					<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
+					<field name="stage_id" select="1" string="Sales Stage"/>
+					<field name="category2_id" select="1" string="Type"/>
+					<field name="priority" string="Priority"/>
+					<newline/>
+					<separator colspan="4" string="Estimates"/>
+					<field name="planned_cost" string="Amount"/>
+					<field name="probability"/>
+					<separator colspan="4" string="Description Information"/>
+						<field name="note" nolabel="1" colspan="4"/>
+
+					<separator colspan="4"/>
+					<group col="8" colspan="4">
+						<field name="state" select="2"/> 
+					 	<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+						<button name="case_open" string="Open" states="draft,pending" type="object"/>
+						<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
+						<button name="case_pending" string="Pending" states="draft,open" type="object"/>
+						<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+						<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+					</group>
+				</page>
+
+				<page string="Extra Info">
+					<field name="id"/>
+					<field name="active"/>
+					<field name="email_cc" colspan="4"/>
+					
+					<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"/>
+					<field name="history_line" colspan="2" nolabel="1" mode="tree,form">
+						<form string="Communication history">
+							<group col="6" colspan="4">
+								<field name="date"/>
+								<field name="email"/>
+								<field name="canal_id"/>
+							</group>
+							<newline/>
+							<field name="description" colspan="4" nolabel="1"/>
+						</form>
+						<tree string="Communication history">
+							<field name="description"/>
+							<field name="email"/>
+							<field name="date"/>
+						</tree>
+					</field>
+					<group col="2" colspan="2" expand="1">
+						<field name="canal_id"/>
+						<field name="som"/>
+						<button name="add_reply" string="Add Last Mail for Replying"
+							states="open" type="object" colspan="2"/>
+						<field name="description" colspan="2" nolabel="1"/>
+						<button name="case_log_reply"
+							string="Send Partner &amp; Historize" states="open"
+							type="object"/>
+						<button name="case_log" string="Historize" states="open"
+							type="object"/>
+					</group>
+
+					<separator colspan="4" string="References"/>
+					<field name="ref" colspan="4"/>
+					<field name="ref2" colspan="4"/>
+				</page>
+				<page string="History">
+					<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>
+				</notebook>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="crm_case_tree_view_oppor">
+		<field name="name">CRM - Opportunities Tree</field>
+		<field name="model">crm.case</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Opportunities Tree"  colors="red:state=='open'">
+				<field name="id"/>
+				<field name="name" string="Opportunities"/>
+				<field name="stage_id"  string="Sales Stage"/>
+				<field name="categ_id" string="Lead Source"/>
+				<field name="category2_id" string="Type"/>
+				<field name="planned_cost" string="Amount"/>
+				<field name="probability"/>
+				<field name="user_id"/>
+				<field name="state"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="crm_case_calendar_view_oppor">
+		<field name="name">CRM - Opportunities Calendar</field>
+		<field name="model">crm.case</field>
+		<field name="type">calendar</field>
+		<field name="priority" eval="2"/>
+		<field name="arch" type="xml">
+			<calendar string="Opportunities" date_start="date" color="user_id" date_delay="duration">
+				<field name="name"/>
+				<field name="partner_id"/>
+			</calendar>
+		</field>
+	</record>
+</data>
+</terp>
diff --git a/addons/crm_configuration/crm_report_view.xml b/addons/crm_configuration/crm_report_view.xml
new file mode 100644
index 00000000000..3dc21239916
--- /dev/null
+++ b/addons/crm_configuration/crm_report_view.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+	#
+	# Cases by section and category2 of case
+	#
+
+	<record model="ir.ui.view" id="view_crm_case_section_categ_tree">
+		<field name="name">CRM Report - Sections and Category2(Tree)</field>
+		<field name="model">report.crm.case.section.categ2</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Cases by Section and Category2">
+				<field name="name"/>
+				<field name="user_id"/>
+				<field name="section_id"/>
+				<field name="category2_id"/>
+				<field name="stage_id"/>
+				<field name="nbr"/>
+				<field name="delay_close"/>
+				<field name="state"/>
+				
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_crm_case_section_categ_form">
+		<field name="name">CRM Report - Sections and Category2(Form)</field>
+		<field name="model">report.crm.case.section.categ2</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Cases by Section and Category2">
+				<field name="name"/>
+				<field name="user_id"/>
+				<field name="section_id" select="1"/>
+				<field name="category2_id" select="1"/>
+				<field name="stage_id"/>
+				<field name="nbr" select="1"/>
+				<field name="state" select="1"/>
+				<field name="delay_close"/>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_crm_case_section_categ_graph">
+		<field name="name">CRM Report - Sections and Category2(Graph)</field>
+		<field name="model">report.crm.case.section.categ2</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Cases by Section and Category2" type="bar" orientation="horizontal">
+				<field name="category2_id"/>
+				<field name="nbr" operator="+"/>
+				<field name="section_id" group="True"/>
+			</graph>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_tree_month">
+		<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="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+	</record>
+	<menuitem parent="report_crm.next_id_65" name="Cases by Section and Category2" action="action_report_crm_case_section_categ_tree_month" id="menu_crm_case_section_categ_tree_month"/>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_tree">
+		<field name="res_model">report.crm.case.section.categ2</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+	</record>
+	<menuitem parent="report_crm.next_id_66" name="Cases by Section and Category2" action="action_report_crm_case_section_categ_tree" id="menu_crm_case_section_categ_tree"/>
+
+	#
+	# 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="user_id"/>
+				<field name="section_id"/>
+				<field name="stage_id"/>
+				<field name="nbr"/>
+				<field name="delay_close"/>
+				<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="user_id"/>
+				<field name="section_id" select="1"/>
+				<field name="stage_id"/>
+				<field name="nbr" select="1"/>
+				<field name="state" select="1"/>
+				<field name="delay_close"/>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_crm_case_section_stage_graph">
+		<field name="name">CRM Report - Sections and Stage(Graph)</field>
+		<field name="model">report.crm.case.section.stage</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph string="Cases by Section and Stage" type="bar" orientation="horizontal">
+				<field name="stage_id"/>
+				<field name="nbr" operator="+"/>
+				<field name="section_id" group="True"/>
+			</graph>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_section_stage_tree_month">
+		<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="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+	</record>
+	<menuitem parent="report_crm.next_id_65" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree_month" id="menu_crm_case_section_stage_tree_month"/>
+	<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">graph,tree</field>
+	</record>
+	<menuitem parent="report_crm.next_id_66" 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
+	#
+
+	<record model="ir.ui.view" id="view_crm_case_section_categ_stage_tree">
+		<field name="name">CRM Report - Section, Category and Stage(Tree)</field>
+		<field name="model">report.crm.case.section.categ.stage</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Cases by Section, Category and Stage">
+				<field name="name"/>
+				<field name="user_id"/>
+				<field name="section_id"/>
+				<field name="categ_id"/>
+				<field name="stage_id"/>
+				<field name="nbr"/>
+				<field name="delay_close"/>
+				<field name="state"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_crm_case_section_categ_stage_form">
+		<field name="name">CRM Report - Section, Category and Stage(Form)</field>
+		<field name="model">report.crm.case.section.categ.stage</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Cases by Section, Category and Stage">
+				<field name="name"/>
+				<field name="user_id"/>
+				<field name="section_id" select="1"/>
+				<field name="categ_id"/>
+				<field name="stage_id"/>
+				<field name="nbr" select="1"/>
+				<field name="state" select="1"/>
+				<field name="delay_close"/>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_stage_tree_month">
+		<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="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+	</record>
+	<menuitem parent="report_crm.next_id_65" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree_month" id="menu_crm_case_section_categ_stage_tree_month"/>
+	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_stage_tree">
+		<field name="res_model">report.crm.case.section.categ.stage</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+	</record>
+	<menuitem parent="report_crm.next_id_66" 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
+	#
+
+	<record model="ir.ui.view" id="view_crm_case_section_categ_categ2_tree">
+		<field name="name">CRM Report - Section, Category and Category2(Tree)</field>
+		<field name="model">report.crm.case.section.categ.categ2</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Cases by Section, Category and Category2">
+				<field name="name"/>
+				<field name="user_id"/>
+				<field name="section_id"/>
+				<field name="categ_id"/>
+				<field name="category2_id"/>
+				<field name="stage_id"/>
+				<field name="nbr"/>
+				<field name="delay_close"/>
+				<field name="state"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_crm_case_section_categ_categ2_form">
+		<field name="name">CRM Report - Section, Category and Category2(Form)</field>
+		<field name="model">report.crm.case.section.categ.categ2</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Cases by Section, Category and Category2">
+				<field name="name"/>
+				<field name="user_id"/>
+				<field name="section_id" select="1"/>
+				<field name="categ_id"/>
+				<field name="category2_id"/>
+				<field name="stage_id"/>
+				<field name="nbr" select="1"/>
+				<field name="state" select="1"/>
+				<field name="delay_close"/>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_categ2_tree_month">
+		<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="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+	</record>
+	<menuitem  parent="report_crm.next_id_65" name="Cases by Section, Category and Category2" action="action_report_crm_case_section_categ_categ2_tree_month" id="menu_crm_case_section_categ_categ2_tree_month"/>
+	<record model="ir.actions.act_window" id="action_report_crm_case_section_categ_categ2_tree">
+		<field name="res_model">report.crm.case.section.categ.categ2</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+	</record>
+	<menuitem parent="report_crm.next_id_66" name="Cases by Section, Category and Category2" action="action_report_crm_case_section_categ_categ2_tree" id="menu_crm_case_section_categ_categ2_tree"/>
+</data>
+</terp>
diff --git a/addons/crm_configuration/report/__init__.py b/addons/crm_configuration/report/__init__.py
new file mode 100644
index 00000000000..093251d9a1a
--- /dev/null
+++ b/addons/crm_configuration/report/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import crm_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_configuration/report/crm_report.py b/addons/crm_configuration/report/crm_report.py
new file mode 100644
index 00000000000..bd483a6a275
--- /dev/null
+++ b/addons/crm_configuration/report/crm_report.py
@@ -0,0 +1,156 @@
+# -*- encoding: utf-8 -*-
+from osv import fields,osv
+
+AVAILABLE_STATES = [
+    ('draft','Draft'),
+    ('open','Open'),
+    ('cancel', 'Canceled'),
+    ('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),
+        '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):
+        cr.execute("""
+              create or replace view report_crm_case_section_categ2 as (
+                select
+                    min(c.id) as id,
+                    substring(c.create_date for 7)||'-01' as name,
+                    c.user_id,
+                    c.state,
+                    c.category2_id,
+                    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.category2_id is not null
+                group by substring(c.create_date for 7), 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),
+        '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):
+        cr.execute("""
+              create or replace view report_crm_case_section_stage as (
+                select
+                    min(c.id) as id,
+                    substring(c.create_date for 7)||'-01' as name,
+                    c.user_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.stage_id is not null
+                group by substring(c.create_date for 7), 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):
+        cr.execute("""
+              create or replace view report_crm_case_section_categ_stage as (
+                select
+                    min(c.id) as id,
+                    substring(c.create_date for 7)||'-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 substring(c.create_date for 7), 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):
+        cr.execute("""
+              create or replace view report_crm_case_section_categ_categ2 as (
+                select
+                    min(c.id) as id,
+                    substring(c.create_date for 7)||'-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 substring(c.create_date for 7), 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_profiling/__init__.py b/addons/crm_profiling/__init__.py
new file mode 100644
index 00000000000..92e0201d272
--- /dev/null
+++ b/addons/crm_profiling/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+import crm_profiling
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_profiling/__terp__.py b/addons/crm_profiling/__terp__.py
new file mode 100644
index 00000000000..c46623864d2
--- /dev/null
+++ b/addons/crm_profiling/__terp__.py
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "crm_profiling management",
+    "version" : "1.3",
+    "depends" : ["base", "crm"],
+    "author" : "Tiny",
+    "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.
+
+    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\"
+
+
+    * Note: this module is not compatible with the module segmentation, since it's the same which has been renamed.
+    """,
+    "website" : "http://tinyerp.com/",
+    "category" : "Generic Modules/Project & Services",
+    "init_xml" : [],
+    "demo_xml" : ["crm_profiling_demo.xml"],
+    "update_xml" : [
+                    "crm_profiling_view.xml",
+                    ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
new file mode 100644
index 00000000000..a043e70a6a2
--- /dev/null
+++ b/addons/crm_profiling/crm_profiling.py
@@ -0,0 +1,235 @@
+# -*- encoding: utf-8 -*-
+from osv import fields,osv
+from osv import orm
+
+def _get_answers(cr, uid, ids):
+    query = """
+    select distinct(answer)
+    from profile_question_yes_rel
+    where profile in (%s)"""% ','.join([str(i) for i in ids ])
+
+    cr.execute(query)
+    ans_yes = [x[0] for x in cr.fetchall()]
+
+    query = """
+    select distinct(answer)
+    from profile_question_no_rel
+    where profile in (%s)"""% ','.join([str(i) for i in ids ])
+
+    cr.execute(query)
+    ans_no = [x[0] for x in cr.fetchall()]
+
+    return [ans_yes, ans_no]
+
+
+def _get_parents(cr, uid, ids):
+    ids_to_check = ids
+    cr.execute("""
+     select distinct(parent_id)
+     from crm_segmentation
+     where parent_id is not null
+     and id in (%s)""" % ','.join([str(i) for i in ids ]))
+
+    parent_ids = [x[0] for x in cr.fetchall()]
+
+    trigger = False
+    for x in parent_ids:
+        if x not in ids_to_check:
+            ids_to_check.append(x)
+            trigger = True
+
+    if trigger:
+        ids_to_check = _get_parents(cr, uid, ids_to_check)
+
+    return ids_to_check
+
+
+def test_prof(cr, uid, seg_id, pid, answers_ids = []):
+#return True if the partner pid fetch the segmentation rule seg_id
+    ids_to_check = _get_parents(cr, uid, [seg_id])
+    [yes_answers, no_answers] = _get_answers(cr, uid, ids_to_check)
+    temp = True
+    for y_ans in yes_answers:
+        if y_ans not in answers_ids:
+            temp = False
+            break
+    if temp:
+        for ans in answers_ids:
+            if ans in no_answers:
+                temp = False
+                break
+    if temp:
+        return True
+    return False
+
+
+def _recompute_categ(self, cr, uid, pid, answers_ids):
+    ok =  []
+    cr.execute('''
+        select r.category_id 
+        from res_partner_category_rel r left join crm_segmentation s on (r.category_id = s.categ_id) 
+        where r.partner_id = %d and (s.exclusif = false or s.exclusif is null);
+        '''% pid)
+    for x in cr.fetchall():
+        ok.append(x[0])
+
+    query = '''
+        select id, categ_id 
+        from crm_segmentation 
+        where profiling_active = true''' 
+    if ok != []:
+        query = query +''' and categ_id not in(%s)'''% ','.join([str(i) for i in ok ])
+    query = query + ''' order by id '''
+
+    cr.execute(query)
+    segm_cat_ids = cr.fetchall()
+
+    for (segm_id, cat_id) in segm_cat_ids:
+        if test_prof(cr, uid, segm_id, pid, answers_ids):
+            ok.append(cat_id)
+    return ok
+
+
+class question(osv.osv):
+    _name="crm_profiling.question"
+    _description= "Question"
+    _columns={
+        'name': fields.char("Question",size=128, required=True),
+        'answers_ids': fields.one2many("crm_profiling.answer","question_id","Avalaible answers",),
+        }
+
+question()
+
+
+class questionnaire(osv.osv):
+    _name="crm_profiling.questionnaire"
+    _description= "Questionnaire"
+
+    def build_form(self, cr, uid, data, context):
+        query = """
+        select name, id
+        from crm_profiling_question
+        where id in ( select question from profile_questionnaire_quest_rel where questionnaire = %s)"""% data['form']['questionnaire_name']
+        cr.execute(query)
+        
+        quest_fields={}
+        quest_form='''<?xml version="1.0"?>
+            <form string="Questionnaire">'''
+        
+        for x in cr.fetchall():
+            quest_form = quest_form + '''<field name="quest_form'''+str(x[1])+'''"/><newline/>'''
+            quest_fields['quest_form'+str(x[1])] = {'string': str(x[0]), 'type': 'many2one', 'relation': 'crm_profiling.answer', 'domain': [('question_id','=',x[1])] }
+        quest_form = quest_form + '''</form>'''      
+        return quest_form,quest_fields
+
+    _columns={
+        'name': fields.char("Questionnaire",size=128, required=True),
+        'description':fields.text("Description", required=True),
+        'questions_ids': fields.many2many('crm_profiling.question','profile_questionnaire_quest_rel','questionnaire', 'question', "Questions"),
+        }
+
+questionnaire()
+
+
+class answer(osv.osv):
+    _name="crm_profiling.answer"
+    _description="Answer"
+    _columns={
+        "name": fields.char("Answer",size=128, required=True),
+        "question_id": fields.many2one('crm_profiling.question',"Question"),
+        }
+answer()
+
+
+class partner(osv.osv):
+    _inherit="res.partner"
+    _columns={
+        "answers_ids": fields.many2many("crm_profiling.answer","partner_question_rel","partner","answer","Answers"),
+        }
+
+    def _questionnaire_compute(self, cr, uid, data, context):
+        temp = []
+        for x in data['form']:
+            if x.startswith("quest_form") and data['form'][x] != 0 :
+                temp.append(data['form'][x])
+
+        query = """ 
+        select answer from partner_question_rel 
+        where partner =%d"""% data['id']
+        cr.execute(query)
+        for x in cr.fetchall():
+            temp.append(x[0])
+
+        self.write(cr, uid, [data['id']],{'answers_ids':[[6,0,temp]]}, context)
+        return {}
+
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if not context:
+            context={}
+        if 'answers_ids' in vals:
+            vals['category_id']=[[6, 0, _recompute_categ(self, cr, uid, ids[0], vals['answers_ids'][0][2])]]
+        return super(partner, self).write(cr, uid, ids, vals, context=context)
+
+partner()
+
+
+class crm_segmentation(osv.osv):
+    _inherit="crm.segmentation"
+    _columns={
+        "answer_yes": fields.many2many("crm_profiling.answer","profile_question_yes_rel","profile","answer","Inclued answers"),
+        "answer_no": fields.many2many("crm_profiling.answer","profile_question_no_rel","profile","answer","Excluded answers"),
+        'parent_id': fields.many2one('crm.segmentation', 'Parent Profile'),
+        'child_ids': fields.one2many('crm.segmentation', 'parent_id', 'Childs profile'),
+        'profiling_active': fields.boolean('Use The Profiling 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')
+        }
+    _constraints = [
+        (orm.orm.check_recursion, 'Error ! You can not create recursive profiles.', ['parent_id'])
+    ]
+
+    def process_continue(self, cr, uid, ids, start=False):
+        categs = self.read(cr,uid,ids,['categ_id','exclusif','partner_id', 'sales_purchase_active', 'profiling_active'])
+        for categ in categs:
+            if start:
+                if categ['exclusif']:
+                    cr.execute('delete from res_partner_category_rel where category_id=%d', (categ['categ_id'][0],))
+
+            id = categ['id']            
+
+            cr.execute('select id from res_partner order by id ')
+            partners = [x[0] for x in cr.fetchall()]
+
+            if categ['sales_purchase_active']:
+                to_remove_list=[]
+                cr.execute('select id from crm_segmentation_line where segmentation_id=%d', (id,))
+                line_ids = [x[0] for x in cr.fetchall()]
+
+                for pid in partners:
+                    if (not self.pool.get('crm.segmentation.line').test(cr, uid, line_ids, pid)):
+                        to_remove_list.append(pid)
+                for pid in to_remove_list:
+                    partners.remove(pid)
+
+            if categ['profiling_active']:
+                to_remove_list=[]
+                for pid in partners:
+
+                    cr.execute('select distinct(answer) from partner_question_rel where partner=%d' % pid)
+                    answers_ids = [x[0] for x in cr.fetchall()]
+
+                    if (not test_prof(cr, uid, id, pid, answers_ids)):
+                        to_remove_list.append(pid)
+                for pid in to_remove_list:
+                    partners.remove(pid)
+
+            for partner_id in partners:
+                cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%d,%d)', (categ['categ_id'][0],partner_id))
+            cr.commit()
+
+            self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
+            cr.commit()
+        return True
+
+crm_segmentation()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_profiling/crm_profiling_demo.xml b/addons/crm_profiling/crm_profiling_demo.xml
new file mode 100644
index 00000000000..1f5a662886d
--- /dev/null
+++ b/addons/crm_profiling/crm_profiling_demo.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+
+
+	<!--
+	Questions
+	-->
+
+	<record model="crm_profiling.question" id="activity_sector">
+		<field name="name">Activity sector?</field>
+	</record>
+	<record model="crm_profiling.question" id="nb_employees">
+		<field name="name">Number of employees?</field>
+	</record>
+	<record model="crm_profiling.question" id="partner_level">
+		<field name="name">Partner level?</field>
+	</record>
+	<record model="crm_profiling.question" id="partner_tiny">
+		<field name="name">TinyERP partner?</field>
+	</record>
+
+	<!--
+	Questionnaires
+	-->
+
+	<record model="crm_profiling.questionnaire" id="questionnaire1">
+		<field name="name">Base questionnaire</field>
+		<field name="description">First questionnaire.</field>
+		<field name="questions_ids" eval="[(6,0,[activity_sector,nb_employees,partner_level])]"/>
+	</record>
+
+	<!--
+	Answers
+	-->
+
+	<record model="crm_profiling.answer" id="sector1">
+		<field name="name">HR</field>
+		<field name="question_id" ref="activity_sector"/>
+	</record>
+	<record model="crm_profiling.answer" id="sector2">
+		<field name="name">Telecom</field>
+		<field name="question_id" ref="activity_sector"/>
+	</record>
+	<record model="crm_profiling.answer" id="sector3">
+		<field name="name">IT</field>
+		<field name="question_id" ref="activity_sector"/>
+	</record>
+	<record model="crm_profiling.answer" id="nb_employees1">
+		<field name="name">1 to 50</field>
+		<field name="question_id" ref="nb_employees"/>
+	</record>
+	<record model="crm_profiling.answer" id="nb_employees2">
+		<field name="name">51 to 100</field>
+		<field name="question_id" ref="nb_employees"/>
+	</record>	
+	<record model="crm_profiling.answer" id="nb_employees3">
+		<field name="name">more than 100</field>
+		<field name="question_id" ref="nb_employees"/>
+	</record>
+	<record model="crm_profiling.answer" id="partner_quality1">
+		<field name="name">bronze</field>
+		<field name="question_id" ref="partner_level"/>
+	</record>
+	<record model="crm_profiling.answer" id="partner_quality2">
+		<field name="name">silver</field>
+		<field name="question_id" ref="partner_level"/>
+	</record>
+	<record model="crm_profiling.answer" id="partner_quality3">
+		<field name="name">gold</field>
+		<field name="question_id" ref="partner_level"/>
+	</record>
+	<record model="crm_profiling.answer" id="partner_tiny1">
+		<field name="name">yes</field>
+		<field name="question_id" ref="partner_tiny"/>
+	</record>
+	<record model="crm_profiling.answer" id="partner_tiny2">
+		<field name="name">no</field>
+		<field name="question_id" ref="partner_tiny"/>
+	</record>
+
+
+	<!--
+	Resource: res.partner.category
+	-->
+
+	<record id="base.res_partner_category_15" model="res.partner.category">
+		<field name="name">IT sector</field>
+		<field name="parent_id" ref="base.res_partner_category_12"/>
+	</record>
+	<record id="base.res_partner_category_16" model="res.partner.category">
+		<field name="name">Telecom sector</field>
+		<field name="parent_id" ref="base.res_partner_category_12"/>
+	</record>
+	<record id="base.res_partner_category_17" model="res.partner.category">
+		<field name="name">HR sector</field>
+		<field name="parent_id" ref="base.res_partner_category_12"/>
+	</record>
+
+
+	<!--
+	Profiles / crm.segmentation
+	-->
+
+	<record model="crm.segmentation" id="crm_segmentation0">
+		<field name="name">TinyERP partners</field>
+		<field name="answer_yes" eval="[(6,0,[partner_tiny1])]" />
+		<field name="categ_id" ref="base.res_partner_category_2"/>
+		<field name="profiling_active">True</field>
+	</record>		
+	<record model="crm.segmentation" id="crm_segmentation1">
+		<field name="name">Bronze partners</field>
+		<field name="answer_yes" eval="[(6,0,[partner_quality1])]" />
+		<field name="parent_id" ref="crm_segmentation0"/>
+		<field name="categ_id" ref="base.res_partner_category_3"/>
+		<field name="profiling_active">True</field>
+	</record>	
+	<record model="crm.segmentation" id="crm_segmentation2">
+		<field name="name">Silver partners</field>	
+		<field name="answer_yes" eval="[(6,0,[partner_quality2])]" />
+		<field name="parent_id" ref="crm_segmentation0"/>
+		<field name="categ_id" ref="base.res_partner_category_4"/>
+		<field name="profiling_active">True</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation3">
+		<field name="name">Gold partners</field>
+		<field name="answer_yes" eval="[(6,0,[partner_quality3])]" />
+		<field name="parent_id" ref="crm_segmentation0"/>
+		<field name="categ_id" ref="base.res_partner_category_5"/>
+		<field name="profiling_active">True</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation4">
+		<field name="name">HR partners</field>
+		<field name="answer_yes" eval="[(6,0,[sector1])]" />
+		<field name="categ_id" ref="base.res_partner_category_17"/>
+		<field name="profiling_active">True</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation5">
+		<field name="name">Telecom partners</field>
+		<field name="answer_yes" eval="[(6,0,[sector2])]" />
+		<field name="categ_id" ref="base.res_partner_category_16"/>
+		<field name="profiling_active">True</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation6">
+		<field name="name">IT partners</field>
+		<field name="answer_yes" eval="[(6,0,[sector3])]" />
+		<field name="categ_id" ref="base.res_partner_category_15"/>
+		<field name="profiling_active">True</field>
+	</record>
+<!--<record model="crm.segmentation" id="crm_segmentation7">
+		<field name="name">small HR partners</field>
+		<field name="parent_id" ref="crm_segmentation4"/>
+		<field name="answer_yes" eval="[(6,0,[nb_employees2])]" />
+		<field name="categ_id">3</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation8">
+		<field name="name">not big HR partners</field>
+		<field name="parent_id" ref="crm_segmentation4"/>
+		<field name="answer_no" eval="[(6,0,[nb_employees3])]" />
+		<field name="categ_id">3</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation9">
+		<field name="name">not bronze HR partners</field>
+		<field name="parent_id" ref="crm_segmentation4"/>
+		<field name="answer_no" eval="[(6,0,[partner_quality1])]" />
+		<field name="categ_id">3</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation10">
+		<field name="name">small telecom partners</field>
+		<field name="parent_id" ref="crm_segmentation5"/>
+		<field name="answer_yes" eval="[(6,0,[nb_employees2])]" />
+		<field name="categ_id">3</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation11">
+		<field name="name">not big telecom partners</field>
+		<field name="parent_id" ref="crm_segmentation5"/>
+		<field name="answer_no" eval="[(6,0,[nb_employees3])]" />
+		<field name="categ_id">3</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation12">
+		<field name="name">not bronze telecom partners</field>
+		<field name="parent_id" ref="crm_segmentation5"/>
+		<field name="answer_no" eval="[(6,0,[partner_quality1])]" />
+		<field name="categ_id">3</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation13">
+		<field name="name">small IT partners</field>
+		<field name="parent_id" ref="crm_segmentation6"/>
+		<field name="answer_yes" eval="[(6,0,[nb_employees2])]" />
+		<field name="categ_id">3</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation14">
+		<field name="name">not big IT partners</field>
+		<field name="parent_id" ref="crm_segmentation6"/>
+		<field name="answer_no" eval="[(6,0,[nb_employees3])]" />
+		<field name="categ_id">3</field>
+	</record>
+	<record model="crm.segmentation" id="crm_segmentation15">
+		<field name="name">not bronze IT partners</field>
+		<field name="parent_id" ref="crm_segmentation6"/>
+		<field name="answer_no" eval="[(6,0,[partner_quality1])]" />
+		<field name="categ_id">3</field>
+	</record>
+
+	<record model="crm.segmentation" id="crm_segmentation16">
+		<field name="name">not bronze partners</field>
+		<field name="answer_no" eval="[(6,0,[partner_quality1])]" />
+		<field name="categ_id">3</field>
+	</record>
+-->
+	<!--
+	Partners
+	-->
+		
+	<record model="res.partner" id="base.res_partner_asus">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees2'), ref('sector2'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_16')])]"/>
+	</record>
+	<record model="res.partner" id="base.res_partner_agrolait">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees1'), ref('sector1'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_17')])]"/>
+	</record>
+	<record model="res.partner" id="base.res_partner_c2c">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/>
+	</record>
+	<record model="res.partner" id="base.res_partner_sednacom">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees1'), ref('sector2'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_16')])]"/>
+	</record>	
+	<record model="res.partner" id="base.res_partner_thymbra">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/>
+	</record>	
+	<record model="res.partner" id="base.res_partner_desertic_hispafuentes">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees2'), ref('sector2'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_16')])]"/>
+	</record>	
+	<record model="res.partner" id="base.res_partner_tinyatwork">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees1'), ref('sector1'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_17')])]"/>
+	</record>	
+	<record model="res.partner" id="base.res_partner_2">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees2'), ref('sector3'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_15')])]"/>
+	</record>	
+	<record model="res.partner" id="base.res_partner_3">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees1'), ref('sector3'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_15')])]"/>
+	</record>	
+	<record model="res.partner" id="base.res_partner_4">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees1'), ref('sector2'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_16')])]"/>
+	</record>	
+	<record model="res.partner" id="base.res_partner_5">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees2'), ref('sector1'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_17')])]"/>
+	</record>	
+	<record model="res.partner" id="base.res_partner_6">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector2'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_16')])]"/>
+	</record>	
+	<record model="res.partner" id="base.res_partner_maxtor">
+		<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees1'), ref('sector3'), ref('partner_tiny1')])]" />
+		<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_15')])]"/>
+	</record>	
+
+</data>
+</terp>
+
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
new file mode 100644
index 00000000000..d890535956a
--- /dev/null
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+<!--		<wizard
+			string="Select partners"
+			model="crm.segmentation"
+			name="open_partner"
+			menu="False"
+			id="wizard_open_partner"/>
+-->
+
+		<wizard
+			string="Using a questionnaire"
+			model="crm_profiling.questionnaire"
+			name="open_questionnaire"
+			menu="False"
+			id="wizard_open_questionnaire"/>
+
+		<record model="ir.actions.act_window" id="open_questionnaires">
+		  <field name="name">Questionnaires</field>
+		  <field name="res_model">crm_profiling.questionnaire</field>
+		  <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" />
+
+
+		<record model="ir.actions.act_window" id="open_questions">
+		  <field name="name">Questions</field>
+		  <field name="res_model">crm_profiling.question</field>
+		  <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" />
+
+<!--		<record model="ir.actions.act_window" id="open_crm_segmentations">
+		  <field name="name">Profiles</field>
+		  <field name="res_model">crm.segmentation</field>
+		  <field name="view_type">form</field>
+		  <field name="view_mode">tree,form</field>
+		</record>
+		<menuitem name="Partners/Configuration/Profiling/Profiles" id="menu_segm_crm_segmentation"
+				  action="open_crm_segmentations" />
+-->
+	<record model="ir.ui.view" id="view_questionnaire_tree">
+		<field name="name">Questionnaires</field>
+		<field name="model">crm_profiling.questionnaire</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+		  <tree string="Questionnaires">
+			<field name="name" select="1" colspan="4"/>
+			<field name="description" select="1" colspan="4"/>
+			<field name="questions_ids" colspan="4" nolabel="1"/>
+		  </tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_questionnaire_form">
+		<field name="name">Questionnaires</field>
+		<field name="model">crm_profiling.questionnaire</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+		  <form string="Questionnaires">
+			<field name="name" select="1" />
+			<newline/>
+			<field name="description" select="1" />
+			<newline/>
+			<field name="questions_ids" colspan="4"/>
+		  </form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_answer">
+		<field name="name">Answers</field>
+		<field name="model">crm_profiling.answer</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+		  <tree string="Answers">
+			<field name="question_id" select="1"/>
+			<field name="name" select="1"/>
+		  </tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_answer_form">
+		<field name="name">Answers</field>
+		<field name="model">crm_profiling.answer</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+		  <form string="Answers">
+			<field name="question_id" select="1"/>
+			<field name="name" select="1"/>
+		  </form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_question_tree">
+		<field name="name">Questions</field>
+		<field name="model">crm_profiling.question</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+		  <tree string="Questions">
+			<field name="name" select="1" colspan="4"/>
+			<field name="answers_ids" colspan="4" nolabel="1"/>
+		  </tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_question_form">
+		<field name="name">Questions</field>
+		<field name="model">crm_profiling.question</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+		  <form string="Questions">
+			<newline/>
+			<field name="name" select="1" />
+			<newline/>
+			<separator string="Avalaible answers" colspan="4"/>
+			<field name="answers_ids" colspan="4" nolabel="1" editable="bottom">
+			  <tree string="Answers" editable="bottom">
+				<field name="name" select="1"/>
+			  </tree>
+			  <form string="Answers">
+				<field name="name" select="1"/>
+			  </form>
+			</field>
+		  </form>
+		</field>
+	</record>
+
+
+	<record model="ir.ui.view" id="view_partner_form">
+		<field name="name">res.partner.profile.form</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">
+			<notebook position="inside">
+				<page string="Profiling">
+				  <button string="Use a questionnaire" name="%(wizard_open_questionnaire)d" type="action" colspan="1"/>
+				  <newline/>
+				  <field name="answers_ids" colspan="4" nolabel="1"/>
+				</page>
+			</notebook>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="crm.crm_segmentation-view">
+		<field name="name">crm.segmentation.form</field>
+		<field name="model">crm.segmentation</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Partner Segmentation">
+				<notebook>
+				<page string="Segmentation">
+					<separator string="Segmentation Description" colspan="4"/>
+					<field name="name" select="1"/>
+					<field name="exclusif"/>
+					<newline/>
+					<field name="categ_id" select="2" colspan="2"/>
+					<newline/>
+					<field name="description" select="2" colspan="4"/>
+					<field name="state"/>
+					<group col="3" colspan="2">
+						<button name="process_start" states="not running" string="Compute Segmentation" type="object"/>
+						<button name="process_stop" states="running" string="Stop Process" type="object"/>
+						<button name="process_continue" states="running" string="Continue Process" type="object"/>
+					</group>
+				</page>
+				<page string="Sales Purchase">
+					<!-- <field name="sales_purchase_active"/> -->
+					<separator string="State of Mind Computation" colspan="4"/>
+					<field name="som_interval"/>
+					<field name="som_interval_max"/>
+					<field name="som_interval_decrease"/>
+					<field name="som_interval_default"/>
+					<separator string="Segmentation Test" colspan="4"/>
+					<field name="segmentation_line" widget="one2many_list" colspan="4"/>
+				</page>
+				<page string="Profiling">
+					<field name="profiling_active" colspan="2"/>
+					<separator string="Profiling Options" colspan="4"/>
+					<field name="parent_id" colspan="2"/><newline/>
+					<separator string="Included Answers :" colspan="2" />
+					<separator string="Excluded Answers :" colspan="2"/>
+					<field name="answer_yes" nolabel="1" colspan="2"/>
+					<field name="answer_no" nolabel="1" colspan="2"/>
+				</page>
+				</notebook>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_partner_crm_segmentation_tree">
+	<!--	<field name="name">crm.segmentation.tree</field>
+		<field name="model">crm.segmentation</field>
+		<field name="type">tree</field>
+		<field name="field_parent">child_ids</field>
+		<field name="arch" type="xml">
+			<tree string="Partner Profiles">
+				<field name="name"/>
+				
+			</tree>
+		</field>
+-->		<field name="name">crm.segmentation.tree</field>
+		<field name="model">crm.segmentation</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Partner Segmentations">
+				<field name="name"/>
+				<field name="description"/>
+				<field name="categ_id"/>
+			</tree>
+		</field>
+	</record>
+
+<!--	<record model="ir.actions.act_window" id="action_partner_crm_segmentation">
+		<field name="name">Partner profile</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">crm.segmentation</field>
+		<field name="view_type">tree</field>
+		<field name="view_id" ref="view_partner_crm_segmentation_tree"/>
+		<field name="domain">[('parent_id','=',False)]</field>
+	</record>
+-->
+<!--	<menuitem
+		name="Partners/Partners by Profile" 
+		sequence="1"
+		action="action_partner_crm_segmentation" 
+		id="menu_partner_crm_segmentation_main"/>
+-->
+<!--	<record model="ir.values" id="ir_action_partner_by_crm_segmentation">
+		<field name="key2" eval="'tree_but_open'"/>
+		<field name="model" eval="'crm.segmentation'"/>
+		<field name="name">Open partners</field>
+		<field name="value" eval="'ir.actions.wizard,%d'%wizard_open_partner"/>
+		<field name="object" eval="True"/>
+	</record>
+-->
+	</data>
+</terp>
diff --git a/addons/crm_profiling/crm_profiling_wizard.xml b/addons/crm_profiling/crm_profiling_wizard.xml
new file mode 100644
index 00000000000..389a9d29cd5
--- /dev/null
+++ b/addons/crm_profiling/crm_profiling_wizard.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+<!--		<wizard
+			string="Select partners"
+			model="segmentation.profile"
+			name="open_partner"
+			id="wizard_open_partner"/>
+-->
+		</data>
+</terp>
diff --git a/addons/crm_profiling/wizard/__init__.py b/addons/crm_profiling/wizard/__init__.py
new file mode 100644
index 00000000000..7add84e8a0c
--- /dev/null
+++ b/addons/crm_profiling/wizard/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+#import open_partner
+import open_questionnaire
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_profiling/wizard/open_questionnaire.py b/addons/crm_profiling/wizard/open_questionnaire.py
new file mode 100644
index 00000000000..ce070669b18
--- /dev/null
+++ b/addons/crm_profiling/wizard/open_questionnaire.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+import pooler
+import wizard
+from tools import UpdateableStr, UpdateableDict
+
+_QUEST_FORM = UpdateableStr()
+_QUEST_FIELDS=UpdateableDict()
+
+class open_questionnaire(wizard.interface):
+
+    def _questionnaire_compute(self, cr, uid, data, context):
+        pooler.get_pool(cr.dbname).get(data['model'])._questionnaire_compute(cr, uid, data, context)
+        return {}
+
+
+    def build_form(self, cr, uid, data, context):
+        quest_form, quest_fields = pooler.get_pool(cr.dbname).get('crm_profiling.questionnaire').build_form(cr, uid, data, context)
+        _QUEST_FORM. __init__(quest_form)
+        _QUEST_FIELDS.__init__(quest_fields)
+        return{}
+
+    _questionnaire_choice_arch = '''<?xml version="1.0"?>
+    <form string="Questionnaire">
+        <field name="questionnaire_name"/>
+    </form>'''
+
+    _questionnaire_choice_fields = {
+            'questionnaire_name': {'string': 'Questionnaire name', 'type': 'many2one', 'relation': 'crm_profiling.questionnaire', 'required': True },
+    }
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch': _questionnaire_choice_arch, 'fields': _questionnaire_choice_fields, 'state':[('end', 'Cancel'), ('open', 'Open Questionnaire')]}
+        },
+        'open': {
+            'actions': [build_form],
+            'result': {'type': 'form', 'arch':_QUEST_FORM, 'fields': _QUEST_FIELDS, 'state':[('end', 'Cancel'), ('compute', 'Save Data')]}
+        },
+        'compute': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _questionnaire_compute, 'state':'end'}
+        }
+    }
+
+open_questionnaire('open_questionnaire')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_vertical/__init__.py b/addons/crm_vertical/__init__.py
new file mode 100644
index 00000000000..cd9c7c0a27c
--- /dev/null
+++ b/addons/crm_vertical/__init__.py
@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+#
+# Generated by the Tiny ERP module recorder !
+#
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_vertical/__terp__.py b/addons/crm_vertical/__terp__.py
new file mode 100644
index 00000000000..c2f13427df3
--- /dev/null
+++ b/addons/crm_vertical/__terp__.py
@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+{
+        "name" : "CRM Verticalisation",
+        "version" : "CRM Verticalisation",
+        "author" : "Tiny",
+        "website" : "http://tinyerp.com",
+        "category" : "Vertical Modules/Parametrization",
+        "description": """Simplification of the interface for CRM.""",
+        "depends" : ["crm_configuration"],
+        "init_xml" : [ ],
+        "demo_xml" : [ ],
+        "update_xml" : ["crm_vertical_view.xml","crm_vertical_shortcuts.xml"],
+        "installable": True
+} 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_vertical/crm_vertical_shortcuts.xml b/addons/crm_vertical/crm_vertical_shortcuts.xml
new file mode 100644
index 00000000000..219626bf725
--- /dev/null
+++ b/addons/crm_vertical/crm_vertical_shortcuts.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" ?>
+<terp>
+	<data noupdate="1">
+		<record id="ir_ui_view_sc_mymeetings0" model="ir.ui.view_sc">
+			<field ref="crm_configuration.menu_crm_case_categ_meet_my" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;My Meetings&quot;" name="name"/>
+			<field name="user_id" ref="base.user_admin"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="ir_ui_view_sc_myleads0" model="ir.ui.view_sc">
+			<field ref="crm_configuration.menu_crm_case_categ0_act_leads_my" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;My Leads&quot;" name="name"/>
+			<field name="user_id" ref="base.user_admin"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="ir_ui_view_sc_myjobsrequests0" model="ir.ui.view_sc">
+			<field ref="crm_configuration.menu_crm_case_categ0_act11" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;My Jobs Requests&quot;" name="name"/>
+			<field name="user_id" ref="base.user_admin"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="ir_ui_view_sc_openopportunities0" model="ir.ui.view_sc">
+			<field ref="crm_configuration.menu_crm_case_categ0_act_oppor1" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;Open Opportunities&quot;" name="name"/>
+			<field name="user_id" ref="base.user_admin"/>
+		</record>
+	</data>
+</terp>
diff --git a/addons/crm_vertical/crm_vertical_view.xml b/addons/crm_vertical/crm_vertical_view.xml
new file mode 100644
index 00000000000..3c5b0356b4b
--- /dev/null
+++ b/addons/crm_vertical/crm_vertical_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+		<record id="crm_configuration.menu_crm_case_category_act_meetings" model="ir.ui.menu">
+			<field eval="&quot;Calendar of Meetings&quot;" name="name"/>
+			<field eval="&quot;terp-calendar&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+		<record id="crm_configuration.menu_crm_case_categ0_act_leads" model="ir.ui.menu">
+			<field eval="&quot;Leads Tracking&quot;" name="name"/>
+			<field eval="&quot;terp-account&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+		<record id="crm_configuration.menu_crm_case_opp" model="ir.ui.menu">
+			<field eval="&quot;terp-sale&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+		<record id="crm_configuration.menu_crm_case_jobs" model="ir.ui.menu">
+			<field eval="&quot;terp-hr&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+		<record id="crm_configuration.menu_crm_case_bug_track" model="ir.ui.menu">
+			<field eval="&quot;terp-sale&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+		<record id="base.menu_finance_main" model="ir.ui.menu">
+			<field ref="base.menu_base_config" name="parent_id"/>
+		</record>
+	</data>
+</terp>
diff --git a/addons/delivery/__terp__.py b/addons/delivery/__terp__.py
index 54434ea7b28..7923b840292 100644
--- a/addons/delivery/__terp__.py
+++ b/addons/delivery/__terp__.py
@@ -38,6 +38,7 @@
     "update_xml" : [
         "delivery_view.xml",
         "delivery_wizard.xml",
+        "partner_view.xml",
         "ir.model.access.csv",
     ],
     "active": False,
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index cba9d83a585..da4bd854b10 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -37,9 +37,9 @@ class delivery_carrier(osv.osv):
     _description = "Carrier and delivery grids"
     _columns = {
         'name': fields.char('Carrier', size=64, required=True),
-        'partner_id': fields.many2one('res.partner', 'Carrier partner', required=True),
-        'product_id': fields.many2one('product.product', 'Delivery product', required=True),
-        'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery grids'),
+        'partner_id': fields.many2one('res.partner', 'Carrier Partner', required=True),
+        'product_id': fields.many2one('product.product', 'Delivery Product', required=True),
+        'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'),
         'active': fields.boolean('Active')
     }
     _defaults = {
@@ -66,7 +66,7 @@ delivery_carrier()
 
 class delivery_grid(osv.osv):
     _name = "delivery.grid"
-    _description = "Delivery grid"
+    _description = "Delivery Grid"
     _columns = {
         'name': fields.char('Grid Name', size=64, required=True),
         'sequence': fields.integer('Sequence', size=64, required=True),
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 4aaced6c4f6..d643f44feb7 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -124,10 +124,9 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                <field name="client_order_ref" position="after">
+                <separator string="Notes" position="before">
                     <field name="carrier_id"/>
-                     
-                </field>
+                </separator>
             </field>
         </record>
         
@@ -195,4 +194,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py
index a3fb2b81a55..9e7be38b93b 100644
--- a/addons/delivery/partner.py
+++ b/addons/delivery/partner.py
@@ -40,8 +40,7 @@ class res_partner(osv.osv):
           string="Delivery Method", 
           method=True,
           view_load=True,
-          group_name="Delivery Properties",
-          help="This carrier will be used, instead of the default one, for delivering goods to the current partner"),
+          help="This delivery method will be used when invoicing from packings."),
     }
 res_partner()
 
diff --git a/addons/delivery/partner_view.xml b/addons/delivery/partner_view.xml
new file mode 100644
index 00000000000..6d6eef912c8
--- /dev/null
+++ b/addons/delivery/partner_view.xml
@@ -0,0 +1,18 @@
+<terp>
+    <data>
+
+        <record id="view_partner_property_form" model="ir.ui.view">
+            <field name="name">res.partner.carrier.property.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <page string="Properties" position="inside">
+                    <separator string="Deliveries" colspan="4"/>
+                    <field name="property_delivery_carrier"/>
+                </page>
+            </field>
+        </record>
+
+    </data>
+</terp>
diff --git a/addons/event/__init__.py b/addons/event/__init__.py
new file mode 100644
index 00000000000..4c676d32f1a
--- /dev/null
+++ b/addons/event/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+import event
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/event/__terp__.py b/addons/event/__terp__.py
new file mode 100644
index 00000000000..17de9067e4f
--- /dev/null
+++ b/addons/event/__terp__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Event",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "category" : "Generic Modules/Association",
+    "description": """Organization and management of events.
+
+    This module allow you
+        * to manage your events and their registrations
+        * to create retro planning for managing your events
+        * to use emails to automaticly confirm and send acknowledgements for any registration to an event
+        * ...
+
+    Note that:
+    - You can define new types of events in
+                Events \ Configuration \ Types of Events
+    - You can access pre-defined reports about number of registration per event or per event category in :
+                Events \ Reporting
+""",
+    "depends" : [
+        "project","crm","base_contact",
+    ],
+    "demo_xml" : ["event_demo.xml"],
+    "init_xml" : ["event_data.xml"],
+    "update_xml" : [
+        "event_wizard.xml","event_view.xml","event_sequence.xml"
+    ],
+    "active" : False,
+    "installable" : True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/event/event.py b/addons/event/event.py
new file mode 100644
index 00000000000..adfe5b04386
--- /dev/null
+++ b/addons/event/event.py
@@ -0,0 +1,417 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2007 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.
+#
+##############################################################################
+
+from osv import fields, osv
+import time
+import netsvc
+import pooler
+import tools
+
+class crm_case_log(osv.osv):
+    _inherit = 'crm.case.log'
+    _description = 'crm.case.log'
+    def create(self, cr, uid, vals, *args, **kwargs):
+            if not 'name' in vals:
+                vals['name']='Historize'
+            return super(osv.osv,self).create(cr, uid, vals, *args, **kwargs)
+    _defaults = {
+        'user_id': lambda self,cr,uid,context: uid,
+    }
+crm_case_log()
+
+class one2many_mod_task(fields.one2many):
+    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
+        if not context:
+            context = {}
+        if not values:
+                values = {}
+        res = {}
+        for id in ids:
+            res[id] = []
+        for id in ids:
+            query = "select project_id from event_event where id = %i" %id
+            cr.execute(query)
+            project_ids = [ x[0] for x in cr.fetchall()]
+            ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',project_ids),('state','<>','done')], limit=self._limit)
+            for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
+                res[id].append( r['id'] )
+        return res
+
+class event_type(osv.osv):
+    _name = 'event.type'
+    _description= 'Event type'
+    _columns = {
+        'name': fields.char('Event type', size=64, required=True),
+    }
+event_type()
+
+class event(osv.osv):
+    _name = 'event.event'
+    _description = 'Event'
+    _inherits = {'crm.case.section': 'section_id'}
+    _order = 'date_begin'
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        return super(event, self).copy(cr, uid,id, default={'code': self.pool.get('ir.sequence').get(cr, uid, 'event.event'),})
+
+    def button_draft(self, cr, uid, ids, context={}):
+        return self.write(cr, uid, ids, {'state':'draft'})
+    def button_cancel(self, cr, uid, ids, context={}):
+        return self.write(cr, uid, ids, {'state':'cancel'})
+    def button_done(self, cr, uid, ids, context={}):
+        return self.write(cr, uid, ids, {'state':'done'})
+    def button_confirm(self, cr, uid, ids, context={}):
+        return self.write(cr, uid, ids, {'state':'confirm'})
+
+    def _get_register(self, cr, uid, ids, name, args, context=None):
+        res={}
+        for event in self.browse(cr, uid, ids, context):
+            query = """select sum(nb_register) from crm_case c left join crm_case_section s on (c.section_id=s.id) right join event_event e on (e.section_id=s.id) right join event_registration r on (r.case_id=c.id) where e.section_id = %s and c.state in ('open','done')""" % event.section_id.id
+            cr.execute(query)
+            res2 = cr.fetchone()
+            if res2 and res2[0]:
+                res[event.id] = res2[0]
+            else:
+                res[event.id] = 0
+        return res
+
+    def _get_prospect(self, cr, uid, ids, name, args, context=None):
+        res={}
+        for event in self.browse(cr, uid, ids, context):
+            query = """select sum(nb_register) from crm_case c left join crm_case_section s on (c.section_id=s.id) right join event_event e on (e.section_id=s.id) right join event_registration r on (r.case_id=c.id) where e.section_id = %s and c.state = 'draft'""" % event.section_id.id
+            cr.execute(query)
+            res2 = cr.fetchone()
+            if res2 and res2[0]:
+                res[event.id] = res2[0]
+            else:
+                res[event.id] = 0
+        return res
+
+    def write(self, cr, uid, ids,vals, *args, **kwargs):
+        res = super(event,self).write(cr, uid, ids,vals, *args, **kwargs)
+        if 'date_begin' in vals and vals['date_begin']:
+            data_event = self.browse(cr, uid, ids)
+            for eve in data_event:
+                if eve.project_id:
+                    self.pool.get('project.project').write(cr, uid, [eve.project_id.id], {'date_end':eve.date_begin})
+        return res
+
+    _columns = {
+        'type': fields.many2one('event.type', 'Type'),
+        'section_id': fields.many2one('crm.case.section', 'Case section', required=True),
+        'register_max': fields.integer('Maximum Registrations'),
+        'register_min': fields.integer('Minimum Registrations'),
+        'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations'),
+        'register_prospect': fields.function(_get_prospect, method=True, string='Unconfirmed Registrations'),
+        'project_id': fields.many2one('project.project', 'Project', readonly=True),
+        'task_ids': one2many_mod_task('project.task', 'project_id', "Project tasks", readonly=True, domain="[('state','&lt;&gt;', 'done')]"),
+        'date_begin': fields.datetime('Beginning date', required=True),
+        'date_end': fields.datetime('Ending date', required=True),
+        'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Canceled')], 'Status', readonly=True, required=True),
+        'mail_auto_registr':fields.boolean('Mail Auto Register',help='A mail is send when the registration is confirmed'),
+        'mail_auto_confirm':fields.boolean('Mail Auto Confirm',help='A mail is send when the event is confimed'),
+        'mail_registr':fields.text('Mail Register',help='Template for the mail'),
+        'mail_confirm':fields.text('Mail Confirm',help='Template for the mail'),
+        'budget_id':fields.many2one('account.budget.post','Budget'),
+        'product_id':fields.many2one('product.product','Product'),
+    }
+    _defaults = {
+        'state': lambda *args: 'draft',
+        'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'event.event'),
+        'user_id': lambda self,cr,uid,ctx: uid,
+    }
+event()
+
+class event_registration(osv.osv):
+
+    def _history(self, cr, uid,ids,keyword, history=False, email=False, context={}):
+        for case in ids:
+            data = {
+                'name': keyword,
+                'som': case.som.id,
+                'canal_id': case.canal_id.id,
+                'user_id': uid,
+                'case_id': case.case_id.id
+            }
+            obj = self.pool.get('crm.case.log')
+            obj.create(cr, uid, data, context)
+        return True
+
+    def button_reg_open(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state':'open',})
+        cases = self.browse(cr, uid, ids)
+        self._history(cr, uid, cases, 'Open', history=True)
+        self.mail_user(cr,uid,ids)
+        return True
+
+    def button_reg_close(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state':'done',})
+        cases = self.browse(cr, uid, ids)
+        self._history(cr, uid, cases, 'Done', history=True)
+        return True
+
+    def button_reg_cancel(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state':'cancel',})
+        cases = self.browse(cr, uid, ids)
+        self._history(cr, uid, cases, 'Cancel', history=True)
+        return True
+
+    def create(self, cr, uid, *args, **argv):
+        args[0]['section_id']= self.pool.get('event.event').browse(cr, uid, args[0]['event_id'], None).section_id.id
+        res = super(event_registration, self).create(cr, uid, *args, **argv)
+        self._history(cr, uid,self.browse(cr, uid, [res]), 'Created', history=True)
+        return res
+
+    def write(self, cr, uid, *args, **argv):
+        if 'event_id' in args[1]:
+            args[1]['section_id']= self.pool.get('event.event').browse(cr, uid, args[1]['event_id'], None).section_id.id
+        return super(event_registration, self).write(cr, uid, *args, **argv)
+
+    def mail_user(self,cr,uid,ids):
+        src=tools.config.options['smtp_user']
+        reg_ids=self.browse(cr,uid,ids)
+        for reg_id in reg_ids:
+            dest=reg_id.email_from
+            if (reg_id.event_id.state in ['confirm','running']) and reg_id.event_id.mail_auto_confirm:
+                if dest:
+                    tools.email_send(src,[dest],'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name,reg_id.event_id.mail_confirm)
+                    return True
+            # Sending another mail
+            if reg_id.event_id.state in ['draft', 'fixed', 'open','confirm','running'] and reg_id.event_id.mail_auto_registr:
+                if dest:
+                    tools.email_send(src,[dest],'Auto Registration: '+'['+str(reg_id.id)+']'+' '+reg_id.name,reg_id.event_id.mail_registr)
+                    return True
+        return False
+
+    _name= 'event.registration'
+    _description = 'Event Registration'
+    _inherits = {'crm.case': 'case_id'}
+    _columns = {
+        'case_id':fields.many2one('crm.case','Case'),
+        'nb_register': fields.integer('Number of Registration', readonly=True, states={'draft':[('readonly',False)]}),
+        "partner_order_id":fields.many2one('res.partner','Partner Order'),
+        'event_id':fields.many2one('event.event', 'Event Related', required=True),
+        "partner_invoice_id":fields.many2one('res.partner', 'Partner Invoice'),
+        "unit_price": fields.float('Unit Price'),
+        "badge_title":fields.char('Badge Title',size=128),
+        "badge_name":fields.char('Badge Name',size=128),
+        "badge_partner":fields.char('Badge Partner',size=128),
+        "invoice_label":fields.char("Label Invoice",size=128,required=True),
+        "tobe_invoiced":fields.boolean("To be Invoice"),
+        "invoice_id":fields.many2one("account.invoice","Invoice"),
+    }
+    _defaults = {
+        'nb_register': lambda *a: 1,
+        'tobe_invoiced' : lambda *a: True,
+        'name': lambda *a: 'Registration'
+    }
+
+    def onchange_badge_name(self, cr, uid, ids, badge_name):
+        data ={}
+        if not badge_name:
+            return data
+        data['name'] = 'Registration: ' + badge_name
+        return {'value':data}
+
+    def onchange_contact_id(self, cr, uid, ids, contact_id):
+        data ={}
+        if not contact_id:
+            return data
+        obj_addr=self.pool.get('res.partner.address').browse(cr, uid, contact_id)
+        data['email_from'] = obj_addr.email
+
+        if obj_addr.contact_id:
+            data['badge_name']=obj_addr.contact_id.name
+            data['badge_title']=obj_addr.contact_id.title
+            d=self.onchange_badge_name(cr, uid, ids,data['badge_name'])
+            data.update(d['value'])
+
+        return {'value':data}
+
+    def onchange_event(self, cr, uid, ids, event_id, partner_invoice_id):
+        context={}
+        if not event_id:
+            return {'value':{'unit_price' : False ,'invoice_label' : False }}
+        data_event =  self.pool.get('event.event').browse(cr,uid,event_id)
+        if data_event.product_id:
+            if not partner_invoice_id:
+                unit_price=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id],context=context)[data_event.product_id.id]
+                return {'value':{'unit_price' : unit_price , 'invoice_label' : data_event.product_id.name}}
+            data_partner = self.pool.get('res.partner').browse(cr,uid,partner_invoice_id)
+            context.update({'partner_id':data_partner})
+            unit_price = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist':data_partner.property_product_pricelist.id})[data_event.product_id.id]
+            return {'value':{'unit_price' :unit_price , 'invoice_label' : data_event.product_id.name}}
+        return {'value':{'unit_price' : False,'invoice_label' : False}}
+
+
+    def onchange_partner_id(self, cr, uid, ids, part, event_id, email=False):#override function for partner name.
+        data={}
+        data['badge_partner']=data['partner_address_id']=data['partner_invoice_id']=data['email_from']=data['badge_title']=data['badge_name']=False
+        if not part:
+            return {'value':data}
+
+        data['partner_invoice_id']=part
+        # this calls onchange_partner_invoice_id
+        d=self.onchange_partner_invoice_id(cr, uid, ids, event_id,part)
+        # this updates the dictionary
+        data.update(d['value'])
+        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
+        data['partner_address_id']=addr['contact']
+        if addr['contact']:
+            d=self.onchange_contact_id(cr, uid, ids,addr['contact'])
+            data.update(d['value'])
+        partner_data=self.pool.get('res.partner').browse(cr, uid, part)
+        data['badge_partner']=partner_data.name
+        return {'value':data}
+
+    def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id):
+        data={}
+        context={}
+        data['unit_price']=False
+        if not event_id:
+            return {'value':data}
+        data_event =  self.pool.get('event.event').browse(cr,uid,event_id)
+
+        if data_event.product_id:
+            if not partner_invoice_id:
+                data['unit_price']=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id],context=context)[data_event.product_id.id]
+                return {'value':data}
+            data_partner = self.pool.get('res.partner').browse(cr,uid,partner_invoice_id)
+            context.update({'partner_id':data_partner})
+            data['unit_price'] = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist':data_partner.property_product_pricelist.id})[data_event.product_id.id]
+            return {'value':data}
+        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 _map_ids(self,method,cr, uid, ids, *args, **argv):
+        case_data = self.browse(cr,uid,ids)
+        new_ids=[]
+        for case in case_data:
+            new_ids.append(case.case_id.id)
+        return getattr(self.pool.get('crm.case'),method)(cr, uid, new_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_escalate(self,cr, uid, ids, *args, **argv):
+        return self._map_ids('case_escalate',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_pending(self,cr, uid, ids, *args, **argv):
+        return self._map_ids('case_pending',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_log(self,cr, uid, ids, *args, **argv):
+        return self._map_ids('case_log',cr,uid,ids,*args,**argv)
+    def case_log_reply(self,cr, uid, ids, *args, **argv):
+        return self._map_ids('case_log_reply',cr,uid,ids,*args,**argv)
+    def add_reply(self,cr, uid, ids, *args, **argv):
+        return self._map_ids('add_reply',cr,uid,ids,*args,**argv)
+    def remind_partner(self,cr, uid, ids, *args, **argv):
+        return self._map_ids('remind_partner',cr,uid,ids,*args,**argv)
+    def remind_user(self,cr, uid, ids, *args, **argv):
+        return self._map_ids('remind_user',cr,uid,ids,*args,**argv)
+
+
+event_registration()
+
+
+
+class report_event_registration(osv.osv):
+    _name = "report.event.registration"
+    _description = "Events on registrations"
+    _auto = False
+    _columns = {
+        'name': fields.char('Event',size=20),
+        'date_begin': fields.datetime('Beginning date', required=True),
+        'date_end': fields.datetime('Ending date', required=True),
+        'draft_state': fields.integer('Draft Registration',size=20),
+        'confirm_state': fields.integer('Confirm Registration',size=20),
+        'register_max': fields.integer('Maximum Registrations'),
+    }
+    def init(self, cr):
+        cr.execute("""
+            create or replace view report_event_registration as (
+                select
+                e.id as id,
+                c.name as name,
+                e.date_begin as date_begin,
+                e.date_end as date_end,
+                (SELECT sum(nb_register) FROM event_registration x , crm_case c  WHERE x.case_id=c.id and c.section_id=e.section_id and state in ('draft')) as draft_state,
+                (SELECT sum(nb_register) FROM event_registration x , crm_case c  WHERE x.case_id=c.id and c.section_id=e.section_id and state in ('open')) as confirm_state,
+                e.register_max as register_max
+                from
+                event_event e,crm_case_section c
+                where
+                e.section_id=c.id
+                )""")
+
+report_event_registration()
+
+class report_event_type_registration(osv.osv):
+    _name = "report.event.type.registration"
+    _description = "Event type on registration"
+    _auto = False
+    _columns = {
+        'name': fields.char('Event Type',size=20),
+        'nbevent':fields.integer('Number Of Events'),
+        'draft_state': fields.integer('Draft Registrations',size=20),
+        'confirm_state': fields.integer('Confirm Registrations',size=20),
+        }
+    def init(self, cr):
+        cr.execute("""
+            create or replace view report_event_type_registration as (
+                select
+                count(t.id) as id,
+                t.name as name,
+                (select sum(nb_register) from event_registration r , crm_case c , event_event e  where c.section_id=e.section_id and r.case_id=c.id and c.state='draft' and e.type=t.id ) as draft_state ,
+                (select sum(nb_register) from event_registration r , crm_case c , event_event e  where c.section_id=e.section_id and r.case_id=c.id and c.state='open' and e.type=t.id ) as  confirm_state,
+                count(t.id) as nbevent
+                from
+                    event_event e
+                inner join
+                    crm_case_section c1 on (e.section_id=c1.id)
+                inner join
+                    event_type t on (e.type=t.id)
+                group by
+                    t.name,t.id
+
+            )""")
+report_event_type_registration()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml
new file mode 100644
index 00000000000..bc8d77bb541
--- /dev/null
+++ b/addons/event/event_data.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+<!-- The base section for all events -->
+
+		<record model="crm.case.section" id="case_section_event">
+			<field name="name">Events</field>
+		</record>
+
+
+	</data>
+</terp>
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
new file mode 100644
index 00000000000..5f743c699a8
--- /dev/null
+++ b/addons/event/event_demo.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+<!-- Demo Data for Product -->
+	<record id="event_product_0" model="product.product">
+		<field name="list_price">68.00</field>
+		<field name="standard_price">15.00</field>
+		<field name="uom_id" ref="product.product_uom_unit"/>
+		<field name="uom_po_id" ref="product.product_uom_unit"/>
+		<field name="name">Ticket for Concert</field>
+		<field name="categ_id" model="product.category" search="[]"/>
+	</record>
+
+	<record id="event_product_1" model="product.product">
+		<field name="list_price">24.00</field>
+		<field name="standard_price">15.00</field>
+		<field name="uom_id" ref="product.product_uom_unit"/>
+		<field name="uom_po_id" ref="product.product_uom_unit"/>
+		<field name="name">Ticket for Opera</field>
+		<field name="categ_id" model="product.category" search="[]"/>
+	</record>
+
+	<record id="event_product_2" model="product.product">
+		<field name="list_price">15.50</field>
+		<field name="standard_price">5.00</field>
+		<field name="uom_id" ref="product.product_uom_unit"/>
+		<field name="uom_po_id" ref="product.product_uom_unit"/>
+		<field name="name">Ticket for Conference</field>
+		<field name="categ_id" model="product.category" search="[]"/>
+	</record>
+
+
+<!-- Demo Data for Event Type -->
+	<record id="event_type_0" model="event.type">
+		<field name="name">Seminar</field>
+	</record>
+
+	<record id="event_type_1" model="event.type">
+		<field name="name">Exhibition</field>
+	</record>
+
+	<record id="event_type_2" model="event.type">
+		<field name="name">Conference</field>
+	</record>
+
+	<record id="event_type_3" model="event.type">
+		<field name="name">Saloon</field>
+	</record>
+
+	<record id="event_type_4" model="event.type">
+		<field name="name">Training</field>
+	</record>
+
+<!-- Demo data for Event -->
+	<record id="event_0" model="event.event">
+		<field name="name">Concert of Bon Jovi</field>
+		<field name="date_begin">2008-01-01 19:00:00</field>
+		<field name="date_end">2008-01-01 23:00:00</field>
+		<field name="product_id" ref="event_product_0"/>
+		<field name="parent_id" ref="case_section_event"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="register_max">500</field>
+		<field name="type" ref="event_type_1"/>
+		<field name="state">draft</field>
+	</record>
+<!--
+	<record id="demo_event_0bis" model="event.event">
+		<field name="name">Concert of Bon Jovi - Brussel</field>
+		<field name="date_begin">2008-02-02 19:00:00</field>
+		<field name="date_end">2008-02-02 23:00:00</field>
+		<field name="product_id" ref="event_product_0"/>
+		<field name="parent_id" ref="event_0"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="register_max">500</field>
+		<field name="type" ref="event_type_1"/>
+	</record>
+
+	<record id="demo_event_0ter" model="event.event">
+		<field name="name">Concert of Bon Jovi - London</field>
+		<field name="date_begin">2008-04-04 19:00:00</field>
+		<field name="date_end">2008-04-04 23:00:00</field>
+		<field name="product_id" ref="event_product_0"/>
+		<field name="parent_id" ref="event_0"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="register_max">500</field>
+		<field name="type" ref="event_type_1"/>
+	</record>
+-->
+	<record id="event_1" model="event.event">
+		<field name="name">Opera of Verdi</field>
+		<field name="date_begin">2008-03-05 18:00:00</field>
+		<field name="date_end">2008-03-05 21:00:00</field>
+		<field name="product_id" ref="event_product_1"/>
+		<field name="type" ref="event_type_1"/>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="parent_id" ref="case_section_event"/>
+		<field name="register_max">350</field>
+		<field name="state">confirm</field>
+	</record>
+
+	<record id="event_2" model="event.event">
+		<field name="name">Conference on ERP Buisness</field>
+		<field name="date_begin">2008-09-09 14:00:00</field>
+		<field name="date_end">2008-09-09 16:30:00</field>
+		<field name="product_id" ref="event_product_2"/>
+		<field name="type" ref="event_type_2"/>
+		<field name="register_max">200</field>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="parent_id" ref="case_section_event"/>
+		<field name="mail_auto_registr">True</field>
+		<field name="mail_auto_confirm">True</field>
+		<field name="state">done</field>
+		<field name="mail_registr">Thanks for registrering. We will keep you informed of the modalities.</field>
+		<field name="mail_confirm">Thanks for registrering. The conference will begin at 2 PM and will be given by Mister Pinckaers.</field>
+	</record>
+
+<!-- Demo data for Registration -->
+	<record id="event_registration_0" model="event.registration">
+		<field name="name">Registration for "Conference on Environment"</field>
+		<field name="partner_id" ref="base.res_partner_asus"/>
+		<field name="event_id" ref="event_2"/>
+		<field name="unit_price">15.50</field>
+		<field name="invoice_label">Ticket for Conference</field>
+	</record>
+	<record id="event_registration_1" model="event.registration">
+		<field name="name">Registration for "Opera of Verdi"</field>
+		<field name="partner_id" ref="base.res_partner_agrolait"/>
+		<field name="event_id" ref="event_1"/>
+		<field name="invoice_label">Ticket for Opera</field>
+		<field name="unit_price">24.00</field>
+		<field name="nb_register">5</field>
+	</record>
+	<record id="event_registration_2" model="event.registration">
+		<field name="name">Registration for "Concert of Bon Jovi"</field>
+		<field name="partner_id" ref="base.res_partner_c2c"/>
+		<field name="event_id" ref="event_0"/>
+		<field name="invoice_label">Ticket for Concert</field>
+		<field name="unit_price">68.00</field>
+		<field name="nb_register">2</field>
+	</record>
+
+	</data>
+</terp>
diff --git a/addons/event/event_sequence.xml b/addons/event/event_sequence.xml
new file mode 100644
index 00000000000..55124ec6462
--- /dev/null
+++ b/addons/event/event_sequence.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+	#
+	# Sequences for crm.case.section
+	#
+
+	<record model="ir.sequence.type" id="seq_section_code">
+		<field name="name">Section Code</field>
+		<field name="code">event.event</field>
+	</record>
+	<record model="ir.sequence" id="seq_section_code1">
+		<field name="name">Section Code</field>
+		<field name="code">event.event</field>
+		<field name="prefix">C/</field>
+		<field name="padding">3</field>
+	</record>
+
+</data>
+</terp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
new file mode 100644
index 00000000000..6a55ea9dfcd
--- /dev/null
+++ b/addons/event/event_view.xml
@@ -0,0 +1,399 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+	<!-- EVENTS  -->
+		<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">
+			<field name="name">Event type</field>
+			<field name="model">event.type</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Event Type">
+					<field name="name" select="1"/>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_event_type_tree">
+			<field name="name">Event type</field>
+			<field name="model">event.type</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Event Type">
+					<field name="name"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_event_type">
+			<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="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config"/>
+
+		<!-- The base section for all events -->
+
+		<record model="ir.actions.act_window" id="action_event_categories">
+			<field name="name">Events by section</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">crm.case.section</field>
+			<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"/>
+
+
+	<!-- Events Organisation/CONFIGURATION/EVENTS  -->
+
+		<record model="ir.ui.view" id="view_event_form">
+			<field name="name">Events</field>
+			<field name="model">event.event</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Events">
+					<notebook>
+					<page string="Information">
+						<separator string="Event description" colspan="4"/>
+						<field name="name" string="Event" select="1" colspan="4"/>
+						<field name="parent_id" domain="[('parent_id','child_of','Event')]" string="Category"/>
+						<field name="type"/>
+						<field name="user_id" select="1"/>
+						<field name="active"/>
+						<field name="date_begin" select="1"/>
+						<field name="date_end" select="2"/>
+						<field name="register_min" select="2"/>
+						<field name="register_max" select="2"/>
+						<field name="budget_id"/>
+						<field name="product_id" required="1"/>
+						<separator string="Tasks management" colspan="4"/>
+						<field name="project_id"/>
+						<button string="Create Retro-Planning" name="%(event.event_wiz)d" type="action"/>
+						<separator string="Status" colspan="4"/>
+						<field name="state" select="1"/>
+						<group col="4" colspan="2">
+							<button string="Confirm Event" name="button_confirm" states="draft" type="object"/>
+							<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
+							<button string="Event Done" name="button_done" states="confirm" type="object"/>
+							<button string="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object"/>
+						</group>
+					</page>
+					<page string="Mailing">
+						<field name="mail_auto_registr"/>
+						<newline/><newline/>
+						<field name="mail_registr"/>
+						<newline/>
+						<field name="mail_auto_confirm"/>
+						<newline/><newline/>
+						<field name="mail_confirm"/>
+						<newline/>
+					</page>
+					<page string="Statistics">
+						<separator string="Registrations" colspan="4"/>
+						<field name="register_current"/>
+						<field name="register_prospect"/>
+						<separator string="Remaining Tasks" colspan="4"/>
+						<field name="task_ids" colspan="4" nolabel="1" widget="one2many_list" >
+								<tree string="All tasks" colors="red:date_deadline&lt;current_date and state=='draft';blue:date_deadline==current_date and state=='draft';grey:state=='cancel' or state=='close'">
+									<field name="sequence"/>
+									<field name="name"/>
+									<field name="user_id" />
+									<field name="date_deadline" />
+									<field name="planned_hours" widget="float_time"/>
+									<field name="effective_hours" widget="float_time"/>
+									<field name="state" />
+								</tree>
+						</field>
+					</page>
+					</notebook>
+			</form>
+			</field>
+		</record>
+
+		<!-- event.event tree view -->
+		<record model="ir.ui.view" id="view_event_tree">
+			<field name="name">event.event.tree</field>
+			<field name="model">event.event</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Events" colors="red:register_min>register_current">
+					<field name="name" string="Name"/>
+					<field name="user_id"/>
+					<field name="date_begin"/>
+					<field name="register_min"/>
+					<field name="register_current"/>
+					<field name="state"/>
+				</tree>
+			</field>
+		</record>
+
+	<!-- Events Organisation/CONFIGURATION/EVENTS  -->
+		<record model="ir.actions.act_window" id="action_new_event_form">
+			<field name="name">New event</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">event.event</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form,tree</field>
+		</record>
+		<menuitem parent="menu_event_config" id="menu_event_new_event" action="action_new_event_form" />
+
+
+		<record model="ir.actions.act_window" id="action_event_view">
+			<field name="name">Events</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">event.event</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+		</record>
+		<menuitem name="All Events" id="menu_event_event" action="action_event_view" parent="menu_event_main"/>
+
+		<record model="ir.actions.act_window" id="action_event_view_draft">
+			<field name="name">Draft Events</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">event.event</field>
+			<field name="domain">[('state','=','draft')]</field>
+		</record>
+		<menuitem
+			parent="menu_event_event"
+			id="menu_event_event_draft"
+			action="action_event_view_draft" />
+		<record model="ir.actions.act_window" id="action_event_view_confirm">
+			<field name="name">Confirmed Events</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">event.event</field>
+			<field name="domain">[('state','=','confirm')]</field>
+		</record>
+		<menuitem parent="menu_event_event"
+			id="menu_event_event_confi.rm"
+			action="action_event_view_confirm" />
+
+
+	<!-- EVENTS/REGISTRATIONS/EVENTS  -->
+
+		<!-- Registration view (form) by _inherits  .................. -->
+		<record model="ir.ui.view" id="event_registration_tree">
+			<field name="name">event.registration.tree</field>
+			<field name="model">event.registration</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Registration">
+					<field name="id"/>
+					<field name="date"/>
+					<field name="event_id"/>
+					<field name="partner_id"/>
+					<field name="nb_register"/>
+					<field name="state"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="event_registration_form">
+			<field name="name">event.registration.form</field>
+			<field name="model">event.registration</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Registration">
+					<notebook>
+					<page string="General">
+						<field name="event_id" select="1" on_change="onchange_event(event_id, partner_invoice_id)" colspan="1"/>
+						<field name="nb_register"/>
+						<newline/>
+						<field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id,event_id, email_from)" />
+						<field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
+						<field name="partner_address_id" select="2" on_change="onchange_contact_id(partner_address_id)" colspan="3"/>
+						<field name="email_from" select="2"/>
+						<button name="remind_partner" string="Send Reminder" states="open,pending" type="object" colspan="2"/>
+						<field name="user_id" select="1"/>
+						<button name="remind_user" string="Send Reminder" states="open,pending" type="object" colspan="2"/>
+						<newline/>
+						<separator colspan="4"/>
+						<field name="unit_price" select="2"/>
+						<separator string="Badge" colspan="4"/>
+						<field name="badge_title" select="2"/>
+						<field name="badge_name" select="2" on_change="onchange_badge_name(badge_name)"/>
+						<field name="badge_partner" select="2"/>
+						<newline/>
+						<separator colspan="4"/>
+						<group col="8" colspan="4">
+							<field name="state" select="1" colspan="2"/>
+							<button name="button_reg_close" string="Registration Invoiced" states="open" type="object"/>
+							<button name="button_reg_open" string="Confirm Registration" states="draft" type="object"/>
+							<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
+						</group>
+					</page>
+					<page string="Extra Info">
+						<field name="name" select="1" colspan="4"/>
+						<field name="id" select="1"/>
+						<field name="active" select="2"/>
+						<field name="email_cc" colspan="4"/>
+						<field name="categ_id" select="2" on_change="onchange_categ_id(categ_id)"/>
+						<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="References"/>
+						<field name="ref" colspan="4"/>
+						<field name="ref2" colspan="4"/>
+					</page>
+					<page string="History">
+						<field name="history_line" colspan="4" nolabel="1" mode="tree,form">						<form string="Communication history">
+								<field name="date"/>
+								<field name="som"/>
+								<newline/>
+								<field name="canal_id"/>
+								<field name="email"/>
+								<newline/>
+								<field name="description" colspan="4"/>
+							</form>
+							<tree string="Communication history">
+								<field name="date"/>
+								<field name="description"/>
+								<field name="som"/>
+								<field name="user_id"/>
+								<field name="canal_id"/>
+							</tree>
+						</field>
+						<field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
+							<tree string="Actions">
+								<separator string="Action Information" colspan="4"/>
+								<field name="name"/>
+								<field name="date"/>
+								<field name="user_id"/>
+							</tree>
+							<form string="Actions">
+								<separator string="Action Information" colspan="4"/>
+								<field name="name" colspan="4"/>
+								<field name="date" select="2"/>
+								<field name="user_id" select="2"/>
+							</form>
+						</field>
+					</page>
+					<page string="Payments">
+						<field name="invoice_label" select="1"/>
+						<field name="tobe_invoiced" select="1"/>
+						<field name="invoice_id"/>
+					</page>
+					</notebook>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_registration">
+		  <field name="name">Registrations</field>
+		  <field name="res_model">event.registration</field>
+		  <field name="view_type">form</field>
+		  <field name="domain"></field>
+		  <field name="view_mode">tree,form</field>
+		</record>
+		<menuitem
+			name="All Registrations"
+			id="menu_action_registration" parent="menu_event_main"
+			action="action_registration"/>
+		<record model="ir.actions.act_window" id="action_registration_draft">
+		  <field name="name">Unconfirmed Registrations</field>
+		  <field name="res_model">event.registration</field>
+		  <field name="view_type">form</field>
+		  <field name="domain">[('state','=','draft')]</field>
+		  <field name="view_mode">tree,form</field>
+		</record>
+		<menuitem
+			parent="menu_action_registration"
+			id="menu_action_registration_draft"
+			action="action_registration_draft"/>
+		<record model="ir.actions.act_window" id="action_registration_confirm">
+		  <field name="name">Confirmed Registrations</field>
+		  <field name="res_model">event.registration</field>
+		  <field name="view_type">form</field>
+		  <field name="domain">[('state','in',('open','done'))]</field>
+		</record>
+		<menuitem
+			parent="menu_action_registration"
+			id="menu_action_registration_confirm"
+			action="action_registration_confirm"/>
+
+
+	<!-- report , event on registration... start -->
+		<record model="ir.ui.view" id="report_event_registration_tree">
+			<field name="name">report.event.registration.tree</field>
+			<field name="model">report.event.registration</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Event on Registration">
+					<field name="name" select="1"/>
+					<field name="date_begin" select="1"/>
+					<field name="date_end"/>
+					<field name="draft_state" select="2"/>
+					<field name="confirm_state" select="2"/>
+					<field name="register_max" select="2"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model ="ir.ui.view" id="report_event_registration_graph">
+			<field name="name">report.event.registration.graph</field>
+			<field name="model">report.event.registration</field>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="Event on Registration" type="bar">
+					<field name="name"/>
+					<field name="draft_state" operator="+"/>
+					<field name="confirm_state" operator="+"/>
+					<field name="register_max" operator="+"/>
+				</graph>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_event_registration">
+			<field name="name">Events On Registrations</field>
+			<field name="res_model">report.event.registration</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">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"/>
+	<!-- end... -->
+
+
+	<!-- report , event  type on registration... start -->
+		<record model="ir.ui.view" id="report_event_type_registration_tree">
+			<field name="name">report.event.type.registration.tree</field>
+			<field name="model">report.event.type.registration</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Registration By Event Types">
+					<field name="name" select="1"/>
+					<field name="nbevent"/>
+					<field name="draft_state" select="2"/>
+					<field name="confirm_state" select="2"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="report_event_type_registration_graph">
+			<field name="name">report.event.type.registration.graph</field>
+			<field name="model">report.event.type.registration</field>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="Registration By Event Types" type="bar">
+					<field name="name"/>
+					<field name="draft_state" operator="+"/>
+					<field name="confirm_state" operator="+"/>
+				</graph>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_event_type_registration">
+			<field name="name">Registration By Event Types</field>
+			<field name="res_model">report.event.type.registration</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">graph,tree</field>
+		</record>
+			<menuitem parent="menu_report_event" action="action_event_type_registration" id="menu_report_event_type_registration"/>
+
+	<!-- end...  -->
+	</data>
+</terp>
diff --git a/addons/event/event_wizard.xml b/addons/event/event_wizard.xml
new file mode 100644
index 00000000000..1e2a7d24176
--- /dev/null
+++ b/addons/event/event_wizard.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+		<wizard string="Project"
+			model="event.event"
+			name="event.project"
+			id="event_wiz"
+			menu="False"/>
+
+		<wizard
+			string="Tasks"
+			model="event.event"
+			name="wizard_event_tasks"
+			id="wizard_event_task"/>
+
+		<wizard
+			string="Registrations"
+			model="event.event"
+			name="wizard_event_registration"
+			id="wizard_event_registration"/>
+
+		<wizard
+			string="New child event"
+			model="event.event"
+			name="wizard_event_new"
+			keyword="client_action_multi"
+			menu="False"
+			id="wizard_event_new"/>
+
+		<wizard
+			string="List Register Partners"
+			model="event.event"
+			name="event.event_reg_partners"
+			id="wizard_event_reg_partners"/>
+
+		<wizard string="Make Invoice"
+					model="event.registration"
+					name="event.reg_make_invoice"
+					id="event_reg_invoice"
+					menu="True"
+		/>
+		<record model="ir.values" id="ir_open_new_event">
+			<field name="key2">tree_but_open</field>
+			<field name="model">event.event</field>
+			<field name="name">New child event</field>
+			<field name="value" eval="'ir.actions.wizard,%d'%wizard_event_new"/>
+			<field name="object" eval="True"/>
+		</record>
+
+	</data>
+</terp>
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
new file mode 100644
index 00000000000..f6d9422cf4f
--- /dev/null
+++ b/addons/event/wizard/__init__.py
@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+import event_registration
+import project_wizard
+import make_invoice
+import event_registrations_partner
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/event/wizard/event_registration.py b/addons/event/wizard/event_registration.py
new file mode 100644
index 00000000000..4e4c9b73e7d
--- /dev/null
+++ b/addons/event/wizard/event_registration.py
@@ -0,0 +1,64 @@
+# -*- encoding: utf-8 -*-
+import wizard
+import pooler
+
+def _event_registration(self, cr, uid, data, context):
+    event_id = data['id']
+    cr.execute(''' SELECT section_id FROM event_event WHERE id = %d '''% (event_id, ))
+    res = cr.fetchone()
+    value = {
+        'domain': [('section_id', '=', res[0])],
+        'name': 'Event registration',
+        'view_type': 'form',
+        'view_mode': 'tree,form',
+        'res_model': 'event.registration',
+        'context': { },
+        'type': 'ir.actions.act_window'
+    }
+    return value
+
+class wizard_event_registration(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'action',
+                'action': _event_registration,
+                'state': 'end'
+            }
+        },
+    }
+wizard_event_registration("wizard_event_registration")
+
+def _event_tasks(self, cr, uid, data, context):
+    event_id = data['id']
+    cr.execute('''SELECT project_id FROM event_event WHERE id = %d '''% (event_id, ))
+    res = cr.fetchone()
+    if not res[0]:
+        raise wizard.except_wizard('Error !', 'No project defined for this event.\nYou can create one with the retro-planning button !')
+    value = {
+        'domain': [('project_id', '=', res[0])],
+        'name': 'Tasks',
+        'view_type': 'form',
+        'view_mode': 'tree,form,calendar',
+        'res_model': 'project.task',
+        'context': { },
+        'type': 'ir.actions.act_window'
+    }
+    return value
+
+class wizard_event_tasks(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'action',
+                'action': _event_tasks,
+                'state': 'end'
+            }
+        },
+    }
+wizard_event_tasks("wizard_event_tasks")
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/event/wizard/event_registrations_partner.py b/addons/event/wizard/event_registrations_partner.py
new file mode 100644
index 00000000000..3b093815d7f
--- /dev/null
+++ b/addons/event/wizard/event_registrations_partner.py
@@ -0,0 +1,76 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: make_invoice.py 1070 2005-07-29 12:41:24Z nicoe $
+#
+# 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 pooler
+
+from osv import fields, osv
+
+def _list_partners(self, cr, uid, data, context):
+        list_partner = []
+        pool_obj=pooler.get_pool(cr.dbname)
+        obj_reg=pool_obj.get('event.registration')
+        reg_ids = obj_reg.search(cr, uid, [('event_id','in',data['ids'])])
+        data_reg = obj_reg.browse(cr, uid, reg_ids)
+        for reg in data_reg:
+            if not reg.partner_id.id in list_partner:
+                list_partner.append(reg.partner_id.id)
+        data['partner_ids'] = list_partner
+        return {}
+
+class event_partners(wizard.interface):
+    def _reg_partners(self, cr, uid, data, context):
+        pool_obj = pooler.get_pool(cr.dbname)
+        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_partner_form')])
+        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,data['partner_ids']))+"])]",
+            'name': 'Partners',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'res.partner',
+            'views': [(False,'tree'),(resource_id,'form')],
+            'type': 'ir.actions.act_window'
+        }
+        return {}
+
+    states = {
+        'init' : {
+               'actions' : [_list_partners],
+               'result': {'type': 'action' , 'action':_reg_partners, 'state':'end'}
+            },
+
+    }
+
+event_partners("event.event_reg_partners")
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/event/wizard/make_invoice.py b/addons/event/wizard/make_invoice.py
new file mode 100644
index 00000000000..0ef2c05197c
--- /dev/null
+++ b/addons/event/wizard/make_invoice.py
@@ -0,0 +1,166 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: make_invoice.py 1070 2005-07-29 12:41:24Z nicoe $
+#
+# 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 netsvc
+import pooler
+
+from osv import fields, osv
+form = """<?xml version="1.0"?>
+<form string="Create Invoices">
+    <newline />
+    <field name="inv_created"/>
+    <newline />
+    <field name="inv_rejected"/>
+    <newline />
+    <field name="inv_rej_reason" width="400"/>
+</form>
+"""
+fields = {
+      'inv_created': {'string':'Invoice Created', 'type':'char', 'readonly':True},
+      'inv_rejected': {'string':'Invoice Rejected', 'type':'char', 'readonly':True},
+      'inv_rej_reason': {'string':'Error Messages', 'type':'text', 'readonly':True},
+          }
+
+def _makeInvoices(self, cr, uid, data, context):
+        invoices = {}
+        invoice_ids = []
+        create_ids=[]
+        tax_ids=[]
+        pool_obj=pooler.get_pool(cr.dbname)
+
+        inv_create = 0
+        inv_reject = 0
+        inv_rej_reason = ""
+        list_inv = []
+        obj_event_reg=pool_obj.get('event.registration')
+        data_event_reg=obj_event_reg.browse(cr,uid,data['ids'])
+        obj_lines=pool_obj.get('account.invoice.line')
+
+        for reg in data_event_reg:
+            if reg.state=='draft':
+               inv_reject = inv_reject + 1
+               inv_rej_reason += "ID "+str(reg.id)+": Invoice cannot be created if the registration is in draft state. \n"
+               continue
+            if (not reg.tobe_invoiced):
+                inv_reject = inv_reject + 1
+                inv_rej_reason += "ID "+str(reg.id)+": Registration Cannot Be Invoiced. \n"
+                continue
+            if reg.invoice_id:
+                inv_reject = inv_reject + 1
+                inv_rej_reason += "ID "+str(reg.id)+": Registration Already Has an Invoice Linked. \n"
+                continue
+            if not reg.event_id.product_id:
+                inv_reject = inv_reject + 1
+                inv_rej_reason += "ID "+str(reg.id)+": Event Related Doesn't Have any Product. \n"
+                continue
+            if not reg.partner_address_id:
+                inv_reject = inv_reject + 1
+                inv_rej_reason += "ID "+str(reg.id)+": Registration Doesn't Have any Contact. \n"
+                continue
+            if not reg.partner_invoice_id:
+                inv_reject = inv_reject + 1
+                inv_rej_reason += "ID "+str(reg.id)+": Registration Doesn't Have any Partner to Invoice. \n"
+                continue
+
+            inv_create = inv_create + 1
+            value=obj_lines.product_id_change(cr, uid, [], reg.event_id.product_id.id,uom =False, partner_id=reg.partner_invoice_id.id)
+
+            data_product=pool_obj.get('product.product').browse(cr,uid,[reg.event_id.product_id.id])
+            a = reg.partner_invoice_id.property_account_receivable.id
+
+            for tax in data_product[0].taxes_id:
+                tax_ids.append(tax.id)
+            inv_id =pool_obj.get('account.invoice.line').create(cr, uid, {
+                    'name': reg.name,
+                    'account_id':value['value']['account_id'],
+                    'price_unit': reg.unit_price,
+                    'quantity': reg.nb_register,
+                    'discount': False,
+                    'uos_id': value['value']['uos_id'],
+                    'product_id':reg.event_id.product_id.id,
+                    'invoice_line_tax_id': [(6,0,tax_ids)],
+                    'note':False,
+            })
+
+            inv = {
+                'name': reg.invoice_label,
+                'origin': reg.invoice_label,
+                'type': 'out_invoice',
+                'reference': False,
+                'account_id': reg.partner_invoice_id.property_account_receivable.id,
+                'partner_id': reg.partner_invoice_id.id,
+                'address_invoice_id':reg.partner_address_id.id,
+                'address_contact_id':reg.partner_address_id.id,
+                'invoice_line': [(6,0,[inv_id])],
+                'currency_id' :reg.partner_invoice_id.property_product_pricelist.currency_id.id,
+                'comment': "",
+                'payment_term':reg.partner_invoice_id.property_payment_term.id,
+            }
+
+            inv_obj = pool_obj.get('account.invoice')
+            inv_id = inv_obj.create(cr, uid, inv)
+            list_inv.append(inv_id)
+            obj_event_reg.write(cr, uid,reg.id, {'invoice_id' : inv_id,'state':'done'})
+            obj_event_reg._history(cr, uid,[reg], 'Invoiced', history=True)
+
+        return {'inv_created' : str(inv_create) , 'inv_rejected' : str(inv_reject) , 'invoice_ids':  list_inv, 'inv_rej_reason': inv_rej_reason}
+
+class make_invoice(wizard.interface):
+    def _list_invoice(self, cr, uid, data, context):
+        pool_obj = pooler.get_pool(cr.dbname)
+        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_form')])
+        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,data['form']['invoice_ids']))+"])]",
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'views': [(False,'tree'),(resource_id,'form')],
+            'context': "{'type':'out_invoice'}",
+            'type': 'ir.actions.act_window'
+        }
+    states = {
+        'init' : {
+               'actions' : [_makeInvoices],
+               'result': {'type': 'form', 'arch': form, 'fields': fields, 'state':[('end','Ok'),('open','Open')]}
+            },
+
+        'open': {
+            'actions': [],
+            'result': {'type':'action', 'action':_list_invoice, 'state':'end'}
+        }
+
+    }
+
+make_invoice("event.reg_make_invoice")
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/event/wizard/project_wizard.py b/addons/event/wizard/project_wizard.py
new file mode 100644
index 00000000000..eeac0b85f42
--- /dev/null
+++ b/addons/event/wizard/project_wizard.py
@@ -0,0 +1,74 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+#
+# Order Point Method:
+#   - Order if the virtual stock of today is bellow the min of the defined order point
+#
+
+import wizard
+import pooler
+
+import time
+
+parameter_form = '''<?xml version="1.0"?>
+<form string="Event" colspan="4">
+    <field name="project_id"
+/>
+</form>'''
+
+parameter_fields = {
+    'project_id': {'string':'Project', 'type':'many2one', 'required':True, 'relation':'project.project', 'domain': [('active','<>',False)]},
+}
+
+def _create_duplicate(self, cr, uid, data, context):
+    event_obj=pooler.get_pool(cr.dbname).get('event.event')
+    project_obj = pooler.get_pool(cr.dbname).get('project.project')
+    duplicate_project_id= project_obj.copy(cr, uid,data['form']['project_id'], {'active': True})
+    project_obj.write(cr, uid, [duplicate_project_id], {'name': "copy of " + project_obj.browse(cr, uid, duplicate_project_id, context).name , 'date_start':time.strftime('%Y-%m-%d'),'date_end': event_obj.browse(cr, uid, [data['id']])[0].date_begin[0:10] })
+    event_obj.write(cr, uid, [data['id']], {'project_id': duplicate_project_id })
+    return {}
+
+class wizard_event_project(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('done', 'Ok')]}
+
+        },
+        'done':{
+                'actions':[_create_duplicate],
+                'result' : {'type':'state', 'state':'end'}
+                }
+    }
+wizard_event_project('event.project')
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/google_map/__init__.py b/addons/google_map/__init__.py
new file mode 100644
index 00000000000..9d20da53b82
--- /dev/null
+++ b/addons/google_map/__init__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 google_map
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/google_map/__terp__.py b/addons/google_map/__terp__.py
new file mode 100644
index 00000000000..1da82283fc3
--- /dev/null
+++ b/addons/google_map/__terp__.py
@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Google Map",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com",
+    "category" : "Generic Modules",
+    "description": """The module adds google map field in partner address
+so that we can directly open google map from the
+url widget.""",
+    "depends" : ["base"],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ["google_map_wizard.xml","google_map_view.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/google_map/google_map.py b/addons/google_map/google_map.py
new file mode 100644
index 00000000000..3d7a82902f7
--- /dev/null
+++ b/addons/google_map/google_map.py
@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+from osv import fields,osv,orm
+
+class res_partner_address(osv.osv):
+    _description ='Partner Contact'
+    _name = 'res.partner.address'
+    _inherit = 'res.partner.address'
+    _columns = {
+#       'google_map': fields.function(_get_url, method=True,
+#           string='Google Map', type='char',),
+        }
+res_partner_address()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
new file mode 100644
index 00000000000..c1f94452a5c
--- /dev/null
+++ b/addons/google_map/google_map_view.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+		<record model="ir.ui.view" id="view_partner_address_form1_inheritg">
+			<field name="name">res.partner.address.form1.inheritg</field>
+			<field name="model">res.partner.address</field>
+			<field name="inherit_id" ref="base.view_partner_address_form1"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="street2" position="replace">
+					<label string="Street2 : " align="1.0"/>
+					<group colspan="1" col="2">
+						<field name="street2" nolabel="1"/>
+						<button name="%(wizard_google_map)d"
+							string="Map" type="action"/>
+					</group>
+				</field>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_partner_address_form2_inheritg">
+			<field name="name">res.partner.address.form2.inheritg</field>
+			<field name="model">res.partner.address</field>
+			<field name="inherit_id" ref="base.view_partner_address_form2"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="street2" position="replace">
+					<label string="Street2 : " align="1.0"/>
+					<group colspan="1" col="2">
+						<field name="street2" nolabel="1"/>
+						<button name="%(wizard_google_map)d" string="Map" type="action"/>
+					</group>
+				</field>
+			</field>
+		</record>
+
+
+		<record model="ir.ui.view" id="view_partner_form_inheritg">
+			<field name="name">res.partner.form.inheritg</field>
+			<field name="model">res.partner</field>
+			<field name="inherit_id" ref="base.view_partner_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="street2" position="replace">
+						<label string="Street2 : " align="1.0"/>
+						<group colspan="1" col="2">
+						<field name="street2" nolabel="1"/>
+						<button name="%(wizard_google_map)d"
+							string="Map" type="action"/>
+						</group>
+					</field>
+				</field>
+		</record>
+
+	</data>
+</terp>
diff --git a/addons/google_map/google_map_wizard.xml b/addons/google_map/google_map_wizard.xml
new file mode 100644
index 00000000000..9d19185aa86
--- /dev/null
+++ b/addons/google_map/google_map_wizard.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+
+		<wizard
+			string="Launch Google Map"
+			model="res.partner.address"
+			name="google_map_launch"
+			id="wizard_google_map"
+			keyword="client_action_multi"/>
+	</data>
+</terp>
diff --git a/addons/google_map/wizard/__init__.py b/addons/google_map/wizard/__init__.py
new file mode 100644
index 00000000000..90e44d8f048
--- /dev/null
+++ b/addons/google_map/wizard/__init__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 google_map_launch
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/google_map/wizard/google_map_launch.py b/addons/google_map/wizard/google_map_launch.py
new file mode 100644
index 00000000000..dcb0c113048
--- /dev/null
+++ b/addons/google_map/wizard/google_map_launch.py
@@ -0,0 +1,68 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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
+from osv import osv
+import pooler
+from osv import fields
+import time
+
+def _launch_wizard(self, cr, uid, data, context):
+    address_obj= pooler.get_pool(cr.dbname).get('res.partner.address')
+    m= address_obj.browse(cr,uid,data['id'],context)
+    url=''
+    url="http://maps.google.com/maps?oi=map&q="
+    if m.street:
+        url+=m.street.replace(' ','+')
+    if m.street2:
+        url+='+'+m.street2.replace(' ','+')
+    if m.city:
+        url+='+'+m.city.replace(' ','+')
+    if m.state_id:
+        url+='+'+m.state_id.name.replace(' ','+')
+    if m.country_id:
+        url+='+'+m.country_id.name.replace(' ','+')
+    if m.zip:
+        url+='+'+m.zip.replace(' ','+')
+    return {
+    'type': 'ir.actions.act_url',
+    'url':url,
+    'target': 'new'
+    }
+
+class launch_map(wizard.interface):
+
+    states= {'init' : {'actions': [],
+                       'result':{'type':'action',
+                                 'action': _launch_wizard,
+                                 'state':'end'}
+                       }
+             }
+launch_map('google_map_launch')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py
index 29a13a55abf..bbabcddb466 100644
--- a/addons/hr/__terp__.py
+++ b/addons/hr/__terp__.py
@@ -37,7 +37,6 @@
     * Employees and hierarchies
     * Work hours sheets
     * Attendances and sign in/out system
-    * Holidays
 
     Different reports are also provided, mainly for attendance statistics.
     """,
@@ -45,7 +44,6 @@
     "init_xml" : [],
     "demo_xml" : [
         "hr_demo.xml", 
-        "hr_bel_holidays_2005.xml",
         "hr_department_demo.xml",
     ],
     "update_xml" : [
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 47f09994f2c..ab75529d4b8 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -121,18 +121,27 @@ class hr_employee(osv.osv):
         'name' : fields.char("Employee", size=128, required=True),
         'active' : fields.boolean('Active'),
         'company_id': fields.many2one('res.company', 'Company'),
+        'user_id' : fields.many2one('res.users', 'Related User'),
+
+        'country_id' : fields.many2one('res.country', 'Nationality'),
+        'birthday' : fields.date("Started on"),
+        'ssnid': fields.char('SSN No', size=32),
+        'sinid': fields.char('SIN No', size=32),
+        'otherid': fields.char('Other ID', size=32),
+        'gender': fields.selection([('',''),('male','Male'),('female','Female')], 'Gender'),
+        'marital': fields.selection([('maried','Maried'),('unmaried','Unmaried'),('divorced','Divorced'),('other','Other')],'Marital Status', size=32),
+
         'address_id': fields.many2one('res.partner.address', 'Contact address'),
-        'state': fields.function(_state, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
-        'started' : fields.date("Started on"),
+        'work_phone': fields.char('Work Phone', size=32),
+        'work_email': fields.char('Work Email', size=128),
+        'work_location': fields.char('Office Location', size=32),
+
         'notes': fields.text('Notes'),
-        'attendances' : fields.one2many('hr.attendance', 'employee_id', "Employee's attendances"),
-        'holidays' : fields.one2many('hr.holidays', 'employee_id', "Employee's holidays"),
-        'workgroups' : fields.many2many('hr.timesheet.group', 'hr_timesheet_employee_rel', 'emp_id', 'tgroup_id', "Employee's work team"),
-        'user_id' : fields.many2one('res.users', 'Tiny ERP User'),
+        'state': fields.function(_state, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
+
+        'parent_id': fields.many2one('hr.employee', 'Manager', select=True),
         'category_id' : fields.many2one('hr.employee.category', 'Category'),
-        'regime' : fields.float('Workhours by week'),
-        'holiday_max' : fields.integer("Number of holidays"),
-        'parent_id': fields.many2one('hr.employee', 'Boss', select=True),
+
         'child_ids': fields.one2many('hr.employee', 'parent_id','Subordinates'),
     }
     _defaults = {
@@ -246,30 +255,3 @@ class hr_attendance(osv.osv):
     _order = 'name desc'
 hr_attendance()
 
-class hr_holidays_status(osv.osv):
-    _name = "hr.holidays.status"
-    _description = "Holidays Status"
-    _columns = {
-        'name' : fields.char('Holiday Status', size=64, required=True, translate=True),
-    }
-hr_holidays_status()
-
-class hr_holidays(osv.osv):
-    _name = "hr.holidays"
-    _description = "Holidays"
-    _columns = {
-        'name' : fields.char('Description', required=True, size=64),
-        'date_from' : fields.datetime('Vacation start day', required=True),
-        'date_to' : fields.datetime('Vacation end day'),
-        'holiday_status' : fields.many2one("hr.holidays.status", "Holiday's Status"),
-        'employee_id' : fields.many2one('hr.employee', 'Employee', select=True),
-    }
-    _defaults = {
-        'employee_id' : _employee_get
-    }
-    _order = 'date_from desc'
-hr_holidays()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr/hr_bel_holidays_2005.xml b/addons/hr/hr_bel_holidays_2005.xml
deleted file mode 100644
index b53b135348b..00000000000
--- a/addons/hr/hr_bel_holidays_2005.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-    <data noupdate="1">
-        <record id="jf" model="hr.holidays.status">
-            <field name="name">Public holidays</field>
-        </record>
-        
-        <record model="hr.holidays">
-            <field name="name">New Year</field>
-            <field name="date_from">2005-01-01 00:00</field>
-            <field name="date_to">2005-01-02 00:00</field>
-            <field name="holiday_status" ref="jf"/>
-        </record>
-        <record model="hr.holidays">
-            <field name="name">Easter Monday</field>
-            <field name="date_from">2005-03-28 00:00</field>
-            <field name="date_to">2005-03-29 00:00</field>
-            <field name="holiday_status" ref="jf"/>
-        </record>
-        <record model="hr.holidays">
-            <field name="name">Labor Day</field>
-            <field name="date_from">2005-05-01 00:00</field>
-            <field name="date_to">2005-05-02 00:00</field>
-            <field name="holiday_status" ref="jf"/>
-        </record>
-        <record model="hr.holidays">
-            <field name="name">Ascension</field>
-            <field name="date_from">2005-05-05 00:00</field>
-            <field name="date_to">2005-05-06 00:00</field>
-            <field name="holiday_status" ref="jf"/>
-        </record>
-        <record model="hr.holidays">
-            <field name="name">Ascension Day</field>
-            <field name="date_from">2005-05-16 00:00</field>
-            <field name="date_to">2005-05-17 00:00</field>
-            <field name="holiday_status" ref="jf"/>
-        </record>
-        <record model="hr.holidays">
-            <field name="name">Pentecost Monday</field>
-            <field name="date_from">2005-05-16 00:00</field>
-            <field name="date_to">2005-05-17 00:00</field>
-            <field name="holiday_status" ref="jf"/>
-        </record>
-        <record model="hr.holidays">
-            <field name="name">National day</field>
-            <field name="date_from">2005-07-21 00:00</field>
-            <field name="date_to">2005-07-22 00:00</field>
-            <field name="holiday_status" ref="jf"/>
-        </record>
-        <record model="hr.holidays">
-            <field name="name">All Saints</field>
-            <field name="date_from">2005-11-01 00:00</field>
-            <field name="date_to">2005-11-02 00:00</field>
-            <field name="holiday_status" ref="jf"/>
-        </record>
-        <record model="hr.holidays">
-            <field name="name">Christmas</field>
-            <field name="date_from">2005-12-25 00:00</field>
-            <field name="date_to">2005-12-26 00:00</field>
-            <field name="holiday_status" ref="jf"/>
-        </record>
-    </data>
-</terp>
\ No newline at end of file
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 2e4c6cfc5ae..0c5229e436f 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <!--		<record model="res.groups" id="hr_id">-->
-        <!--			<field name="name">HR</field>-->
-        <!--		</record>-->
         
         <record model="hr.action.reason">
             <field name="name">Start of shift</field>
@@ -30,23 +27,6 @@
             <field name="action_type">sign_out</field>
         </record>
         
-        <record id="status_unpaid" model="hr.holidays.status">
-            <field name="name">Unpaid holidays</field>
-        </record>
-        <record id="ca" model="hr.holidays.status">
-            <field name="name">Annual holidays</field>
-        </record>
-        <record id="status_sick" model="hr.holidays.status">
-            <field name="name">Sickness holidays</field>
-        </record>
-        <record id="ma" model="hr.holidays.status">
-            <field name="name">Maternity holidays</field>
-        </record>
-        <record id="status_unauth" model="hr.holidays.status">
-            <field name="name">Unauthorised holidays</field>
-        </record>
-        
-        
         <!-- Example employee -->
         
         <record id="timesheet_group1" model="hr.timesheet.group">
@@ -131,21 +111,6 @@
             <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         
-        <record model="hr.holidays">
-            <field name="name">Bali Trip</field>
-            <field name="date_from">2005-05-11 08:00</field>
-            <field name="date_to">2005-05-25 18:00</field>
-            <field name="holiday_status" ref="ca"/>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record model="hr.holidays">
-            <field name="name">Paternity holiday</field>
-            <field name="date_from">2005-06-02 08:00</field>
-            <field name="date_to">2005-06-13 18:00</field>
-            <field name="holiday_status" ref="ma"/>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        
         <record id="attendance1" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-01 08:21')" name="name"/>
             <field name="action">sign_in</field>
diff --git a/addons/hr/hr_report.xml b/addons/hr/hr_report.xml
index ad52de20cbf..60de2e0b3c1 100644
--- a/addons/hr/hr_report.xml
+++ b/addons/hr/hr_report.xml
@@ -3,4 +3,4 @@
     <data>
         <report auto="False" id="attendance_error_report" keyword="client_print_multi" menu="False" model="hr.employee" multi="True" name="hr.timesheet.attendance.error" rml="hr/report/attendance_errors.rml" string="Attendance Error Report"/>
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 8f3fe74bf46..ee2f50bc6c2 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -6,45 +6,63 @@
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root"/>
         
         <!--
-		==========
-		Employee 
-		==========
-		-->
+        ==========
+        Employee 
+        ==========
+        -->
         <record id="view_employee_form" model="ir.ui.view">
             <field name="name">hr.employee.form</field>
             <field name="model">hr.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee">
-                    <notebook>
-                        <page string="Information">
-                            <separator colspan="4" string="General Information"/>
-                            <field name="name" select="1"/>
-                            <field name="company_id"/>
-                            <field name="user_id"/>
-                            <field name="address_id"/>
-                            <field colspan="4" name="notes"/>
-                            <separator colspan="4" string="Working Data"/>
-                            <field name="regime"/>
-                            <field name="active" select="1"/>
-                            <field name="holiday_max"/>
-                            <field name="started" select="1"/>
-                            <field name="parent_id" select="1"/>
-                            <field name="category_id"/>
-                            <field colspan="4" name="workgroups"/>
-                            <field name="state"/>
+                    <group colspan="4" col="4">
+                        <field name="name" select="1"/>
+                        <field name="active" select="1"/>
+                        <field name="company_id"/>
+                        <field name="user_id"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Personal Information">
                             <group col="2" colspan="2">
-                                <button name="sign_in" states="absent" string="Sign in !" type="object"/>
-                                <button name="sign_out" states="present" string="Sign out !" type="object"/>
+                                <separator colspan="2" string="Social IDs"/>
+                                <field name="ssnid"/>
+                                <field name="sinid"/>
+                                <field name="otherid"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Status" colspan="2"/>
+                                <field name="gender"/>
+                                <field name="marital"/>
+                                <field name="country_id"/>
+                                <field name="birthday"/>
+                            </group>
+
+                            <group col="2" colspan="2">
+                                <separator string="Contact Information" colspan="2"/>
+                                <field name="address_id" colspan="2"/>
+                                <field name="work_phone"/>
+                                <field name="work_email"/>
+                                <field name="work_location"/>
+                            </group>
+
+                            <group col="4" colspan="2">
+                                <separator string="Job Information" colspan="4"/>
+                                <field name="parent_id" select="1" colspan="4"/>
+                                <field name="state"/>
+                                <button name="sign_in" states="absent" string="Sign In" type="object"/>
+                                <button name="sign_out" states="present" string="Sign Out" type="object"/>
+                                <field name="category_id" colspan="4"/>
                             </group>
                         </page>
-                        <page string="Holidays">
-                            <field colspan="4" name="holidays" nolabel="1" widget="one2many_list"/>
+                        <page string="Notes">
+                            <field colspan="4" nolabel="1" name="notes"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
+
         <record id="view_employee_tree" model="ir.ui.view">
             <field name="name">hr.employee.tree</field>
             <field name="model">hr.employee</field>
@@ -53,8 +71,10 @@
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>
-                    <field name="user_id"/>
+                    <field name="work_phone"/>
+                    <field name="work_email"/>
                     <field name="address_id"/>
+                    <field name="parent_id"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -67,22 +87,10 @@
             <field name="view_id" ref="view_employee_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
+
         <menuitem action="open_view_employee_tree" id="menu_open_view_employee_tree" parent="hr.menu_hr_root"/>
+
         
-        <record id="view_employee_list" model="ir.ui.view">
-            <field name="name">hr.employee.tree</field>
-            <field name="model">hr.employee</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Employees">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="address_id"/>
-                    <field name="state"/>
-                    <field name="parent_id"/>
-                </tree>
-            </field>
-        </record>
         <record id="open_view_employee_list" model="ir.actions.act_window">
             <field name="name">Employees</field>
             <field name="res_model">hr.employee</field>
@@ -91,7 +99,7 @@
             <field name="view_id" ref="view_employee_list"/>
         </record>
         <menuitem action="open_view_employee_list" id="menu_open_view_employee_list" parent="hr.menu_open_view_employee_tree"/>
-        
+
         <record id="open_view_employee_new" model="ir.actions.act_window">
             <field name="name">New Employee</field>
             <field name="res_model">hr.employee</field>
@@ -100,12 +108,11 @@
         </record>
         <menuitem action="open_view_employee_new" id="menu_open_view_employee_new" parent="hr.menu_open_view_employee_tree"/>
         
-        
         <!--
-		=======================
-		Employee architecture
-		=======================
-		-->
+        =======================
+        Employee architecture
+        =======================
+        -->
         <record id="view_partner_tree2" model="ir.ui.view">
             <field name="name">hr.employee.tree</field>
             <field name="model">hr.employee</field>
@@ -140,10 +147,10 @@
         
         
         <!-- 
-		============
-		Working Time
-		============
-		-->
+        ============
+        Working Time
+        ============
+        -->
         <record id="create_group" model="ir.ui.view">
             <field name="name">hr.timesheet.group.form</field>
             <field name="model">hr.timesheet.group</field>
@@ -294,7 +301,6 @@
         <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"/>
         <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="hr.menu_hr_attendance"/>
         
-        
         <!-- Holidays -->
         <record id="edit_holiday" model="ir.ui.view">
             <field name="name">hr.holidays.form</field>
@@ -378,7 +384,7 @@
             <field name="view_id" ref="view_holiday_status"/>
         </record>
         <menuitem action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration"/>
-        
+
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
             <field name="model">hr.action.reason</field>
diff --git a/addons/hr/report/timesheet.py b/addons/hr/report/timesheet.py
deleted file mode 100644
index 780b101c0e3..00000000000
--- a/addons/hr/report/timesheet.py
+++ /dev/null
@@ -1,191 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# $Id$
-#
-# 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.
-#
-##############################################################################
-
-from mx import DateTime
-from mx.DateTime import now
-
-import netsvc
-import pooler
-
-from report.interface import report_rml
-from report.interface import toxml
-
-one_week = DateTime.RelativeDateTime(days=7)
-num2day = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
-
-def to_hour(h):
-    return int(h), int(round((h - int(h)) * 60, 0))
-
-class report_custom(report_rml):
-    def create_xml(self, cr, uid, ids, datas, context):
-        service = netsvc.LocalService('object_proxy')
-
-        start_date = DateTime.strptime(datas['form']['init_date'], '%Y-%m-%d')
-        end_date = DateTime.strptime(datas['form']['end_date'], '%Y-%m-%d')
-        first_monday = start_date - DateTime.RelativeDateTime(days=start_date.day_of_week)
-        last_monday = end_date + DateTime.RelativeDateTime(days=7 - end_date.day_of_week)
-
-        if last_monday < first_monday:
-            first_monday, last_monday = last_monday, first_monday
-
-        user_xml = []
-        
-        jf_sql = """select hol.date_from, hol.date_to from hr_holidays as hol, hr_holidays_status as stat
-                    where hol.holiday_status = stat.id and stat.name = 'Public holidays' """
-        cr.execute(jf_sql)
-        jfs = []
-        jfs = [(DateTime.strptime(l['date_from'], '%Y-%m-%d %H:%M:%S'), DateTime.strptime(l['date_to'], '%Y-%m-%d %H:%M:%S')) for l in cr.dictfetchall()]
-        
-        for employee_id in ids:
-            emp = service.execute(cr.dbname, uid, 'hr.employee', 'read', [employee_id], ['id', 'name'])[0]
-            monday, n_monday = first_monday, first_monday + one_week
-            stop, week_xml = False, []
-            user_repr = '''
-            <user>
-              <name>%s</name>
-              %%s
-            </user>
-            ''' % toxml(emp['name'])
-            while monday != last_monday:
-                #### Work hour calculation
-                sql = '''
-                select action, att.name
-                from hr_employee as emp inner join hr_attendance as att
-                     on emp.id = att.employee_id
-                where att.name between '%s' and '%s' and emp.id = %s
-                order by att.name
-                '''
-                for idx in range(7):
-                    cr.execute(sql, (monday, monday + DateTime.RelativeDateTime(days=idx+1), employee_id))
-                    attendences = cr.dictfetchall()
-                    week_wh = {}
-                    if attendences and attendences[0]['action'] == 'sign_out':
-                        attendences.insert(0, {'name': monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
-                    if attendences and attendences[-1]['action'] == 'sign_in':
-                        attendences.append({'name' : n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
-                    for att in attendences:
-                        dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
-                        if att['action'] == 'sign_out':
-                            week_wh[ldt.day_of_week] = week_wh.get(ldt.day_of_week, 0) + (dt - ldt).hours
-                        ldt = dt
-
-                #### Theoretical workhour calculation
-                week_twh = {}
-                sql = '''
-                select t.hour_from, t.hour_to
-                from hr_timesheet as t
-                     inner join (hr_timesheet_group as g inner join hr_timesheet_employee_rel as rel
-                                 on rel.tgroup_id = g.id and rel.emp_id = %s)
-                     on t.tgroup_id = g.id
-                where dayofweek = %s 
-                      and date_from = (select max(date_from) 
-                                       from hr_timesheet inner join (hr_timesheet_employee_rel 
-                                                                        inner join hr_timesheet_group 
-                                                                        on hr_timesheet_group.id = hr_timesheet_employee_rel.tgroup_id
-                                                                            and hr_timesheet_employee_rel.emp_id = %s)
-                                                         on hr_timesheet.tgroup_id = hr_timesheet_group.id
-                                       where dayofweek = %s and date_from <= '%s') 
-                order by date_from desc
-                '''
-                for idx in range(7):
-                    day = monday + DateTime.RelativeDateTime(days=idx+1)
-                    # Is this a public holiday ?
-                    isPH = False
-                    for jf_start, jf_end in jfs:
-                        if jf_start <= day < jf_end:
-                            isPH = True
-                            break
-                    if isPH:
-                        week_twh[idx] = 0
-                    else:
-                        cr.execute(sql, (emp['id'], day.day_of_week, emp['id'], day.day_of_week, day))
-                        dhs = cr.dictfetchall()
-                        week_twh[idx] = reduce(lambda x,y:x+(DateTime.strptime(y['hour_to'], '%H:%M:%S') - DateTime.strptime(y['hour_from'], '%H:%M:%S')).hours,dhs, 0)
-
-                #### Holiday calculation
-                sql = '''
-                select hol.date_from, hol.date_to, stat.name as status
-                from hr_employee as emp 
-                     inner join (hr_holidays as hol left join hr_holidays_status as stat
-                                 on hol.holiday_status = stat.id)
-                     on emp.id = hol.employee_id
-                where ((hol.date_from <= '%s' and hol.date_to >= '%s') 
-                        or (hol.date_from < '%s' and hol.date_to >= '%s')
-                        or (hol.date_from > '%s' and hol.date_to < '%s')
-                       and stat.name != 'Public holidays') and emp.id = %s
-                order by hol.date_from
-                '''
-                cr.execute(sql, (monday, monday, n_monday, n_monday, monday, n_monday, employee_id))
-                holidays = cr.dictfetchall()
-                week_hol = {}
-                for hol in holidays:
-                    df = DateTime.strptime(hol['date_from'], '%Y-%m-%d %H:%M:%S')
-                    dt = DateTime.strptime(hol['date_to'], '%Y-%m-%d %H:%M:%S')
-                    for idx in range(7):
-                        day = monday + DateTime.RelativeDateTime(days=idx+1)
-                        if (df.year, df.month, df.day) <= (day.year, day.month, day.day) <= (dt.year, dt.month, dt.day):
-                            if (df.year, df.month, df.day) == (dt.year, dt.month, dt.day):
-                                week_hol[idx] = {'status' : hol['status'], 'hours' : (dt - df).hours}
-                            else:
-                                week_hol[idx] = {'status' : hol['status'], 'hours' : week_twh[idx]}
-                
-                # Week xml representation
-                week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % n_monday.strftime('%Y-%m-%d')]
-                for idx in range(7):
-                    week_repr.append('<%s>' % num2day[idx])
-                    week_repr.append('<theoretical>%sh%02d</theoretical>' % to_hour(week_twh[idx]))
-                    if idx in week_wh:
-                        week_repr.append('<workhours>%sh%02d</workhours>' % to_hour(week_wh[idx]))
-                    if idx in week_hol and week_hol[idx]['hours']:
-                        week_repr.append('<holidayhours type="%(status)s">%(hours)s</holidayhours>' % week_hol[idx])
-                    week_repr.append('</%s>' % num2day[idx])
-                week_repr.append('<total>')
-                week_repr.append('<theoretical>%sh%02d</theoretical>' % to_hour(reduce(lambda x,y:x+y, week_twh.values(), 0)))
-                week_repr.append('<worked>%sh%02d</worked>' % to_hour(reduce(lambda x,y:x+y, week_wh.values(), 0)))
-                week_repr.append('<holiday>%sh%02d</holiday>' % to_hour(reduce(lambda x,y:x+y, [day['hours'] for day in week_hol.values()], 0)))
-                week_repr.append('</total>')
-                week_repr.append('</week>')
-                if len(week_repr) > 30: # 30 = minimal length of week_repr
-                    week_xml.append('\n'.join(week_repr))
-                
-                monday, n_monday = n_monday, n_monday + one_week
-            user_xml.append(user_repr % '\n'.join(week_xml))
-        
-        xml = '''<?xml version="1.0" encoding="UTF-8" ?>
-        <report>
-        %s
-        </report>
-        ''' % '\n'.join(user_xml)
-        return self.post_process_xml_data(cr, uid, xml, context)
-
-report_custom('report.hr.timesheet.allweeks', 'hr.employee', '', 'addons/hr/report/timesheet.xsl')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr/report/timesheet.xsl b/addons/hr/report/timesheet.xsl
deleted file mode 100644
index d318f2bf614..00000000000
--- a/addons/hr/report/timesheet.xsl
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:fo="http://www.w3.org/1999/XSL/Format">
-
-    <xsl:import href="../../custom/corporate_defaults.xsl"/>
-    <xsl:import href="../../base/report/rml_template.xsl"/>
-    <xsl:variable name="page_format">a4_normal</xsl:variable>
-
-    <xsl:template name="stylesheet">
-        <blockTableStyle id="week">
-            <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
-            <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
-            <blockTextColor colorName="red" start="-1,0" stop="-1,-1"/>
-            <lineStyle kind="LINEBEFORE" colorName="grey" start="-1,0" stop="-1,-1"/>
-            <blockValign value="TOP"/>
-        </blockTableStyle>
-    </xsl:template>
-
-    <xsl:template match="/">
-        <xsl:call-template name="rml" />
-    </xsl:template>
-
-    <xsl:template name="story">
-        <xsl:apply-templates select="report/user"/>
-    </xsl:template>
-
-    <xsl:template match="user">
-        <para>
-            <b>Name:</b>
-            <i><xsl:value-of select="name" /></i>
-        </para>
-        <blockTable colWidths="4cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm" style="week">
-            <tr>
-                <td></td>
-                <td>Mon</td>
-                <td>Tue</td>
-                <td>Wed</td>
-                <td>Thu</td>
-                <td>Fri</td>
-                <td>Sat</td>
-                <td>Sun</td>
-                <td>Tot</td>
-            </tr>
-            <xsl:for-each select="week">
-                <tr></tr>
-                <tr>
-                    <td>Week :</td>
-                    <td></td>
-                    <td>from <xsl:value-of select="weekstart" /> to <xsl:value-of select="weekend" /></td>
-                </tr>
-                <tr>
-                    <td>Theoretical workhours</td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Monday/theoretical">
-                                <xsl:value-of select="Monday/theoretical" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Tuesday/theoretical">
-                                <xsl:value-of select="Tuesday/theoretical" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Wednesday/theoretical">
-                                <xsl:value-of select="Wednesday/theoretical" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Thursday/theoretical">
-                                <xsl:value-of select="Thursday/theoretical" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Friday/theoretical">
-                                <xsl:value-of select="Friday/theoretical" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Saturday/theoretical">
-                                <xsl:value-of select="Saturday/theoretical" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Sunday/theoretical">
-                                <xsl:value-of select="Sunday/theoretical" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:value-of select="total/theoretical" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>Workhours</td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Monday/workhours">
-                                <xsl:value-of select="Monday/workhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Tuesday/workhours">
-                                <xsl:value-of select="Tuesday/workhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Wednesday/workhours">
-                                <xsl:value-of select="Wednesday/workhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Thursday/workhours">
-                                <xsl:value-of select="Thursday/workhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Friday/workhours">
-                                <xsl:value-of select="Friday/workhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Saturday/workhours">
-                                <xsl:value-of select="Saturday/workhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Sunday/workhours">
-                                <xsl:value-of select="Sunday/workhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:value-of select="total/worked" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>Holiday hours</td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Monday/holidayhours">
-                                <xsl:value-of select="Monday/holidayhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Tuesday/holidayhours">
-                                <xsl:value-of select="Tuesday/holidayhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Wednesday/holidayhours">
-                                <xsl:value-of select="Wednesday/holidayhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Thursday/holidayhours">
-                                <xsl:value-of select="Thursday/holidayhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Friday/holidayhours">
-                                <xsl:value-of select="Friday/holidayhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Saturday/holidayhours">
-                                <xsl:value-of select="Saturday/holidayhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="Sunday/holidayhours">
-                                <xsl:value-of select="Sunday/holidayhours" />
-                            </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
-                        </xsl:choose>							
-                    </td>
-                    <td>
-                        <xsl:value-of select="total/holiday" />
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </blockTable>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/addons/hr_holidays/__init__.py b/addons/hr_holidays/__init__.py
new file mode 100644
index 00000000000..88be1b293ee
--- /dev/null
+++ b/addons/hr_holidays/__init__.py
@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+import hr
+import report
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
new file mode 100644
index 00000000000..1396ab5215a
--- /dev/null
+++ b/addons/hr_holidays/__terp__.py
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Human Resources: Holidays management",
+    "version" : "0.1",
+    "author" : "Tiny & Axelor",
+    "category" : "Generic Modules/Human Resources",
+    "website" : "http://tinyerp.com/",
+    "description": """Human Ressources: Holidays tracking and workflow
+
+    This module allows you to manage holidays and holidays requests. For each employee, you can also define a number of available holidays per holiday status. 
+
+    Note that:
+    - A synchronisation with an internal agenda (use of the crm module) is possible: in order to automaticly create a case when an holiday request is accepted, you have to link the holidays status to a case section. You can set up this info and your color preferencies in
+                HR \ Configuration \ Holidays Status
+    - An employee can make a negative holiday request (holiday request of -2 days for example), this is considered by the system as an ask for more off-days. It will increase his total of that holiday status available (if the request is accepted).
+    - There are two ways to print the employee's holidays:
+        * The first will allow to choose employees by department and is used by clicking the menu item located in
+                HR \ Holidays Request \ Print Summary of Holidays
+        * The second will allow you to choose the holidays report for specific employees. Go on the list
+                HR \ Employees \ Employees
+            then select the ones you want to choose, click on the print icon and select the option
+                'Print Summary of Employee's Holidays'
+    - The wizard allows you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. These states must be set up by a user from the group 'HR' and with the role 'holidays'. You can define these features in the security tab from the user data in
+                Administration \ Users \ Users
+            for example, you maybe will do it for the user 'admin'.
+""",
+    "depends" : ["hr","crm_configuration"],
+    "init_xml" : [],
+    "demo_xml" : ["hr_bel_holidays_2008.xml",],
+    "update_xml" : ["hr_workflow.xml","hr_view.xml","hr_holidays_report.xml","hr_holidays_wizard.xml",],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py
new file mode 100644
index 00000000000..e541f69c3ce
--- /dev/null
+++ b/addons/hr_holidays/hr.py
@@ -0,0 +1,211 @@
+# -*- encoding: utf-8 -*-
+##################################################################################
+#
+# Copyright (c) 2005-2006 Axelor SARL. (http://www.axelor.com) All Rights Reserved.
+#
+# $Id: hr.py 4656 2006-11-24 09:58:42Z Cyp $
+#
+# 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.
+#
+##############################################################################
+
+from mx import DateTime
+import time
+import pooler
+import netsvc
+import datetime
+from osv import fields, osv
+
+
+def _employee_get(obj,cr,uid,context={}):
+    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+    if ids:
+        return ids[0]
+    return False
+
+def strToDate(dt):
+    dt_date=datetime.date(int(dt[0:4]),int(dt[5:7]),int(dt[8:10]))
+    return dt_date
+
+class hr_holidays(osv.osv):
+    _name = "hr.holidays"
+    _inherit = 'hr.holidays'
+    _description = "Holidays"
+    _columns = {
+        'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
+        'state': fields.selection([('draft', 'draft'), ('confirm', 'Confirmed'), ('refuse', 'Refused'), ('validate', 'Validate'), ('cancel', 'Cancel')], 'Status', readonly=True),
+        'date_from' : fields.datetime('Vacation start day', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'date_to' : fields.datetime('Vacation end day',required=True,readonly=True, states={'draft':[('readonly',False)]}),
+        'holiday_status' : fields.many2one("hr.holidays.status", "Holiday's Status", required=True,readonly=True, states={'draft':[('readonly',False)]}),
+        'employee_id' : fields.many2one('hr.employee', 'Employee', select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}),
+        'user_id':fields.many2one('res.users', 'Employee_id', states={'draft':[('readonly',False)]}, select=True, readonly=True),
+        'manager_id' : fields.many2one('hr.employee', 'Holiday manager', invisible=False, readonly=True),
+        'notes' : fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
+        'number_of_days': fields.float('Number of Days in this Holiday Request',required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'case_id':fields.many2one('crm.case', 'Case'),
+    }
+    _defaults = {
+        'employee_id' : _employee_get ,
+        'state' : lambda *a: 'draft',
+        'user_id': lambda obj, cr, uid, context: uid
+    }
+    _order = 'date_from desc'
+    def set_to_draft(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {
+            'state':'draft',
+            'manager_id': False
+        })
+        return True
+
+    def holidays_validate(self, cr, uid, ids, *args):
+        self.check_holidays(cr,uid,ids)
+
+        vals = {
+            'state':'validate',
+        }
+        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        if ids2:
+            vals['manager_id'] = ids2[0]
+
+        self.write(cr, uid, ids, vals)
+        return True
+
+    def holidays_confirm(self, cr, uid, ids, *args):
+        user = False
+        for id in self.browse(cr, uid, ids):
+            if id.employee_id.user_id:
+                user = id.employee_id.user_id.id
+        self.write(cr, uid, ids, {
+            'state':'confirm',
+            'user_id': user,
+        })
+        return True
+
+    def holidays_refuse(self, cr, uid, ids, *args):
+        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        self.write(cr, uid, ids, {
+            'state':'refuse',
+            'manager_id':ids2[0]
+        })
+        return True
+
+    def holidays_cancel(self, cr, uid, ids, *args):
+        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:
+                    self.pool.get('crm.case').unlink(cr,uid,record.case_id.id)
+        self.write(cr, uid, ids, {
+            'state':'cancel'
+            })
+
+        return True
+
+    def holidays_draft(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {
+            'state':'draft'
+        })
+        return True
+
+    def check_holidays(self,cr,uid,ids):
+
+        for record in self.browse(cr, uid, ids):
+            leave_asked = record.number_of_days
+            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 leave_asked>=0.00:
+                if holiday_id:
+                    obj_holidays_per_user=self.pool.get('hr.holidays.per.user').browse(cr, uid,holiday_id[0])
+                    leaves_rest=obj_holidays_per_user.max_leaves - obj_holidays_per_user.leaves_taken
+                    if leaves_rest < leave_asked:
+                        raise osv.except_osv('Attention!','You Cannot Validate leaves while available leaves are less than asked leaves.')
+                    self.pool.get('hr.holidays.per.user').write(cr,uid,obj_holidays_per_user.id,{'leaves_taken':obj_holidays_per_user.leaves_taken + leave_asked})
+                if record.holiday_status.section_id:
+                    vals={}
+                    vals['name']=record.name
+                    vals['section_id']=record.holiday_status.section_id.id
+                    epoch_c = time.mktime(time.strptime(record.date_to,'%Y-%m-%d %H:%M:%S'))
+                    epoch_d = time.mktime(time.strptime(record.date_from,'%Y-%m-%d %H:%M:%S'))
+                    diff_day = (epoch_c - epoch_d)/(3600*24)
+                    vals['duration']= (diff_day) * 8
+                    vals['note']=record.notes
+                    vals['user_id']=record.user_id.id
+                    vals['date']=record.date_from
+                    case_id=self.pool.get('crm.case').create(cr,uid,vals)
+                    self.write(cr, uid, ids, {'case_id':case_id})
+            else:
+                if holiday_id:
+                    obj_holidays_per_user=self.pool.get('hr.holidays.per.user').browse(cr, uid,holiday_id[0])
+                    note=obj_holidays_per_user.notes or ''
+                    notes= note + '\n***' + time.strftime('%Y-%m-%d %H:%M:%S') + ' ' + record.name
+                    self.pool.get('hr.holidays.per.user').write(cr,uid,obj_holidays_per_user.id,{'max_leaves':obj_holidays_per_user.max_leaves + abs(leave_asked),'notes':notes})
+                else:
+                    vals={}
+                    vals['employee_id']=record.employee_id.id
+                    vals['holiday_status']=record.holiday_status.id
+                    vals['max_leaves']=abs(leave_asked)
+                    vals['leaves_taken']=0.00
+                    self.pool.get('hr.holidays.per.user').create(cr,uid,vals)
+
+        return True
+hr_holidays()
+
+class hr_holidays_status(osv.osv):
+    _name = "hr.holidays.status"
+    _inherit = 'hr.holidays.status'
+    _description = "Holidays Status"
+    _columns = {
+        'name' : fields.char('Holiday Status', size=64, required=True, translate=True),
+        'section_id': fields.many2one('crm.case.section', 'Section'),
+        'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color of the status', required=True),
+    }
+    _defaults = {
+        'color_name': lambda *args: 'red',
+    }
+hr_holidays_status()
+
+
+class hr_holidays_per_user(osv.osv):
+    _name = "hr.holidays.per.user"
+    _description = "Holidays Per User"
+    _columns = {
+        'employee_id' : fields.many2one('hr.employee', 'Employee',required=True),
+        'user_id' : fields.many2one('res.users','User'),
+        'holiday_status' : fields.many2one("hr.holidays.status", "Holiday's Status", required=True),
+        'max_leaves' : fields.float('Maximum Leaves Allowed',required=True),
+        'leaves_taken' : fields.float('Leaves Already Taken',readonly=True),
+        'notes' : fields.text('Notes'),
+    }
+
+    def create(self, cr, uid, vals, *args, **kwargs):
+
+        if vals['employee_id']:
+            obj_emp=self.pool.get('hr.employee').browse(cr,uid,vals['employee_id'])
+            vals.update({'user_id': obj_emp.user_id.id})
+        return super(osv.osv,self).create(cr, uid, vals, *args, **kwargs)
+
+hr_holidays_per_user()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_holidays/hr_bel_holidays_2008.xml b/addons/hr_holidays/hr_bel_holidays_2008.xml
new file mode 100644
index 00000000000..7ab92c0e6dd
--- /dev/null
+++ b/addons/hr_holidays/hr_bel_holidays_2008.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<terp>
+	<data noupdate="1">
+
+		<record model="hr.holidays">
+			<field name="name">New Year</field>
+			<field name="date_from">2008-01-01 08:00</field>
+			<field name="date_to">2008-01-01 18:00</field>
+			<field name="holiday_status" ref="hr.jf" />
+		</record>
+		<record model="hr.holidays">
+			<field name="name">Easter Monday</field>
+			<field name="date_from">2008-03-24 08:00</field>
+			<field name="date_to">2008-03-24 18:00</field>
+			<field name="holiday_status" ref="hr.jf" />
+		</record>
+		<record model="hr.holidays">
+			<field name="name">Labour Day</field>
+			<field name="date_from">2008-05-01 08:00</field>
+			<field name="date_to">2008-05-01 18:00</field>
+			<field name="holiday_status" ref="hr.jf" />
+		</record>
+		<record model="hr.holidays">
+			<field name="name">Ascension</field>
+			<field name="date_from">2008-05-02 08:00</field>
+			<field name="date_to">2008-05-02 18:00</field>
+			<field name="holiday_status" ref="hr.jf" />
+		</record>
+		<record model="hr.holidays">
+			<field name="name">Pentecost Monday</field>
+			<field name="date_from">2008-05-12 08:00</field>
+			<field name="date_to">2008-05-12 18:00</field>
+			<field name="holiday_status" ref="hr.jf" />
+		</record>
+		<record model="hr.holidays">
+			<field name="name">National Day</field>
+			<field name="date_from">2008-07-21 08:00</field>
+			<field name="date_to">2008-07-21 18:00</field>
+			<field name="holiday_status" ref="hr.jf" />
+		</record>
+		<record model="hr.holidays">
+			<field name="name">Assumption Day</field>
+			<field name="date_from">2008-08-15 08:00</field>
+			<field name="date_to">2008-08-15 18:00</field>
+			<field name="holiday_status" ref="hr.jf" />
+		</record>
+		<record model="hr.holidays">
+			<field name="name">All Saints</field>
+			<field name="date_from">2008-11-01 08:00</field>
+			<field name="date_to">2008-11-01 18:00</field>
+			<field name="holiday_status" ref="hr.jf" />
+		</record>
+		<record model="hr.holidays">
+			<field name="name">Armistice</field>
+			<field name="date_from">2008-11-11 08:00</field>
+			<field name="date_to">2008-11-11 18:00</field>
+			<field name="holiday_status" ref="hr.jf" />
+		</record>
+		<record model="hr.holidays">
+			<field name="name">Christmas</field>
+			<field name="date_from">2008-12-25 08:00</field>
+			<field name="date_to">2008-12-25 18:00</field>
+			<field name="holiday_status" ref="hr.jf" />
+		</record>
+	</data>
+</terp>
diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml
new file mode 100644
index 00000000000..781cb04656a
--- /dev/null
+++ b/addons/hr_holidays/hr_holidays_report.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+		<report id="report_holidays_summary"
+				string="Summary Of Holidays"
+				model="hr.holidays"
+				name="hr.holidays.holidays_summary"
+				xsl="hr_holidays/report/holidays_summary.xsl"
+				auto="False"
+				menu="False"/>
+
+		<!--<wizard id="wizard_hr_holidays_summary"
+			string="Summary Of Holidays"
+			model="hr.holidays"
+			name="hr.holidays.holidays_summary"
+			menu="False"/>
+
+		<menuitem
+			name="Human Resources/Holidays Request/Print Summary Of Holidays"
+			action="wizard_hr_holidays_summary"
+			type="wizard"
+			id="menu_wizard_hr_holidays_summary"/>-->
+
+	</data>
+</terp>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
new file mode 100644
index 00000000000..4d99b0fb488
--- /dev/null
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+	<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"/>
+
+	<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>
+</terp>
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
new file mode 100644
index 00000000000..b37ec0cebf1
--- /dev/null
+++ b/addons/hr_holidays/hr_view.xml
@@ -0,0 +1,252 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+
+		<!-- Holidays -->
+		<record model="ir.ui.view" id="edit_holiday_inherit_new">
+			<field name="name">hr.holidays.form.inherit</field>
+			<field name="model">hr.holidays</field>
+			<field name="type">form</field>
+			<field name="inherit_id" eval="False"/>
+			<field name="arch" type="xml">
+                <form string="Employee holidays">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="date_from" select="1"/>
+                    <field name="date_to" select="1"/>
+                    <newline/>
+                    <field name="holiday_status" select="1"/>
+					<group col="12" colspan="2">
+						<button string="Confirm" name="confirm" states="draft" type="workflow"/>
+						<button string="Validate" name="validate" states="confirm" type="workflow"/>
+						<button string="Refuse" name="refuse" states="confirm" type="workflow"/>
+						<button string="Cancel" name="cancel" states="validate,refuse" type="workflow"/>
+						<button string="Set to Draft" name="set_to_draft" states="cancel" type="object"/>
+					</group>
+					<field name="state" select="1" colspan="2"/>
+					<newline />
+					<field name="notes" col="12" colspan="4"/>
+					<newline />
+					<field name="manager_id" colspan="2"/>
+					<field name="employee_id" select="1" />
+					<newline />
+					<field name="number_of_days" colspan="2"/>
+                </form>
+				</field>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_holiday">
+			<field name="name">hr.holidays.tree</field>
+			<field name="model">hr.holidays</field>
+			<field name="inherit_id" eval="False"/>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+                <tree string="Employee holidays">
+                    <field name="name"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="holiday_status"/>
+					<field name="state"/>
+                </tree>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_holiday_2">
+			<field name="name">hr.holidays.tree</field>
+			<field name="model">hr.holidays</field>
+			<field name="inherit_id" ref="hr.view_holiday"/>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<field name="name" position="after">
+					<field name="number_of_days" string="Number of Days"/>
+					<field name="employee_id"/>
+				</field>
+			</field>
+		</record>
+
+		<!-- holidays status -->
+		<record model="ir.ui.view" id="edit_holiday_status_form">
+			<field name="name">hr.holidays.status.form</field>
+			<field name="model">hr.holidays.status</field>
+			<field name="inherit_id" eval="False"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+                <form string="Define holiday status">
+                    <field colspan="4" name="name" select="1"/>
+					<field name="color_name" select="2"/>
+					<field name="section_id"  select="1" />
+                </form>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="view_holiday_status_tree">
+			<field name="name">hr.holidays.status.tree</field>
+			<field name="model">hr.holidays.status</field>
+			<field name="inherit_id" eval="False"/>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+                <tree string="Holiday status">
+                    <field name="name"/>
+					<field name="color_name" />
+					<field name="section_id" />
+                </tree>
+			</field>
+		</record>
+        <record id="open_view_holiday_status" model="ir.actions.act_window">
+            <field name="name">Holiday Status</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.holidays.status</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem action="open_view_holiday_status" groups="base.group_admin" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration"/>
+
+		<!-- holidays per user -->
+		<record model="ir.ui.view" id="view_holidays_per_user_form">
+			<field name="name">hr.holidays.per.user.form</field>
+			<field name="model">hr.holidays.per.user</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Holidays Per Employee">
+					<field name="employee_id" select="1" />
+					<field name="holiday_status" select="1" />
+					<newline/>
+					<field name="max_leaves" select="2"  colspan="2" />
+					<newline/>
+					<field name="leaves_taken" select="2" colspan="2" />
+					<newline/>
+					<field name="notes" colspan="4" />
+				</form>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="view_holidays_per_user_tree">
+			<field name="name">hr.holidays.per.user.tree</field>
+			<field name="model">hr.holidays.per.user</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Holidays Per Employee">
+					<field name="employee_id"/>
+					<field name="holiday_status"/>
+					<field name="max_leaves"/>
+					<field name="leaves_taken"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_holidays_per_user_graph">
+			<field name="name">hr.holidays.per.user.graph</field>
+			<field name="model">hr.holidays.per.user</field>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+			<graph type="bar" string="Holidays Allowed">
+				<field name="employee_id"/>
+				<field name="max_leaves" operator="+"/>
+				<field name="leaves_taken" operator="+"/>
+			</graph>
+		</field>
+		</record>
+
+		<!-- Menu Items -->
+		<record model="ir.actions.act_window" id="open_ask_holidays">
+			<field name="res_model">hr.holidays</field>
+			<field name="view_type">form</field>
+			<field name="view_id" ref="edit_holiday_inherit_new" />
+		</record>
+		<menuitem name="Holidays Request" parent="hr.menu_hr_root" id="menu_open_ask_holidays" action="open_ask_holidays"/>
+
+		<record model="ir.actions.act_window" id="action_all_holiday">
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">hr.holidays</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+		</record>
+		<menuitem name="All Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_all_holiday" action="action_all_holiday" />
+
+		<record model="ir.actions.act_window" id="action_my_holiday">
+			<field name="name">My Holidays Request</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">hr.holidays</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="domain">[('user_id','=',uid)]</field>
+		</record>
+		<menuitem name="My Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" />
+
+		<record model="ir.actions.act_window" id="action_my_holiday_draft">
+			<field name="name">My Holidays Request Draft</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">hr.holidays</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="domain">[('user_id','=',uid), ('state','=','draft')]</field>
+		</record>
+		<menuitem name="My Draft Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" />
+
+		<record model="ir.actions.act_window" id="action_my_holiday_waiting">
+			<field name="name">My Holidays Request Waiting confirmation</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">hr.holidays</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="domain">[('user_id','=',uid), ('state','=','confirm')]</field>
+		</record>
+		<menuitem name="My Awaiting Confirmation Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" />
+
+		<record model="ir.actions.act_window" id="action_my_holiday_validate">
+			<field name="name">My Holidays Request Validated</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">hr.holidays</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="domain">[('user_id','=',uid), ('state','=','validate')]</field>
+		</record>
+		<menuitem name="My Validated Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_validate" action="action_my_holiday_validate" />
+
+		<record model="ir.actions.act_window" id="action_my_holiday_refuse">
+			<field name="name">My Holidays Request Refused</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">hr.holidays</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="domain">[('user_id','=',uid), ('state','=','refuse')]</field>
+		</record>
+		<menuitem name="My Refused Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_refuse" action="action_my_holiday_refuse" />
+
+		<record model="ir.actions.act_window" id="action_holiday_waiting">
+			<field name="name">Requests Awaiting for Validation</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">hr.holidays</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="domain">[('state','=','confirm')]</field>
+		</record>
+		<menuitem name="Holidays Requests Awaiting for Validation" parent="menu_action_all_holiday" id="menu_action_holiday_waiting" action="action_holiday_waiting" />
+
+		<record model="ir.actions.act_window" id="action_holidays_per_user">
+			<field name="name">Holidays Per Employee</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">hr.holidays.per.user</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form,graph</field>
+		</record>
+		<menuitem name="Holidays Per Employee" parent="hr.menu_hr_configuration" id="menu_open_holidays_per_user" action="action_holidays_per_user"	groups="base.group_admin"/>
+
+		<record model="ir.actions.act_window" id="action_my_holiday_available">
+			<field name="name">My Available Holidays</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">hr.holidays.per.user</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree</field>
+			<field name="domain">[('user_id','=',uid)]</field>
+		</record>
+		<menuitem name="My Available Holidays" parent="hr.menu_hr_reporting" id="menu_action_my_holiday_available" action="action_my_holiday_available" />
+
+
+	<!--  Shortcuts -->
+		<act_window name="My Holiday Requests"
+			domain="[('employee_id', '=', active_id)]"
+			res_model="hr.holidays"
+			src_model="hr.employee"
+			id="act_hr_employee_holiday_request"/>
+
+	</data>
+</terp>
diff --git a/addons/hr_holidays/hr_workflow.xml b/addons/hr_holidays/hr_workflow.xml
new file mode 100644
index 00000000000..3e2549486a4
--- /dev/null
+++ b/addons/hr_holidays/hr_workflow.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" ?>
+<terp>
+<data>
+
+	<!-- Roles definition -->
+
+	<record model="res.roles" id="HR_holidays">
+		<field name="name">holidays</field>
+	</record>
+
+	<!-- Workflow definition -->
+
+	<record model="workflow" id="wkf_holidays">
+		<field name="name">hr.wkf.holidays</field>
+		<field name="osv">hr.holidays</field>
+		<field name="on_create">True</field>
+	</record>
+
+	<record model="workflow.activity" id="act_draft">
+		<field name="wkf_id" ref="wkf_holidays" />
+		<field name="flow_start">True</field>
+		<field name="name">draft</field>
+	</record>
+
+	<record model="workflow.activity" id="act_confirm">
+		<field name="wkf_id" ref="wkf_holidays" />
+		<field name="name">confirm</field>
+		<field name="kind">function</field>
+		<field name="action">holidays_confirm()</field>
+		<field name="split_mode">OR</field>
+	</record>
+
+	<record model="workflow.activity" id="act_validate">
+		<field name="wkf_id" ref="wkf_holidays" />
+		<field name="name">validate</field>
+		<field name="kind">function</field>
+		<field name="action">holidays_validate()</field>
+	</record>
+
+	<record model="workflow.activity" id="act_refuse">
+		<field name="wkf_id" ref="wkf_holidays" />
+		<field name="name">refuse</field>
+		<field name="kind">function</field>
+		<field name="action">holidays_refuse()</field>
+
+	</record>
+
+	<record model="workflow.activity" id="act_cancel">
+		<field name="wkf_id" ref="wkf_holidays" />
+		<field name="name">cancel</field>
+		<field name="flow_stop">True</field>
+		<field name="kind">stopall</field>
+		<field name="action">holidays_cancel()</field>
+		<field name="join_mode">XOR</field>
+	</record>
+
+	<record model="workflow.transition" id="t1">
+		<field name="act_from" ref="act_draft" />
+		<field name="act_to" ref="act_confirm" />
+		<field name="signal">confirm</field>
+	</record>
+	
+	<record model="workflow.transition" id="t2">
+		<field name="act_from" ref="act_confirm" />
+		<field name="act_to" ref="act_validate" />
+		<field name="signal">validate</field>
+		<field name="role_id" ref="HR_holidays"/>
+	</record>
+
+	<record model="workflow.transition" id="t3">
+		<field name="act_from" ref="act_confirm" />
+		<field name="act_to" ref="act_refuse" />
+		<field name="signal">refuse</field>
+		<field name="role_id" ref="HR_holidays"/>
+	</record>
+
+	<record model="workflow.transition" id="t4">
+		<field name="act_from" ref="act_validate" />
+		<field name="act_to" ref="act_cancel" />
+		<field name="signal">cancel</field>
+		<field name="role_id" ref="HR_holidays"/>
+	</record>
+
+	<record model="workflow.transition" id="t5">
+		<field name="act_from" ref="act_refuse" />
+		<field name="act_to" ref="act_cancel" />
+		<field name="signal">cancel</field>
+		<field name="role_id" ref="HR_holidays"/>
+	</record>
+
+	<record model="workflow.transition" id="t7">
+		<field name="act_from" ref="act_cancel" />
+		<field name="act_to" ref="act_draft" />
+	</record>
+</data>
+</terp>
diff --git a/addons/hr_holidays/report/__init__.py b/addons/hr_holidays/report/__init__.py
new file mode 100644
index 00000000000..0ed85c820fc
--- /dev/null
+++ b/addons/hr_holidays/report/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import holidays_summary_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_holidays/report/holidays_summary.xsl b/addons/hr_holidays/report/holidays_summary.xsl
new file mode 100644
index 00000000000..ebe00a83911
--- /dev/null
+++ b/addons/hr_holidays/report/holidays_summary.xsl
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<xsl:template match="/">
+		<xsl:call-template name="rml" />
+	</xsl:template>
+
+	<xsl:template name="rml">
+		<document filename="example.pdf">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+				<pageTemplate id="first">
+					<frame id="col1" x1="0.8cm" y1="2.0cm" width="28.0cm" height="17cm"/>
+				</pageTemplate>
+			</template>
+
+			<stylesheet>
+				<paraStyle name="normal" fontName="Helvetica" fontSize="6" alignment="left" />
+				<paraStyle name="normal-title" fontName="Helvetica" fontSize="10" alignment="center"/>
+				<paraStyle name="digits" fontName="Helvetica" fontSize="6" alignment="left"/>
+				<paraStyle name="title" fontName="Helvetica" fontSize="18" alignment="center" />
+				<paraStyle name="dept" fontName="Helvetica-Bold" fontSize="8" alignment="left" />
+				<paraStyle name="employee" fontName="Helvetica-Bold" fontSize="6" textColor="black" />
+				<paraStyle name="leaveid" fontName="Helvetica" fontSize="6" alignment="center" />
+				<paraStyle name="print-date" fontName="Helvetica" fontSize="11" alignment="right" />
+				<paraStyle name="sum" fontName="Helvetica-BoldOblique" fontSize="6" alignment="left" />
+				<paraStyle name="company" textColor="purple" fontName="Helvetica-Bold" fontSize="11" alignment="left"/>
+				<blockTableStyle id="header">
+    			  	 <blockAlignment value="LEFT" start="0,0" stop="-1,-1"/>
+    			  	 <blockFont name="Helvetica" size="8" start="0,0" stop="-1,-1"/>
+     				 <blockValign value="TOP"/>
+   				</blockTableStyle>
+				<blockTableStyle id="products">
+					 <blockAlignment value="CENTER" start="1,0" stop="-1,-1"/>
+					 <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
+					 <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+					 <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+					 <lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
+					 <blockFont name="Helvetica-Bold" size="8" start="0,-1" stop="-1,-1"/>
+					 <blockValign value="TOP"/>
+				</blockTableStyle>
+				<blockTableStyle id="legend">
+					<blockAlignment value="CENTER" start="0,0" stop="-1,-1" />
+					<blockFont name="Helvetica" size="7" start="0,0" stop="-1,-1"/>
+					<lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
+					<lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+					<lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+					<lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
+					<blockBackground colorName="#FFFFFF" start="0,0" stop="-1,-1"/>
+					<xsl:for-each select="/report/legend">
+						<blockBackground>
+							<xsl:attribute name="colorName">
+							<xsl:value-of select="attribute::color" />
+							</xsl:attribute>
+							<xsl:attribute name="start">
+								<xsl:text>0,</xsl:text>
+								<xsl:value-of select="attribute::row" />
+							</xsl:attribute>
+							<xsl:attribute name="stop">
+								<xsl:text>0,</xsl:text>
+								<xsl:value-of select="attribute::row" />
+							</xsl:attribute>
+						</blockBackground>
+					</xsl:for-each>
+					<blockValign value="TOP"/>
+				</blockTableStyle>
+				<blockTableStyle id="month">
+					<blockAlignment value="CENTER" start="1,0" stop="-1,-1" />
+					<blockFont name="Helvetica" size="5" start="0,0" stop="-1,-1"/>
+					<blockFont name="Helvetica-BoldOblique" size="4.5" start="-1,0" stop="-1,-1"/>
+					<blockBackground colorName="#FFFFFF" start="1,0" stop="-2,1"/>
+					<xsl:for-each select="/report/days/dayy[@name='Sat' or @name='Sun']">
+						<xsl:variable name="col" select="attribute::cell" />
+						<blockBackground>
+							<xsl:attribute name="colorName">lightgrey</xsl:attribute>
+							<xsl:attribute name="start">
+								<xsl:value-of select="$col" />
+								<xsl:text>,0</xsl:text>
+							</xsl:attribute>
+							<xsl:attribute name="stop">
+								<xsl:value-of select="$col" />
+								<xsl:text>,-1</xsl:text>
+							</xsl:attribute>
+						</blockBackground>
+					</xsl:for-each>
+					<xsl:for-each select="/report/info">
+						<xsl:variable name="val" select="attribute::val" />
+						<xsl:variable name="col" select="attribute::number" />
+						<xsl:variable name="row" select="attribute::id" />
+						<xsl:for-each select="/report/legend">
+							<xsl:variable name="val_id" select="attribute::id" />
+							<xsl:variable name="color" select="attribute::color" />
+							<xsl:if test="$val_id = $val ">
+								<blockBackground>
+									<xsl:attribute name="colorName"><xsl:value-of select="$color" /></xsl:attribute>
+									<xsl:attribute name="start">
+										<xsl:value-of select="$col" />
+										<xsl:text>,</xsl:text>
+										<xsl:value-of select="$row + 1" />
+									</xsl:attribute>
+									<xsl:attribute name="stop">
+										<xsl:value-of select="$col" />
+										<xsl:text>,</xsl:text>
+										<xsl:value-of select="$row + 1" />
+									</xsl:attribute>
+								</blockBackground>
+							</xsl:if>
+						</xsl:for-each>
+					</xsl:for-each>
+					<xsl:for-each select="report/employee">
+						<xsl:variable name="dept" select="attribute::id" />
+						<xsl:variable name="row" select="attribute::row" />
+						<xsl:if test="$dept = 1">
+							<blockBackground>
+								<xsl:attribute name="colorName">lightgrey</xsl:attribute>
+								<xsl:attribute name="start">
+									<xsl:text>0,</xsl:text>
+									<xsl:value-of select="$row +1" />
+								</xsl:attribute>
+								<xsl:attribute name="stop">
+									<xsl:text>0,</xsl:text>
+									<xsl:value-of select="$row +1" />
+								</xsl:attribute>
+							</blockBackground>
+						</xsl:if>
+					</xsl:for-each>
+					<lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
+					<lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+					<lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+					<lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
+					<blockValign value="TOP"/>
+				</blockTableStyle>
+
+			</stylesheet>
+
+			<story>
+				<xsl:call-template name="story"/>
+			</story>
+		</document>
+	</xsl:template>
+
+	<xsl:template name="story">
+	<xsl:variable name="cols_header">
+			<xsl:text>13.7cm,13.7cm</xsl:text>
+	</xsl:variable>
+	<blockTable>
+			<xsl:attribute name="style">header</xsl:attribute>
+			<xsl:attribute name="colWidths"><xsl:value-of select="$cols_header"/></xsl:attribute>
+			<tr>
+				<xsl:for-each select="report/res">
+					<td>
+					<para>
+						<xsl:attribute name="style">company</xsl:attribute>
+						Company Name: <xsl:value-of select="attribute::name" />
+					</para>
+					</td>
+					<td>
+					<para>
+						<xsl:attribute name="style">print-date</xsl:attribute>
+						Printing time: <xsl:value-of select="attribute::today" />
+					</para>
+					</td>
+				</xsl:for-each>
+			</tr>
+		</blockTable>
+		<spacer length="0.8cm" />
+		<para style="title" t="1">Off-Days' Summary</para>
+		<spacer length="0.5cm" />
+		<para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> holidays. </para>
+		<spacer length="0.8cm" />
+		<xsl:variable name="cols_legend">
+			<xsl:text>0.7cm,5.0cm</xsl:text>
+		</xsl:variable>
+		<blockTable>
+			<xsl:attribute name="style">products</xsl:attribute>
+			<xsl:attribute name="colWidths"><xsl:value-of select="report/cols_months"/></xsl:attribute>
+			<tr>
+			 	<td>Month</td>
+				<xsl:for-each select="report/months">
+					<td>
+						<xsl:value-of select="attribute::name" />
+					</td>
+				</xsl:for-each>
+				<td> </td>
+			</tr>
+		</blockTable>
+
+		<blockTable>
+			<xsl:attribute name="style">month</xsl:attribute>
+			<xsl:attribute name="colWidths"><xsl:value-of select="report/cols" /></xsl:attribute>
+			<tr>
+				<td> </td>
+				<xsl:for-each select="report/days/dayy">
+					<td>
+						<xsl:value-of select="attribute::name" />
+					</td>
+				</xsl:for-each>
+				<td> </td>
+			</tr>
+			<tr>
+				<td><para>
+						<xsl:attribute name="style">employee</xsl:attribute>
+								Departments &amp; Employees
+					</para>
+				</td>
+				<xsl:for-each select="report/days/dayy">
+					<td><para><xsl:attribute name="style">digits</xsl:attribute>
+						<xsl:value-of select="attribute::number" /></para>
+					</td>
+				</xsl:for-each>
+				<td>Sum</td>
+            </tr>
+			<xsl:apply-templates select="report/employee"/>
+			<xsl:for-each select="report/employee">
+				<xsl:variable name="id" select="attribute::id"/>
+				<xsl:variable name="rw" select="attribute::row"/>
+				<xsl:variable name="sum" select="attribute::sum"/>
+				<tr>
+					<td t="1">
+						<para>
+							<xsl:choose>
+   								 <xsl:when test="$id = 1">
+      							 	<xsl:attribute name="style">dept</xsl:attribute>
+      							 </xsl:when>
+								<xsl:otherwise>
+      								<xsl:attribute name="style">normal</xsl:attribute>
+   								</xsl:otherwise>
+							</xsl:choose>
+							<xsl:value-of select="attribute::name"/>
+						</para>
+					</td>
+					<xsl:for-each select="//report/days/dayy">
+						<xsl:variable name="cell" select="attribute::cell" />
+						<td>
+						<para><xsl:attribute name="style">digits</xsl:attribute>
+						<xsl:value-of select="//employee[@row=$rw]/time-element[@index=$cell]"/>
+						</para>
+
+						</td>
+					</xsl:for-each>
+					<td><para>
+						<xsl:attribute name="style">sum</xsl:attribute><xsl:value-of select="attribute::sum"/></para></td>
+				</tr>
+			</xsl:for-each>
+
+		</blockTable>
+		<spacer length="1cm" />
+		<condPageBreak height="1in" />
+		<blockTable>
+			<xsl:attribute name="style">legend</xsl:attribute>
+			<xsl:attribute name="colWidths"><xsl:value-of select="$cols_legend"/></xsl:attribute>
+			<tr>
+					<td>Color</td>
+					<td>Holiday Type</td>
+
+			</tr>
+			<xsl:for-each select="report/legend">
+			<tr>
+					<td>
+							<para>
+							<xsl:attribute name="style">digits</xsl:attribute>
+								<xsl:value-of select="attribute::id"/>
+							</para>
+					</td>
+					<td>
+							<para>
+							<xsl:attribute name="style">normal</xsl:attribute>
+								<xsl:value-of select="attribute::name"/>
+							</para>
+					</td>
+            </tr>
+            </xsl:for-each>
+		</blockTable>
+	</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
new file mode 100644
index 00000000000..e450efc6890
--- /dev/null
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -0,0 +1,246 @@
+# -*- encoding: utf-8 -*-
+import datetime
+import time
+
+from osv import fields, osv
+from report.interface import report_rml
+from report.interface import toxml
+
+import pooler
+
+
+def lengthmonth(year, month):
+    if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
+        return 29
+    return [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]
+
+def strToDate(dt):
+    dt_date=datetime.date(int(dt[0:4]),int(dt[5:7]),int(dt[8:10]))
+    return dt_date
+
+def emp_create_xml(self,cr,uid,dept,holiday_type,row_id,empid,name,som,eom):
+
+    display={}
+
+    if dept==0:
+        count=0
+        p_id=pooler.get_pool(cr.dbname).get('hr.holidays').search(cr,uid,[('employee_id','in',[empid,False])])
+        ids_date = pooler.get_pool(cr.dbname).get('hr.holidays').read(cr,uid,p_id,['date_from','date_to','holiday_status','state'])
+
+        for index in range(1,61):
+            diff=index-1
+            current=som+datetime.timedelta(diff)
+
+            for item in ids_date:
+    #            print current,"from",item['date_from'],"to",item['date_to']
+                if current >= strToDate(item['date_from']) and current <= strToDate(item['date_to']):
+                    if item['state'] in holiday_type:
+                        display[index]=item['holiday_status'][0]
+                        count=count +1
+                    else:
+                        display[index]=' '
+                    break
+                else:
+                    display[index]=' '
+    else:
+         for index in range(1,61):
+              display[index]=' '
+              count=''
+
+    xml = '''
+        <time-element index="%d">
+            <value>%s</value>
+        </time-element>
+        '''
+    time_xml = ([xml % (index, value) for index,value in display.iteritems()])
+    data_xml=['<info id="%d" number="%d" val="%s" />' % (row_id,x,display[x]) for x in range(1,len(display)+1) ]
+
+    # Computing the xml
+    xml = '''
+    %s
+    <employee row="%d" id="%d" name="%s" sum="%s">
+    %s
+    </employee>
+    ''' % (data_xml,row_id,dept, toxml(name),count, '\n'.join(time_xml))
+
+    return xml
+
+class report_custom(report_rml):
+    def create_xml(self, cr, uid, ids,data, context):
+        depts=[]
+        emp_id={}
+        done={}
+
+        cr.execute("select name from res_company")
+        res=cr.fetchone()[0]
+        date_xml=[]
+        date_today=time.strftime('%Y-%m-%d %H:%M:%S')
+        date_xml +=['<res name="%s" today="%s" />' % (res,date_today)]
+
+        cr.execute("select id,name,color_name from hr_holidays_status order by id")
+        legend=cr.fetchall()
+
+        today=datetime.datetime.today()
+
+        first_date=data['form']['date_from']
+
+        som = strToDate(first_date)
+        eom = som+datetime.timedelta(59)
+
+        day_diff=eom-som
+
+        if data['form']['holiday_type']!='both':
+            type=data['form']['holiday_type']
+            if data['form']['holiday_type']=='Confirmed':
+                holiday_type=('confirm')
+            else:
+                holiday_type=('validate')
+        else:
+            type="Confirmed and Validated"
+            holiday_type=('confirm','validate')
+        date_xml.append('<from>%s</from>\n'% (som))
+        date_xml.append('<to>%s</to>\n' %(eom))
+        date_xml.append('<type>%s</type>'%(type))
+
+#        date_xml=[]
+        for l in range(0,len(legend)):
+            date_xml += ['<legend row="%d" id="%d" name="%s" color="%s" />' % (l+1,legend[l][0],legend[l][1],legend[l][2])]
+
+        date_xml += ['<date month="%s" year="%d" />' % (som.strftime('%B'), som.year),'<days>']
+
+        cell=1
+        if day_diff.days>=30:
+            date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som.replace(day=x).strftime('%a'),x-som.day+1) for x in range(som.day, lengthmonth(som.year, som.month)+1)]
+        else:
+            if day_diff.days>=(lengthmonth(som.year, som.month)-som.day):
+                date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som.replace(day=x).strftime('%a'),x-som.day+1) for x in range(som.day, lengthmonth(som.year, som.month)+1)]
+            else:
+                date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som.replace(day=x).strftime('%a'),x-som.day+1) for x in range(som.day, eom.day+1)]
+
+        cell=x-som.day+1
+        day_diff1=day_diff.days-cell+1
+
+        width_dict={}
+        month_dict={}
+
+        i=1
+        j=1
+        year=som.year
+        month=som.month
+        month_dict[j]=som.strftime('%B')
+        width_dict[j]=cell
+
+        while day_diff1>0:
+            if month+i<=12:
+                if day_diff1>30:
+                    som1=datetime.date(year,month+i,1)
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, lengthmonth(year,i+month)+1)]
+                    i=i+1
+                    j=j+1
+                    month_dict[j]=som1.strftime('%B')
+                    cell=cell+x
+                    width_dict[j]=x
+
+                else:
+                    som1=datetime.date(year,month+i,1)
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, eom.day+1)]
+                    i=i+1
+                    j=j+1
+                    month_dict[j]=som1.strftime('%B')
+                    cell=cell+x
+                    width_dict[j]=x
+
+                day_diff1=day_diff1-x
+#                print "now day_diff1 is..frst.",day_diff1
+            else:
+                years=year+1
+                year=years
+                month=0
+                i=1
+                if day_diff1>=30:
+                    som1=datetime.date(years,i,1)
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, lengthmonth(years,i)+1)]
+                    i=i+1
+                    j=j+1
+                    month_dict[j]=som1.strftime('%B')
+                    cell=cell+x
+                    width_dict[j]=x
+
+                else:
+                    som1=datetime.date(years,i,1)
+                    i=i+1
+                    j=j+1
+                    month_dict[j]=som1.strftime('%B')
+                    date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, eom.day+1)]
+                    cell=cell+x
+                    width_dict[j]=x
+
+                day_diff1=day_diff1-x
+#                print "now day_diff1 is..scnd.",day_diff1
+
+        date_xml.append('</days>')
+        date_xml.append('<cols>3.5cm%s,0.4cm</cols>\n' % (',0.4cm' * (60)))
+
+        st='<cols_months>3.5cm'
+        for m in range(1,len(width_dict)+1):
+            st+=',' + str(0.4 *width_dict[m])+'cm'
+        st+=',0.4cm</cols_months>\n'
+
+        months_xml =['<months  number="%d" name="%s" />' % (x,month_dict[x]) for x in range(1,len(month_dict)+1) ]
+        months_xml.append(st)
+
+        emp_xml=''
+        row_id=1
+
+        if data['model']=='hr.employee':
+
+            for id in data['form']['emp'][0][2]:
+                 items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr,uid,id,['id','name'])
+
+                 emp_xml += emp_create_xml(self,cr,uid,0,holiday_type,row_id,items['id'],items['name'],som, eom)
+                 row_id = row_id +1
+
+        elif data['model']=='ir.ui.menu':
+
+            for id in data['form']['depts'][0][2]:
+                dept = pooler.get_pool(cr.dbname).get('hr.department').browse(cr, uid, id, context.copy())
+                depts.append(dept)
+
+                cr.execute('select user_id from hr_department_user_rel where department_id=%d'%(dept.id))
+                result=cr.fetchall()
+
+                if result==[]:
+                    continue
+                dept_done=0
+                for d in range(0,len(result)):
+                    emp_id[d]=pooler.get_pool(cr.dbname).get('hr.employee').search(cr,uid,[('user_id','=',result[d][0])])
+                    items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr,uid,emp_id[d],['id','name'])
+
+                    for item in items:
+                        if item['id'] in done:
+                            continue
+                        else:
+                            if dept_done==0:
+                                emp_xml += emp_create_xml(self,cr,uid,1,holiday_type,row_id,dept.id,dept.name,som, eom)
+                                row_id = row_id +1
+                            dept_done=1
+
+                        done[item['id']] = 1
+
+                        emp_xml += emp_create_xml(self,cr,uid,0,holiday_type,row_id,item['id'],item['name'],som, eom)
+                        row_id = row_id +1
+
+        # Computing the xml
+        xml='''<?xml version="1.0" encoding="UTF-8" ?>
+        <report>
+        %s
+        %s
+        %s
+        </report>
+        ''' % (months_xml,date_xml, emp_xml)
+
+        return xml
+
+report_custom('report.holidays.summary', 'hr.holidays', '', 'addons/hr_holidays/report/holidays_summary.xsl')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_holidays/wizard/__init__.py b/addons/hr_holidays/wizard/__init__.py
new file mode 100644
index 00000000000..b8703e0bbcb
--- /dev/null
+++ b/addons/hr_holidays/wizard/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+import holidays_summary
+import holidays_summary_employees
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_holidays/wizard/holidays_summary.py b/addons/hr_holidays/wizard/holidays_summary.py
new file mode 100644
index 00000000000..abea600b580
--- /dev/null
+++ b/addons/hr_holidays/wizard/holidays_summary.py
@@ -0,0 +1,105 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+# 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 datetime
+import time
+import pooler
+
+form='''<?xml version="1.0"?>
+<form string="Report Options">
+    <field name="date_from" colspan="2" />
+    <field name="holiday_type" colspan="2" />
+    <field name="depts" colspan="4" />
+
+</form>'''
+
+zero_form='''<?xml version="1.0"?>
+<form string="Notification">
+<label string="You have to select atleast 1 Department. Try again." colspan="4"/>
+</form>'''
+
+zero_fields={
+}
+
+class wizard_report(wizard.interface):
+    def _check(self, cr, uid, data, context):
+        data['form']['date_from']=time.strftime('%Y-%m-%d')
+        data['form']['holiday_type']='Validated'
+
+        return data['form']
+
+    def _checkdepts(self, cr, uid, data, context):
+
+        if len(data['form']['depts'][0][2])==0:
+            return 'notify'
+        else:
+            return 'report'
+
+    fields={
+        'date_from':{
+                'string':'From',
+                'type':'date',
+                'required':True,
+        },
+        'depts': {
+                'string': 'Department(s)', 
+                'type': 'many2many', 
+                'relation': 'hr.department'
+        },
+        'holiday_type':{
+                'string':"Select Holiday Type",
+                'required':True,
+                'type':'selection',
+                'selection':[('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')]
+        },
+    }
+
+    states={
+        'init':{
+            'actions':[_check],
+            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel'), ('checkdept', 'Print')]}
+        },
+        'checkdept': {
+            'actions': [],
+            'result': {'type':'choice','next_state':_checkdepts}
+        },
+        'notify': {
+            'actions': [],
+            'result': {'type':'form','arch':zero_form,'fields':zero_fields,'state':[('end','Ok')]}
+        },
+        'report':{
+            'actions':[],
+            'result':{'type':'print', 'report':'holidays.summary', 'state':'end'}
+        }
+    }
+wizard_report('hr.holidays.summary')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_holidays/wizard/holidays_summary_employees.py b/addons/hr_holidays/wizard/holidays_summary_employees.py
new file mode 100644
index 00000000000..9637d109774
--- /dev/null
+++ b/addons/hr_holidays/wizard/holidays_summary_employees.py
@@ -0,0 +1,68 @@
+# -*- encoding: utf-8 -*-
+
+import wizard
+import datetime
+import time
+import pooler
+
+
+form='''<?xml version="1.0"?>
+<form string="Report Options">
+    <field name="date_from" colspan="2" />
+    <field name="holiday_type" colspan="2" />
+    <field name="emp" colspan="4" invisible="True"/>
+</form>'''
+
+zero_form='''<?xml version="1.0"?>
+<form string="Notification">
+<label string="You have to select at least 1 Employee. Try again." colspan="4"/>
+</form>'''
+
+zero_fields={
+}
+
+class wizard_report(wizard.interface):
+    def _check(self, cr, uid, data, context):
+        data['form']['date_from']=time.strftime('%Y-%m-%d')
+        data['form']['holiday_type']='Validated'
+        data['form']['emp'] = data['ids']
+        return data['form']
+
+    def _checkemps(self, cr, uid, data, context):
+
+        if len(data['form']['emp'][0][2])==0:
+            return 'notify'
+        else:
+            return 'report'
+
+    fields={
+        'date_from':{
+            'string':'From',
+            'type':'date',
+            'required':True,
+        },
+        'holiday_type':{'string':"Select Holiday Type",'type':'selection','selection':[('Validated','Validated'),('Confirmed','Confirmed'),('both','Both')]},
+        'emp': {'string': 'Employee(s)', 'type': 'many2many', 'relation': 'hr.employee'},
+    }
+
+    states={
+        'init':{
+            'actions':[_check],
+            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel'), ('checkemp', 'Print')]}
+        },
+        'checkemp': {
+            'actions': [],
+            'result': {'type':'choice','next_state':_checkemps}
+        },
+        'notify': {
+            'actions': [],
+            'result': {'type':'form','arch':zero_form,'fields':zero_fields,'state':[('end','Ok')]}
+        },
+        'report':{
+            'actions':[],
+            'result':{'type':'print', 'report':'holidays.summary', 'state':'end'}
+        }
+    }
+wizard_report('hr.holidays.summary.employee')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 7d0d4e8f172..6c26b7f1c6b 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -31,6 +31,7 @@
 import time
 from osv import fields
 from osv import osv
+from osv.orm import except_orm
 
 
 class hr_employee(osv.osv):
@@ -116,7 +117,16 @@ class hr_analytic_timesheet(osv.osv):
         'date' : lambda self,cr,uid,ctx: ctx.get('date', time.strftime('%Y-%m-%d')),
         'user_id' : lambda obj, cr, uid, ctx : ctx.get('user_id', uid),
     }
-
+    def create(self, cr, uid, vals, context={}):
+        try:
+            res = super(hr_analytic_timesheet, self).create(cr, uid, vals, context)
+            return res
+        except Exception,e:
+            if 'journal_id' in e.args[0]:
+                raise except_orm(_('ValidateError'),
+                     _('No analytic journal available for this employee.\nDefine an employee for the selected user and assign an analytic journal.'))
+            else:
+                raise
 
     def on_change_user_id(self, cr, uid, ids, user_id):
         if not user_id:
@@ -126,10 +136,7 @@ class hr_analytic_timesheet(osv.osv):
             'product_uom_id' : self._getEmployeeUnit(cr, user_id, context= {}),
             'general_account_id' :self. _getGeneralAccount(cr, user_id, context= {}),
             'journal_id' : self._getAnalyticJournal(cr, user_id, context= {}),
-                           }}
-
-
-
+        }}
 hr_analytic_timesheet()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index e1995546d75..5285c115577 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -60,9 +60,19 @@
         </record>
         <menuitem action="act_hr_timesheet_line_me_all_form" id="menu_act_hr_timesheet_line_me_all_form" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"/>
 
+        <record id="act_hr_timesheet_line_evry1_today_form_my" model="ir.actions.act_window">
+            <field name="name">My Working Hours of The Day</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),('date', '=',time.strftime('%Y-%m-%d'))]</field>
+        </record>
+        <menuitem action="act_hr_timesheet_line_evry1_today_form_my" id="menu_act_hr_timesheet_line_evry1_today_form_my" parent="menu_act_hr_timesheet_line_me_all_form"/>
+ 
         
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
-            <field name="name">Workin Hours</field>
+            <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>
@@ -85,10 +95,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="notes" position="after">
-                    <field name="product_id"/>
-                    <field name="journal_id"/>
-                </field>
+                <notebook position="inside">
+					<page string="Timesheets">
+						<field name="product_id"/>
+						<field name="journal_id"/>
+					</page>
+                </notebook>
             </field>
         </record>
     </data>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 86ce7c0d5a6..9dab5605d6a 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -113,7 +113,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
         </record>
-        <menuitem action="action_hr_analytic_timesheet_tree_invoiced" id="menu_hr_analytic_timesheet_tree_invoiced" parent="hr_timesheet_invoice.menu_hr_analytic_timesheet_tree"/>
+        <menuitem action="action_hr_analytic_timesheet_tree_invoiced" id="menu_hr_analytic_timesheet_tree_invoiced" parent="menu_hr_analytic_timesheet_tree"/>
          
         
         
@@ -124,7 +124,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)]</field>
         </record>
-        <menuitem action="action_hr_analytic_timesheet_tree_invoiced_my" id="menu_hr_analytic_timesheet_tree_invoiced_my" parent="hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced"/>
+        <menuitem action="action_hr_analytic_timesheet_tree_invoiced_my" id="menu_hr_analytic_timesheet_tree_invoiced_my" parent="menu_hr_analytic_timesheet_tree"/>
          
         
         <record id="action_open_analytic_accounts" model="ir.actions.act_window">
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 56bf68750db..c513ee0c1ba 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -222,8 +222,8 @@ class hr_timesheet_sheet(osv.osv):
                 'new': [('readonly', False)]}
             ),
         'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True, states={'draft':[('readonly',False)],'new':[('readonly',False)]}),
-        'state' : fields.selection([('new', 'New'),('draft','Draft'),('confirm','Confirmed'),('done','Done')], 'State', select=True, required=True, readonly=True),
-        'state_attendance' : fields.function(_state_attendance, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present'),('none','No employee defined')], string='Current state'),
+        'state' : fields.selection([('new', 'New'),('draft','Draft'),('confirm','Confirmed'),('done','Done')], 'Status', select=True, required=True, readonly=True),
+        'state_attendance' : fields.function(_state_attendance, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present'),('none','No employee defined')], string='Current Status'),
         'total_attendance_day': fields.function(_total_day, method=True, string='Total Attendance'),
         'total_timesheet_day': fields.function(_total_day, method=True, string='Total Timesheet'),
         'total_difference_day': fields.function(_total_day, method=True, string='Difference'),
@@ -276,8 +276,16 @@ class hr_timesheet_sheet(osv.osv):
                 return False
         return True
 
+    def _date_current_check(self, cr, uid, ids):
+        for sheet in self.browse(cr, uid, ids):
+            if sheet.date_current < sheet.date_from or sheet.date_current > sheet.date_to:
+                return False
+        return True
+
+
     _constraints = [
-        (_sheet_date, 'You can not have 2 timesheets that overlaps !', ['date_from','date_to'])
+        (_sheet_date, 'You can not have 2 timesheets that overlaps !', ['date_from','date_to']),
+        (_date_current_check, 'You must select a Current date wich is in the timesheet dates !', ['date_current']),
     ]
 
     def action_set_to_draft(self, cr, uid, ids, *args):
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 791f0a254fb..d3d23e6fb92 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -129,7 +129,7 @@
                                     <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                                     <field name="amount"/>
                                     <field name="general_account_id"/>
-                                    <field name="journal_id"/>
+<!--                                    <field name="journal_id"/>-->
                                     <field invisible="1" name="user_id" required="1"/>
                                 </tree>
                             </field>
diff --git a/addons/idea/__init__.py b/addons/idea/__init__.py
new file mode 100644
index 00000000000..75ef8809acf
--- /dev/null
+++ b/addons/idea/__init__.py
@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+#
+# Generated by the OpenERP plugin for Dia !
+#
+
+import idea
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/idea/__terp__.py b/addons/idea/__terp__.py
new file mode 100644
index 00000000000..6091a7c1cc8
--- /dev/null
+++ b/addons/idea/__terp__.py
@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+{
+        "name" : "Idea Manager",
+        "version" : "0.1",
+        "author" : "Tiny",
+        "website" : "http://openerp.com",
+        "category" : "Tools",
+        "description": """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 userscan 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.""", 
+        "depends" : ['base'],
+        "init_xml" : [ ],
+        "demo_xml" : [ ],
+        "update_xml" : ['idea_view.xml', 'idea_workflow.xml'],
+        "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
new file mode 100644
index 00000000000..2fdab6f90ea
--- /dev/null
+++ b/addons/idea/idea.py
@@ -0,0 +1,220 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+from osv import osv, fields
+
+VoteValues = [('-1','Not Voted'),('0','Very Bad'),('25', 'Bad'),('50','Normal'),('75','Good'),('100','Very Good') ]
+DefaultVoteValue = '50'
+
+class idea_category(osv.osv):
+    _name = "idea.category"
+    _description = "Category for an idea"
+    _columns = {
+        'name': fields.char('Category', size=64, required=True),
+        'summary': fields.text('Summary'),
+        'parent_id': fields.many2one('idea.category','Parent Categories', ondelete='set null'),
+        'child_ids': fields.one2many('idea.category','parent_id','Child Categories')
+    }
+    _sql_constraints = [
+        ('name', 'unique(parent_id,name)', 'The name of the category must be unique' )
+    ]
+    _order = 'parent_id,name asc'
+idea_category()
+
+class idea_idea(osv.osv):
+    _name = 'idea.idea'
+    _rec_name = 'title'
+
+    def _vote_avg_compute(self, cr, uid, ids, name, arg, context = None):
+        if not len(ids):
+            return {}
+
+        sql = """select i.id, avg(v.score::integer) 
+                   from idea_idea i left outer join idea_vote v on i.id = v.idea_id
+                    where i.id in (%s)
+                    group by i.id
+                """ % ','.join(['%d']*len(ids))
+
+        cr.execute(sql, ids)
+        return dict(cr.fetchall())
+
+    def _vote_count(self,cr,uid,ids,name,arg,context=None):
+        if not len(ids):
+            return {}
+
+        sql = """select i.id, count(1) 
+                   from idea_idea i left outer join idea_vote v on i.id = v.idea_id
+                    where i.id in (%s)
+                    group by i.id
+                """ % ','.join(['%d']*len(ids))
+
+        cr.execute(sql, ids)
+        return dict(cr.fetchall())
+
+    def _comment_count(self,cr,uid,ids,name,arg,context=None):
+        if not len(ids):
+            return {}
+
+        sql = """select i.id, count(1) 
+                   from idea_idea i left outer join idea_comment c on i.id = c.idea_id
+                    where i.id in (%s)
+                    group by i.id
+                """ % ','.join(['%d']*len(ids))
+
+
+        cr.execute(sql,ids)
+        return dict(cr.fetchall())
+
+    def _vote_read(self, cr, uid, ids, name, arg, context = None):
+        res = {}
+        for id in ids:
+            res[id] = '-1'
+        vote_obj = self.pool.get('idea.vote')
+        votes_ids = vote_obj.search(cr, uid, [('idea_id', 'in', ids), ('user_id', '=', uid)])
+        for vote in vote_obj.browse(cr, uid, votes_ids, context):
+            res[vote.idea_id.id] = vote.score
+        return res
+
+    def _vote_save(self, cr, uid, id, field_name, field_value, arg, context = None):
+        vote_obj = self.pool.get('idea.vote')
+        vote = vote_obj.search(cr,uid,[('idea_id', '=', id),('user_id', '=', uid)])
+        textual_value = str(field_value)
+        if vote:
+            if int(field_value)>=0:
+                vote_obj.write(cr,uid, vote, { 'score' : textual_value })
+            else:
+                vote_obj.unlink(cr,uid, vote)
+        else:
+            if int(field_value)>=0:
+                vote_obj.create(cr,uid, { 'idea_id' : id, 'user_id' : uid, 'score' : textual_value })
+
+
+    _columns = {
+        'user_id': fields.many2one('res.users', 'Creator', required=True, readonly=True),
+        'title': fields.char('Idea Summary', size=64, required=True),
+        'description': fields.text('Description', required=True, help='Content of the idea'),
+        'comment_ids': fields.one2many('idea.comment', 'idea_id', 'Comments'),
+        'create_date' : fields.datetime( 'Creation date', readonly=True),
+        'vote_ids' : fields.one2many('idea.vote', 'idea_id', 'Vote'),
+        'my_vote' : fields.function(_vote_read, fnct_inv = _vote_save, string="My Vote", method=True, type="selection", selection=VoteValues),
+        'vote_avg' : fields.function(_vote_avg_compute, method=True, string="Average Score", type="float"),
+        'count_votes' : fields.function(_vote_count, method=True, string="Count of votes", type="integer"),
+        'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"),
+        'category_id': fields.many2one('idea.category', 'Category', required=True ),
+        'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Canceled')], 'Status', readonly=True),
+        'stat_vote_ids': fields.one2many('idea.vote.stat', 'idea_id', 'Statistics', readonly=True),
+    }
+
+    _defaults = {
+        'user_id': lambda self,cr,uid,context: uid,
+        'my_vote': lambda *a: '-1', 
+        'state': lambda *a: 'draft'
+    }
+    _order = 'id desc'
+
+    def idea_cancel(self, cr, uid, ids):
+        self.write(cr, uid, ids, { 'state' : 'cancel' })
+        return True
+
+    def idea_open(self, cr, uid, ids):
+        self.write(cr, uid, ids, { 'state' : 'open' })
+        return True
+
+    def idea_close(self, cr, uid, ids):
+        self.write(cr, uid, ids, { 'state' : 'close' })
+        return True
+
+    def idea_draft(self, cr, uid, ids):
+        self.write(cr, uid, ids, { 'state' : 'draft' })
+        return True
+idea_idea()
+
+class idea_comment(osv.osv):
+    _name = 'idea.comment'
+    _description = 'Comments'
+    _rec_name = 'content'
+    _columns = {
+        'idea_id': fields.many2one('idea.idea', 'Idea', required=True, ondelete='cascade' ),
+        'user_id': fields.many2one('res.users', 'User', required=True ),
+        'content': fields.text( 'Comment', required=True ),
+        'create_date' : fields.datetime( 'Creation date', readonly=True),
+    }
+    _defaults = {
+        'user_id': lambda self, cr, uid, context: uid
+    }
+    _order = 'id desc'
+idea_comment()
+
+class idea_vote(osv.osv):
+    _name = 'idea.vote'
+    _rec_name = 'score'
+    _columns = {
+        'user_id': fields.many2one( 'res.users', 'User'),
+        'idea_id': fields.many2one('idea.idea', 'Idea', required=True, ondelete='cascade'),
+        'score': fields.selection( VoteValues, 'Score', required=True)
+    }
+    _defaults = {
+        'score': lambda *a: DefaultVoteValue,
+    }
+idea_vote()
+
+class idea_vote_stat(osv.osv):
+    _name = 'idea.vote.stat'
+    _description = 'Idea Votes Statistics'
+    _auto = False
+    _rec_name = 'idea_id'
+    _columns = {
+        'idea_id': fields.many2one('idea.idea', 'Idea', readonly=True),
+        'score': fields.selection( VoteValues, 'Score', readonly=True),
+        'nbr': fields.integer('Number of Votes', readonly=True),
+    }
+    def init(self, cr):
+        """
+        initialize the sql view for the stats
+        
+        cr -- the cursor
+        """
+        cr.execute("""
+            create or replace view idea_vote_stat as (
+                select
+                    min(v.id) as id,
+                    i.id as idea_id,
+                    v.score,
+                    count(1) as nbr
+                from
+                    idea_vote v
+                    left join 
+                    idea_idea i on (v.idea_id=i.id)
+                group by
+                    i.id, v.score, i.id
+        )""")
+idea_vote_stat()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
new file mode 100644
index 00000000000..11d8c722fb9
--- /dev/null
+++ b/addons/idea/idea_view.xml
@@ -0,0 +1,288 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+	<menuitem name="Tools" id="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>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Category of ideas">
+					<field name="name" select="1"/>
+					<field name="parent_id" select="1"/>
+					<newline/>
+					<field name="summary" select="2" colspan="4"/>
+				</form>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="view_idea_category_tree">
+			<field name="name">idea.category.tree</field>
+			<field name="model">idea.category</field>
+			<field name="type">tree</field>
+			<field name="field_parent">child_ids</field>
+			<field name="arch" type="xml">
+				<tree string="Category of ideas">
+					<field name="name"/>
+				</tree>
+			</field>
+		</record>
+	<record model="ir.actions.act_window" id="action_idea_category">
+		<field name="name">Categories</field>
+		<field name="res_model">idea.category</field>
+		<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="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category"/>
+
+	<record model="ir.actions.act_window" id="action_idea_category_tree">
+		<field name="name">Ideas by Categories</field>
+		<field name="res_model">idea.category</field>
+		<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" 
+		action="action_idea_category_tree"/>
+
+
+	<record model="ir.actions.act_window" id="action_idea_idea_categ_open">
+		<field name="name">Open Ideas</field>
+		<field name="res_model">idea.idea</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','=','open'),('category_id','child_of',[active_id])]</field>
+	</record>
+	<record model="ir.values" id="action_idea_idea_categ_open_val">
+		<field name="key2" eval=" 'tree_but_open'" />
+		<field name="model" eval="'idea.category'" />
+		<field name="name">Ideas</field>
+		<field name="value" eval="'ir.actions.act_window,'+str(action_idea_idea_categ_open)" />
+		<field name="object" eval="True" />
+	</record>
+
+	<record model="ir.ui.view" id="view_idea_stat_form">
+		<field name="name">idea.stat.form</field>
+		<field name="model">idea.stat</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="stat">
+				<field name="avgscore" />
+				<field name="nbr_comments" />
+				<field name="nbr_votes" />
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_idea_vote_tree">
+		<field name="name">idea.vote.tree</field>
+		<field name="model">idea.vote</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+		<tree string="Votes">
+			<field name="idea_id"/>
+			<field name="user_id"/>
+			<field name="score" />
+		</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_idea_vote_form">
+		<field name="name">idea.vote.form</field>
+		<field name="model">idea.vote</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+		<form string="Votes">
+			<field name="idea_id" select="1" />
+			<field name="user_id" select="1" />
+			<field name="score" select="2"/>
+		</form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_idea_idea_form">
+		<field name="name">idea.idea.form</field>
+		<field name="model">idea.idea</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+		<form string="New Idea">
+			<notebook>
+				<page string="Idea">
+					<field name="title" select="1" />
+					<field name="category_id" select="1"/>
+					<field name="user_id" select="1"/>
+					<field name="my_vote"/>
+					<field name="vote_avg" />
+					<field name="description" colspan="4" select="2"/>
+					<field name="state" select="2"/>
+					<group colspan="2" col="3">
+						<button name="idea_open" string="Open" states="draft"/>
+						<button name="idea_close" string="Close" states="open"/>
+						<button name="idea_cancel" string="Cancel" states="open" />
+					</group>
+				</page>
+				<page string="Comments">
+					<field name="comment_ids" nolabel="1" colspan="4">
+						<form string="Comment">
+							<separator string="Your comment" colspan="4"/>
+							<field name="content" nolabel="1" />
+						</form>
+					</field>
+				</page>
+				<page string="Statistics">
+					<field name="stat_vote_ids" colspan="4" mode="graph,tree" nolabel="1">
+						<graph string="vote_stat of ideas" type="bar">
+							<field name="score"/>
+							<field name="nbr"/>
+						</graph>
+						<tree string="vote_stat of ideas">
+							<field name="score"/>
+							<field name="nbr"/>
+						</tree>
+					</field>
+				</page>
+			</notebook>
+		</form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_idea_idea_tree">
+		<field name="name">idea.idea.tree</field>
+		<field name="model">idea.idea</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+		<tree string="All Ideas">
+			<field name="category_id" />
+			<field name="create_date"/> 
+			<field name="user_id" />
+			<field name="title"/>
+			<field name="vote_avg" />
+			<field name="count_comments" />
+			<field name="count_votes" />
+		</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_idea_comment_tree">
+		<field name="name">idea.comment.tree</field>
+		<field name="model">idea.comment</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+		<tree string="Comments">
+			<field name="create_date" />
+			<field name="user_id" />
+			<field name="content" string="Comment" />
+		</tree>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_idea_idea">
+		<field name="name">Ideas</field>
+		<field name="res_model">idea.idea</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+	<menuitem name="All 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>
+		<field name="res_model">idea.idea</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','=','open')]</field>
+	</record>
+	<menuitem name="Open Ideas" parent="menu_idea_idea" id="menu_idea_idea_open" action="action_idea_idea_open"/>
+
+
+	<record model="ir.actions.act_window" id="action_idea_idea_my_idea">
+		<field name="name">My Ideas</field>
+		<field name="res_model">idea.idea</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('user_id', '=', uid)]</field>
+	</record>
+	<menuitem name="My Ideas" parent="menu_ideas1" id="menu_idea_idea_my_idea" action="action_idea_idea_my_idea" />
+
+	<record model="ir.actions.act_window" id="action_idea_idea_draft_my">
+		<field name="name">My Draft Ideas</field>
+		<field name="res_model">idea.idea</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+	</record>
+	<menuitem 
+		name="My Draft Ideas" parent="menu_idea_idea_my_idea"
+		id="menu_idea_idea_draft_my" 
+		action="action_idea_idea_draft_my"/>
+
+
+	<record model="ir.actions.act_window" id="action_idea_idea_open_my">
+		<field name="name">My Open Ideas</field>
+		<field name="res_model">idea.idea</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
+	</record>
+	<menuitem 
+		name="My Open Ideas" parent="menu_idea_idea_my_idea"
+		id="menu_idea_idea_open_my"
+		action="action_idea_idea_open_my"/>
+
+		<record model="ir.ui.view" id="view_idea_vote_stat_graph">
+			<field name="name">idea.vote_stat.graph</field>
+			<field name="model">idea.vote.stat</field>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="vote_stat of ideas">
+					<field name="score"/>
+					<field name="nbr"/>
+				</graph>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_idea_vote_stat_form">
+			<field name="name">idea.vote.stat.form</field>
+			<field name="model">idea.vote.stat</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="vote_stat of ideas">
+					<field name="idea_id" select="1"/>
+					<field name="score"  select="1"/>
+					<field name="nbr"  select="2"/>
+				</form>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="view_idea_vote_stat_tree">
+			<field name="name">idea.vote.stat.tree</field>
+			<field name="model">idea.vote.stat</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="vote_stat of ideas">
+					<field name="idea_id"/>
+					<field name="score" />
+					<field name="nbr" />
+				</tree>
+			</field>
+		</record>
+
+	<record model="ir.actions.act_window" id="action_idea_vote_stat">
+		<field name="name">Statistics on Votes</field>
+		<field name="res_model">idea.vote.stat</field>
+		<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"/>
+
+
+	<record model="ir.actions.act_window" id="action_idea_vote">
+		<field name="name">Idea's vote</field>
+		<field name="res_model">idea.vote</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+	<menuitem name="All Votes" parent="menu_ideas" id="menu_idea_vote" action="action_idea_vote"/>
+
+	</data>
+</terp>
diff --git a/addons/idea/idea_workflow.xml b/addons/idea/idea_workflow.xml
new file mode 100644
index 00000000000..eed32adf105
--- /dev/null
+++ b/addons/idea/idea_workflow.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<terp>
+    <data>
+        <record model="workflow" id="wkf_idea">
+            <field name="name">idea.wkf</field>
+            <field name="osv">idea.idea</field>
+            <field name="on_create">True</field>
+        </record>
+
+        <record model="workflow.activity" id="act_draft">
+            <field name="wkf_id" ref="wkf_idea" />
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+            <field name="kind">function</field>
+            <field name="action">idea_draft()</field>
+        </record>
+
+        <record model="workflow.activity" id="act_open">
+            <field name="wkf_id" ref="wkf_idea" />
+            <field name="name">open</field>
+            <field name="kind">function</field>
+            <field name="action">idea_open()</field>
+        </record>
+
+        <record model="workflow.activity" id="act_close">
+            <field name="wkf_id" ref="wkf_idea" />
+            <field name="name">close</field>
+            <field name="kind">function</field>
+            <field name="action">idea_close()</field>
+            <field name="flow_stop">True</field>
+        </record>
+
+        <record model="workflow.activity" id="act_cancel">
+            <field name="wkf_id" ref="wkf_idea" />
+            <field name="name">cancel</field>
+            <field name="kind">function</field>
+            <field name="action">idea_cancel()</field>
+            <field name="flow_stop">True</field>
+        </record>
+
+        <record model="workflow.transition" id="t1">
+            <field name="act_from" ref="act_draft" />
+            <field name="act_to" ref="act_open" />
+            <field name="signal">idea_open</field>
+        </record>
+
+        <record model="workflow.transition" id="t2">
+            <field name="act_from" ref="act_open" />
+            <field name="act_to" ref="act_close" />
+            <field name="signal">idea_close</field>
+        </record>
+
+        <record model="workflow.transition" id="t3">
+            <field name="act_from" ref="act_draft" />
+            <field name="act_to" ref="act_cancel" />
+            <field name="signal">idea_cancel</field>
+        </record>
+
+        <record model="workflow.transition" id="t4">
+            <field name="act_from" ref="act_open" />
+            <field name="act_to" ref="act_cancel" />
+            <field name="signal">idea_cancel</field>
+        </record>
+
+        <record model="workflow.transition" id="t5">
+            <field name="act_from" ref="act_cancel" />
+            <field name="act_to" ref="act_draft" />
+            <field name="signal">idea_draft</field>
+        </record>
+
+    </data>
+</terp>
diff --git a/addons/invoice_payment_tab/__init__.py b/addons/invoice_payment_tab/__init__.py
new file mode 100644
index 00000000000..ec1dcc7cf7a
--- /dev/null
+++ b/addons/invoice_payment_tab/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import invoice_payment_tab
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/invoice_payment_tab/__terp__.py b/addons/invoice_payment_tab/__terp__.py
new file mode 100644
index 00000000000..bce164bd71d
--- /dev/null
+++ b/addons/invoice_payment_tab/__terp__.py
@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Invoice payment tab",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://openerp.com",
+    "category" : "Generic Modules/Accounting",
+    "description": """
+        This module defines a new tab on invoices, which contains all the payments made for this invoice. This improvement will allow accountants to easily manage due amounts and prepayments.
+    """,
+    "depends" : ["base","account"],
+    "init_xml" : [],
+    "demo_xml" : [],
+
+    "update_xml" : ["invoice_payment_tab_view.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/invoice_payment_tab/invoice_payment_tab.py b/addons/invoice_payment_tab/invoice_payment_tab.py
new file mode 100644
index 00000000000..3102495c3f4
--- /dev/null
+++ b/addons/invoice_payment_tab/invoice_payment_tab.py
@@ -0,0 +1,73 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2007 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 netsvc
+import time
+from osv import fields, osv
+
+class account_invoice(osv.osv):
+    _inherit = 'account.invoice'
+    _description = 'Account Invoice'
+
+    def _amount_residual(self, cr, uid, ids, name, args, context={}):
+        res = {}
+        data_inv = self.browse(cr, uid, ids)
+        for inv in data_inv:
+            paid_amt = 0.0
+            to_pay = inv.amount_total
+            for lines in inv.move_lines:
+                paid_amt = paid_amt + lines.credit
+            res[inv.id] = to_pay - paid_amt
+        return res
+
+    def _get_lines(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for id in ids:
+            move_lines = self.move_line_id_payment_get(cr,uid,[id])
+            if not move_lines:
+                res[id] = []
+                continue
+            data_lines = self.pool.get('account.move.line').browse(cr,uid,move_lines)
+            for line in data_lines:
+                ids_line = []
+                if line.reconcile_id:
+                    ids_line = line.reconcile_id.line_id
+                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]
+        return res
+
+    _columns = {
+        'move_lines':fields.function(_get_lines , method=True,type='many2many' , relation='account.move.line',string='Move Lines'),
+        'residual': fields.function(_amount_residual, method=True, digits=(16,2),string='Residual', store=True),
+                }
+
+account_invoice()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/invoice_payment_tab/invoice_payment_tab_view.xml b/addons/invoice_payment_tab/invoice_payment_tab_view.xml
new file mode 100644
index 00000000000..a1781fdb21a
--- /dev/null
+++ b/addons/invoice_payment_tab/invoice_payment_tab_view.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+
+<!-- add payments tab on account.invoice -->
+		<record model="ir.ui.view" id="invoice_form_payment">
+			<field name="name">account.invoice.payment.form</field>
+			<field name="type">form</field>
+			<field name="model">account.invoice</field>
+			<field name="inherit_id" ref="account.invoice_form"/>
+			<field name="arch" type="xml">
+				<notebook position="inside">
+					<page string="Payments">
+						<field name="move_lines" colspan="4"/>
+					</page>
+				</notebook>
+			</field>
+		</record>
+
+	<record model="ir.ui.view" id="invoice_supplier_payment">
+			<field name="name">account.invoice.payment.supplier</field>
+			<field name="type">form</field>
+			<field name="model">account.invoice</field>
+			<field name="inherit_id" ref="account.invoice_supplier_form"/>
+			<field name="arch" type="xml">
+				<notebook position="inside">
+					<page string="Payments">
+						<field name="move_lines" colspan="4"/>
+					</page>
+				</notebook>
+			</field>
+		</record>
+
+<!-- add residual field on invoice object form + tree -->
+		<record model="ir.ui.view" id="invoice_form_payment_inherit">
+			<field name="name">account.invoice.form.residual</field>
+			<field name="type">form</field>
+			<field name="model">account.invoice</field>
+			<field name="inherit_id" ref="account.invoice_form"/>
+			<field name="arch" type="xml">
+				<field name="reconciled" position="after">
+					<field name="residual"/>
+				</field>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="invoice_tree_inherit">
+			<field name="name">account.invoice.tree.residual</field>
+			<field name="type">form</field>
+			<field name="model">account.invoice</field>
+			<field name="inherit_id" ref="account.invoice_tree"/>
+			<field name="arch" type="xml">
+				<field name="state" position="before">
+					<field name="residual"/>
+				</field>
+			</field>
+		</record>
+
+	<record model="ir.ui.view" id="invoice_supplier_form_residual">
+			<field name="name">account.invoice.supplier.inherit</field>
+			<field name="type">form</field>
+			<field name="model">account.invoice</field>
+			<field name="inherit_id" ref="account.invoice_supplier_form"/>
+			<field name="arch" type="xml">
+				<field name="reconciled" position="after">
+					<field name="residual"/>
+				</field>
+			</field>
+		</record>
+
+	</data>
+</terp>
diff --git a/addons/l10n_be/wizard/partner_vat_listing.py b/addons/l10n_be/wizard/partner_vat_listing.py
index 1fc88af68bc..8270cc95051 100644
--- a/addons/l10n_be/wizard/partner_vat_listing.py
+++ b/addons/l10n_be/wizard/partner_vat_listing.py
@@ -20,7 +20,7 @@ form = """<?xml version="1.0"?>
 fields = {
     'fyear': {'string': 'Fiscal Year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True,},
     'mand_id':{'string':'MandataireId','type':'char','size':'30','required': True,},
-    'limit_amount':{'string':'Limit Amount','type':'int','required': True, },
+    'limit_amount':{'string':'Limit Amount','type':'integer','required': True, },
     'test_xml': {'string':'Test XML file', 'type':'boolean', },
    }
 msg_form = """<?xml version="1.0"?>
@@ -46,7 +46,7 @@ class wizard_vat(wizard.interface):
         seq_controlref = pooler.get_pool(cr.dbname).get('ir.sequence').get(cr, uid,'controlref')
         seq_declarantnum = pooler.get_pool(cr.dbname).get('ir.sequence').get(cr, uid,'declarantnum')
         obj_cmpny = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid).company_id
-        company_vat = obj_cmpny.partner_id.vat 
+        company_vat = obj_cmpny.partner_id.vat
         if not company_vat: #if not vat_company:
             raise wizard.except_wizard('Data Insufficient','No VAT Number Associated with Main Company!')
 
diff --git a/addons/membership/__init__.py b/addons/membership/__init__.py
new file mode 100644
index 00000000000..ec633f37d1b
--- /dev/null
+++ b/addons/membership/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+import membership
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/membership/__terp__.py b/addons/membership/__terp__.py
new file mode 100644
index 00000000000..19311f6ebb0
--- /dev/null
+++ b/addons/membership/__terp__.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Membership",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "category" : "Generic Modules/Association",
+    "depends" : [
+        "base", "product", "account",
+        ],
+    "demo_xml" : [
+        #"demo_data.xml",
+        "membership_demo.xml"
+        ],
+    "init_xml" : [
+        "membership_data.xml",
+        ],
+    "update_xml" : [
+        "membership_view.xml","membership_wizard.xml"
+        ],
+    "active" : False,
+    "installable" : True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/membership/demo_data.xml b/addons/membership/demo_data.xml
new file mode 100755
index 00000000000..8c01d860c9b
--- /dev/null
+++ b/addons/membership/demo_data.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" ?>
+<terp>
+	<data noupdate="1">
+		<record id="account_tax_testingtax0" model="account.tax">
+			<field eval="1" name="sequence"/>
+			<field eval="1.0" name="base_sign"/>
+			<field eval="&quot;true&quot;" name="applicable_type"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="&quot;# price_unit
+# address : res.partner.address object or False
+# product : product.product object or False
+
+result = price_unit * 0.10&quot;" name="python_compute_inv"/>
+			<field eval="1.0" name="ref_tax_sign"/>
+			<field eval="&quot;percent&quot;" name="type"/>
+			<field eval="1.0" name="ref_base_sign"/>
+			<field eval="&quot;vat&quot;" name="tax_group"/>
+			<field eval="&quot;1&quot;" name="active"/>
+			<field eval="&quot;testing tax&quot;" name="name"/>
+			<field eval="0.069" name="amount"/>
+			<field eval="&quot;# price_unit
+# address : res.partner.address object or False
+# product : product.product object or None
+# partner : res.partner object or None
+
+result = price_unit * 0.10&quot;" name="python_compute"/>
+			<field eval="1.0" name="tax_sign"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="base.EUR" model="res.currency"/>
+	</data>
+	<data>
+		<record id="product_template_0" model="product.template">
+			<field name="list_price" eval="150.0"/>
+			<field name="name" eval="&quot;Membership 2006&quot;"/>
+			<field name="categ_id" eval="7"/>
+			<field name="type" eval="&quot;service&quot;"/>
+		</record>
+	</data>
+	<data>
+		<record id="product_product_0" model="product.product">
+			<field eval="&quot;2007-03-31&quot;" name="membership_date_to"/>
+			<field eval="&quot;1&quot;" name="membership"/>
+			<field eval="&quot;m2006&quot;" name="default_code"/>
+			<field eval="&quot;2006-01-01&quot;" name="membership_date_from"/>
+			<field eval="&quot;1&quot;" name="active"/>
+			<field eval="150.0" name="price_margin"/>
+			<field name="product_tmpl_id" ref="product_template_0"/>
+		</record>
+	</data>
+	<data>
+		<record id="product_template_1" model="product.template">
+			<field name="list_price" eval="160.0"/>
+			<field name="name" eval="&quot;Membership 2007&quot;"/>
+			<field name="categ_id" eval="7"/>
+			<field name="type" eval="&quot;service&quot;"/>
+		</record>
+	</data>
+	<data>
+		<record id="product_product_1" model="product.product">
+			<field eval="&quot;2008-03-31&quot;" name="membership_date_to"/>
+			<field eval="&quot;1&quot;" name="membership"/>
+			<field eval="&quot;m2007&quot;" name="default_code"/>
+			<field eval="&quot;2007-01-01&quot;" name="membership_date_from"/>
+			<field eval="&quot;1&quot;" name="active"/>
+			<field eval="160.0" name="price_margin"/>
+			<field name="product_tmpl_id" ref="product_template_1"/>
+		</record>
+	</data>
+	<data>
+		<record id="product_template_2" model="product.template">
+			<field name="list_price" eval="165.0"/>
+			<field name="name" eval="&quot;Membership 2008&quot;"/>
+			<field name="categ_id" eval="7"/>
+			<field name="type" eval="&quot;service&quot;"/>
+		</record>
+	</data>
+	<data>
+		<record id="product_product_2" model="product.product">
+			<field eval="&quot;2009-03-31&quot;" name="membership_date_to"/>
+			<field eval="&quot;1&quot;" name="membership"/>
+			<field eval="&quot;m2008&quot;" name="default_code"/>
+			<field eval="&quot;2008-01-01&quot;" name="membership_date_from"/>
+			<field eval="&quot;1&quot;" name="active"/>
+			<field eval="165.0" name="price_margin"/>
+			<field name="product_tmpl_id" ref="product_template_2"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="account_invoice_0" model="account.invoice">
+			<field name="partner_id" ref="base.res_partner_agrolait"/>
+			<field name="account_id" ref="account.a_recv"/>
+			<field name="address_contact_id" ref="base.res_partner_address_8"/>
+			<field eval="&quot;none&quot;" name="reference_type"/>
+			<field name="journal_id" ref="account.sales_journal"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="currency_id" ref="base.EUR"/>
+			<field name="address_invoice_id" ref="base.res_partner_address_8"/>
+			<field eval="&quot;paid&quot;" name="state"/>
+			<field eval="&quot;out_invoice&quot;" name="type"/>
+			<field eval="&quot;2006-02-10&quot;" name="date_invoice"/>
+		</record>
+		<record id="account_invoice_line_membership0" model="account.invoice.line">
+			<field name="uos_id" ref="product.product_uom_unit"/>
+			<field eval="&quot;Membership 2006&quot;" name="name"/>
+			<field name="invoice_id" ref="account_invoice_0"/>
+			<field eval="150.0" name="price_unit"/>
+			<field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
+			<field name="product_id" ref="product_product_0"/>
+			<field eval="1.0" name="quantity"/>
+			<field name="account_id" ref="account.a_sale"/>
+		</record>
+	</data>
+
+	<data noupdate="1">
+		<record id="account_invoice_1" model="account.invoice">
+			<field name="partner_id" ref="base.res_partner_agrolait"/>
+			<field name="account_id" ref="account.a_recv"/>
+			<field name="address_contact_id" ref="base.res_partner_address_8"/>
+			<field eval="&quot;none&quot;" name="reference_type"/>
+			<field name="journal_id" ref="account.sales_journal"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="currency_id" ref="base.EUR"/>
+			<field name="address_invoice_id" ref="base.res_partner_address_8"/>
+			<field eval="&quot;paid&quot;" name="state"/>
+			<field eval="&quot;out_invoice&quot;" name="type"/>
+			<field eval="&quot;2007-01-30&quot;" name="date_invoice"/>
+		</record>
+		<record id="account_invoice_line_membership1" model="account.invoice.line">
+			<field name="uos_id" ref="product.product_uom_unit"/>
+			<field eval="&quot;Membership 2007&quot;" name="name"/>
+			<field name="invoice_id" ref="account_invoice_1"/>
+			<field eval="160.0" name="price_unit"/>
+			<field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
+			<field name="product_id" ref="product_product_1"/>
+			<field eval="1.0" name="quantity"/>
+			<field name="account_id" ref="account.a_sale"/>
+		</record>
+	</data>
+
+	<data noupdate="1">
+		<record id="account_invoice_2" model="account.invoice">
+			<field name="partner_id" ref="base.res_partner_agrolait"/>
+			<field name="account_id" ref="account.a_recv"/>
+			<field name="address_contact_id" ref="base.res_partner_address_8"/>
+			<field eval="&quot;none&quot;" name="reference_type"/>
+			<field name="journal_id" ref="account.sales_journal"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="currency_id" ref="base.EUR"/>
+			<field name="address_invoice_id" ref="base.res_partner_address_8"/>
+			<field eval="&quot;paid&quot;" name="state"/>
+			<field eval="&quot;out_invoice&quot;" name="type"/>
+			<field eval="&quot;2007-11-30&quot;" name="date_invoice"/>
+		</record>
+		<record id="account_invoice_line_membership1" model="account.invoice.line">
+			<field name="uos_id" ref="product.product_uom_unit"/>
+			<field eval="&quot;Membership 2007&quot;" name="name"/>
+			<field name="invoice_id" ref="account_invoice_2"/>
+			<field eval="160.0" name="price_unit"/>
+			<field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
+			<field name="product_id" ref="product_product_2"/>
+			<field eval="1.0" name="quantity"/>
+			<field name="account_id" ref="account.a_sale"/>
+		</record>
+	</data>
+<!--
+	<data>
+		<workflow action="invoice_open" model="account.invoice" ref="account_invoice_2"/>
+	</data>
+
+	<data>
+		<workflow action="invoice_open" model="account.invoice" ref="account_invoice_1"/>
+	</data>
+
+
+	<data>
+		<workflow action="invoice_open" model="account.invoice" ref="account_invoice_0"/>
+	</data>
+-->
+</terp>
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
new file mode 100644
index 00000000000..6e339609e6e
--- /dev/null
+++ b/addons/membership/membership.py
@@ -0,0 +1,786 @@
+# -*- encoding: utf-8 -*-
+'''Membership'''
+##############################################################################
+#
+# Copyright (c) 2007 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.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools import config
+import time
+
+STATE = [
+    ('none', 'Non Member'),
+    ('canceled', 'Canceled Member'),
+    ('old', 'Old Member'),
+    ('waiting', 'Waiting Member'),
+    ('invoiced', 'Invoiced Member'),
+    ('associated', 'Associated Member'),
+    ('free', 'Free Member'),
+    ('paid', 'Paid Member'),
+]
+
+STATE_PRIOR = {
+        'none' : 0,
+        'canceled' : 1,
+        'old' : 2,
+        'waiting' : 3,
+        'invoiced' : 4,
+        'associated' : 5,
+        'free' : 6,
+        'paid' : 7
+        }
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    _columns = {
+        'associate_member': fields.many2one('res.partner', 'Associate member'),
+                }
+res_partner()
+
+REQUETE = '''SELECT partner, state FROM (
+SELECT members.partner AS partner,
+CASE WHEN MAX(members.state) = 0 THEN 'none'
+ELSE CASE WHEN MAX(members.state) = 1 THEN 'canceled'
+ELSE CASE WHEN MAX(members.state) = 2 THEN 'old'
+ELSE CASE WHEN MAX(members.state) = 3 THEN 'waiting'
+ELSE CASE WHEN MAX(members.state) = 4 THEN 'invoiced'
+ELSE CASE WHEN MAX(members.state) = 5 THEN 'associated'
+ELSE CASE WHEN MAX(members.state) = 6 THEN 'free'
+ELSE CASE WHEN MAX(members.state) = 7 THEN 'paid'
+END END END END END END END END
+    AS state FROM (
+SELECT partner,
+    CASE WHEN MAX(inv_digit.state) = 4 THEN 7
+    ELSE CASE WHEN MAX(inv_digit.state) = 3 THEN 4
+    ELSE CASE WHEN MAX(inv_digit.state) = 2 THEN 3
+    ELSE CASE WHEN MAX(inv_digit.state) = 1 THEN 1
+END END END END
+AS state
+FROM (
+    SELECT p.id as partner,
+    CASE WHEN ai.state = 'paid' THEN 4
+    ELSE CASE WHEN ai.state = 'open' THEN 3
+    ELSE CASE WHEN ai.state = 'proforma' THEN 2
+    ELSE CASE WHEN ai.state = 'draft' THEN 2
+    ELSE CASE WHEN ai.state = 'cancel' THEN 1
+END END END END END
+AS state
+FROM res_partner p
+JOIN account_invoice ai ON (
+    p.id = ai.partner_id
+)
+JOIN account_invoice_line ail ON (
+    ail.invoice_id = ai.id
+)
+JOIN membership_membership_line ml ON (
+    ml.account_invoice_line  = ail.id
+)
+WHERE ml.date_from <= '%s'
+AND ml.date_to >= '%s'
+GROUP BY
+p.id,
+ai.state
+    )
+    AS inv_digit
+    GROUP by partner
+UNION
+SELECT p.id AS partner,
+    CASE WHEN  p.free_member THEN 6
+    ELSE CASE WHEN p.associate_member IN (
+        SELECT ai.partner_id FROM account_invoice ai JOIN
+        account_invoice_line ail ON (ail.invoice_id = ai.id AND ai.state = 'paid')
+        JOIN membership_membership_line ml ON (ml.account_invoice_line = ail.id)
+        WHERE ml.date_from <= '%s'
+        AND ml.date_to >= '%s'
+    )
+    THEN 5
+END END
+AS state
+FROM res_partner p
+WHERE p.free_member
+OR p.associate_member > 0
+UNION
+SELECT p.id as partner,
+    MAX(CASE WHEN ai.state = 'paid' THEN 2
+    ELSE 0
+    END)
+AS state
+FROM res_partner p
+JOIN account_invoice ai ON (
+    p.id = ai.partner_id
+)
+JOIN account_invoice_line ail ON (
+    ail.invoice_id = ai.id
+)
+JOIN membership_membership_line ml ON (
+    ml.account_invoice_line  = ail.id
+)
+WHERE ml.date_from < '%s'
+AND ml.date_to < '%s'
+AND ml.date_from <= ml.date_to
+GROUP BY
+p.id
+)
+AS members
+GROUP BY members.partner
+)
+AS final
+%s
+'''
+
+
+class membership_line(osv.osv):
+    '''Member line'''
+
+    def _check_membership_date(self, cr, uid, ids, context=None):
+        '''Check if membership product is not in the past'''
+
+        cr.execute('''
+         SELECT MIN(ml.date_to - ai.date_invoice)
+         FROM membership_membership_line ml
+         JOIN account_invoice_line ail ON (
+            ml.account_invoice_line = ail.id
+            )
+        JOIN account_invoice ai ON (
+            ai.id = ail.invoice_id)
+        WHERE ml.id in (%s)
+        ''' % ','.join([str(id) for id in ids]))
+
+        res = cr.fetchall()
+        for r in res:
+            if r[0] and r[0] < 0:
+                return False
+        return True
+
+    def _state(self, cr, uid, ids, name, args, context=None):
+        '''Compute the state lines'''
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            cr.execute('''
+            SELECT i.state FROM
+            account_invoice i WHERE
+            i.id = (
+                SELECT l.invoice_id FROM
+                account_invoice_line l WHERE
+                l.id = (
+                    SELECT  ml.account_invoice_line FROM
+                    membership_membership_line ml WHERE
+                    ml.id = %d
+                    )
+                )
+            ''' % line.id)
+            fetched = cr.fetchone()
+            if not fetched :
+                res[line.id] = 'canceled'
+                continue
+            istate = fetched[0]
+            state = 'none'
+            if (istate == 'draft') | (istate == 'proforma'):
+                state = 'waiting'
+            elif istate == 'open':
+                state = 'invoiced'
+            elif istate == 'paid':
+                state = 'paid'
+            elif istate == 'cancel':
+                state = 'canceled'
+            res[line.id] = state
+        return res
+
+
+    _description = __doc__
+    _name = 'membership.membership_line'
+    _columns = {
+            'partner': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=1),
+            'date_from': fields.date('From'),
+            'date_to': fields.date('To'),
+            'date_cancel' : fields.date('Cancel date'),
+            'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line'),
+            'state': fields.function(_state, method=True, string='State', type='selection', selection=STATE),
+            }
+    _rec_name = 'partner'
+    _order = 'id desc'
+    _constraints = [
+            (_check_membership_date, 'Error, this membership product is out of date', [])
+            ]
+
+membership_line()
+
+
+class Partner(osv.osv):
+    '''Partner'''
+
+    def _membership_state_search_inv(self,cr,uid,ids):
+        data_inv = self.pool.get('account.invoice').browse(cr,uid,ids)
+        list_partner = []
+        for data in data_inv:
+            list_partner.append(data.partner_id.id)
+        return list_partner
+
+    def _membership_state(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for id in ids:
+            res[id] = 'none'
+        today = time.strftime('%Y-%m-%d')
+
+        for id in ids:
+            partner_data = self.browse(cr,uid,id)
+            if partner_data.membership_cancel and today > partner_data.membership_cancel:
+                res[id] = 'canceled'
+                continue
+            if partner_data.membership_stop and today > partner_data.membership_stop:
+                res[id] = 'old'
+                continue
+            s = 4
+            if partner_data.member_lines:
+                for mline in partner_data.member_lines:
+                    if mline.date_from <= today and mline.date_to >= today:
+                        if mline.account_invoice_line and mline.account_invoice_line.invoice_id:
+                            mstate = mline.account_invoice_line.invoice_id.state
+                            if mstate == 'paid':
+                                s = 0
+                                break
+                            elif mstate == 'open' and s!=0:
+                                s = 1
+                            elif mstate == 'cancel' and s!=0 and s!=1:
+                                s = 2
+                            elif  (mstate == 'draft' or mstate == 'proforma') and s!=0 and s!=1:
+                                s = 3
+                if s==4:
+                    for mline in partner_data.member_lines:
+                        if mline.date_from < today and mline.date_to < today and mline.date_from<=mline.date_to and mline.account_invoice_line.invoice_id.state == 'paid':
+                            s = 5
+                        else:
+                            s = 6
+                if s==0:
+                    res[id] = 'paid'
+                elif s==1:
+                    res[id] = 'invoiced'
+                elif s==2:
+                    res[id] = 'canceled'
+                elif s==3:
+                    res[id] = 'waiting'
+                elif s==5:
+                    res[id] = 'old'
+                elif s==6:
+                    res[id] = 'none'
+            if partner_data.free_member and s!=0:
+                res[id] = 'free'
+            if partner_data.associate_member:
+                assciate_partner = self.browse(cr,uid,partner_data.associate_member.id)
+                cr.execute('select membership_state from res_partner where id=%d', (partner_data.id,))
+                data_partner_state = cr.fetchall()
+                for i in assciate_partner.member_lines:
+                    if i.date_from <= today and i.date_to >= today and i.account_invoice_line.invoice_id.state == 'paid' and s!=0 and data_partner_state[0][0] !='free':
+                        res[id] = 'associated'
+#
+#       '''Compute membership state of partners'''
+#       today = time.strftime('%Y-%m-%d')
+##      res = {}
+##      for id in ids:
+##          res[id] = 'none'
+#       clause = 'WHERE partner IN (' + ','.join([str(id) for id in ids]) + ')'
+#       cr.execute(REQUETE % (today, today, today, today, today, today, clause))
+#       fetches = cr.fetchall()
+#       for fetch in fetches:
+#           res[fetch[0]] = fetch[1]
+        return res
+
+#no more need becaz of new functionality store attribut on function field
+#   def _membership_state_search(self, cr, uid, obj, name, args):
+#       '''Search on membership state'''
+#
+#       today = time.strftime('%Y-%m-%d')
+#       clause = 'WHERE '
+#       for i in range(len(args)):
+#           if i!=0:
+#               clause += 'OR '
+#           clause += 'state '+args[i][1]+" '"+args[i][2]+"' "
+#       cr.execute(REQUETE % (today, today, today, today, today, today, clause))
+#       ids=[x[0] for x in cr.fetchall()]
+#
+#       return [('id', 'in', ids)]
+
+    def _membership_start(self, cr, uid, ids, name, args, context=None):
+        '''Return the start date of membership'''
+        res = {}
+        member_line_obj = self.pool.get('membership.membership_line')
+        for partner in self.browse(cr, uid, ids):
+            if partner.membership_state == 'associated':
+                partner_id = partner.associate_member.id
+            else:
+                partner_id = partner.id
+            line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
+                    limit=1, order='date_from')
+            if line_id:
+                res[partner.id] = member_line_obj.read(cr, uid, line_id[0],
+                        ['date_from'])['date_from']
+            else:
+                res[partner.id] = False
+        return res
+
+    def _membership_start_search(self, cr, uid, obj, name, args):
+        '''Search on membership start date'''
+        if not len(args):
+            return []
+        where = ' AND '.join(['date_from '+x[1]+' \''+str(x[2])+'\''
+            for x in args])
+        cr.execute('SELECT partner, MIN(date_from) \
+                FROM ( \
+                    SELECT partner, MIN(date_from) AS date_from \
+                    FROM membership_membership_line \
+                    GROUP BY partner \
+                ) AS foo \
+                WHERE '+where+' \
+                GROUP BY partner')
+        res = cr.fetchall()
+        if not res:
+            return [('id', '=', '0')]
+        return [('id', 'in', [x[0] for x in res])]
+
+    def _membership_stop(self, cr, uid, ids, name, args, context=None):
+        '''Return the stop date of membership'''
+        res = {}
+        member_line_obj = self.pool.get('membership.membership_line')
+        for partner in self.browse(cr, uid, ids):
+            cr.execute('select membership_state from res_partner where id=%d', (partner.id,))
+            data_state = cr.fetchall()
+            #if partner.membership_state == 'associated':
+            if data_state[0][0] == 'associated':
+                partner_id = partner.associate_member.id
+            else:
+                partner_id = partner.id
+            line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
+                    limit=1, order='date_to desc')
+            if line_id:
+                res[partner.id] = member_line_obj.read(cr, uid, line_id[0],
+                        ['date_to'])['date_to']
+            else:
+                res[partner.id] = False
+        return res
+
+    def _membership_stop_search(self, cr, uid, obj, name, args):
+        '''Search on membership stop date'''
+        if not len(args):
+            return []
+        where = ' AND '.join(['date_to '+x[1]+' \''+str(x[2])+'\''
+            for x in args])
+        cr.execute('SELECT partner, MAX(date_to) \
+                FROM ( \
+                    SELECT partner, MAX(date_to) AS date_to \
+                    FROM membership_membership_line \
+                    GROUP BY partner \
+                ) AS foo \
+                WHERE '+where+' \
+                GROUP BY partner')
+        res = cr.fetchall()
+        if not res:
+            return [('id', '=', '0')]
+        return [('id', 'in', [x[0] for x in res])]
+
+    def _membership_cancel(self, cr, uid, ids, name, args, context=None):
+        '''Return the cancel date of membership'''
+        res = {}
+        member_line_obj = self.pool.get('membership.membership_line')
+        for partner_id in ids:
+            line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
+                    limit=1, order='date_cancel')
+            if line_id:
+                res[partner_id] = member_line_obj.read(cr, uid, line_id[0],
+                        ['date_cancel'])['date_cancel']
+            else:
+                res[partner_id] = False
+        return res
+
+    def _membership_cancel_search(self, cr, uid, obj, name, args):
+        '''Search on membership cancel date'''
+        if not len(args):
+            return []
+        where = ' AND '.join(['date_cancel '+x[1]+' \''+str(x[2])+'\''
+            for x in args])
+        cr.execute('SELECT partner, MIN(date_cancel) \
+                FROM ( \
+                    SELECT partner, MIN(date_cancel) AS date_cancel \
+                    FROM membership_membership_line \
+                    GROUP BY partner \
+                ) AS foo \
+                WHERE '+where+' \
+                GROUP BY partner')
+        res = cr.fetchall()
+        if not res:
+            return [('id', '=', '0')]
+        return [('id', 'in', [x[0] for x in res])]
+
+
+
+    _inherit = 'res.partner'
+    _columns = {
+        'member_lines': fields.one2many('membership.membership_line', 'partner',
+            'Membership'),
+        'membership_amount': fields.float('Membership amount', digites=(16, 2),
+            help='The price negociated by the partner'),
+#       'membership_state': fields.function(_membership_state, method=True, string='Current membership state',
+#           type='selection', selection=STATE, fnct_search=_membership_state_search),
+        'membership_state': fields.function(_membership_state, method=True, string='Current membership state',
+            type='selection',selection=STATE,store={'account.invoice':(['state'],_membership_state_search_inv)}),
+#       'associate_member': fields.many2one('res.partner', 'Associate member'),
+        'free_member': fields.boolean('Free member'),
+        'membership_start': fields.function(_membership_start, method=True,
+            string='Start membership date', type='date',
+            fnct_search=_membership_start_search),
+        'membership_stop': fields.function(_membership_stop, method=True,
+            string='Stop membership date', type='date',
+            fnct_search=_membership_stop_search),
+        'membership_cancel': fields.function(_membership_cancel, method=True,
+            string='Cancel membership date', type='date',
+            fnct_search=_membership_cancel_search),
+    }
+    _defaults = {
+        'free_member': lambda *a: False,
+        'membership_cancel' : lambda *d : False,
+    }
+
+Partner()
+
+class product_template(osv.osv):
+    _inherit = 'product.template'
+    _columns = {
+            'member_price':fields.float('Member Price', digits=(16, int(config['price_accuracy']))),
+            }
+product_template()
+
+class Product(osv.osv):
+
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False):
+        if ('product' in context) and (context['product']=='membership_product'):
+            model_data_ids_form = self.pool.get('ir.model.data').search(cr,user,[('model','=','ir.ui.view'),('name','in',['membership_products_form','membership_products_tree'])])
+            resource_id_form = self.pool.get('ir.model.data').read(cr,user,model_data_ids_form,fields=['res_id','name'])
+            dict_model={}
+            for i in resource_id_form:
+                dict_model[i['name']]=i['res_id']
+            if view_type=='form':
+                view_id = dict_model['membership_products_form']
+            else:
+                view_id = dict_model['membership_products_tree']
+        return super(Product,self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
+
+    '''Product'''
+    _inherit = 'product.product'
+    _description = 'product.product'
+
+    _columns = {
+            'membership': fields.boolean('Membership', help='Specify if this product is a membership product'),
+            'membership_date_from': fields.date('Date from'),
+            'membership_date_to': fields.date('Date to'),
+#           'member_price':fields.float('Member Price'),
+            }
+
+    _defaults = {
+            'membership': lambda *args: False
+            }
+Product()
+
+
+class Invoice(osv.osv):
+    '''Invoice'''
+
+    _inherit = 'account.invoice'
+
+
+    def action_move_create(self, cr, uid, ids, context=None):
+        '''Create membership.membership_line if the product is for membership'''
+        if context is None:
+            context = {}
+        member_line_obj = self.pool.get('membership.membership_line')
+        partner_obj = self.pool.get('res.partner')
+        for invoice in self.browse(cr, uid, ids):
+
+            # fetch already existing member lines
+            former_mlines = member_line_obj.search(cr,uid,
+                    [('account_invoice_line','in',
+                        [ l.id for l in invoice.invoice_line])], context)
+            # empty them :
+            if former_mlines:
+                member_line_obj.write(cr,uid,former_mlines, {'account_invoice_line':False}, context)
+
+            for line in invoice.invoice_line:
+                if line.product_id and line.product_id.membership:
+                    date_from = line.product_id.membership_date_from
+                    date_to  = line.product_id.membership_date_to
+                    if invoice.date_invoice > date_from and invoice.date_invoice < date_to:
+                        date_from = invoice.date_invoice
+                    member_line_obj.create(cr, uid, {
+                        'partner': invoice.partner_id.id,
+                        'date_from': date_from,
+                        'date_to': date_to,
+                        'account_invoice_line': line.id,
+                        })
+        return super(Invoice, self).action_move_create(cr, uid, ids, context)
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        '''Create a 'date_cancel' on the membership_line object'''
+
+        if context is None:
+            context = {}
+        member_line_obj = self.pool.get('membership.membership_line')
+        today = time.strftime('%Y-%m-%d')
+
+        for invoice in self.browse(cr, uid, ids):
+            mlines = member_line_obj.search(cr,uid,
+                    [('account_invoice_line','in',
+                        [ l.id for l in invoice.invoice_line])], context)
+            member_line_obj.write(cr,uid,mlines, {'date_cancel':today}, context)
+Invoice()
+
+
+class ReportPartnerMemberYear(osv.osv):
+    '''Membership by Years'''
+
+    _name = 'report.partner_member.year'
+    _description = __doc__
+    _auto = False
+    _rec_name = 'year'
+    _columns = {
+        'year': fields.char('Year', size='4', readonly=True, select=1),
+        'canceled_number': fields.integer('Canceled', readonly=True),
+        'waiting_number': fields.integer('Waiting', readonly=True),
+        'invoiced_number': fields.integer('Invoiced', readonly=True),
+        'paid_number': fields.integer('Paid', readonly=True),
+        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
+        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
+        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
+        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
+        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
+            select=2),
+    }
+
+    def init(self, cr):
+        '''Create the view'''
+        cr.execute("""
+    CREATE OR REPLACE VIEW report_partner_member_year AS (
+        SELECT
+        MIN(id) AS id,
+        COUNT(ncanceled) as canceled_number,
+        COUNT(npaid) as paid_number,
+        COUNT(ninvoiced) as invoiced_number,
+        COUNT(nwaiting) as waiting_number,
+        SUM(acanceled) as canceled_amount,
+        SUM(apaid) as paid_amount,
+        SUM(ainvoiced) as invoiced_amount,
+        SUM(awaiting) as waiting_amount,
+        year,
+        currency
+        FROM (SELECT
+            CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
+            CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
+            CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN ml.id END AS nwaiting,
+            CASE WHEN ai.state = 'cancel'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS acanceled,
+            CASE WHEN ai.state = 'paid'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS apaid,
+            CASE WHEN ai.state = 'open'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS ainvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS awaiting,
+            TO_CHAR(ml.date_from, 'YYYY') AS year,
+            ai.currency_id AS currency,
+            MIN(ml.id) AS id
+            FROM membership_membership_line ml
+            JOIN (account_invoice_line ail
+                LEFT JOIN account_invoice ai
+                ON (ail.invoice_id = ai.id))
+            ON (ml.account_invoice_line = ail.id)
+            JOIN res_partner p
+            ON (ml.partner = p.id)
+            GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
+            ai.currency_id, ml.id) AS foo
+        GROUP BY year, currency)
+                """)
+
+ReportPartnerMemberYear()
+
+
+class ReportPartnerMemberYearNew(osv.osv):
+    '''New Membership by Years'''
+
+    _name = 'report.partner_member.year_new'
+    _description = __doc__
+    _auto = False
+    _rec_name = 'year'
+
+    _columns = {
+        'year': fields.char('Year', size='4', readonly=True, select=1),
+        'canceled_number': fields.integer('Canceled', readonly=True),
+        'waiting_number': fields.integer('Waiting', readonly=True),
+        'invoiced_number': fields.integer('Invoiced', readonly=True),
+        'paid_number': fields.integer('Paid', readonly=True),
+        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
+        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
+        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
+        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
+        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
+            select=2),
+    }
+
+    def init(self, cr):
+        '''Create the view'''
+        cr.execute("""
+    CREATE OR REPLACE VIEW report_partner_member_year AS (
+        SELECT
+        MIN(id) AS id,
+        COUNT(ncanceled) as canceled_number,
+        COUNT(npaid) as paid_number,
+        COUNT(ninvoiced) as invoiced_number,
+        COUNT(nwaiting) as waiting_number,
+        SUM(acanceled) as canceled_amount,
+        SUM(apaid) as paid_amount,
+        SUM(ainvoiced) as invoiced_amount,
+        SUM(awaiting) as waiting_amount,
+        year,
+        currency
+        FROM (SELECT
+            CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
+            CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
+            CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN ml.id END AS nwaiting,
+            CASE WHEN ai.state = 'cancel'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS acanceled,
+            CASE WHEN ai.state = 'paid'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS apaid,
+            CASE WHEN ai.state = 'open'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS ainvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS awaiting,
+            TO_CHAR(ml.date_from, 'YYYY') AS year,
+            ai.currency_id AS currency,
+            MIN(ml.id) AS id
+            FROM membership_membership_line ml
+            JOIN (account_invoice_line ail
+                LEFT JOIN account_invoice ai
+                ON (ail.invoice_id = ai.id))
+            ON (ml.account_invoice_line = ail.id)
+            JOIN res_partner p
+            ON (ml.partner = p.id)
+            GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
+            ai.currency_id, ml.id) AS foo
+        GROUP BY year, currency)
+                """)
+
+ReportPartnerMemberYear()
+
+
+class ReportPartnerMemberYearNew(osv.osv):
+    '''New Membership by Years'''
+
+    _name = 'report.partner_member.year_new'
+    _description = __doc__
+    _auto = False
+    _rec_name = 'year'
+    _columns = {
+        'year': fields.char('Year', size='4', readonly=True, select=1),
+        'canceled_number': fields.integer('Canceled', readonly=True),
+        'waiting_number': fields.integer('Waiting', readonly=True),
+        'invoiced_number': fields.integer('Invoiced', readonly=True),
+        'paid_number': fields.integer('Paid', readonly=True),
+        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
+        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
+        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
+        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
+        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
+            select=2),
+    }
+
+    def init(self, cursor):
+        '''Create the view'''
+        cursor.execute("""
+        CREATE OR REPLACE VIEW report_partner_member_year_new AS (
+        SELECT
+        MIN(id) AS id,
+        COUNT(ncanceled) AS canceled_number,
+        COUNT(npaid) AS paid_number,
+        COUNT(ninvoiced) AS invoiced_number,
+        COUNT(nwaiting) AS waiting_number,
+        SUM(acanceled) AS canceled_amount,
+        SUM(apaid) AS paid_amount,
+        SUM(ainvoiced) AS invoiced_amount,
+        SUM(awaiting) AS waiting_amount,
+        year,
+        currency
+        FROM (SELECT
+            CASE WHEN ai.state = 'cancel' THEN ml2.id END AS ncanceled,
+            CASE WHEN ai.state = 'paid' THEN ml2.id END AS npaid,
+            CASE WHEN ai.state = 'open' THEN ml2.id END AS ninvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN ml2.id END AS nwaiting,
+            CASE WHEN ai.state = 'cancel'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS acanceled,
+            CASE WHEN ai.state = 'paid'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS apaid,
+            CASE WHEN ai.state = 'open'
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS ainvoiced,
+            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
+                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
+            ELSE 0 END AS awaiting,
+            TO_CHAR(ml2.date_from, 'YYYY') AS year,
+            ai.currency_id AS currency,
+            MIN(ml2.id) AS id
+            FROM (SELECT
+                    partner AS id,
+                    MIN(date_from) AS date_from
+                    FROM membership_membership_line
+                    GROUP BY partner
+                ) AS ml1
+                JOIN membership_membership_line ml2
+                JOIN (account_invoice_line ail
+                    LEFT JOIN account_invoice ai
+                    ON (ail.invoice_id = ai.id))
+                ON (ml2.account_invoice_line = ail.id)
+                ON (ml1.id = ml2.partner AND ml1.date_from = ml2.date_from)
+            JOIN res_partner p
+            ON (ml2.partner = p.id)
+            GROUP BY TO_CHAR(ml2.date_from, 'YYYY'), ai.state,
+            ai.currency_id, ml2.id) AS foo
+        GROUP BY year, currency
+        )
+    """)
+
+ReportPartnerMemberYearNew()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/membership/membership_data.xml b/addons/membership/membership_data.xml
new file mode 100644
index 00000000000..9c36d8de5d5
--- /dev/null
+++ b/addons/membership/membership_data.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" ?>
+<terp>
+	<data noupdate="1">
+
+	<!--
+	Price type
+	-->
+		<record model="product.price.type" id="product_price_type_memberprice" >
+			<field name="name">Member Price</field>
+			<field name="field">member_price</field>
+		</record>
+
+	<!--
+	Price list
+	-->
+	<record model="product.pricelist" id="list1m">
+		<field name="name">Member Sale Pricelist</field>
+		<field name="type">sale</field>
+	</record>
+	<record model="product.pricelist.version" id="ver1m">
+		<field name="pricelist_id" ref="list1m"/>
+		<field name="name">Member Sale Pricelist Version</field>
+	</record>
+	<record model="product.pricelist.item" id="item1m">
+		<field name="price_version_id" ref="ver1m"/>
+		<field name="base" ref="product_price_type_memberprice" />
+		<field name="name">Member Sale Pricelist Line</field>
+	</record>
+
+	</data>
+</terp>
diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
new file mode 100644
index 00000000000..fe6339a961b
--- /dev/null
+++ b/addons/membership/membership_demo.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+<!-- Demo Data for Membership Product -->
+	<record id="member_product_0" model="product.product">
+		<field name="membership">True</field>
+		<field name="membership_date_from">2008-01-01</field>
+		<field name="membership_date_to">2009-06-01</field>
+		<field name="name">Membership Product - 1</field>
+		<field name="categ_id" ref="product.cat1"/>
+		<field name="type">service</field>
+	</record>
+	<record id="member_product_1" model="product.product">
+		<field name="membership">True</field>
+		<field name="membership_date_from">2008-01-01</field>
+		<field name="membership_date_to">2009-08-01</field>
+		<field name="name">Membership Product - 2</field>
+		<field name="categ_id" ref="product.cat1"/>
+		<field name="type">service</field>
+	</record>
+
+<!-- Demo data for paid member -->
+	<record id="paid_member_0" model="res.partner">
+		<field name="name">Member Partner - Paid</field>
+	</record>
+
+<!-- Demo data for invoiced member -->
+	<record id="inv_member_0" model="res.partner">
+		<field name="name">Member Partner - Invoice</field>
+	</record>
+
+<!-- Demo data for cancel member -->
+	<record id="cancel_member_0" model="res.partner">
+		<field name="name">Member Partner - Cancel</field>
+		<field name="membership_cancel">2008-01-01</field>
+	</record>
+
+<!-- Demo data for waiting member -->
+	<record id="waiting_member_0" model="res.partner">
+		<field name="name">Member Partner - Waiting</field>
+	</record>
+
+<!-- Demo data for res.partner.address -->
+	<record id="res_partner_address_0" model="res.partner.address">
+		<field name="partner_id" ref="membership.paid_member_0"/>
+	</record>
+
+<!-- Demo data for Accounts -->
+	<record id="account_account_membershipaccount0" model="account.account">
+		<field name="name">membership account</field>
+		<field name="code">1254</field>
+		<field name="company_id" ref="base.main_company"/>
+		<field name="close_method">balance</field>
+		<field eval="1" name="sign"/>
+		<field eval="1" name="active"/>
+		<field name="type">asset</field>
+		<field eval="1" name="reconcile"/>
+	</record>
+
+<!-- Demo data for Invoices -->
+	<record id="account_invoice_0" model="account.invoice">
+		<field name="account_id" ref="account_account_membershipaccount0"/>
+		<field name="company_id" ref="base.main_company"/>
+		<field name="currency_id" ref="base.EUR"/>
+		<field name="address_invoice_id" ref="res_partner_address_0"/>
+		<field name="partner_id" ref="membership.paid_member_0"/>
+		<field name="date_invoice">2008-05-09</field>
+		<field name="journal_id" ref="account.sales_journal"/>
+		<field name="state">paid</field>
+		<field name="type">out_invoice</field>
+	</record>
+	<record id="account_invoice_1" model="account.invoice">
+		<field name="account_id" ref="account_account_membershipaccount0"/>
+		<field name="company_id" ref="base.main_company"/>
+		<field name="currency_id" ref="base.EUR"/>
+		<field name="address_invoice_id" ref="res_partner_address_0"/>
+		<field name="partner_id" ref="membership.inv_member_0"/>
+		<field name="date_invoice">2008-05-09</field>
+		<field name="journal_id" ref="account.sales_journal"/>
+		<field name="state">open</field>
+		<field name="type">out_invoice</field>
+	</record>
+	<record id="account_invoice_2" model="account.invoice">
+		<field name="account_id" ref="account_account_membershipaccount0"/>
+		<field name="company_id" ref="base.main_company"/>
+		<field name="currency_id" ref="base.EUR"/>
+		<field name="address_invoice_id" ref="res_partner_address_0"/>
+		<field name="partner_id" ref="membership.cancel_member_0"/>
+		<field name="date_invoice">2008-05-09</field>
+		<field name="journal_id" ref="account.sales_journal"/>
+		<field name="state">cancel</field>
+		<field name="type">out_invoice</field>
+	</record>
+	<record id="account_invoice_3" model="account.invoice">
+		<field name="account_id" ref="account_account_membershipaccount0"/>
+		<field name="company_id" ref="base.main_company"/>
+		<field name="currency_id" ref="base.EUR"/>
+		<field name="address_invoice_id" ref="res_partner_address_0"/>
+		<field name="partner_id" ref="membership.waiting_member_0"/>
+		<field name="date_invoice">2008-05-09</field>
+		<field name="journal_id" ref="account.sales_journal"/>
+		<field name="state">draft</field>
+		<field name="type">out_invoice</field>
+	</record>
+
+<!-- Demo data for invoice line -->
+	<record id="account_invoice_line_membershipproduct0" model="account.invoice.line">
+		<field name="name">Membership Product - 1</field>
+		<field name="invoice_id" ref="account_invoice_0"/>
+		<field eval="1.0" name="price_unit"/>
+		<field eval="1.0" name="quantity"/>
+		<field name="account_id" ref="account_account_membershipaccount0"/>
+		<field name="product_id" ref="membership.member_product_0"/>
+		<field name="account_analytic_id" ref="account.analytic_project_2"/>
+	</record>
+	<record id="account_invoice_line_membershipproduct1" model="account.invoice.line">
+		<field name="name">Membership Product - 2</field>
+		<field name="invoice_id" ref="account_invoice_1"/>
+		<field eval="1.0" name="price_unit"/>
+		<field eval="1.0" name="quantity"/>
+		<field name="account_id" ref="account_account_membershipaccount0"/>
+		<field name="product_id" ref="membership.member_product_1"/>
+		<field name="account_analytic_id" ref="account.analytic_project_2"/>
+	</record>
+	<record id="account_invoice_line_membershipproduct2" model="account.invoice.line">
+		<field name="name">Membership Product - 2</field>
+		<field name="invoice_id" ref="account_invoice_2"/>
+		<field eval="1.0" name="price_unit"/>
+		<field eval="1.0" name="quantity"/>
+		<field name="account_id" ref="account_account_membershipaccount0"/>
+		<field name="product_id" ref="membership.member_product_1"/>
+		<field name="account_analytic_id" ref="account.analytic_project_2"/>
+	</record>
+	<record id="account_invoice_line_membershipproduct3" model="account.invoice.line">
+		<field name="name">Membership Product - 2</field>
+		<field name="invoice_id" ref="account_invoice_3"/>
+		<field eval="1.0" name="price_unit"/>
+		<field eval="1.0" name="quantity"/>
+		<field name="account_id" ref="account_account_membershipaccount0"/>
+		<field name="product_id" ref="membership.member_product_1"/>
+		<field name="account_analytic_id" ref="account.analytic_project_2"/>
+	</record>
+
+<!-- Demo data for membership line -->
+	<record id="member_line_1" model="membership.membership_line">
+		<field name="date_from">2008-01-01</field>
+		<field name="date_to">2009-08-01</field>
+		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct0" />
+		<field name="state">paid</field>
+		<field name="partner" ref="paid_member_0"/>
+	</record>
+	<record id="member_line_2" model="membership.membership_line">
+		<field name="date_from">2008-01-01</field>
+		<field name="date_to">2009-08-01</field>
+		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct1" />
+		<field name="state">invoiced</field>
+		<field name="partner" ref="inv_member_0"/>
+	</record>
+	<record id="member_line_3" model="membership.membership_line">
+		<field name="date_from">2008-01-01</field>
+		<field name="date_to">2009-08-01</field>
+		<field name="date_cancel">2008-08-05</field>
+		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct2" />
+		<field name="state">canceled</field>
+		<field name="partner" ref="cancel_member_0"/>
+	</record>
+	<record id="member_line_3" model="membership.membership_line">
+		<field name="date_from">2008-01-01</field>
+		<field name="date_to">2009-08-01</field>
+		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct3" />
+		<field name="state">waiting</field>
+		<field name="partner" ref="waiting_member_0"/>
+	</record>
+
+<!-- Demo data for free member -->
+	<record id="free_member_0" model="res.partner">
+		<field name="name">Member Partner - Free</field>
+		<field name="free_member">True</field>
+	</record>
+
+<!-- Demo data for associate member -->
+	<record id="associate_member_0" model="res.partner">
+		<field name="name">Member Partner - Associate</field>
+		<field name="associate_member" ref="paid_member_0"/>
+	</record>
+	<record id="associate_member_1" model="res.partner">
+		<field name="name">Partner - Associate</field>
+		<field name="associate_member" ref="paid_member_0"/>
+	</record>
+
+<!-- Demo data for non member -->
+	<record id="non_member_0" model="res.partner">
+		<field name="name">Member Partner - None</field>
+	</record>
+
+	</data>
+</terp>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
new file mode 100644
index 00000000000..16ac3e910cc
--- /dev/null
+++ b/addons/membership/membership_view.xml
@@ -0,0 +1,574 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+
+
+		<!-- MEMBERSHIP -->
+
+		<!-- MEMBERSHIP/MEMBERSHIP PRODUCTS -->
+
+		<record model="ir.ui.view" id="membership_products_tree">
+			<field name="name">Membership products</field>
+			<field name="model">product.product</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Membership products">
+					<field name="code"/>
+					<field name="name"/>
+					<field name="membership_date_from"/>
+					<field name="membership_date_to"/>
+					<field name="lst_price"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="membership_products_form">
+			<field name="name">Membership products</field>
+			<field name="model">product.product</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Membership products">
+					<field name="default_code"/>
+					<field name="name"/>
+					<field name="membership_date_from" required="1"/>
+					<field name="membership_date_to" required="1"/>
+					<field name="list_price"/>
+					<field name="type"/>
+					<field name="categ_id"/>
+					<field name="membership" colspan="1"/>
+					<field name="active" colspan="1"/>
+					<newline/>
+					<field name="taxes_id" colspan="4"/>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="product_normal_form_view">
+			<field name="name">Membership product</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="product.product_normal_form_view"/>
+			<field name="arch" type="xml">
+				<page string="Information" position="after">
+					<page string="Membership">
+						<field name="membership" readonly="1"/>
+						<newline/>
+						<field name="membership_date_from" readonly="1"/>
+						<field name="membership_date_to" readonly="1"/>
+					</page>
+				</page>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_membership_products">
+			<field name="name">Membership Products</field>
+			<field name="res_model">product.product</field>
+			<field name="domain">[('membership','=',True), ('type', '=', 'service')]</field>
+			<field name="context">{'membership':True, 'type':'service'}</field>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_product_view_tree">
+			<field name="sequence" eval="1"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="membership_products_tree"/>
+			<field name="act_window_id" ref="action_membership_products"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_product_view_form">
+			<field name="sequence" eval="2"/>
+			<field name="view_mode">form</field>
+			<field name="view_id" ref="membership_products_form"/>
+			<field name="act_window_id" ref="action_membership_products"/>
+		</record>
+
+		<menuitem name="Membership" id="menu_membership"/>
+		<menuitem name="Configuration" parent="menu_membership"
+			id="menu_conf"
+			sequence="1"/>
+		<menuitem name="Membership products" parent="menu_conf"
+			id="menu_membership_products"
+			action="action_membership_products"/>
+
+
+
+		<!-- MEMBERSHIP/CURRENT MEMBERS -->
+
+		<record model="ir.ui.view" id="membership_members_tree">
+			<field name="name">Current members</field>
+			<field name="model">res.partner</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Members">
+					<field name="name"/>
+					<field name="membership_start"/>
+					<field name="membership_stop"/>
+					<field name="membership_state"/>
+				</tree>
+			</field>
+		</record>
+
+
+		<record model="ir.actions.act_window" id="action_membership_members">
+			<field name="name">Current members</field>
+			<field name="res_model">res.partner</field>
+			<field name="domain">[('membership_state','&lt;&gt;','none'),('membership_state','&lt;&gt;','canceled'),('membership_state','&lt;&gt;','old'),('membership_state','&lt;&gt;','waiting')]</field>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_view_tree">
+			<field name="sequence" eval="1"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="membership_members_tree"/>
+			<field name="act_window_id" ref="action_membership_members"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_view_form">
+			<field name="sequence" eval="2"/>
+			<field name="view_mode">form</field>
+			<field name="act_window_id" ref="action_membership_members"/>
+		</record>
+
+		<menuitem name="Current members" parent="menu_membership"
+			id="menu_members"
+			sequence="2"
+			action="action_membership_members"/>
+		<!-- MEMBERSHIP/MEMBERS/PAID MEMBERS  -->
+
+		<record model="ir.actions.act_window" id="action_membership_members_paid">
+			<field name="name">Paid members</field>
+			<field name="res_model">res.partner</field>
+			<field name="domain">[('membership_state', '=', 'paid')]</field>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_paid_view_tree">
+			<field name="sequence" eval="1"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="membership_members_tree"/>
+			<field name="act_window_id" ref="action_membership_members_paid"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_paid_view_form">
+			<field name="sequence" eval="2"/>
+			<field name="view_mode">form</field>
+			<field name="act_window_id" ref="action_membership_members_paid"/>
+		</record>
+
+		<menuitem name="Paid members" parent="menu_members"
+			id="menu_members_paid"
+			action="action_membership_members_paid"/>
+
+
+		<!-- MEMBERSHIP/MEMBERS/FREE MEMBERS  -->
+
+		<record model="ir.actions.act_window" id="action_membership_members_free">
+			<field name="name">Free members</field>
+			<field name="res_model">res.partner</field>
+			<field name="domain">[('membership_state', '=', 'free')]</field>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_free_view_tree">
+			<field name="sequence" eval="1"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="membership_members_tree"/>
+			<field name="act_window_id" ref="action_membership_members_free"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_free_view_form">
+			<field name="sequence" eval="2"/>
+			<field name="view_mode">form</field>
+			<field name="act_window_id" ref="action_membership_members_free"/>
+		</record>
+
+		<menuitem name="Free members" parent="menu_members"
+			id="menu_members_free"
+			action="action_membership_members_free"/>
+
+
+
+
+		<!-- MEMBERSHIP/MEMBERS/ASSOCIATED MEMBERS  -->
+
+		<record model="ir.actions.act_window" id="action_membership_members_associated">
+			<field name="name">Associated members</field>
+			<field name="res_model">res.partner</field>
+			<field name="domain">[('membership_state', '=', 'associated')]</field>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_associated_view_tree">
+			<field name="sequence" eval="1"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="membership_members_tree"/>
+			<field name="act_window_id" ref="action_membership_members_associated"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_associated_view_form">
+			<field name="sequence" eval="2"/>
+			<field name="view_mode">form</field>
+			<field name="act_window_id" ref="action_membership_members_associated"/>
+		</record>
+
+		<menuitem name="Associated members" parent="menu_members"
+			id="menu_members_associated"
+			action="action_membership_members_associated"/>
+
+
+		<!-- MEMBERSHIP/MEMBERS/INVOICED MEMBERS  -->
+
+		<record model="ir.actions.act_window" id="action_membership_members_invoiced">
+			<field name="name">Invoiced members</field>
+			<field name="res_model">res.partner</field>
+			<field name="domain">[('membership_state', '=', 'invoiced')]</field>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_invoiced_view_tree">
+			<field name="sequence" eval="1"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="membership_members_tree"/>
+			<field name="act_window_id" ref="action_membership_members_invoiced"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_invoiced_view_form">
+			<field name="sequence" eval="2"/>
+			<field name="view_mode">form</field>
+			<field name="act_window_id" ref="action_membership_members_invoiced"/>
+		</record>
+
+		<menuitem name="Invoiced members" parent="menu_members"
+			id="menu_members_invoiced"
+			action="action_membership_members_invoiced"/>
+
+
+		<!-- MEMBERSHIP/MEMBERS/FUTURE MEMBERS  -->
+
+		<record model="ir.actions.act_window" id="action_membership_members_waiting">
+			<field name="name">Future members</field>
+			<field name="res_model">res.partner</field>
+			<field name="domain">[('membership_state', '=', 'waiting')]</field>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_waiting_view_tree">
+			<field name="sequence" eval="1"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="membership_members_tree"/>
+			<field name="act_window_id" ref="action_membership_members_waiting"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_waiting_view_form">
+			<field name="sequence" eval="2"/>
+			<field name="view_mode">form</field>
+			<field name="act_window_id" ref="action_membership_members_waiting"/>
+		</record>
+
+		<menuitem name="Future members (invoice not confirmed)" parent="menu_membership"
+			id="menu_members_waiting"
+			sequence="3"
+			action="action_membership_members_waiting"/>
+
+		<!-- MEMBERSHIP/MEMBERS/OLD MEMBERS  -->
+
+		<record model="ir.actions.act_window" id="action_membership_members_old">
+			<field name="name">Old members</field>
+			<field name="res_model">res.partner</field>
+			<field name="domain">[('membership_state', '=', 'old')]</field>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_old_view_tree">
+			<field name="sequence" eval="1"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="membership_members_tree"/>
+			<field name="act_window_id" ref="action_membership_members_old"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_membership_members_old_view_form">
+			<field name="sequence" eval="2"/>
+			<field name="view_mode">form</field>
+			<field name="act_window_id" ref="action_membership_members_old"/>
+		</record>
+
+		<menuitem name="Old members" parent="menu_membership"
+			id="menu_members_old"
+			sequence="4"
+			action="action_membership_members_old"/>
+
+
+
+		<!-- PARTNERS -->
+
+		<wizard
+			string="Invoice Membership"
+			model="res.partner"
+			name="wizard_invoice_membership"
+			id="wizard_invoice_membership"
+			/>
+
+
+		<record model="ir.ui.view" id="view_partner_tree">
+			<field name="name">res.partner.tree.form.inherit</field>
+			<field name="model">res.partner</field>
+			<field name="inherit_id" ref="base.view_partner_tree"/>
+			<field name="arch" type="xml">
+				<tree string="Partners">
+					<field name="category_id" position="after"/>
+					<field name="membership_state"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_partner_form">
+			<field name="name">res.partner.form.inherit</field>
+			<field name="model">res.partner</field>
+			<field name="inherit_id" ref="base.view_partner_form"/>
+			<field name="arch" type="xml">
+				<notebook position="inside">
+					<page string="Membership">
+						<field name="membership_state" select="2"/>
+						<field name="membership_amount" select="2"/>
+						<field name="associate_member"/>
+						<field name="free_member" select="2"/>
+						<field name="membership_start" select="2"/>
+						<field name="membership_stop" select="2"/>
+						<field name="membership_cancel" select="2"/>
+						<field name="member_lines" nolabel="1" colspan="4" readonly="1">
+							<tree string="Membership">
+								<field name="date_from"/>
+								<field name="date_to"/>
+								<field name="state"/>
+							</tree>
+							<form string="Membership">
+								<field name="date_from"/>
+								<field name="date_to"/>
+								<field name="account_invoice_line"/>
+								<field name="state"/>
+							</form>
+						</field>
+					</page>
+				</notebook>
+
+			</field>
+		</record>
+
+		<!-- MEMBERSHIP/REPORTING -->
+		<menuitem name="Reporting" parent="menu_membership"
+			sequence="5"
+			id="menu_reporting"/>
+
+		<!-- REPORTING/MEMBERSHIP BY YEAR  -->
+
+
+		<record model="ir.ui.view" id="view_report_partner_member_year_tree1">
+			<field name="name">report.partner_member.year.tree</field>
+			<field name="model">report.partner_member.year</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Membership by Years">
+					<field name="canceled_number"/>
+					<field name="waiting_number"/>
+					<field name="invoiced_number"/>
+					<field name="paid_number"/>
+					<field name="year"/>
+				</tree>
+			</field>
+		</record>
+
+
+		<record model="ir.ui.view" id="view_report_partner_member_year_tree2">
+			<field name="name">report.partner_member.year.tree</field>
+			<field name="model">report.partner_member.year</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Membership by Years">
+					<field name="canceled_amount"/>
+					<field name="waiting_amount"/>
+					<field name="invoiced_amount"/>
+					<field name="paid_amount"/>
+					<field name="currency"/>
+					<field name="year"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_report_partner_member_year_graph1">
+			<field name="name">report.partner_member.year.graph1</field>
+			<field name="model">report.partner_member.year</field>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="Membership by Years" type="bar">
+					<field name="year"/>
+					<field name="canceled_number"/>
+					<field name="waiting_number"/>
+					<field name="invoiced_number"/>
+					<field name="paid_number"/>
+				</graph>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_report_partner_member_year_graph2">
+			<field name="name">report.partner_member.year.graph2</field>
+			<field name="model">report.partner_member.year</field>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="Membership by Years" type="bar">
+					<field name="year"/>
+					<field name="canceled_amount"/>
+					<field name="waiting_amount"/>
+					<field name="invoiced_amount"/>
+					<field name="paid_amount"/>
+				</graph>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_report_partner_member_year_tree">
+			<field name="res_model">report.partner_member.year</field>
+			<field name="view_type">form</field>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view1">
+			<field name="sequence" eval="3"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="view_report_partner_member_year_tree1"/>
+			<field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+		</record>
+
+
+		<record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view4">
+			<field name="sequence" eval="4"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="view_report_partner_member_year_tree2"/>
+			<field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view2">
+			<field name="sequence" eval="1"/>
+			<field name="view_mode">graph</field>
+			<field name="view_id" ref="view_report_partner_member_year_graph1"/>
+			<field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_report_partner_member_year_tree_view3">
+			<field name="sequence" eval="2"/>
+			<field name="view_mode">graph</field>
+			<field name="view_id" ref="view_report_partner_member_year_graph2"/>
+			<field name="act_window_id" ref="action_report_partner_member_year_tree"/>
+		</record>
+
+		<menuitem name="Membership by Years" parent="menu_reporting"
+			action="action_report_partner_member_year_tree"
+			id="menu_report_partner_member_year"/>
+
+
+		<!-- REPORTING/NEW MEMBERSHIP BY YEAR  -->
+
+
+
+		<record model="ir.ui.view" id="view_report_partner_member_year_new_tree1">
+			<field name="name">report.partner_member.year_new.tree</field>
+			<field name="model">report.partner_member.year_new</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="New Membership by Years">
+					<field name="canceled_number"/>
+					<field name="waiting_number"/>
+					<field name="invoiced_number"/>
+					<field name="paid_number"/>
+					<field name="year"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_report_partner_member_year_new_tree2">
+			<field name="name">report.partner_member.year_new.tree</field>
+			<field name="model">report.partner_member.year_new</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="New Membership by Years">
+					<field name="canceled_amount"/>
+					<field name="waiting_amount"/>
+					<field name="invoiced_amount"/>
+					<field name="paid_amount"/>
+					<field name="currency"/>
+					<field name="year"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_report_partner_member_year_new_graph1">
+			<field name="name">report.partner_member.year_new.graph1</field>
+			<field name="model">report.partner_member.year_new</field>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="New Membership by Years" type="bar">
+					<field name="year"/>
+					<field name="canceled_number"/>
+					<field name="waiting_number"/>
+					<field name="invoiced_number"/>
+					<field name="paid_number"/>
+				</graph>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_report_partner_member_year_new_graph2">
+			<field name="name">report.partner_member.year_new.graph2</field>
+			<field name="model">report.partner_member.year_new</field>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="New Membership by Years" type="bar">
+					<field name="year"/>
+					<field name="canceled_amount"/>
+					<field name="waiting_amount"/>
+					<field name="invoiced_amount"/>
+					<field name="paid_amount"/>
+				</graph>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_report_partner_member_year_new_tree">
+			<field name="res_model">report.partner_member.year_new</field>
+			<field name="view_type">form</field>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view4">
+			<field name="sequence" eval="4"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="view_report_partner_member_year_new_tree2"/>
+			<field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view1">
+			<field name="sequence" eval="3"/>
+			<field name="view_mode">tree</field>
+			<field name="view_id" ref="view_report_partner_member_year_new_tree1"/>
+			<field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view2">
+			<field name="sequence" eval="1"/>
+			<field name="view_mode">graph</field>
+			<field name="view_id" ref="view_report_partner_member_year_new_graph1"/>
+			<field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="action_report_partner_member_year_new_tree_view3">
+			<field name="sequence" eval="2"/>
+			<field name="view_mode">graph</field>
+			<field name="view_id" ref="view_report_partner_member_year_new_graph2"/>
+			<field name="act_window_id" ref="action_report_partner_member_year_new_tree"/>
+		</record>
+
+		<menuitem name="New Membership by Years" parent="menu_reporting"
+			action="action_report_partner_member_year_new_tree"
+			id="menu_report_partner_member_year_new"/>
+
+<!-- View for product.product object inherited from product module................ -->
+		<record model="ir.ui.view" id="view_product_form_inherit1">
+			<field name="name">product.normal.form</field>
+			<field name="type">form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="product.product_normal_form_view"/>
+			<field name="arch" type="xml">
+				<field name="list_price" position="after">
+			    	<field name="member_price"/>
+				</field>
+			</field>
+		</record>
+
+	</data>
+</terp>
diff --git a/addons/membership/membership_wizard.xml b/addons/membership/membership_wizard.xml
new file mode 100644
index 00000000000..54a14f83c3c
--- /dev/null
+++ b/addons/membership/membership_wizard.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+
+	</data>
+</terp>
diff --git a/addons/membership/wizard/__init__.py b/addons/membership/wizard/__init__.py
new file mode 100644
index 00000000000..5adfffd9e86
--- /dev/null
+++ b/addons/membership/wizard/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import  invoice_membership
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/membership/wizard/invoice_membership.py b/addons/membership/wizard/invoice_membership.py
new file mode 100644
index 00000000000..73e0808eab6
--- /dev/null
+++ b/addons/membership/wizard/invoice_membership.py
@@ -0,0 +1,129 @@
+# -*- encoding: utf-8 -*-
+from osv import fields
+import wizard
+import pooler
+import time
+
+def _invoice_membership(self, cr, uid, data, context):
+    partner_ids = data['ids']
+    product_id = data['form']['product']
+
+    pool = pooler.get_pool(cr.dbname)
+
+    cr.execute('''
+            SELECT partner_id, id, type
+            FROM res_partner_address
+            WHERE partner_id IN (%s)
+            ''' % ','.join([str(id) for id in partner_ids])
+            )
+    fetchal = cr.fetchall()
+    if not fetchal:
+        raise wizard.except_wizard('Error !', 'No Address defined for this partner')
+    partner_address_ids = {}
+    for x in range(len(fetchal)):
+        pid = fetchal[x][0]
+        id = fetchal[x][1]
+        type = fetchal[x][2]
+
+        if partner_address_ids.has_key(pid) and partner_address_ids[pid]['type'] == 'invoice':
+            continue
+        partner_address_ids[pid] = {'id': id, 'type': type}
+
+
+    invoice_list= []
+    invoice_obj = pool.get('account.invoice')
+    partner_obj = pool.get('res.partner')
+    product_obj = pool.get('product.product')
+    invoice_line_obj = pool.get(('account.invoice.line'))
+    invoice_tax_obj = pool.get(('account.invoice.tax'))
+    product = product_obj.read(cr, uid, product_id, ['uom_id'])
+
+    for partner_id in partner_ids:
+        account_id = partner_obj.read(cr, uid, partner_id, ['property_account_receivable'])['property_account_receivable'][0]
+        invoice_id = invoice_obj.create(cr, uid, {
+            'partner_id' : partner_id,
+            'address_invoice_id': partner_address_ids[partner_id]['id'],
+            'account_id': account_id,
+            }
+        )
+
+        line_value =  {
+            'invoice_id' : invoice_id,
+            'product_id' : product_id,
+            }
+
+        quantity = 1
+
+        line_dict = invoice_line_obj.product_id_change(cr, uid, {}, product_id, product['uom_id'][0], quantity, '', 'out_invoice', partner_id, context=context)
+
+        line_value.update(line_dict['value'])
+        if line_value['invoice_line_tax_id']:
+            tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
+            line_value['invoice_line_tax_id'] = tax_tab
+        else:
+            print "no tax"
+        invoice_line_id = invoice_line_obj.create(cr, uid, line_value)
+        invoice_list.append(invoice_id)
+        if line_value['invoice_line_tax_id']:
+            invoice_obj.write(cr, uid, [invoice_id], {'tax_line':tax_tab})
+            tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()[0]
+            invoice_tax_obj.create(cr, uid, tax_value)
+
+    value = {
+            'domain': [
+                ('id', 'in', invoice_list),
+                ],
+            'name': 'Membership invoice',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'type': 'ir.actions.act_window',
+        }
+
+    return value
+
+wizard_arch= """<?xml version="1.0"?>
+<form string="Choose invoice details">
+    <field
+        name="product"
+        domain="[('membership','=','True')]"
+        context="product='membership_product'"
+        />
+</form>"""
+
+
+
+class wizard_invoice_membership(wizard.interface):
+
+    states = {
+
+        'init' : {
+            'actions' : [],
+            'result' : {
+                'type' : 'form',
+                'arch' : wizard_arch,
+                'fields' : {
+                        'product': {
+                            'string': 'Membership product',
+                            'type': 'many2one',
+                            'relation': 'product.product',
+                            'required': True
+                        },
+                },
+                'state' : [('end', 'Cancel'),('ok', 'Confirm') ]}
+        },
+
+        'ok' : {
+            'actions' : [],
+            'result' : {'type' : 'action',
+                        'action': _invoice_membership,
+                        'state' : 'end'
+            },
+        },
+
+    }
+
+wizard_invoice_membership("wizard_invoice_membership")
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index d9576eeef6f..37d9cc01534 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -305,7 +305,7 @@ class mrp_production(osv.osv):
     _description = 'Production'
     _date_name  = 'date_planned'
     _columns = {
-        'name': fields.char('Name', size=64, required=True),
+        'name': fields.char('Reference', size=64, required=True),
         'origin': fields.char('Origin', size=64),
         'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority'),
 
@@ -315,8 +315,8 @@ class mrp_production(osv.osv):
         'product_uos_qty': fields.float('Product Qty'),
         'product_uos': fields.many2one('product.uom', 'Product UOM'),
 
-        'location_src_id': fields.many2one('stock.location', 'Production Location', required=True),
-        'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True),
+        'location_src_id': fields.many2one('stock.location', 'Raw Products Location', required=True),
+        'location_dest_id': fields.many2one('stock.location', 'Finnished Products Location', required=True),
 
         'date_planned': fields.date('Scheduled date', required=True),
         'date_start': fields.datetime('Start Date'),
@@ -332,11 +332,12 @@ class mrp_production(osv.osv):
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
 
-        'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],'State', readonly=True)
+        'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],'Status', readonly=True)
     }
     _defaults = {
         'priority': lambda *a: '1',
         'state': lambda *a: 'draft',
+        'date_planned': lambda *a: time.strftime('%Y-%m-%d'),
         'product_qty':  lambda *a: 1.0,
         'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.production') or '/',
     }
@@ -676,7 +677,7 @@ class mrp_procurement(osv.osv):
 
         'close_move': fields.boolean('Close Move at end', required=True),
         'location_id': fields.many2one('stock.location', 'Location', required=True),
-        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]}, readonly=True),
+        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]}, readonly=True, required=True),
 
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
         'purchase_line_id': fields.many2one('purchase.order.line', 'Purchase Order Line'),
@@ -684,11 +685,12 @@ class mrp_procurement(osv.osv):
         'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
 
         'message': fields.char('Latest error', size=64),
-        'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('exception','Exception'),('running','Running'),('cancel','Cancel'),('done','Done'),('waiting','Waiting')], 'State')
+        'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('exception','Exception'),('running','Running'),('cancel','Cancel'),('done','Done'),('waiting','Waiting')], 'Status')
     }
     _defaults = {
         'state': lambda *a: 'draft',
         'priority': lambda *a: '1',
+        'date_planned': lambda *a: time.strftime('%Y-%m-%d'),
         'close_move': lambda *a: 0,
         'procure_method': lambda *a: 'make_to_order',
     }
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 11634ae480f..15ba0b3cc82 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -381,24 +381,28 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Production orders">
-                    <notebook>
-                        <page string="General">
-                            <field colspan="4" name="name" select="1"/>
-                            <field name="date_planned" select="1"/>
-                            <field name="priority"/>
-                            
-                            <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
-                            <field name="product_qty"/>
-                            <field name="product_uom"/>
-                            <!--
-                    <field name="product_uos_qty"/>
-                    <field name="product_uos"/>
-                    -->
-                            <field name="bom_id" select="2"/>
-                            
-                            <newline/>
+					<group colspan="4" col="6">
+						<field name="name" select="1"/>
+						<field name="date_planned" select="1"/>
+						<field name="priority"/>
+						
+						<field name="product_id" on_change="product_id_change(product_id)" select="1"/>
+						<field name="product_qty"/>
+						<field name="product_uom"/>
+						<group colspan="6" col="6">
+							<label string="" colspan="2"/>
+							<field name="product_uos_qty" groups="product.group_uos"/>
+							<field name="product_uos" groups="product.group_uos"/>
+						</group>
+					</group>
+
+                    <notebook colspan="4">
+                        <page string="Consumed Products">
                             <field name="location_src_id" select="2"/>
                             <field name="location_dest_id"/>
+                            <field name="bom_id" select="2"/>
+                            <field name="origin" select="1"/>
+                            <newline/>
                             
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list"/>
                             <group col="9" colspan="4">
@@ -412,20 +416,20 @@
                                 <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
                             </group>
                         </page>
-                        <page string="Scheduled goods">
+                        <page string="Scheduled Products">
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
+                        <page string="Finnished Products">
+                            <field colspan="4" name="move_created_ids" nolabel="1"/>
+                        </page>
                         <page string="Workcenters">
                             <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string="Other Info">
+                        <page string="Extra Information">
                             <field name="date_start" select="2"/>
                             <field name="date_finnished"/>
                             <field name="picking_id"/>
-                            <field name="origin" select="1"/>
                             <field name="move_prod_id"/>
-                            <newline/>
-                            <field colspan="4" name="move_created_ids" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
@@ -446,7 +450,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('state','=','ready')]</field>
         </record>
         <menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action"/>
@@ -455,20 +459,29 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('state','=','in_production')]</field>
         </record>
         <menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="menu_mrp_production_action"/>
         <record id="mrp_production_action4" model="ir.actions.act_window">
-            <field name="name">Production orders waiting goods</field>
+            <field name="name">Production 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>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('state','=','confirmed')]</field>
         </record>
         <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.menu_mrp_production_action"/>
         
+         <record id="mrp_production_new" model="ir.actions.act_window">
+            <field name="name">New Production Order</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.production</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree,calendar</field>
+        </record>
+        <menuitem action="mrp_production_new" id="menu_production_orders_new" parent="mrp.menu_mrp_production_action"/>
+        
         <record id="mrp_production_workcenter_form_view" model="ir.ui.view">
             <field name="name">mrp.production.workcenter.line.form</field>
             <field name="model">mrp.production.workcenter.line</field>
@@ -538,7 +551,7 @@
             <field name="model">mrp.production.product.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Scheduled goods">
+                <form string="Scheduled Products">
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
@@ -553,7 +566,7 @@
             <field name="model">mrp.production.product.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Scheduled goods">
+                <tree string="Scheduled Products">
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
@@ -591,34 +604,51 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Procurement">
-                    <separator colspan="4" string="General Information"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="priority"/>
-                    <field name="date_planned" select="1"/>
-                    <field name="procure_method" select="2"/>
-                    <field name="date_close" select="2"/>
-                    <newline/>
-                    <field name="product_qty"/>
-                    <field name="product_uom"/>
-                    <field name="product_uos_qty"/>
-                    <field name="product_uos"/>
-                    <field name="product_id" select="1"/>
-                    <field name="location_id" select="2"/>
-                    <newline/>
-                    <field name="origin" select="2"/>
-                    <field name="move_id"/>
-                    <newline/>
-                    <field colspan="4" name="message"/>
-                    <separator colspan="4" string="Properties"/>
-                    <field colspan="4" name="property_ids" nolabel="1"/>
-                    <group col="7" colspan="4">
-                        <field name="state" readonly="1" select="2"/>
-                        <button name="button_confirm" states="draft" string="Confirm"/>
-                        <button name="button_restart" states="exception" string="Retry"/>
-                        <button name="button_cancel" states="exception,waiting" string="Cancel"/>
-                        <button name="button_check" states="confirmed" string="Run procurement"/>
-                        <button name="button_cancel" states="draft,running" string="Cancel"/>
-                    </group>
+					<notebook>
+					<page string="Procurement Details">
+						<group col="2" colspan="2">
+							<separator colspan="2" string="References"/>
+							<field name="name" select="1" string="Procurement Reason"/>
+							<field name="origin" select="2"/>
+						</group>
+						<group col="2" colspan="2">
+							<separator colspan="2" string="Planification"/>
+							<field name="date_planned" select="1"/>
+							<field name="procure_method" select="2"/>
+							<field name="priority"/>
+						</group>
+
+						<separator colspan="4" string="Product &amp; Location"/>
+						<field name="product_id" select="1"/>
+						<field name="location_id" select="2"/>
+						<field name="product_qty"/>
+						<field name="product_uom"/>
+
+						<field name="product_uos_qty" groups="product.group_uos"/>
+						<field name="product_uos" groups="product.group_uos"/>
+
+						<separator colspan="4" string="Status"/>
+						<field colspan="4" name="message" readonly="1"/>
+						<field name="state" readonly="1" select="2"/>
+						<group col="7" colspan="2">
+							<button name="button_confirm" states="draft" string="Confirm"/>
+							<button name="button_restart" states="exception" string="Retry"/>
+							<button name="button_cancel" states="exception,waiting" string="Cancel"/>
+							<button name="button_check" states="confirmed" string="Run procurement"/>
+							<button name="button_cancel" states="draft,running" string="Cancel"/>
+						</group>
+					</page>
+					<page string="Extra Information">
+						<separator colspan="4" string="Details"/>
+						<field name="bom_id" select="2"/>
+						<field name="move_id"/>
+						<field name="date_close" select="2"/>
+						<field name="close_move"/>
+						<field name="purchase_id"/>
+						<separator colspan="4" string="Properties"/>
+						<field colspan="4" name="property_ids" nolabel="1"/>
+					</page>
+					</notebook>
                 </form>
             </field>
         </record>
@@ -627,7 +657,7 @@
             <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" ref="mrp_procurement_form_view"/>
+            <field name="view_id" eval="False"/>
         </record>
         <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root"/>
         
@@ -680,6 +710,15 @@
         </record>
         <menuitem action="mrp_procurement_action11" id="menu_mrp_procurement_action11" parent="mrp.menu_mrp_procurement_action5"/>
         
+         <record id="mrp_procurement_new" model="ir.actions.act_window">
+            <field name="name">New Procurement</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">form,tree</field>
+        </record>
+        <menuitem action="mrp_procurement_new" id="menu_mrp_procurement_new" parent="mrp.menu_mrp_procurement_action5"/>
+        
         <!-- Order Point -->
         <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
             <field name="name">stock.warehouse.orderpoint.tree</field>
diff --git a/addons/mrp/wizard/schedulers.py b/addons/mrp/wizard/schedulers.py
index 0f83bc08afc..98ff98111ea 100644
--- a/addons/mrp/wizard/schedulers.py
+++ b/addons/mrp/wizard/schedulers.py
@@ -47,8 +47,8 @@ def _procure_confirm(self, cr, uid, schedule_cycle=1.0, po_cycle=1.0,\
         cr = pooler.get_db(use_new_cursor).cursor()
     wf_service = netsvc.LocalService("workflow")
 
-    cr.execute('select id from mrp_procurement where state=%s order by date_planned', ('exception',))
-    ids = map(lambda x:x[0], cr.fetchall())
+    procurement_obj = pooler.get_pool(cr.dbname).get('mrp.procurement')
+    ids=procurement_obj.search(cr,uid,[], order="date_planned")
     for id in ids:
         wf_service.trg_validate(uid, 'mrp.procurement', id, 'button_restart', cr)
     if use_new_cursor:
@@ -63,7 +63,6 @@ def _procure_confirm(self, cr, uid, schedule_cycle=1.0, po_cycle=1.0,\
     report_except = 0
     report_later = 0
     ids = [1]
-    procurement_obj = pooler.get_pool(cr.dbname).get('mrp.procurement')
     while len(ids):
         cr.execute('select id from mrp_procurement where state=%s and procure_method=%s order by date_planned limit 500 offset %d', ('confirmed','make_to_order',offset))
         ids = map(lambda x:x[0], cr.fetchall())
@@ -196,10 +195,7 @@ def _procure_orderpoint_confirm(self, cr, uid, automatic=False,\
     if automatic:
         create_automatic_op(cr, uid, context=context)
     while ids:
-        cr.execute('SELECT id ' \
-                'FROM stock_warehouse_orderpoint ' \
-                'WHERE active OFFSET %d LIMIT 100', (offset,))
-        ids = map(lambda x: x[0], cr.fetchall())
+        ids=orderpoint_obj.search(cr,uid,[],offset=offset,limit=100)
         for op in orderpoint_obj.browse(cr, uid, ids):
             #if op.procurement_id and op.procurement_id.purchase_id:
             #   if (op.procurement_id.purchase_id.state=='confirmed'):
diff --git a/addons/multi_company/__init__.py b/addons/mrp_jit/__init__.py
similarity index 90%
rename from addons/multi_company/__init__.py
rename to addons/mrp_jit/__init__.py
index 5ece96e6515..f3762e3825f 100644
--- a/addons/multi_company/__init__.py
+++ b/addons/mrp_jit/__init__.py
@@ -1,9 +1,8 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
-#
-# $Id$
+# Copyright (c) 2006 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
@@ -25,7 +24,8 @@
 # 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.
-###############################################################################
+#
+##############################################################################
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp_jit/__terp__.py b/addons/mrp_jit/__terp__.py
new file mode 100644
index 00000000000..b2701e0ca27
--- /dev/null
+++ b/addons/mrp_jit/__terp__.py
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+{
+    "name":"MRP JIT",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Generic Modules/Production",
+    "description": """
+    This module allows Just In Time computation of all procurement.
+
+    If you install this module, you will not have to run the schedulers anymore.
+    Each document is computed in realtime. Note that this module can slow down your
+    system a little bit.
+
+    It may also increase your stock size because products are reserved as soon
+    as possible. In that case, you can not use priorities anymore on the different
+    pickings.
+    """,
+    "depends":["mrp","sale"],
+    "demo_xml":[],
+    "update_xml":["mrp_jit.xml"],
+    "active":False,
+    "installable":True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
new file mode 100644
index 00000000000..dd35e0c7afe
--- /dev/null
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+	# -----------------------------------------------------------
+	# Procurement - Automatic schedule
+	# -----------------------------------------------------------
+
+		<record model="workflow.transition" id="mrp.trans_confirm_confirm_wait">
+			<field name="signal" eval="False"/>
+		</record>
+
+</data>
+</terp>
diff --git a/addons/mrp_operations/__init__.py b/addons/mrp_operations/__init__.py
new file mode 100644
index 00000000000..82d349e3d76
--- /dev/null
+++ b/addons/mrp_operations/__init__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 mrp_operations
+import report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__terp__.py
new file mode 100644
index 00000000000..e19e676452f
--- /dev/null
+++ b/addons/mrp_operations/__terp__.py
@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Workcenter Production start end workflow",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com/module_mrp.html",
+    "category" : "Generic Modules/Production",
+    "depends" : ["stock", "hr", "purchase", "product", "mrp"],
+    "description": """
+     This module adds state, date_start,date_stop in production order operation lines
+     (in the "Workcenters" tab)
+     State: draft, confirm, done, cancel
+     When finnishing/confirming,cancelling production orders set all state lines to the according state
+     Create menus:
+         Production Management > All Operations
+         Production Management > All Operations > Operations To Do (state="confirm")
+     Which is a view on "Workcenters" lines in production order,
+     editable tree
+
+    Add buttons in the form view of production order under workcenter tab:
+    * start (set state to confirm), set date_start
+    * done (set state to done), set date_stop
+    * set to draft (set state to draft)
+    * cancel set state to cancel
+
+    When the production order becomes "ready to produce", operations must
+    become 'confirmed'. When the production order is done, all operations
+    must become done.
+
+    The field delay is the delay(stop date - start date).
+    So that we can compare the theoric delay and real delay.
+
+    """,
+    "init_xml" : [],
+    "demo_xml" : ["mrp_operation_data.xml"],
+    "update_xml" : ["mrp_operations_workflow.xml","mrp_operations_view.xml","mrp_operations_report.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_operations/mrp_operation_data.xml b/addons/mrp_operations/mrp_operation_data.xml
new file mode 100644
index 00000000000..19ee1b8feca
--- /dev/null
+++ b/addons/mrp_operations/mrp_operation_data.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+
+	<record model="mrp_operations.operation.code" id="mrp_op_1">
+		<field name="name">Normal Start</field>
+		<field name="code">nstart</field>
+		<field name="start_stop">start</field>
+	</record>
+
+	<record model="mrp_operations.operation.code" id="mrp_op_2">
+		<field name="name">Normal Stop</field>
+		<field name="code">nstop</field>
+		<field name="start_stop">stop</field>
+	</record>
+
+	<record model="mrp_operations.operation.code" id="mrp_op_3">
+		<field name="name">Broken Stop</field>
+		<field name="code">broken</field>
+		<field name="start_stop">stop</field>
+	</record>
+
+</data>
+</terp>
\ No newline at end of file
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
new file mode 100644
index 00000000000..d654e337e67
--- /dev/null
+++ b/addons/mrp_operations/mrp_operations.py
@@ -0,0 +1,161 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: mrp.py 1292 2005-09-08 03:26:33Z pinky $
+#
+# 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.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import ir
+
+import netsvc
+import time
+from mx import DateTime
+
+#----------------------------------------------------------
+# Workcenters
+#----------------------------------------------------------
+# capacity_hour : capacity per hour. default: 1.0.
+#          Eg: If 5 concurrent operations at one time: capacity = 5 (because 5 employees)
+# unit_per_cycle : how many units are produced for one cycle
+#
+# TODO: Work Center may be recursive ?
+#
+
+class mrp_production_workcenter_line(osv.osv):
+    _inherit = 'mrp.production.workcenter.line'
+    _name = 'mrp.production.workcenter.line'
+    _description = 'Production workcenters used'
+
+    def _calc_delay(self, cr, uid, ids, name, arg, context={}):
+        result = {}
+        for obj in self.browse(cr, uid, ids, context):
+            if obj.date_start and obj.date_finnished:
+                diff = DateTime.strptime(obj.date_finnished, '%Y-%m-%d %H:%M:%S') - DateTime.strptime(obj.date_start, '%Y-%m-%d %H:%M:%S')
+                result[obj.id]=diff.day
+            else:
+                result[obj.id] = 0
+        return result
+
+    _columns = {
+        'state': fields.selection([('draft','Draft'),('confirm', 'Confirm'),('cancel','Canceled'),('done','Done')],'Status', readonly=True),
+#       'date_start': fields.datetime('Start Date'),
+#       'date_finnished': fields.datetime('End Date'),
+#       'delay': fields.function(_calc_delay, method=True, string='Delay', help="This is delay between operation start and stop in this workcenter"),
+        'delay': fields.float('delay', required=True),
+
+
+    }
+    _defaults = {
+        'state': lambda *a: 'draft',
+        'delay': lambda *a: 0.0
+    }
+
+    def action_draft(self, cr, uid, ids):
+        self.write(cr, uid, ids, {'state':'draft'})
+#       self.write(cr, uid, ids, {'state':'draft','date_start':None})
+        return True
+
+    def action_confirm(self, cr, uid, ids):
+        self.write(cr, uid, ids, {'state':'confirm'})
+#       self.write(cr, uid, ids, {'state':'confirm','date_start':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
+        return True
+
+    def action_done(self, cr, uid, ids):
+        self.write(cr, uid, ids, {'state':'done'})
+#       self.write(cr, uid, ids, {'state':'done','date_finnished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
+        return True
+
+    def action_cancel(self, cr, uid, ids):
+        self.write(cr, uid, ids, {'state':'cancel'})
+#       self.write(cr, uid, ids, {'state':'cancel','date_start':None})
+        return True
+
+mrp_production_workcenter_line()
+
+class mrp_production(osv.osv):
+    _name = 'mrp.production'
+    _inherit = 'mrp.production'
+    _description = 'Production'
+
+    def action_confirm(self, cr, uid, ids):
+        obj=self.browse(cr,uid,ids)[0]
+        for workcenter_line in obj.workcenter_lines:
+            tmp=self.pool.get('mrp.production.workcenter.line').action_confirm(cr,uid,[workcenter_line.id])
+        return super(mrp_production,self).action_confirm(cr,uid,ids)
+
+    def action_production_end(self, cr, uid, ids):
+        obj=self.browse(cr,uid,ids)[0]
+        for workcenter_line in obj.workcenter_lines:
+            tmp=self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,[workcenter_line.id])
+        return super(mrp_production,self).action_production_end(cr,uid,ids)
+
+    def action_cancel(self, cr, uid, ids):
+        obj=self.browse(cr,uid,ids)[0]
+        for workcenter_line in obj.workcenter_lines:
+            tmp=self.pool.get('mrp.production.workcenter.line').action_cancel(cr,uid,[workcenter_line.id])
+        return super(mrp_production,self).action_cancel(cr,uid,ids)
+
+mrp_production()
+
+class mrp_operations_operation_code(osv.osv):
+    _name="mrp_operations.operation.code"
+    _columns={
+        'name': fields.char('Operation Name',size=64, required=True),
+        'code': fields.char('Code', size=16, required=True),
+        'start_stop': fields.selection([('start','Start'),('stop','Stop'),('done','Done')], 'Status', required=True),
+    }
+mrp_operations_operation_code()
+
+class mrp_operations_operation(osv.osv):
+    _name="mrp_operations.operation"
+    def create(self, cr, uid, vals, context=None):
+        wf_service = netsvc.LocalService('workflow')
+        code_ids=self.pool.get('mrp_operations.operation.code').search(cr,uid,[('id','=',vals['code_id'])])
+        code=self.pool.get('mrp_operations.operation.code').browse(cr,uid,code_ids)[0]
+        if code.start_stop=='start' or code.start_stop=='stop' or code.start_stop=='done':
+            wc_op_id=self.pool.get('mrp.production.workcenter.line').search(cr,uid,[('workcenter_id','=',vals['workcenter_id']),('production_id','=',vals['production_id'])])
+            if not wc_op_id:
+                production_obj=self.pool.get('mrp.production').browse(cr,uid,vals['production_id'])
+                wc_op_id.append(self.pool.get('mrp.production.workcenter.line').create(cr,uid,{'production_id':vals['production_id'],'name':production_obj.product_id.name,'workcenter_id':vals['workcenter_id']}))
+            if code.start_stop=='start':
+                tmp=self.pool.get('mrp.production.workcenter.line').action_confirm(cr,uid,wc_op_id[0])
+            if code.start_stop=='done':
+                tmp=self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,wc_op_id)
+            if code.start_stop=='stop':
+                self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finnished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
+        return super(mrp_operations_operation, self).create(cr, uid, vals,  context=context)
+
+    _columns={
+        'production_id':fields.many2one('mrp.production','Production',required=True),
+        'workcenter_id':fields.many2one('mrp.workcenter','Workcenter',required=True),
+        'code_id':fields.many2one('mrp_operations.operation.code','Code',required=True),
+        }
+
+mrp_operations_operation()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_operations/mrp_operations_report.xml b/addons/mrp_operations/mrp_operations_report.xml
new file mode 100644
index 00000000000..a6c546cbd31
--- /dev/null
+++ b/addons/mrp_operations/mrp_operations_report.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+		<report
+			id="report_wc_barcode"
+			string="Workcenters Barcode"
+			model="mrp.workcenter"
+			name="mrp.wc.barcode"
+			rml="mrp_operations/report/mrp_wc_barcode.rml"
+			header="False"/>
+
+		<report
+			id="report_code_barcode"
+			string="Start/Stop Barcode"
+			model="mrp_operations.operation.code"
+			name="mrp.code.barcode"
+			rml="mrp_operations/report/mrp_code_barcode.rml"
+			header="False"/>
+
+	</data>
+</terp>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
new file mode 100644
index 00000000000..9cd3ae93053
--- /dev/null
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+	<record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit">
+		<field name="name">mrp.production.workcenter.line.inherit.tree</field>
+		<field name="model">mrp.production.workcenter.line</field>
+		<field name="inherit_id" ref="mrp.mrp_production_workcenter_tree_view"/>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<field name="hour" position="after">
+				<field name="production_id"/>
+				<field name="state" />
+			</field>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="mrp_production_workcenter_form_view_inherit">
+		<field name="name">mrp.production.workcenter.line.form.inherit</field>
+		<field name="model">mrp.production.workcenter.line</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="mrp.mrp_production_workcenter_form_view"/>
+		<field name="arch" type="xml">
+				<field name="hour" position="after">
+					<group colspan="4" col="6">
+							<field name="state" select="2"/>
+							<button name="button_draft" string="Set Draft" states="cancel"/>
+							<button name="button_confirm" string="Confirm" states="draft"/>
+							<button name="button_done" string="Done" states="confirm"/>
+							<button name="button_cancel" string="Cancel" states="draft,confirm"/>
+					</group>
+					<field name="delay"/>
+					<field name="production_id"/>
+<!--					<field name="date_finnished"/>
+					<field name="date_start"/>
+					<newline/>
+-->
+				</field>
+		</field>
+	</record>
+
+	<!-- Action for tree view of workcenter line   -->
+
+	<record model="ir.actions.act_window" id="mrp_production_wc_action_form">
+		<field name="name">Operations</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">mrp.production.workcenter.line</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('id','=',active_id)]</field>
+	</record>
+
+	<!-- Action for All Operations   -->
+
+	<record model="ir.actions.act_window" id="mrp_production_wc_action">
+		<field name="name">All Operations</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">mrp.production.workcenter.line</field>
+		<field name="view_type">tree</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+
+	<!-- Action for Confirm Operations   -->
+
+	<record model="ir.actions.act_window" id="mrp_production_wc_confirm_action">
+		<field name="name">Confirm Operations</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">mrp.production.workcenter.line</field>
+		<field name="view_type">tree</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','=','confirm')]</field>
+	</record>
+
+	<!-- Action for Draft Operations   -->
+
+	<record model="ir.actions.act_window" id="mrp_production_wc_draft_action">
+		<field name="name">Draft Operations</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">mrp.production.workcenter.line</field>
+		<field name="view_type">tree</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','=','draft')]</field>
+	</record>
+
+	<record model="ir.values" id="mrp_production_wc_action_open">
+		<field name="key2" eval="'tree_but_open'"/>
+		<field name="model" eval="'mrp.production.workcenter.line'"/>
+		<field name="name">Operations</field>
+		<field name="value" eval="'ir.actions.act_window,'+str(mrp_production_wc_action_form)"/>
+		<field name="object" eval="True"/>
+
+	</record>
+
+	<menuitem name="All Operations" parent="mrp.menu_mrp_root" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>
+	<menuitem name="Production Orders to Do" parent="menu_mrp_production_wc_action" action="mrp_production_wc_confirm_action" id="menu_mrp_production_wc_confirm_action"/>
+	<menuitem name="Waiting Production Orders" parent="menu_mrp_production_wc_action" action="mrp_production_wc_draft_action" id="menu_mrp_production_wc_draft_action"/>
+
+<!-- Operation codes -->
+
+	<record model="ir.ui.view" id="mrp_production_code_tree_view">
+		<field name="name">mrp.production.code.tree</field>
+		<field name="model">mrp_operations.operation.code</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Production Operation Code">
+				<field name="name" select="1"/>
+				<field name="code" select="1"/>
+				<field name="start_stop" select="1"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="mrp_production_code_form_view">
+		<field name="name">mrp.production.code.form</field>
+		<field name="model">mrp_operations.operation.code</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Production Operation Code">
+				<field name="name" select="1"/>
+				<field name="code" select="1"/>
+				<field name="start_stop" select="1"/>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="mrp_production_code_action">
+		<field name="name">Operation Code</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">mrp_operations.operation.code</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<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"/>
+
+<!-- Operations -->
+
+	<record model="ir.ui.view" id="mrp_production_operation_tree_view">
+		<field name="name">mrp.production.operation.tree</field>
+		<field name="model">mrp_operations.operation</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Production Operation" editable="top">
+				<field name="production_id"/>
+				<field name="workcenter_id"/>
+				<field name="code_id"/>
+			</tree>
+		</field>
+	</record>
+
+	<!--<record model="ir.ui.view" id="mrp_production_operation_form_view">
+		<field name="name">mrp.production.operation.form</field>
+		<field name="model">mrp_operations.operation</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Production Operation">
+				<field name="production_id" select="1"/>
+				<field name="workcenter_id" select="1"/>
+				<field name="code_id" select="1"/>
+			</form>
+		</field>
+	</record>
+-->
+	<record model="ir.actions.act_window" id="mrp_production_operation_action">
+		<field name="name">Operation</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">mrp_operations.operation</field>
+		<field name="view_type">form</field>
+		<field name="view_id" ref="mrp_production_operation_tree_view"/>
+	</record>
+
+	<menuitem name="Operations" parent="mrp.menu_mrp_configuration" id="menu_mrp_production_operation_action" action="mrp_production_operation_action"/>
+
+
+</data>
+</terp>
diff --git a/addons/mrp_operations/mrp_operations_workflow.xml b/addons/mrp_operations/mrp_operations_workflow.xml
new file mode 100644
index 00000000000..045427b2f07
--- /dev/null
+++ b/addons/mrp_operations/mrp_operations_workflow.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+	# -----------------------------------------------------------
+	# Activities
+	# -----------------------------------------------------------
+
+	<record model="workflow" id="wkf_prod_workcenter">
+		<field name="name">mrp.production.workcenter.line.basic</field>
+		<field name="osv">mrp.production.workcenter.line</field>
+		<field name="on_create">True</field>
+	</record>
+
+		<record model="workflow.activity" id="prod_act_wc_draft">
+			<field name="wkf_id" ref="wkf_prod_workcenter"/>
+			<field name="flow_start">True</field>
+			<field name="name">draft</field>
+			<field name="kind">function</field>
+			<field name="action">action_draft()</field>
+		</record>
+		<record model="workflow.activity" id="prod_act_wc_start">
+			<field name="wkf_id" ref="wkf_prod_workcenter"/>
+			<field name="name">confirm</field>
+			<field name="kind">function</field>
+			<field name="action">action_confirm()</field>
+		</record>
+		<record model="workflow.activity" id="prod_act_wc_cancel">
+			<field name="wkf_id" ref="wkf_prod_workcenter"/>
+			<field name="name">cancel</field>
+			<field name="kind">function</field>
+			<field name="action">action_cancel()</field>
+		</record>
+		<record model="workflow.activity" id="prod_act_wc_done">
+			<field name="wkf_id" ref="wkf_prod_workcenter"/>
+			<field name="name">done</field>
+			<field name="kind">function</field>
+			<field name="flow_stop">True</field>
+			<field name="action">action_done()</field>
+		</record>
+	# -----------------------------------------------------------
+	# Transition
+	# -----------------------------------------------------------
+
+		<record model="workflow.transition" id="prod_trans_wc_draft_start">
+			<field name="act_from" ref="prod_act_wc_draft"/>
+			<field name="act_to" ref="prod_act_wc_start"/>
+			<field name="signal">button_confirm</field>
+		</record>
+		<record model="workflow.transition" id="prod_trans_wc_start_done">
+			<field name="act_from" ref="prod_act_wc_start"/>
+			<field name="act_to" ref="prod_act_wc_done"/>
+			<field name="signal">button_done</field>
+		</record>
+		<record model="workflow.transition" id="prod_trans_wc_draft_cancel">
+			<field name="act_from" ref="prod_act_wc_draft"/>
+			<field name="act_to" ref="prod_act_wc_cancel"/>
+			<field name="signal">button_cancel</field>
+		</record>
+		<record model="workflow.transition" id="prod_trans_wc_cancel_draft">
+			<field name="act_from" ref="prod_act_wc_cancel"/>
+			<field name="act_to" ref="prod_act_wc_draft"/>
+			<field name="signal">button_draft</field>
+		</record>
+		<record model="workflow.transition" id="prod_trans_wc_start_cancel">
+			<field name="act_from" ref="prod_act_wc_start"/>
+			<field name="act_to" ref="prod_act_wc_cancel"/>
+			<field name="signal">button_cancel</field>
+		</record>
+</data>
+</terp>
diff --git a/addons/mrp_operations/report/__init__.py b/addons/mrp_operations/report/__init__.py
new file mode 100644
index 00000000000..80d4fd2a1d2
--- /dev/null
+++ b/addons/mrp_operations/report/__init__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 mrp_wc_barcode
+import mrp_code_barcode
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_operations/report/mrp_code_barcode.py b/addons/mrp_operations/report/mrp_code_barcode.py
new file mode 100644
index 00000000000..8a565b2c3a5
--- /dev/null
+++ b/addons/mrp_operations/report/mrp_code_barcode.py
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+class code_barcode(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(code_barcode, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+        })
+report_sxw.report_sxw('report.mrp.code.barcode', 'mrp_operations.operation.code', 'addons/mrp_operations/report/mrp_code_barcode.rml',parser=code_barcode,header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_operations/report/mrp_code_barcode.rml b/addons/mrp_operations/report/mrp_code_barcode.rml
new file mode 100644
index 00000000000..e23ffc3e5fc
--- /dev/null
+++ b/addons/mrp_operations/report/mrp_code_barcode.rml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+<template pageSize="(5.5cm,2.8cm)" title="Test" author="Martin Simon" allowSplitting="20">
+<pageTemplate id="first">
+  <frame id="first" x1="0.1cm" y1="0.1cm" width="5.3cm" height="2.4cm"/>
+</pageTemplate>
+</template>
+<stylesheet>
+<initialize>
+  <paraStyle name="all" alignment="justify"/>
+</initialize>
+	<blockTableStyle id="Tableau1">
+	  <blockAlignment value="LEFT"/>
+	  <blockValign value="TOP"/>
+	  <lineStyle kind="GRID" colorName="black"/>
+	  <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
+	</blockTableStyle>
+	<paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="CENTER"/>
+	<paraStyle name="P2" fontName="Times-Roman" fontSize="8.0" leading="8" alignment="CENTER"/>
+	<paraStyle name="P3" fontName="Times-Roman" fontSize="5.0" leading="8" alignment="CENTER"/>
+	<paraStyle name="P4" fontName="Times-Roman" fontSize="5.0" leading="8" alignment="CENTER"/>
+
+<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="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') ]]
+	<blockTable colWidths="5.3cm" style="Tableau1">
+	  <tr>
+		<td>
+		  <para style="P1">[[ str(o.name) ]] ([[ str(o.code) ]])</para>
+	<barCode code="code128" x="26.9mm" height="68.1mm" quiet="9" fontName="Times-Roman" fontSize="50"  alignment="CENTER">[['ID'+str(o.id)]]</barCode>
+		</td>
+	  </tr>
+	</blockTable>
+</story>
+</document>
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.py b/addons/mrp_operations/report/mrp_wc_barcode.py
new file mode 100644
index 00000000000..6dfda1bcf8e
--- /dev/null
+++ b/addons/mrp_operations/report/mrp_wc_barcode.py
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+import time
+from report import report_sxw
+
+class workcenter_code(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(workcenter_code, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+        })
+report_sxw.report_sxw('report.mrp.wc.barcode', 'mrp.workcenter', 'addons/mrp_operations/report/mrp_wc_barcode.rml',parser=workcenter_code,header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.rml b/addons/mrp_operations/report/mrp_wc_barcode.rml
new file mode 100644
index 00000000000..6a4b8ae13d7
--- /dev/null
+++ b/addons/mrp_operations/report/mrp_wc_barcode.rml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+<template pageSize="(5.5cm,2.8cm)" title="Test" author="Martin Simon" allowSplitting="20">
+<pageTemplate id="first">
+  <frame id="first" x1="0.1cm" y1="0.1cm" width="5.3cm" height="2.4cm"/>
+</pageTemplate>
+</template>
+<stylesheet>
+<initialize>
+  <paraStyle name="all" alignment="justify"/>
+</initialize>
+	<blockTableStyle id="Tableau1">
+	  <blockAlignment value="LEFT"/>
+	  <blockValign value="TOP"/>
+	  <lineStyle kind="GRID" colorName="black"/>
+	  <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
+	</blockTableStyle>
+	<paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="CENTER"/>
+	<paraStyle name="P2" fontName="Times-Roman" fontSize="8.0" leading="8" alignment="CENTER"/>
+	<paraStyle name="P3" fontName="Times-Roman" fontSize="5.0" leading="8" alignment="CENTER"/>
+	<paraStyle name="P4" fontName="Times-Roman" fontSize="5.0" leading="8" alignment="CENTER"/>
+
+<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="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') ]]
+	<blockTable colWidths="5.3cm" style="Tableau1">
+	  <tr>
+		<td>
+		  <para style="P1">[[ str(o.name) ]]</para>
+	<barCode code="code128" x="26.9mm" height="68.1mm" quiet="9" fontName="Times-Roman" fontSize="50"  alignment="CENTER">[['ID'+str(o.id)]]</barCode>
+		</td>
+	  </tr>
+	</blockTable>
+</story>
+</document>
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
deleted file mode 100644
index f6d64d14f8a..00000000000
--- a/addons/multi_company/multi_company_demo.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-    <data noupdate="1">
-        <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>
-</terp>
\ No newline at end of file
diff --git a/addons/multi_company_account/multi_company_account.py b/addons/multi_company_account/multi_company_account.py
deleted file mode 100644
index 65f49a8ac12..00000000000
--- a/addons/multi_company_account/multi_company_account.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# $Id$
-#
-# 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.
-#
-##############################################################################
-
-from osv import osv, fields
-
-class account_journal(osv.osv):
-    _name = "account.journal"
-    _inherit = "account.journal"
-    _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_journal()
-
-class account_analytic_journal(osv.osv):
-    _name = "account.analytic.journal"
-    _inherit = "account.analytic.journal"
-    _columns = {
-        'company_id': fields.many2one('res.company', 'Company'),
-    }
-    _defaults = {
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-    }
-account_analytic_journal()
-
-class account_budget_post(osv.osv):
-    _name = 'account.budget.post'
-    _inherit = 'account.budget.post'
-    _columns ={
-        'company_id': fields.many2one('res.company', 'Company'),
-    }
-    _defaults = {
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-    }
-account_budget_post()
-
-class account_period(osv.osv):
-    _name = 'account.period'
-    _inherit = 'account.period'
-    _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_period()
-
-class account_fiscalyear(osv.osv):
-    _name = 'account.fiscalyear'
-    _inherit = 'account.fiscalyear'
-    _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_fiscalyear()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/multi_company_account/multi_company_account_data.xml b/addons/multi_company_account/multi_company_account_data.xml
deleted file mode 100644
index 64b4ebe8f8e..00000000000
--- a/addons/multi_company_account/multi_company_account_data.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-    <data>
-        
-        <record id="account.sales_journal" model="account.journal">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.expenses_journal" model="account.journal">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.bank_journal" model="account.journal">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        
-        <record id="journal_comp_rule_group" model="ir.rule.group">
-            <field name="name">Journal multi-company</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.journal')]"/>
-            <field eval="True" name="global"/>
-        </record>
-        <record id="journal_comp_rule" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','account.journal'),('name','=','company_id')]"/>
-            <field name="operator">child_of</field>
-            <field name="operand">user.company_id.id</field>
-            <field name="rule_group" ref="journal_comp_rule_group"/>
-        </record>
-        
-        <record id="analytic_journal_comp_rule_group" model="ir.rule.group">
-            <field name="name">Analytic journal multi-company</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.analytic.journal')]"/>
-            <field eval="True" name="global"/>
-        </record>
-        <record id="analytic_journal_comp_rule" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]"/>
-            <field name="operator">child_of</field>
-            <field name="operand">user.company_id.id</field>
-            <field name="rule_group" ref="analytic_journal_comp_rule_group"/>
-        </record>
-        <record id="analytic_journal_comp_rule_false" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]"/>
-            <field name="operator">=</field>
-            <field name="operand">False</field>
-            <field name="rule_group" ref="analytic_journal_comp_rule_group"/>
-        </record>
-        
-        <record id="budget_post_comp_rule_group" model="ir.rule.group">
-            <field name="name">Budget post multi-company</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.budget.post')]"/>
-            <field eval="True" name="global"/>
-        </record>
-        <record id="budget_post_comp_rule" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]"/>
-            <field name="operator">child_of</field>
-            <field name="operand">user.company_id.id</field>
-            <field name="rule_group" ref="budget_post_comp_rule_group"/>
-        </record>
-        <record id="budget_post_comp_rule_false" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]"/>
-            <field name="operator">=</field>
-            <field name="operand">False</field>
-            <field name="rule_group" ref="budget_post_comp_rule_group"/>
-        </record>
-        
-        <record id="period_comp_rule_group" model="ir.rule.group">
-            <field name="name">Period multi-company</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.period')]"/>
-            <field eval="True" name="global"/>
-        </record>
-        <record id="period_comp_rule" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','account.period'),('name','=','company_id')]"/>
-            <field name="operator">child_of</field>
-            <field name="operand">user.company_id.id</field>
-            <field name="rule_group" ref="period_comp_rule_group"/>
-        </record>
-        
-        
-        <record id="fiscal_year_comp_rule_group" model="ir.rule.group">
-            <field name="name">Fiscal year multi-company</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.fiscalyear')]"/>
-            <field eval="True" name="global"/>
-        </record>
-        <record id="fiscal_year_comp_rule" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','account.fiscalyear'),('name','=','company_id')]"/>
-            <field name="operator">child_of</field>
-            <field name="operand">user.company_id.id</field>
-            <field name="rule_group" ref="fiscal_year_comp_rule_group"/>
-        </record>
-        
-        <record id="account_comp_rule_group" model="ir.rule.group">
-            <field name="name">Account multi-company</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.account')]"/>
-            <field eval="True" name="global"/>
-        </record>
-        <record id="account_comp_rule" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','account.account'),('name','=','company_id')]"/>
-            <field name="operator">child_of</field>
-            <field name="operand">user.company_id.id</field>
-            <field name="rule_group" ref="account_comp_rule_group"/>
-        </record>
-        
-        <record id="tax_comp_rule_group" model="ir.rule.group">
-            <field name="name">Tax multi-company</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.tax')]"/>
-            <field eval="True" name="global"/>
-        </record>
-        <record id="tax_comp_rule" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','account.tax'),('name','=','company_id')]"/>
-            <field name="operator">child_of</field>
-            <field name="operand">user.company_id.id</field>
-            <field name="rule_group" ref="tax_comp_rule_group"/>
-        </record>
-        
-        <record id="tax_code_comp_rule_group" model="ir.rule.group">
-            <field name="name">Tax code multi-company</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.tax.code')]"/>
-            <field eval="True" name="global"/>
-        </record>
-        <record id="tax_code_comp_rule" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','account.tax.code'),('name','=','company_id')]"/>
-            <field name="operator">child_of</field>
-            <field name="operand">user.company_id.id</field>
-            <field name="rule_group" ref="tax_code_comp_rule_group"/>
-        </record>
-        
-        <record id="invoice_comp_rule_group" model="ir.rule.group">
-            <field name="name">Invoice multi-company</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.invoice')]"/>
-            <field eval="True" name="global"/>
-        </record>
-        <record id="invoice_comp_rule" model="ir.rule">
-            <field model="ir.model.fields" name="field_id" search="[('model','=','account.invoice'),('name','=','company_id')]"/>
-            <field name="operator">child_of</field>
-            <field name="operand">user.company_id.id</field>
-            <field name="rule_group" ref="invoice_comp_rule_group"/>
-        </record>
-        
-    </data>
-</terp>
\ No newline at end of file
diff --git a/addons/multi_company_account/multi_company_account_demo.xml b/addons/multi_company_account/multi_company_account_demo.xml
deleted file mode 100644
index ffd302f42b3..00000000000
--- a/addons/multi_company_account/multi_company_account_demo.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-    <data noupdate="1">
-        <record id="account.data_fiscalyear" model="account.fiscalyear">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        
-        <record id="account.period_1" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.period_2" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.period_3" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.period_4" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.period_5" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.period_6" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.period_7" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.period_8" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.period_9" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.period_10" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.period_11" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="account.period_12" model="account.period">
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-    </data>
-</terp>
\ No newline at end of file
diff --git a/addons/multi_company_account/multi_company_account_view.xml b/addons/multi_company_account/multi_company_account_view.xml
deleted file mode 100644
index 6c974b7c8e9..00000000000
--- a/addons/multi_company_account/multi_company_account_view.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-    <data>
-        
-        <record id="view_account_journal_form_multi_company" model="ir.ui.view">
-            <field name="name">account.journal.form</field>
-            <field name="model">account.journal</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_journal_form"/>
-            <field name="arch" type="xml">
-                <field name="user_id" position="after">
-                    <field name="company_id"/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="view_account_analytic_journal_form_multi_company" model="ir.ui.view">
-            <field name="name">account.analytic.journal.form</field>
-            <field name="model">account.analytic.journal</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_journal_form"/>
-            <field name="arch" type="xml">
-                <field name="active" position="after">
-                    <field name="company_id"/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="view_budget_post_form_multi_company" model="ir.ui.view">
-            <field name="name">account.budget.post.form</field>
-            <field name="model">account.budget.post</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_budget_post_form"/>
-            <field name="arch" type="xml">
-                <field name="sens" position="after">
-                    <field name="company_id"/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="view_account_fiscalyear_form_multi_company" model="ir.ui.view">
-            <field name="name">account.fiscalyear.form</field>
-            <field name="model">account.fiscalyear</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_fiscalyear_form"/>
-            <field name="arch" type="xml">
-                <field name="date_stop" position="after">
-                    <field name="company_id"/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="view_account_period_form_multi_company" model="ir.ui.view">
-            <field name="name">account.period.form</field>
-            <field name="model">account.period</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_period_form"/>
-            <field name="arch" type="xml">
-                <field name="date_stop" position="after">
-                    <field name="company_id"/>
-                </field>
-            </field>
-        </record>
-        
-    </data>
-</terp>
\ No newline at end of file
diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
new file mode 100644
index 00000000000..c3d6477de9c
--- /dev/null
+++ b/addons/point_of_sale/__init__.py
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pos
+import stock
+import wizard
+import report
+# 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
new file mode 100644
index 00000000000..6ddb5ae00bf
--- /dev/null
+++ b/addons/point_of_sale/__terp__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+{
+    "name": "Point Of Sale",
+    "version": "1.0",
+    "author": "Tiny",
+
+    "description": """
+Main features :
+ - Fast encoding of the sale.
+ - Allow to choose one payment mode (the quick way) or to split the payment between several payment mode.
+ - Computation of the amount of money to return.
+ - Create and confirm picking list automatically.
+ - Allow the user to create invoice automatically.
+ - Allow to refund former sales.
+
+    """,
+    "category": "Generic Modules/Sales & Purchases",
+    "depends": ["sale", "purchase", "account", "account_tax_include"],
+    "init_xml": [],
+    "demo_xml": [],
+    "update_xml": ["pos_report.xml", "pos_wizard.xml", "pos_view.xml", "pos_sequence.xml", "pos_data.xml", "pos_workflow.xml"],
+    "installable": True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
new file mode 100644
index 00000000000..84caf98b877
--- /dev/null
+++ b/addons/point_of_sale/pos.py
@@ -0,0 +1,874 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 time
+import netsvc
+from osv import fields, osv
+from mx import DateTime
+
+
+class pos_config_journal(osv.osv):
+    _name = 'pos.config.journal'
+    _description = "Point of Sale journal configuration."
+    _columns = {
+        'name': fields.char('Description', size=64),
+        'code': fields.char('Code', size=64),
+        'journal_id': fields.many2one('account.journal', "Journal")
+    }
+
+pos_config_journal()
+
+
+class pos_order(osv.osv):
+    _name = "pos.order"
+    _description = "Point of Sale"
+    _order = "date_order, create_date desc"
+    _order = "date_order desc"
+
+    wf_service = netsvc.LocalService("workflow")
+
+    def _amount_total(self, cr, uid, ids, field_name, arg, context):
+        id_set = ",".join(map(str, ids))
+        cr.execute("""
+        SELECT
+            p.id,
+            COALESCE(SUM(
+                l.price_unit*l.qty*(1-(l.discount/100.0)))::decimal(16,2), 0
+                ) 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 """)
+        res = dict(cr.fetchall())
+
+        for rec in self.browse(cr, uid, ids, context):
+            if rec.partner_id and rec.partner_id.property_account_tax:
+                res[rec.id] = res[rec.id] - rec.amount_tax
+        return res
+
+    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),
+                        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
+        return res
+
+    def _total_payment(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        for order in self.browse(cr, uid, ids):
+            val = 0.0
+            for payment in order.payments:
+                val += payment.amount
+            res[order.id] = val
+        return res
+
+    def _total_return(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        for order in self.browse(cr, uid, ids):
+            val = 0.0
+            for payment in order.payments:
+                val += (payment.amount < 0 and payment.amount or 0)
+            res[order.id] = val
+        return res
+
+    def payment_get(self, cr, uid, ids, context=None):
+        cr.execute("select id from pos_payment where order_id in (%s)" % \
+                    ','.join([str(i) for i in ids]))
+        return [i[0] for i in cr.fetchall()]
+
+    def _sale_journal_get(self, cr, uid, context):
+        journal_obj = self.pool.get('account.journal')
+        res = journal_obj.search(cr, uid,
+            [('type', '=', 'sale')], limit=1)
+        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)
+        return res
+
+    def copy(self, cr, uid, id, default=None, context={}):
+        if not default:
+            default = {}
+        default.update({
+            'state': 'draft',
+            'payments': [],
+            'partner_id': False,
+            'invoice_id': False,
+            'account_move': False,
+            'last_out_picking': False,
+            'nb_print': 0,
+            'pickings': []
+        })
+        return super(pos_order, self).copy(cr, uid, id, default, context)
+
+    _columns = {
+        'name': fields.char('Order Description', size=64, required=True,
+            states={'draft': [('readonly', False)]}, readonly=True),
+        'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
+            states={'draft': [('readonly', False)]}, readonly=True),
+        'date_order': fields.date('Date Ordered', readonly=True),
+        'date_validity': fields.date('Validity Date', required=True),
+        'user_id': fields.many2one('res.users', 'Salesman',
+            readonly=True),
+        '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_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, ),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
+        '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'),
+        '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')
+        }
+
+    def _journal_default(self, cr, uid, context={}):
+        journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
+        if journal_list:
+            return journal_list[0]
+        else:
+            return False
+
+    _defaults = {
+        'user_id': 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'),
+        'date_order': lambda *a: time.strftime('%Y-%m-%d'),
+        'date_validity': lambda *a: (DateTime.now() + DateTime.RelativeDateTime(months=+6)).strftime('%Y-%m-%d'),
+        'nb_print': lambda *a: 0,
+        'sale_journal': _sale_journal_get,
+        'account_receivable': _receivable_get,
+        'invoice_wanted': lambda *a: False
+    }
+
+    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.")
+
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'pos.order', order.id, 'paid', cr)
+        return True
+
+    def dummy_button(self, cr, uid, order, context={}):
+        return True
+
+    def test_paid(self, cr, uid, ids, context=None):
+        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 \
+                (order.amount_paid != order.amount_total):
+                return False
+        return True
+
+    def _get_qty_differences(self, orders, old_picking):
+        """check if the customer changed the product quantity"""
+        order_dict = {}
+        for order in orders:
+            for line in order.lines:
+                order_dict[line.product_id.id] = line
+
+        # check the quantity differences:
+        diff_dict = {}
+        for line in old_picking.move_lines:
+            order_line = order_dict.get(line.product_id.id)
+            if not order_line:
+                deleted = True
+                qty_to_delete_from_original_picking = line.product_qty
+                diff_dict[line.product_id.id] = (deleted, qty_to_delete_from_original_picking)
+            elif line.product_qty != order_line.qty:
+                deleted = False
+                qty_to_delete_from_original_picking = line.product_qty - order_line.qty
+                diff_dict[line.product_id.id] = (deleted, qty_to_delete_from_original_picking)
+
+        return diff_dict
+
+    def _split_picking(self, cr, uid, ids, context, old_picking, diff_dict):
+        """if the customer changes the product quantity, split the picking in two"""
+        # create a copy of the original picking and adjust the product qty:
+        picking_model = self.pool.get('stock.picking')
+        defaults = {
+            'note': "Partial picking from customer", # add a note to tell why we create a new picking
+            'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out'), # increment the sequence
+        }
+
+        new_picking_id = picking_model.copy(cr, uid, old_picking.id, defaults) # state = 'draft'
+        new_picking = picking_model.browse(cr, uid, new_picking_id, context)
+
+        for line in new_picking.move_lines:
+            p_id = line.product_id.id
+            if p_id in diff_dict:
+                diff = diff_dict[p_id]
+                deleted = diff[0]
+                qty_to_del = diff[1]
+                if deleted: # product has been deleted (customer didn't took it):
+                    # delete this product from old picking:
+                    for old_line in old_picking.move_lines:
+                        if old_line.product_id.id == p_id:
+                            old_line.write(cr, uid, [old_line.id], {'state': 'draft'}) # cannot delete if not draft
+                            old_line.unlink(cr, uid, [old_line.id], context)
+                elif qty_to_del > 0: # product qty has been modified (customer took less than the ordered quantity):
+                    # subtract qty from old picking:
+                    for old_line in old_picking.move_lines:
+                        if old_line.product_id.id == p_id:
+                            old_line.write(cr, uid, [old_line.id], {'product_qty': old_line.product_qty - qty_to_del})
+                    # add qty to new picking:
+                    line.write(cr, uid, [line.id], {'product_qty': qty_to_del})
+                else: # product hasn't changed (customer took it without any change):
+                    # delete this product from new picking:
+                    line.unlink(cr, uid, [line.id], context)
+            else:
+                # delete it in the new picking:
+                line.unlink(cr, uid, [line.id], context)
+
+    def create_picking(self, cr, uid, ids, context={}):
+        """Create a picking for each order and validate it."""
+        picking_obj = self.pool.get('stock.picking')
+
+        orders = self.browse(cr, uid, ids, context)
+        for order in orders:
+            if not order.last_out_picking:
+                new = True
+                picking_id = picking_obj.create(cr, uid, {
+                    'origin': order.name,
+                    'type': 'out',
+                    'state': 'draft',
+                    'move_type': 'direct',
+                    'note': 'POS notes ' + (order.note or ""),
+                    'invoice_state': 'none',
+                    'auto_picking': True,
+                    'pos_order': order.id,
+                    })
+                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})
+                picking = picking_obj.browse(cr, uid, [picking_id], context)[0]
+                new = False
+
+                # split the picking (if product quantity has changed):
+                diff_dict = self._get_qty_differences(orders, picking)
+                if diff_dict:
+                    self._split_picking(cr, uid, ids, context, picking, diff_dict)
+
+            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
+                    stock_dest_id = int(val.split(',')[1])
+                    if line.qty < 0:
+                        (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,
+                        'picking_id': picking_id,
+                        'product_id': line.product_id.id,
+                        'product_uos_qty': line.qty,
+                        'tracking_id': False,
+                        'state': 'waiting',
+                        'location_id': location_id,
+                        'location_dest_id': stock_dest_id,
+                    })
+
+            self.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
+
+    def set_to_draft(self, cr, uid, ids, *args):
+        if not len(ids):
+            return False
+
+        self.write(cr, uid, ids, {'state': 'draft'})
+
+        wf_service = netsvc.LocalService("workflow")
+        for i in ids:
+            wf_service.trg_create(uid, 'pos.order', i, cr)
+        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
+            self.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)
+
+        return True
+
+    def add_payment(self, cr, uid, order_id, amount, journal, context=None):
+        """Create a new payment for the order"""
+
+        order = self.browse(cr, uid, order_id, context)
+        if order.invoice_wanted and not order.partner_id:
+            raise osv.except_osv("Error", "Cannot create invoice without a partner.")
+
+        payment_id = self.pool.get('pos.payment').create(cr, uid, {
+            'order_id': order_id,
+            'journal_id': journal,
+            'amount': amount,
+            })
+
+        self.wf_service.trg_validate(uid, 'pos.order', order_id, 'payment', cr)
+        self.wf_service.trg_write(uid, 'pos.order', order_id, cr)
+        return payment_id
+
+    def add_product(self, cr, uid, order_id, product_id, qty, context=None):
+        """Create a new order line the order"""
+        line_obj = self.pool.get('pos.order.line')
+        values = self.read(cr, uid, order_id, ['partner_id', 'pricelist_id'])
+
+        pricelist = values['pricelist_id'] and values['pricelist_id'][0]
+        product = values['partner_id'] and values['partner_id'][0]
+
+        price = line_obj.price_by_product(cr, uid, [],
+                pricelist, product_id, qty, product)
+
+        order_line_id = line_obj.create(cr, uid, {
+            'order_id': order_id,
+            'product_id': product_id,
+            'qty': qty,
+            'price_unit': price,
+            })
+        self.wf_service.trg_write(uid, 'pos.order', order_id, cr)
+
+        return order_line_id
+
+    def refund(self, cr, uid, ids, context={}):
+        clone_list = []
+        line_obj = self.pool.get('pos.order.line')
+
+        for order in self.browse(cr, uid, ids):
+            clone_id = self.copy(cr, uid, order.id, {
+                'name': order.name + ' REFUND',
+                'date_order': time.strftime('%Y-%m-%d'),
+                'state': 'draft',
+                'note': 'REFUND\n'+ (order.note or ''),
+                'invoice_id': False,
+                'nb_print': 0,
+                'payments': False,
+                })
+            clone_list.append(clone_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
+                    })
+        return clone_list
+
+    def action_invoice(self, cr, uid, ids, context={}):
+        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):
+            if order.invoice_id:
+                inv_ids.append(order.invoice_id.id)
+                continue
+
+            if not order.partner_id:
+                raise osv.except_osv('Error', 'Please provide a partner for the sale.')
+
+            inv = {
+                'name': 'Invoice from POS: '+order.name,
+                'origin': order.name,
+                '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'])
+            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,
+                    'product_id': line.product_id.id,
+                    '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)['value'])
+                inv_line['price_unit'] = line.price_unit
+                inv_line['discount'] = line.discount
+
+                inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\
+                    and [(6, 0, inv_line['invoice_line_tax_id'])] or []
+                inv_line_ref.create(cr, uid, inv_line, context)
+
+        for i in inv_ids:
+            self.wf_service.trg_validate(uid, 'account.invoice', i, 'invoice_open', cr)
+        return inv_ids
+
+    def create_account_move(self, cr, uid, ids, context=None):
+        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')
+        account_tax_obj = self.pool.get('account.tax')
+        period = account_period_obj.find(cr, uid, context=context)[0]
+
+        for order in self.browse(cr, uid, ids, context=context):
+
+            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
+
+            # Create an entry for the sale
+            move_id = account_move_obj.create(cr, uid, {
+                'journal_id': order.sale_journal.id,
+                'period_id': period,
+                }, context=context)
+
+            # Create an move for each order line
+            for line in order.lines:
+
+                tax_amount = 0
+                taxes = [t for t in line.product_id.taxes_id]
+                computed_taxes = account_tax_obj.compute_inv(
+                    cr, uid, taxes, line.product_id.list_price, line.qty)
+
+                for tax in computed_taxes:
+                    tax_amount += round(tax['amount'], 2)
+                    group_key = (tax['tax_code_id'],
+                                tax['base_code_id'],
+                                tax['account_collected_id'])
+
+                    if group_key in group_tax:
+                        group_tax[group_key] += round(tax['amount'], 2)
+                    else:
+                        group_tax[group_key] = round(tax['amount'], 2)
+
+                amount = line.price_subtotal - tax_amount
+
+                # Search for the income account
+                if  line.product_id.property_account_income.id:
+                    income_account = line.\
+                                    product_id.property_account_income.id
+                elif line.product_id.categ_id.\
+                        property_account_income_categ.id:
+                    income_account = line.product_id.categ_id.\
+                                    property_account_income_categ.id
+                else:
+                    raise osv.except_osv('Error !', 'There is no income '\
+                        'account defined for this product: "%s" (id:%d)'\
+                        % (line.product_id.name, line.product_id.id, ))
+
+
+                # Empty the tax list as long as there is no tax code:
+                tax_code_id = False
+                tax_amount = 0
+                while computed_taxes:
+                    tax = computed_taxes.pop(0)
+                    if amount > 0:
+                        tax_code_id = tax['base_code_id']
+                        tax_amount = line.price_subtotal * tax['base_sign']
+                    else:
+                        tax_code_id = tax['ref_base_code_id']
+                        tax_amount = line.price_subtotal * tax['ref_base_sign']
+                    # If there is one we stop
+                    if tax_code_id:
+                        break
+
+                # Create a move for the line
+                account_move_line_obj.create(cr, uid, {
+                    'name': order.name,
+                    'date': order.date_order,
+                    'ref': order.name,
+                    'move_id': move_id,
+                    'account_id': income_account,
+                    '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,
+                }, context=context)
+
+                # For each remaining tax with a code, whe create a move line
+                for tax in computed_taxes:
+                    if amount > 0:
+                        tax_code_id = tax['base_code_id']
+                        tax_amount = line.price_subtotal * tax['base_sign']
+                    else:
+                        tax_code_id = tax['ref_base_code_id']
+                        tax_amount = line.price_subtotal * tax['ref_base_sign']
+                    if not tax_code_id:
+                        continue
+
+                    account_move_line_obj.create(cr, uid, {
+                        'name': order.name,
+                        'date': order.date_order,
+                        'ref': order.name,
+                        'move_id': move_id,
+                        'account_id': income_account,
+                        '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,
+                    }, context=context)
+
+
+            # Create a move for each tax group
+            (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,
+                    'date': order.date_order,
+                    'ref': order.name,
+                    'move_id': move_id,
+                    'account_id': key[account_pos],
+                    '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': key[tax_code_pos],
+                    'tax_amount': amount,
+                }, context=context)
+
+            # counterpart
+            to_reconcile.append(account_move_line_obj.create(cr, uid, {
+                'name': order.name,
+                'date': order.date_order,
+                'ref': order.name,
+                'move_id': move_id,
+                'account_id': order_account,
+                'credit': ((order.amount_total<0) and -order.amount_total)\
+                    or 0.0,
+                'debit': ((order.amount_total>0) and order.amount_total)\
+                    or 0.0,
+                'journal_id': order.sale_journal.id,
+                'period_id': period,
+            }, context=context))
+
+
+            # search the account receivable for the payments:
+            account_receivable = order.sale_journal.default_credit_account_id.id
+            if not account_receivable:
+                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, ))
+
+            for payment in order.payments:
+
+                if payment.amount > 0:
+                    payment_account = \
+                        payment.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
+
+                # Create one entry for the payment
+                payment_move_id = account_move_obj.create(cr, uid, {
+                    'journal_id': order.sale_journal.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': order.sale_journal.id,
+                    'period_id': period,
+                }, 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': order.sale_journal.id,
+                    'period_id': period,
+                }, 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)
+        return True
+
+    def action_paid(self, cr, uid, ids, context=None):
+        self.create_picking(cr, uid, ids, context={})
+        self.write(cr, uid, ids, {'state': 'paid'})
+        return True
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        self.cancel_order(cr, uid, ids, context={})
+        self.write(cr, uid, ids, {'state': 'cancel'})
+        return True
+
+    def action_done(self, cr, uid, ids, context=None):
+        self.create_account_move(cr, uid, ids, context={})
+        self.write(cr, uid, ids, {'state': 'done'})
+        return True
+
+pos_order()
+
+
+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):
+        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)
+        return res
+
+    def price_by_product(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
+        if not product_id:
+            return 0.0
+        if not pricelist:
+            raise osv.except_osv('No Pricelist !',
+                'You have to select a pricelist in the sale form !\n'
+                'Please set one before choosing a product.')
+
+        price = self.pool.get('product.pricelist').price_get(cr, uid,
+            [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"
+                " and quantity.\nYou have to change either the product,"
+                " the quantity or the pricelist.")
+        return price
+
+    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)
+
+        return {'value': {'price_unit': price}}
+
+    _columns = {
+        'name': fields.char('Line Description', 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),
+        'qty': fields.float('Quantity'),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal'),
+        'discount': fields.float('Discount (%)', digits=(16, 2)),
+        'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'),
+        'create_date': fields.datetime('Creation date', readonly=True),
+        }
+
+    _defaults = {
+        '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,
+        }
+
+    def create(self, cr, user, vals, context={}):
+        if vals.get('product_id'):
+            return super(pos_order_line, self).create(cr, user, vals, context)
+        return False
+
+    def write(self, cr, user, ids, values, context={}):
+        if 'product_id' in values and not values['product_id']:
+            return False
+        return super(pos_order_line, self).write(cr, user, ids, values, context)
+
+pos_order_line()
+
+
+class pos_payment(osv.osv):
+    _name = 'pos.payment'
+    _description = 'Pos Payment'
+
+    def _journal_get(self, cr, uid, context={}):
+        obj = self.pool.get('account.journal')
+        ids = obj.search(cr, uid, [('type', '=', 'cash')])
+        res = obj.read(cr, uid, ids, ['id', 'name'], context)
+        res = [(r['id'], r['name']) for r in res]
+        return res
+
+    def _journal_default(self, cr, uid, context={}):
+        journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
+        if journal_list:
+            return journal_list[0]
+        else:
+            return False
+
+    _columns = {
+        'name': fields.char('Description', size=64),
+        'order_id': fields.many2one('pos.order', 'Order Ref', required=True),
+        'journal_id': fields.many2one('account.journal', "Journal", required=True),
+        'amount': fields.float('Amount', required=True),
+    }
+    _defaults = {
+        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.payment'),
+        'journal_id': _journal_default,
+    }
+
+    def create(self, cr, user, vals, context={}):
+        if vals.get('journal_id') and vals.get('amount'):
+            return super(pos_payment, self).create(cr, user, vals, context)
+        return False
+
+    def write(self, cr, user, ids, values, context={}):
+        if 'amount' in values and not values['amount']:
+            return False
+        if 'journal_id' in values and not values['journal_id']:
+            return False
+        return super(pos_payment, self).write(cr, user, ids, values, context)
+
+pos_payment()
+
+
+class report_transaction_pos(osv.osv):
+    _name = "report.transaction.pos"
+    _description = "transaction for the pos"
+    _auto = False
+    _columns = {
+        'date_create': fields.date('Date', readonly=True),
+        'journal_id': fields.many2one('account.journal', 'Journal', 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),
+    }
+
+    def init(self, cr):
+        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,
+                    date_trunc('day',pp.create_date)::date as date_create,
+                    ps.user_id,
+                    ps.invoice_id
+                from
+                    pos_payment pp, pos_order ps
+                WHERE ps.id = pp.order_id
+                group by
+                    pp.journal_id, date_trunc('day',pp.create_date), ps.user_id, ps.invoice_id
+            )
+            """)
+report_transaction_pos()
+
+# 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
new file mode 100644
index 00000000000..51be9126600
--- /dev/null
+++ b/addons/point_of_sale/pos_data.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+<!-- FIXME : -->
+
+<!-- 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> -->
+
+</data>
+</terp>
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
new file mode 100644
index 00000000000..b477abc912e
--- /dev/null
+++ b/addons/point_of_sale/pos_report.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<terp>
+	<data>
+		<report
+			id="pos_receipt"
+			string="Receipt"
+			model="pos.order"
+			name="pos.receipt"
+			rml="point_of_sale/report/pos_receipt.rml"
+			auto="False"/>
+
+		<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_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"
+			rml="point_of_sale/report/pos_lines.rml"
+			 />
+
+	</data>
+</terp>
diff --git a/addons/point_of_sale/pos_sequence.xml b/addons/point_of_sale/pos_sequence.xml
new file mode 100644
index 00000000000..3faf09aa20d
--- /dev/null
+++ b/addons/point_of_sale/pos_sequence.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+
+	#
+	# Sequences for pos.order
+	#
+
+	<record model="ir.sequence.type" id="seq_type_pos_order">
+		<field name="name">POS Order</field>
+		<field name="code">pos.order</field>
+	</record>
+	<record model="ir.sequence" id="seq_pos_order">
+		<field name="name">POS Order</field>
+		<field name="code">pos.order</field>
+		<field name="prefix">POS/</field>
+		<field name="padding">3</field>
+	</record>
+
+	<record model="ir.sequence.type" id="seq_type_pos_payment">
+		<field name="name">POS Payment</field>
+		<field name="code">pos.payment</field>
+	</record>
+	<record model="ir.sequence" id="seq_pos_payment">
+		<field name="name">POS Payment</field>
+		<field name="code">pos.payment</field>
+		<field name="prefix">Payment/</field>
+		<field name="padding">2</field>
+	</record>
+
+	<record model="ir.sequence.type" id="seq_type_pos_order_line">
+		<field name="name">POS order line</field>
+		<field name="code">pos.order.line</field>
+	</record>
+	<record model="ir.sequence" id="seq_pos_order_line">
+		<field name="name">POS order line</field>
+		<field name="code">pos.order.line</field>
+		<field name="prefix">Order Line/</field>
+		<field name="padding">2</field>
+	</record>
+
+</data>
+</terp>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
new file mode 100644
index 00000000000..7f1e26a6677
--- /dev/null
+++ b/addons/point_of_sale/pos_view.xml
@@ -0,0 +1,337 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+	<record model="ir.ui.view" id="view_pos_pos_form">
+		<field name="name">pos.order</field>
+		<field name="model">pos.order</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Sales Order POS">
+				<notebook >
+
+
+					<page string="Order lines">
+					  <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="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"/>
+					  </form>
+				     </field>
+					  <group colspan="4" col="7">
+						<field name="amount_tax"/>
+						<field name="amount_total"/>
+
+						  <button name="%(pos_discount)d"
+								  string="D_iscount"
+								  type="action" states="draft"/>
+
+						  <button name="dummy_button"
+								  string="Compute"
+								  type="object" />
+
+						</group>
+
+					<separator colspan="4" string="Actions"/>
+						<group colspan="4" col="9">
+
+						  <field name="state" select="2"/>
+
+						  <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="cancel"
+								  string="Cancel"
+								   states="paid"/>
+
+						  <button name="set_to_draft"
+									string="Set to draft"
+								   	states="cancel"
+									type="object" />
+
+						  <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="journal_id" select="1" width="200"/>
+					    <field name="amount" />
+					  </tree>
+				      </field>
+						<separator string="Invoicing" colspan="4"/>
+					    <field name="nb_print"/>
+						<newline/>
+					    <field name="partner_id" />
+						<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="pricelist_id" domain="[('type','=','sale')]"/>
+					    <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="Pickings" colspan="4"/>
+						<field name="pickings" nolabel="1" colspan="4"/>
+
+				   </page>
+				</notebook>
+
+			</form>
+		</field>
+	</record>
+
+
+	<record model="ir.actions.act_window" id="action_pos_pos_form">
+		<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_pos_form"/>
+		<field name="domain">[ ('date_order','>=',time.strftime('%Y-%m-%d')) ]</field>
+	</record>
+
+
+	<record model="ir.ui.view" id="view_pos_order_tree">
+		<field name="name">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"/>
+				<field name="user_id"/>
+				<field name="invoice_id"/>
+				<field name="last_out_picking"/>
+				<field name="state"/>
+				<field name="amount_total" sum="Amount total"/>
+			</tree>
+		</field>
+	</record>
+	<menuitem name="Point of Sale" id="menu_point_root" />
+	<menuitem name="Point of Sale" parent="menu_point_root" id="menu_point_ofsale" action="action_pos_pos_form"/>
+	<wizard 
+		string="Wizard default journals"
+		model="pos.config.journal"
+		name="pos.config.journal"
+		menu="False"
+		id="wizard_default_journal"/>
+
+	<menuitem name="Configuration" parent="menu_point_root" id="menu_point_config"/>
+	<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">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','=', time.strftime('%Y-%m-%d'))]</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">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.ui.view" id="view_pos_order_line">
+		<field name="name">Sale lines</field>
+		<field name="model">pos.order.line</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="POS Order lines">
+		      <field name="product_id" readonly="1"/>
+		      <field name="qty" readonly="1" sum="Total qty"/>
+		      <field name="discount" readonly="1"/>
+		      <field name="price_unit" readonly="1"/>
+		      <field name="price_subtotal" readonly="1" sum="Sum of subtotals"/>
+		      <field name="create_date" readonly="1"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_pos_order_line_form">
+		<field name="name">Sale line</field>
+		<field name="model">pos.order.line</field>
+		<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"/>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_pos_order_line">
+		<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"/>
+	</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_day">
+		<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="domain">[('create_date','like',time.strftime('%Y-%m-%d'))]</field>
+	</record>
+	<menuitem name="POS Lines of the day" parent="menu_action_pos_order_line" id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
+
+
+	<!-- report -->
+
+	<record model="ir.ui.view" id="view_pos_trans_user_form">
+	<field name="name">report.trans.pos.user.form</field>
+	<field name="model">report.transaction.pos</field>
+	<field name="type">form</field>
+	<field name="arch" type="xml">
+		<form string="POS ">
+			<field name="user_id" select="1"/>
+			<field name="journal_id" select="1"/>
+			<field name="date_create" select="1"/>
+			<field name="no_trans" select="2"/>
+			<field name="amount" select="2"/>
+			<field name="invoice_id" select="2"/>
+			</form>
+		</field>
+	</record>
+
+
+	<record model="ir.ui.view" id="view_trans_pos_user_tree">
+		<field name="name">Sales by user</field>
+		<field name="model">report.transaction.pos</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="POS">
+			<field name="date_create"/>
+			<field name="user_id"/>
+			<field name="journal_id"/>
+			<field name="no_trans" sum="Total Transaction"/>
+			<field name="amount" sum="Amount total"/>
+			<field name="invoice_id"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_trans_pos_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'))]</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="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'))]</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>
+	</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"/> -->
+
+
+</data>
+</terp>
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
new file mode 100644
index 00000000000..1de4e726973
--- /dev/null
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+
+		<wizard string="Refund Orders" model="pos.order"
+				name="pos.refund_order" id="pos_refund" menu="False"/>
+
+		<wizard string="Payment" model="pos.order"
+				name="pos.payment" id="pos_payment" menu="False"/>
+
+		<wizard string="Create Invoices" model="pos.order"
+				name="pos.create_invoice" id="pos_invoice" multi="True"/>
+
+		<wizard string="Add products" model="pos.order"
+				name="pos.add_product" id="pos_add_product"  menu="False"/>
+
+		<wizard string="Cancel" model="pos.order"
+				name="pos.cancel" id="pos_cancel" multi="True"/>
+
+		<wizard string="Confirm" model="pos.order"
+				name="pos.confirm" id="pos_confirm" multi="True"/>
+
+		<wizard string="Discount" model="pos.order"
+				name="pos.discount" id="pos_discount" menu="False"/>
+
+		<wizard string="Get From Order" model="pos.order"
+				name="pos.sale.get" id="pos_sale_get"/>
+
+	</data>
+</terp>
diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/pos_workflow.xml
new file mode 100644
index 00000000000..da5916597fb
--- /dev/null
+++ b/addons/point_of_sale/pos_workflow.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<terp>
+  <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_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_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>
+
+	<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>
+</terp>
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
new file mode 100644
index 00000000000..02ba5343891
--- /dev/null
+++ b/addons/point_of_sale/report/__init__.py
@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 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 pos_receipt
+import pos_invoice
+import pos_lines
+import pos_details
+import pos_details_summary
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
new file mode 100644
index 00000000000..06c057e65e9
--- /dev/null
+++ b/addons/point_of_sale/report/pos_details.py
@@ -0,0 +1,140 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+##
+## 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
+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_sum_discount(self, objects):
+        #code for the sum of discount value
+        return reduce(lambda acc, object:
+                                        acc + reduce(
+                                                lambda sum_dis, line:
+                                                        sum_dis + ((line.price_unit * line.qty) * (line.discount / 100)),
+                                                object.lines,
+                                                0.0),
+                                    objects,
+                                    0.0)
+
+    def _get_payments(self, objects, 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.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)
+
+    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
+
+    def _sum_invoice(self, objects):
+        return reduce(lambda acc, obj:
+                        acc + obj.invoice_id.amount_total,
+                        [o for o in objects if o.invoice_id and o.invoice_id.number],
+                        0.0)
+
+    def _ellipsis(self, orig_str, maxlen=100, ellipsis='...'):
+        maxlen = maxlen - len(ellipsis)
+        if maxlen <= 0:
+            maxlen = 1
+        new_str = orig_str[:maxlen]
+        return new_str
+
+    def _strip_name(self, name, maxlen=50):
+        return self._ellipsis(name, maxlen, ' ...')
+
+    def _get_tax_amount(self, objects):
+        res = {}
+        list_ids = []
+        for order in objects:
+            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
+
+    def _get_sales_total(self, objects):
+        return reduce(lambda x, o: x + len(o.lines), objects, 0)
+
+    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 __init__(self, cr, uid, name, context):
+        super(pos_details, self).__init__(cr, uid, name, context)
+        self.total = 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,
+        })
+
+report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale/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
new file mode 100644
index 00000000000..0fdbc060f79
--- /dev/null
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -0,0 +1,210 @@
+<?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="5.0" y1="57.0" width="590" height="828"/>
+        </pageTemplate>
+    </template>
+    <stylesheet>
+        <blockTableStyle id="Standard_Outline">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+        <blockTableStyle id="Tableau8">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <lineStyle kind="GRID" colorName="black"/>
+            <blockBackground colorName="#dddddd" start="0,0" stop="-1,0"/>
+        </blockTableStyle>
+        <blockTableStyle id="Tableau6">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <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"/>
+        </blockTableStyle>
+        <blockTableStyle id="tmpTable1">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+        <blockTableStyle id="tmpTable2">
+            <blockAlignment value="CENTER"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+        <blockTableStyle id="tmpTable3">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <lineStyle kind="GRID" colorName="black"/>
+        </blockTableStyle>
+        <blockTableStyle id="tmpTable4">
+            <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="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"/>
+        <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P5" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P16" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P17" fontName="Times-Bold" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P8" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P13" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.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="Heading1" fontName="Helvetica" alignment="CENTER" fontSize="14.0" leading="15" spaceBefore="10.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="14.0" leading="18" spaceBefore="10.0" spaceAfter="6.0"/>
+        <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>
+
+        <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>
+            </tr>
+        </blockTable>
+        <section>
+            [[ repeatIn(objects,'o') ]]
+            <blockTable colWidths="80,57,180,40,27,37,37,40,40" style="Tableau6" rowHeights="0.5cm">
+                <tr>
+                    <td>[[ repeatIn(o.lines,'line') ]]<para style="P5">[[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></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></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>
+                </tr>
+            </blockTable>
+        </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">
+                        <tr>
+                            <td>
+                                <para style="P3">
+                                    <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>
+                    </blockTable>
+                    <para style="P2"><font color="white" /> </para>
+                    <blockTable colWidths="150,50" style="Tableau8">
+                        <tr>
+                            <td>
+                                <para style="P3">
+                                    <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>
+                    </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>
+            </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
new file mode 100644
index 00000000000..63a0c9d11df
--- /dev/null
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -0,0 +1,141 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+##
+## 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
+from report import report_sxw
+
+
+class pos_details_summary(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_sum_discount(self, objects):
+        #code for the sum of discount value
+        return reduce(lambda acc, object:
+                                        acc + reduce(
+                                                lambda sum_dis, line:
+                                                        sum_dis + ((line.price_unit * line.qty ) * (line.discount / 100)),
+                                                object.lines,
+                                                0.0),
+                                    objects,
+                                    0.0 )
+
+    def _get_payments(self, objects, 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.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)
+
+    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
+
+    def _sum_invoice(self, objects):
+        return reduce(lambda acc, obj:
+                                                acc + obj.invoice_id.amount_total,
+                                    [o for o in objects if o.invoice_id and o.invoice_id.number],
+                                    0.0)
+
+    def _ellipsis(self, string, maxlen=100, ellipsis = '...'):
+        ellipsis = ellipsis or ''
+        return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
+
+    def _strip_name(self, name, maxlen=50):
+        return self._ellipsis(name, maxlen, ' ...')
+
+    def _get_tax_amount(self, objects):
+        res = {}
+        list_ids = []
+        for order in objects:
+            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
+
+    def _get_sales_total(self, objects):
+        return reduce(lambda x, o: x + len(o.lines), objects, 0)
+
+    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 __init__(self, cr, uid, name, context):
+        super(pos_details_summary, self).__init__(cr, uid, name, context)
+        self.total = 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,
+        })
+
+report_sxw.report_sxw('report.pos.details_summary',
+                                            'pos.order',
+                                            'addons/point_of_sale/report/pos_details_summary.rml',
+                                            parser=pos_details_summary,
+                                            header=None)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
new file mode 100644
index 00000000000..50f70778ab1
--- /dev/null
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -0,0 +1,170 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+    <template pageSize="(595.0,842.0)" title="Test" author="Olivier Laurent" allowSplitting="20">
+        <pageTemplate id="first">
+            <frame id="first" x1="5.0" y1="57.0" width="590" height="828"/>
+        </pageTemplate>
+    </template>
+    <stylesheet>
+        <blockTableStyle id="Standard_Outline">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+        <blockTableStyle id="Tableau8">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <lineStyle kind="GRID" colorName="black"/>
+            <blockBackground colorName="#dddddd" start="0,0" stop="-1,0"/>
+        </blockTableStyle>
+        <blockTableStyle id="Tableau6">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <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"/>
+        </blockTableStyle>
+        <blockTableStyle id="tmpTable1">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+        <blockTableStyle id="tmpTable2">
+            <blockAlignment value="CENTER"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+        <blockTableStyle id="tmpTable3">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <lineStyle kind="GRID" colorName="black"/>
+        </blockTableStyle>
+        <blockTableStyle id="tmpTable4">
+            <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="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"/>
+        <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P5" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P16" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P17" fontName="Times-Bold" fontSize="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P8" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="P13" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.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="Heading1" fontName="Helvetica" alignment="CENTER" fontSize="14.0" leading="15" spaceBefore="10.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="14.0" leading="18" spaceBefore="10.0" spaceAfter="6.0"/>
+        <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>
+            <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">
+                        <tr>
+                            <td>
+                                <para style="P3">
+                                    <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>
+                    </blockTable>
+                    <para style="P2"><font color="white" /> </para>
+                    <blockTable colWidths="150,50" style="Tableau8">
+                        <tr>
+                            <td>
+                                <para style="P3">
+                                    <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>
+                    </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>
+            </tr>
+        </blockTable>
+    </story>
+</document>
+
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
new file mode 100644
index 00000000000..f9cc641642b
--- /dev/null
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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
+from report import report_sxw
+from osv import osv
+
+
+class pos_invoice(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_invoice, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+        })
+
+    def preprocess(self, objects, data, ids):
+        super(pos_invoice, self).preprocess(objects, data, ids)
+        iids = []
+        nids = []
+
+        for order in objects:
+            order.write(self.cr, self.uid, [order.id], {'nb_print': order.nb_print + 1})
+
+            if order.invoice_id and order.invoice_id not in iids:
+                if not order.invoice_id:
+                    raise osv.except_osv('Error !', 'Please create an invoice for this sale.')
+                iids.append(order.invoice_id)
+                nids.append(order.invoice_id.id)
+        self.cr.commit()
+        data['ids'] = nids
+        self.datas = data
+        self.ids = nids
+        self.objects = iids
+        self.localcontext['data'] = data
+        self.localcontext['objects'] = iids
+
+report_sxw.report_sxw('report.pos.invoice', 'pos.order', 'addons/libeurop/report/invoice.rml', parser= pos_invoice)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
new file mode 100644
index 00000000000..6e6630ca5d8
--- /dev/null
+++ b/addons/point_of_sale/report/pos_lines.py
@@ -0,0 +1,53 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+##
+## 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
+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)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'total_quantity': self.__total_quantity__,
+        })
+
+    def __total_quantity__(self, obj):
+        tot = 0
+        for line in obj.lines:
+            tot += line.qty
+        self.total = tot
+        return self.total
+
+report_sxw.report_sxw('report.pos.lines', 'pos.order', 'addons/point_of_sale/report/pos_lines.rml', parser=pos_lines)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
new file mode 100644
index 00000000000..42ad6597655
--- /dev/null
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -0,0 +1,254 @@
+<?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="Tableau6">
+      <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"/>
+      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <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="P1" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" fontName="Times-BoldItalic" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.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"/>
+  </stylesheet>
+  <story>
+    <para style="P9">[[ repeatIn(objects,'o') ]]</para>
+    <para style="P13">
+      <font color="white"> </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('%d/%m/%Y')]]</font>
+    </para>
+    <para style="P12">
+      <font face="Times-Roman" size="11.0"/>
+    </para>
+    <para style="P12">
+      <font face="Times-Roman" size="11.0">Journal:</font>
+    </para>
+    <blockTable colWidths="197.0,57.0,57.0,57.0,47.0,67.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="P2">Date</para>
+        </td>
+        <td>
+          <para style="P3">Name</para>
+        </td>
+        <td>
+          <para style="P3">Product Name</para>
+        </td>
+        <td>
+          <para style="P3">Unit Price</para>
+        </td>
+        <td>
+          <para style="P3">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="P3">Taxes</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="P8">
+        <font face="Times-Roman">[[ repeatIn(o.lines, 'l') ]]</font>
+      </para>
+      <blockTable colWidths="194.0,61.0,56.0,57.0,47.0,65.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="P4">[[l.create_date]]</para>
+          </td>
+          <td>
+            <para style="P7">[[l.name]]</para>
+          </td>
+          <td>
+            <para style="P5">[[l.product_id.name]]</para>
+          </td>
+          <td>
+            <para style="P5">[[l.price_unit]]</para>
+          </td>
+          <td>
+            <para style="P5">[[l.discount]]</para>
+          </td>
+          <td>
+            <para style="P6">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="80.0,80.0,80.0,64.0,96.0,80.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">Total No. of Articles</para>
+        </td>
+        <td>
+          <para style="P10">
+            <font face="Times-Roman" size="12.0">[[total_quantity(o)]]</font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P10">
+            <font face="Times-Roman">Total Sold</font>
+          </para>
+        </td>
+        <td>
+          <para style="P10">
+            <font face="Times-Roman" size="12.0"/>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">Total Taxes</para>
+        </td>
+        <td>
+          <para style="P4">[[ '%.2f' % o.amount_tax ]] [[o.pricelist_id.currency_id.code ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">Total Paid</para>
+        </td>
+        <td>
+          <para style="P4">[[ '%.2f' % o.amount_total ]] [[o.pricelist_id.currency_id.code ]]
+</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py
new file mode 100644
index 00000000000..1a32d8efe8c
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt.py
@@ -0,0 +1,68 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 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
+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,
+            '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 = %d '
+        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  = %d '
+        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
+
+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
new file mode 100644
index 00000000000..c4152d6cd48
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -0,0 +1,133 @@
+<?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="145" 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"/>
+      <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="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <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="LEFT"/>
+    <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="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>
+    <para style="P1">[[ repeatIn(objects,'o') ]]</para>
+    <para style="P2">[[ o.user_id.company_id.name ]]</para>
+    <para style="P3">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
+    <para style="P3">[[ address and address.country_id and address.country_id.name ]]</para>
+    <para style="P3">Tel : [[ address and address.phone ]]</para>
+    <para style="P3">E-mail : [[ address and address.email ]]</para>
+    <para style="P3">User : [[ o.user_id.name ]]</para>
+    <para style="P3">Date : [[ time.strftime('%d/%m/%Y %H:%M') ]]</para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">Operation N° : [[ o.name ]]</para>
+    <blockTable colWidths="97.0,23.0,26.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="95.0,23.0,27.0" style="Tableau3">
+        <tr>
+          <td>
+            <para style="P9">[[ line.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[ '%.f' % line.qty ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[ '%.2f' % net(line.id) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="109.0,37.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P13">Disc : </para>
+        </td>
+        <td>
+          <para style="P10">[[ '%.2f' % (disc(o.id) or 0.0,) ]] </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Total :</para>
+        </td>
+        <td>
+          <para style="P7">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+	<section>
+		[[ repeatIn((o.amount_total&gt;0) and o.payments or [], 'p') ]]
+		<para style="P30">
+			[[ p.journal_id.name ]] : [[ '%.2f' % (p.amount,) ]]
+		</para>
+	</section>
+	<section>
+		[[ repeatIn((o.amount_total&lt;0) 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/sale_wizard.xml b/addons/point_of_sale/sale_wizard.xml
new file mode 100644
index 00000000000..2a5311313a2
--- /dev/null
+++ b/addons/point_of_sale/sale_wizard.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+		<wizard string="Pos payment" model="sale.order" name="sale.pos_payment" id="pos_payment" />
+	</data>
+</terp>
diff --git a/addons/point_of_sale/stock.py b/addons/point_of_sale/stock.py
new file mode 100644
index 00000000000..1b1620e2b9d
--- /dev/null
+++ b/addons/point_of_sale/stock.py
@@ -0,0 +1,45 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 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.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+import netsvc
+
+
+class stock_picking(osv.osv):
+
+    _inherit = 'stock.picking'
+    _columns = {
+        'pos_order': fields.many2one('pos.order', 'Pos order'),
+    }
+
+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
new file mode 100644
index 00000000000..8a7191f0de2
--- /dev/null
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 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 wizard_pos_payment
+import wizard_default_journal
+import wizard_refund_order
+import wizard_add_product
+import wizard_confirm
+import wizard_discount
+import wizard_get_sale
+# 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
new file mode 100644
index 00000000000..18937a42d28
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_add_product.py
@@ -0,0 +1,96 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+import wizard
+
+
+_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 _add(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    order_obj.add_product(cr, uid, data['id'], data['form']['product'],
+                            data['form']['quantity'], context=context)
+
+    return {}
+
+
+def _pre_init(self, cr, uid, data, context):
+    return {'product': False, 'quantity': 1}
+
+
+class add_product(wizard.interface):
+
+    states = {
+        'init': {
+            'actions': [_pre_init],
+            'result': {
+                'type': 'form',
+                'arch': _form,
+                'fields': _fields,
+                'state': [('end', 'Cancel'), ('add', '_Add product', 'gtk-ok', True)
+                ]
+            }
+        },
+        'add': {
+            'actions': [_add],
+            'result': {
+                'type': 'state',
+                'state': 'init',
+            }
+        },
+    }
+
+add_product('pos.add_product')
+
+# 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
new file mode 100644
index 00000000000..3d4fa727a53
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_confirm.py
@@ -0,0 +1,56 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 netsvc
+
+
+def _confirm(self, cr, uid, data, context):
+    wf_service = netsvc.LocalService("workflow")
+
+    for i in data['ids']:
+        wf_service.trg_validate(uid, 'pos.order', i, 'done', cr)
+    return {}
+
+
+class pos_confirm(wizard.interface):
+    states = {
+        'init': {'actions' : [_confirm],
+            'result': {
+                'type': 'state',
+                'state': 'end',
+            }
+        },
+    }
+
+pos_confirm('pos.confirm')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_default_journal.py b/addons/point_of_sale/wizard/wizard_default_journal.py
new file mode 100644
index 00000000000..2ea97c63017
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_default_journal.py
@@ -0,0 +1,136 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+
+
+def _get_default_journal_selection(self, cr, uid, context):
+    pool = pooler.get_pool(cr.dbname)
+    obj = pool.get('account.journal')
+    ids = obj.search(cr, uid, [('type', '=', 'cash')])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    res.insert(0, ('', ''))
+    return res
+
+default_journal_form = '''<?xml version="1.0"?>
+<form string="Select default journals">
+    <field name="default_journal" />
+    <newline />
+    <field name="default_journal_rebate" />
+    <newline />
+    <field name="default_journal_gift" />
+    <newline />
+</form>'''
+
+default_journal_fields = {
+    'default_journal': {'string': 'Default journal', 'type': 'selection',
+        'selection': _get_default_journal_selection,
+    },
+    'default_journal_rebate': {'string': 'Default rebate journal', 'type': 'selection',
+        'selection': _get_default_journal_selection,
+    },
+    'default_journal_gift': {'string': 'Default gift journal', 'type': 'selection',
+        'selection': _get_default_journal_selection,
+    },
+}
+
+
+class wizard_default_journal(wizard.interface):
+
+    def _set_default_journal(self, cr, uid, data, context):
+
+        def _update_default_journal_config(journal_type, journal_code, journal_descr, journal_codes, data):
+            default_journal_id = data.get('form', {}).get(journal_type) or None
+            dico = dict(name=journal_descr, code=journal_code, journal_id=default_journal_id)
+            if default_journal_id:
+                if journal_code in journal_codes:
+                    ids = [obj.id for obj in objs if obj.code == journal_code]
+                    pos_config_journal.write(cr, uid, ids, dico, context)
+                else:
+                    pos_config_journal.create(cr, uid, dico, context)
+            else:
+                ids = [obj.id for obj in objs if obj.code == journal_code]
+                pos_config_journal.write(cr, uid, ids, dico, context)
+
+        pool = pooler.get_pool(cr.dbname)
+        pos_config_journal = pool.get('pos.config.journal')
+        ids = pos_config_journal.search(cr, uid, [])
+        objs = pos_config_journal.browse(cr, uid, ids)
+        journal_codes = [str(obj.code) for obj in objs]
+
+        _update_default_journal_config('default_journal', 'DEFAULT', 'Default journal', journal_codes, data)
+        _update_default_journal_config('default_journal_rebate', 'REBATE', 'Default rebate journal', journal_codes, data)
+        _update_default_journal_config('default_journal_gift', 'GIFT', 'Default gift journal', journal_codes, data)
+
+        return {}
+
+    def _get_defaults(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        pos_config_journal = pool.get('pos.config.journal')
+        ids = pos_config_journal.search(cr, uid, [])
+        objs = pos_config_journal.browse(cr, uid, ids)
+        journal_codes = {}
+        for obj in objs:
+            journal_codes[obj.code] = int(obj.journal_id.id)
+
+        form = data['form']
+        form['default_journal'] = journal_codes.get('DEFAULT')
+        form['default_journal_rebate'] = journal_codes.get('REBATE')
+        form['default_journal_gift'] = journal_codes.get('GIFT')
+
+        return form
+
+    states = {
+        'init': {
+            'actions': [_get_defaults],
+            'result': {
+                'type': 'form',
+                'arch': default_journal_form,
+                'fields': default_journal_fields,
+                'state': [
+                    ('end', 'Cancel'),
+                    ('set_default_journal', 'Define default journals')
+                ]
+            }
+        },
+        'set_default_journal': {
+            'actions': [_set_default_journal],
+            'result': {
+                'type': 'state',
+                'state': "end",
+            }
+        },
+    }
+
+wizard_default_journal('pos.config.journal')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_discount.py b/addons/point_of_sale/wizard/wizard_discount.py
new file mode 100644
index 00000000000..775c123649e
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_discount.py
@@ -0,0 +1,89 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+
+import wizard
+
+
+_form = """<?xml version="1.0"?>
+<form string="Discount :">
+    <field name="discount"/>
+</form>
+"""
+
+_fields = {
+    'discount': {
+        'string': 'Discount percentage',
+        'type': 'float',
+        'required': True,
+        'default': lambda *args: 5
+    },
+}
+
+
+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 {}
+
+
+class discount_wizard(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': _form,
+                'fields': _fields,
+                'state': (('end', 'Cancel'),
+                          ('apply_discount', 'Apply Discount', 'gtk-ok', True)
+                         )
+            }
+        },
+        'apply_discount': {
+            'actions': [],
+            'result': {
+                'type': 'action',
+                'action': apply_discount,
+                'state': "end",
+            }
+        },
+    }
+
+discount_wizard('pos.discount')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_get_sale.py b/addons/point_of_sale/wizard/wizard_get_sale.py
new file mode 100644
index 00000000000..684c0b14cf0
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_get_sale.py
@@ -0,0 +1,101 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+import wizard
+
+picking_form = """<?xml version="1.0"?>
+<form string="Select an Open Sale Order">
+    <field name="picking_id" domain="[('state','in',('assigned','confirmed')), ('type', '=', 'out')]" context="{'contact_display':'partner'}"/>
+</form>
+"""
+
+picking_fields = {
+    'picking_id': {'string': 'Sale Order', 'type': 'many2one', 'relation': 'stock.picking', 'required': True}
+}
+
+
+def _sale_complete(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
+
+    if order.state in ('paid', 'invoiced'):
+        raise wizard.except_wizard('UserError', "You can't modify this order. It has already been paid")
+
+    pick = pool.get('stock.picking').browse(cr, uid, data['form']['picking_id'], context)
+
+    order.write(cr, uid, data['id'], {
+        'last_out_picking': data['form']['picking_id'],
+        'partner_id': pick.address_id and pick.address_id.partner_id.id
+    })
+
+    order = pool.get('stock.picking').write(cr, uid, [data['form']['picking_id']], {
+        'invoice_state': 'none',
+        'pos_order': data['id']
+    })
+
+    for line in pick.move_lines:
+        pool.get('pos.order.line').create(cr, uid, {
+            'name': line.sale_line_id.name,
+            'order_id': data['id'],
+            'qty': line.product_qty,
+            'product_id': line.product_id.id,
+            'price_unit': line.sale_line_id.price_unit,
+            'discount': line.sale_line_id.discount,
+        })
+
+    return {}
+
+
+class pos_sale_get(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': picking_form,
+                'fields': picking_fields,
+                'state': (('end', 'Cancel'),
+                          ('set', 'Confirm', 'gtk-ok', True)
+                         )
+            }
+        },
+        'set': {
+            'actions': [_sale_complete],
+            'result': {
+                'type': 'state',
+                'state': "end",
+            }
+        },
+    }
+
+pos_sale_get('pos.sale.get')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment.py b/addons/point_of_sale/wizard/wizard_pos_payment.py
new file mode 100644
index 00000000000..86284ffb507
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_payment.py
@@ -0,0 +1,211 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 pooler
+import netsvc
+import wizard
+
+
+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')])
+    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="invoice_wanted" />
+</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,
+        },
+    }
+
+
+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)
+        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]
+
+        return journal
+
+    pool = pooler.get_pool(cr.dbname)
+    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
+
+    # get amount to pay:
+    amount = order.amount_total - order.amount_paid
+
+    # 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
+
+    return {'journal': journal, 'amount': amount, 'invoice_wanted': invoice_wanted_checked}
+
+
+def _add_pay(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    amount = data['form']['amount']
+    journal = data['form']['journal']
+    invoice_wanted = data['form']['invoice_wanted'] == 1
+
+    # 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'], amount, journal, 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)
+    #if not order.amount_total:
+    #   return 'receipt'
+    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'
+        else:
+            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 {}
+
+
+class pos_payment(wizard.interface):
+    states = {
+        'init': {
+            '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': "init",
+            }
+        },
+        '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'
+            }
+        },
+
+    }
+
+pos_payment('pos.payment')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_refund_order.py b/addons/point_of_sale/wizard/wizard_refund_order.py
new file mode 100644
index 00000000000..a446bf7e0a2
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_refund_order.py
@@ -0,0 +1,103 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id:
+#
+# 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 netsvc
+#from tools.misc import UpdateableStr
+#import pooler
+import wizard
+import pooler
+
+
+warning_form = '''<?xml version="1.0"?>
+<form string="Refund ">
+<separator string="Refund order :" colspan="4"/>
+<newline/>
+<field name="date_validity"/>
+</form>
+'''
+
+warning_fields = {
+    'date_validity': {'string': 'Validity Date', 'type': 'date'}
+}
+
+
+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 _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)
+
+    if data['form']['date_validity']:
+        order_ref.write(cr, uid, clone_list, {
+            'date_validity': data['form']['date_validity']
+            })
+
+    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'
+    }
+
+
+class refund_order(wizard.interface):
+    states = {
+        'init': {
+            'actions': [_get_date],
+            'result': {
+                'type': 'form',
+                'arch': warning_form,
+                'fields': warning_fields,
+                'state': [('end', 'Cancel', 'gtk-no'), ('refund_n_quit', 'Ok', 'gtk-yes')]
+            }
+        },
+        'refund_n_quit': {
+            'actions': [],
+            'result': {
+                'type': 'action',
+                'action': _refunding,
+                'state': 'end'
+            }
+        },
+    }
+
+refund_order('pos.refund_order')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/processus/processus.py b/addons/processus/processus.py
index 44bd0237193..ef1ea150e9a 100644
--- a/addons/processus/processus.py
+++ b/addons/processus/processus.py
@@ -53,7 +53,7 @@ class processus_node(osv.osv):
         'kind': fields.selection([('state','State'),('router','Router'),('subflow','Subflow')],'Kind of Node', required=True),
         'menu_id': fields.many2one('ir.ui.menu', 'Related Menu'),
         'note': fields.text('Notes'),
-        'model_id': fields.many2one('ir.model', 'Model', ondelete='set null'),
+        'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
         'model_states': fields.char('States Expression', size=128),
         'flow_start': fields.boolean('Starting Flow'),
         'transition_in': fields.one2many('processus.transition', 'node_to_id', 'Starting Transitions'),
diff --git a/addons/processus/processus_view.xml b/addons/processus/processus_view.xml
index 46033d4fb06..3eac5892874 100644
--- a/addons/processus/processus_view.xml
+++ b/addons/processus/processus_view.xml
@@ -92,7 +92,7 @@
 							</tree>
 							<form string="Outgoing Transitions">
 								<notebook>
-								<page name="Description">
+								<page string="Description">
 									<field name="name"/>
 									<newline/>
 									<field name="node_from_id"/>
@@ -134,7 +134,7 @@
 		<field name="arch" type="xml">
 			<form string="Transitions">
 				<notebook>
-				<page name="Description">
+				<page string="Description">
 					<field name="name"/>
 					<newline/>
 					<field name="node_from_id"/>
diff --git a/addons/processus/report/processus_print.py b/addons/processus/report/processus_print.py
index 6aa800cd218..f7f6b83fe40 100644
--- a/addons/processus/report/processus_print.py
+++ b/addons/processus/report/processus_print.py
@@ -4,10 +4,12 @@ import ImageDraw
 import ImageFont
 import math
 
+import addons
+
 ROUNDED = 30
 BGCOLOR = (228,233,237)
 TITLECOLOR = (150,70,70)
-FONT = 'addons/processus/report/sb.ttf'
+FONT = addons.get_module_resource('processus', 'report/sb.ttf')
 BOXSIZE = (160,120)
 
 size = 800,600
@@ -127,24 +129,25 @@ class graph(object):
 
     def node(self, x, y, data, start_color=False):
         self.draw.node(x,y,BOXSIZE[0], BOXSIZE[1], data.get('title','Unknown'), start_color and (255,125,125) or BGCOLOR)
-        self.draw.picture(x+35, y+BOXSIZE[1]-5, 'addons/processus/report/gtk-help.png')
+        self.draw.picture(x+35, y+BOXSIZE[1]-5, addons.get_module_resource('processus', 'report/gtk-help.png'))
         if start_color:
-            self.draw.picture(x+65, y+BOXSIZE[1]-5, 'addons/processus/report/gtk-open.png')
-            self.draw.picture(x+95, y+BOXSIZE[1]-5, 'addons/processus/report/gtk-print.png')
+            self.draw.picture(x+65, y+BOXSIZE[1]-5, addons.get_module_resource('processus', 'report/gtk-open.png'))
+            self.draw.picture(x+95, y+BOXSIZE[1]-5, addons.get_module_resource('processus', 'report/gtk-print.png'))
         y = y+25
         menus = data.get('menu','').split('/')
         while menus:
             menu = menus.pop(0)
             if menu:
                 if menus: menu=menu+' /'
-                self.draw.draw_text(x+23, y, 10, menu, color=(0,0,0), maxlength=BOXSIZE[0] - 25, font_name='addons/processus/report/ds.ttf')
+                self.draw.draw_text(x+23, y, 10, menu, color=(0,0,0), maxlength=BOXSIZE[0] - 25, 
+                    font_name=addons.get_module_resource('processus', 'report/ds.ttf'))
                 y+=15
 
     def arrow_role(self, node_from, node_to, role='Hello'):
         start = (node_from[0]+BOXSIZE[0]/2, node_from[1]+BOXSIZE[1]/2)
         stop = (node_to[0]+BOXSIZE[0]/2, node_to[1]+BOXSIZE[1]/2)
         (x,y) = self.draw.arrow_role(start, stop, role)
-        self.draw.picture(x, y-3, 'addons/processus/report/role.png')
+        self.draw.picture(x, y-3, addons.get_module_resource('processus', 'report/role.png'))
         self.draw.draw_text(x,y-3, 12, 'Salesman', color=(0,0,0), center=True)
 
     def arrow(self, node_from, node_to):
diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py
index 7a99d4327d1..83273f65a6c 100644
--- a/addons/product/__terp__.py
+++ b/addons/product/__terp__.py
@@ -53,7 +53,8 @@
     Print product labels with barcodes.
     """,
     "update_xml" : ["product_data.xml","product_report.xml",
-        "product_view.xml", "pricelist_view.xml","product_security.xml"],
+        "product_view.xml", "pricelist_view.xml","product_security.xml",
+        "partner_view.xml"],
     "active": False,
     "installable": True
 }
diff --git a/addons/product/partner.py b/addons/product/partner.py
index 1435b174742..ed7a4d68d07 100644
--- a/addons/product/partner.py
+++ b/addons/product/partner.py
@@ -40,10 +40,10 @@ class res_partner(osv.osv):
             'product.pricelist',
             type='many2one', 
             relation='product.pricelist', 
+            domain=[('type','=','sale')],
             string="Sale Pricelist", 
             method=True,
             view_load=True,
-            group_name="Pricelists Properties",
             help="This pricelist will be used, instead of the default one, \
                     for sales to the current partner"),
     }
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
new file mode 100644
index 00000000000..c13194c47e6
--- /dev/null
+++ b/addons/product/partner_view.xml
@@ -0,0 +1,21 @@
+<terp>
+    <data>
+
+        <record id="view_partner_property_form" model="ir.ui.view">
+            <field name="name">res.partner.product.property.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <page string="Sales &amp; Purchases" position="inside">
+                    <newline/>
+                    <group col="2" colspan="2">
+                        <separator string="Sales" colspan="2"/>
+                        <field name="property_product_pricelist"/>
+                    </group>
+                </page>
+            </field>
+        </record>
+
+    </data>
+</terp>
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 6defddcff64..e5d52cbb632 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -215,7 +215,7 @@ class product_pricelist(osv.osv):
 
                 price_limit = price
 
-                price = price * (1.0-(res['price_discount'] or 0.0))
+                price = price * (1.0+(res['price_discount'] or 0.0))
                 price = rounding(price, res['price_round'])
                 price += (res['price_surcharge'] or 0.0)
                 if res['price_min_margin']:
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 3000886397b..80c59479996 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -79,7 +79,7 @@
                     <group col="6" colspan="5">
                         <label string="New Price ="/>
                         <label string="Base Price"/>
-                        <label string="* ( 1 - "/>
+                        <label string="* ( 1 + "/>
                         <field name="price_discount" nolabel="1"/>
                         <label string=" ) + "/>
                         <field name="price_surcharge" nolabel="1"/>
@@ -185,4 +185,4 @@
         <menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="product.menu_config_product"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/product/product.py b/addons/product/product.py
index 77878dcfb93..0d69f6c5cd0 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -244,14 +244,14 @@ class product_template(osv.osv):
         'description': fields.text('Description'),
         'description_purchase': fields.text('Purchase Description'),
         'description_sale': fields.text('Sale Description'),
-        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True),
-        'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True),
-        'sale_delay': fields.float('Customer lead time', help="This is the average time between the confirmation of the customer order and the delivery of the finnished products. It's the time you promise to your customers."),
-        'produce_delay': fields.float('Manufacturing lead time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different delays will be summed for all levels and purchase orders."),
+        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed, consumable are stockable products with infinite stock, or without a stock management in the system."),
+        'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Purchase will trigger purchase orders when requested."),
+        'sale_delay': fields.float('Customer Lead Time', help="This is the average time between the confirmation of the customer order and the delivery of the finnished products. It's the time you promise to your customers."),
+        'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different delays will be summed for all levels and purchase orders."),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until refurnishing. 'Make to Order': When needed, purchase or produce for the procurement request."),
         'rental': fields.boolean('Rentable product'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True),
-        'list_price': fields.float('Public Price', digits=(16, int(config['price_accuracy']))),
+        'list_price': fields.float('Sale Price', digits=(16, int(config['price_accuracy']))),
         'standard_price': fields.float('Cost Price', required=True, digits=(16, int(config['price_accuracy']))),
         'volume': fields.float('Volume'),
         'weight': fields.float('Gross weight'),
@@ -262,16 +262,19 @@ class product_template(osv.osv):
         'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
         'uom_id': fields.many2one('product.uom', 'Default UOM', required=True),
         'uom_po_id': fields.many2one('product.uom', 'Purchase UOM', required=True),
-        'state': fields.selection([('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
+        'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
         'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
             help='Keep empty to use the default UOM'),
         'uos_coeff': fields.float('UOM -> UOS Coeff', digits=(16,4),
             help='Coefficient to convert UOM to UOS\n'
             ' uom = uos * coeff'),
-        'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure type', required=True),
-        'tracking': fields.boolean('Track lots'),
-        'seller_delay': fields.function(_calc_seller_delay, method=True, type='integer', string='Supplier lead time', help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
+        'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
+        'tracking': fields.boolean('Track Lots', help="Force to use a Production Lot number during stock operations for traceability."),
+        'seller_delay': fields.function(_calc_seller_delay, method=True, type='integer', string='Supplier Lead Time', help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
+        'loc_rack': fields.char('Rack', size=16),
+        'loc_row': fields.char('Row', size=16),
+        'loc_case': fields.char('Case', size=16),
     }
 
     def _get_uom_id(self, cr, uid, *args):
@@ -325,6 +328,13 @@ class product_template(osv.osv):
 product_template()
 
 class product_product(osv.osv):
+    def view_header_get(self, cr, uid, view_id, view_type, context):
+        res = super(product_product, self).view_header_get(cr, uid, view_id, view_type, context)
+        if res: return res
+        if (not context.get('categ_id', False)):
+            return False
+        return _('Products: ')+self.pool.get('product.category').browse(cr, uid, context['categ_id'], context).name
+
     def _product_price(self, cr, uid, ids, name, arg, context={}):
         res = {}
         quantity = context.get('quantity', 1)
@@ -410,8 +420,8 @@ class product_product(osv.osv):
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True),
         'ean13': fields.char('EAN13', size=13),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Palettization', help="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."),
-        'price_extra': fields.float('Price Extra', digits=(16, int(config['price_accuracy']))),
-        'price_margin': fields.float('Price Margin', digits=(16, int(config['price_accuracy']))),
+        'price_extra': fields.float('Variant Price Extra', digits=(16, int(config['price_accuracy']))),
+        'price_margin': fields.float('Variant Price Margin', digits=(16, int(config['price_accuracy']))),
     }
 
     def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):        
@@ -580,7 +590,7 @@ class product_supplierinfo(osv.osv):
         'qty' : fields.float('Minimal quantity', required=True),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
         'delay' : fields.integer('Delivery delay', required=True),
-        'pricelist_ids': fields.one2many('pricelist.partnerinfo', 'suppinfo_id', 'Pricelist'),
+        'pricelist_ids': fields.one2many('pricelist.partnerinfo', 'suppinfo_id', 'Supplier Pricelist'),
     }
     _defaults = {
         'qty': lambda *a: 0.0,
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 0a8b918d0d9..f7704167d80 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -31,44 +31,84 @@
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Product">
+                    <group colspan="2" col="4">
+                        <separator string="Product Description" colspan="4"/>
+                        <field name="name" select="1"/>
+                        <field name="default_code" select="1"/>
+                        <field groups="base.group_extended" name="variants" select="2"/>
+                        <field groups="base.group_extended" name="ean13" select="2"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Product Type" colspan="2"/>
+                        <field name="sale_ok" select="2"/>
+                        <field name="purchase_ok" select="2"/>
+                        <field groups="base.group_extended" name="rental" select="2"/>
+                    </group>
                     <notebook>
                         <page string="Information">
-                            <field name="name" select="1"/>
-                            <field name="default_code" select="1"/>
-                            <field groups="base.group_extended" name="variants" select="2"/>
-                            <field groups="base.group_extended" name="ean13" select="2"/>
-                            <newline/>
-                            <field name="categ_id" select="1"/>
-                            <field name="type" select="2"/>
-                            <field digits="(14, 3)" groups="base.group_extended" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
-                            <newline/>
-                            <field digits="(14, 3)" groups="base.group_extended" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
-                            <field digits="(14, 3)" groups="base.group_extended" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
-                            <field name="procure_method"/>
-                            <field name="state" select="2"/>
-                            <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                            <field name="uom_po_id"/>
-                            <field groups="base.group_extended" name="product_manager" select="2"/>
+                            <group colspan="2" col="2">
+                                <separator string="Procurement" colspan="2"/>
+                                <field name="type" select="2"/>
+                                <field name="procure_method"/>
+                                <field name="supply_method"/>
+                            </group>
+
+                            <group colspan="2" col="2">
+                                <separator string="Weigths" colspan="2"/>
+                                <field digits="(14, 3)" groups="base.group_extended" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                <field digits="(14, 3)" groups="base.group_extended" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                <field digits="(14, 3)" groups="base.group_extended" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="status">
+                                <separator string="Status" colspan="2"/>
+                                <field name="categ_id" select="1"/>
+                                <field name="state" select="2"/>
+                                <field groups="base.group_extended" name="product_manager" select="2"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="uom">
+                                <separator string="Lots" colspan="2"/>
+                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                <field name="uom_po_id"/>
+                                <field name="tracking"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="uom">
+                                <separator string="Second UoM" colspan="2"/>
+                                <field name="uos_id"/>
+                                <field name="uos_coeff"/>
+                                <field name="mes_type"/>
+                            </group>
+
                         </page>
-                        <page string="Procurement">
-                            <field name="supply_method"/>
-                            <field name="active" select="2"/>
-                            <newline/>
-                            <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                            <field name="sale_ok" select="2"/>
-                            <field name="produce_delay"/>
-                            <field name="purchase_ok" select="2"/>
-                            <field name="warranty"/>
-                            <field groups="base.group_extended" name="rental" select="2"/>
-                            <newline/>
-                            <field name="list_price"/>
+                        <page string="Procurement &amp; Locations">
+                            <group colspan="2" col="2" name="delay">
+                                <separator string="Delays" colspan="2"/>
+                                <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                <field name="produce_delay"/>
+                                <field name="warranty"/>
+                            </group>
+                            <group colspan="2" col="2" name="store">
+                                <separator string="Storage Localisation" colspan="2"/>
+                                <field name="loc_rack"/>
+                                <field name="loc_row"/>
+                                <field name="loc_case"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="misc">
+                                <separator string="Miscelleanous" colspan="2"/>
+                                <field name="active" select="2"/>
+                            </group>
+
+                        </page>
+                        <page string="Prices">
+                            <separator string="Base Prices" colspan="4"/>
                             <field name="standard_price"/>
+                            <field name="list_price"/>
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
-                            <field groups="base.group_uos" name="uos_id"/>
-                            <field groups="base.group_uos" name="uos_coeff"/>
-                            <newline/>
-                            <field colspan="4" name="seller_ids" nolabel="1" widget="one2many_list"/>
+                            <field colspan="4" name="seller_ids" nolabel="1" mode="form,tree"/>
                         </page>
                         <page string="Descriptions">
                             <separator string="Description"/>
@@ -79,8 +119,6 @@
                             <field colspan="4" name="description_purchase" nolabel="1"/>
                         </page>
                         <page groups="base.group_extended" string="Packaging">
-                            <field name="mes_type"/>
-                            <field name="tracking"/>
                             <field colspan="4" name="packaging" nolabel="1">
                                 <form string="Packaging">
                                     <field name="ean" select="1"/>
@@ -101,9 +139,6 @@
                                 </form>
                             </field>
                         </page>
-                        <page groups="base.group_extended" string="Properties">
-                            <properties/>
-                        </page>
                     </notebook>
                 </form>
             </field>
@@ -127,9 +162,7 @@
                     <field name="name" select="1"/>
                     <field name="parent_id"/>
                     <field name="sequence"/>
-                    <group colspan="4" groups="base.group_extended">
-                        <properties/>
-                    </group>
+                    <newline/>
                 </form>
             </field>
         </record>
@@ -165,12 +198,13 @@
         
         
         <record id="product_normal_action_tree" model="ir.actions.act_window">
-            <field name="name">product.normal.action.tree</field>
+            <field name="name" eval="False"/>
             <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">[('categ_id','child_of',[active_id])]</field>
+            <field name="context">{'categ_id':active_id}</field>
         </record>
         <record id="ir_product_category_open" model="ir.values">
             <field eval="'tree_but_open'" name="key2"/>
@@ -440,9 +474,6 @@
                             <separator string="Purchase Description"/>
                             <field colspan="4" name="description_purchase" nolabel="1"/>
                         </page>
-                        <page string="Properties">
-                            <properties/>
-                        </page>
                     </notebook>
                 </form>
             </field>
diff --git a/addons/profile_accounting/__init__.py b/addons/profile_accounting/__init__.py
index 1497184785b..b7dbe65518f 100644
--- a/addons/profile_accounting/__init__.py
+++ b/addons/profile_accounting/__init__.py
@@ -27,7 +27,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-
+import profile_accounting
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/profile_accounting/__terp__.py b/addons/profile_accounting/__terp__.py
index 0063ca497ed..01ccadd87ae 100644
--- a/addons/profile_accounting/__terp__.py
+++ b/addons/profile_accounting/__terp__.py
@@ -31,9 +31,9 @@
     "version":"1.0",
     "author":"Tiny",
     "category":"Profile",
-    "depends":["account","report_analytic","board_account","account_followup"],
+    "depends":["account","report_analytic","board_account","account_followup",'invoice_payment_tab'],
     "demo_xml":[],
-    "update_xml":[],
+    "update_xml":["profile_accounting.xml"],
     "active":False,
     "installable":True,
 }
diff --git a/addons/profile_accounting/profile_accounting.py b/addons/profile_accounting/profile_accounting.py
new file mode 100644
index 00000000000..a1bf4e8f1fd
--- /dev/null
+++ b/addons/profile_accounting/profile_accounting.py
@@ -0,0 +1,75 @@
+##############################################################################
+#
+# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
+#
+# $Id: __terp__.py 8595 2008-06-16 13:00:21Z stw $
+#
+# 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.
+###############################################################################
+
+from osv import fields, osv
+import pooler
+
+class config_install_extra_modules(osv.osv_memory):
+    _name='config.install_extra_modules'
+    _columns = {
+        'name':fields.char('Name', size=64),
+        'account_analytic_analysis':fields.boolean('Analytic Accounting'),
+        'account_analytic_plans':fields.boolean('Multiple Analytic Plans'),
+        'account_payment':fields.boolean('Suppliers Payment Management'),
+        'account_asset':fields.boolean('Asset Management'),
+        'hr_timesheet_invoice':fields.boolean('Invoice on Analytic Entries'),
+        'account_budget_crossover':fields.boolean('Analytic Budgets'),
+    }
+    def action_cancel(self,cr,uid,ids,conect=None):
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.module.module.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+         }
+        
+    
+    def action_install(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]:
+                    ids += mod_obj.search(cr, uid, [('name', '=', r)])
+                    mod_obj.action_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.module.module.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+            }
+    
+    
+config_install_extra_modules()
+
+# 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
new file mode 100644
index 00000000000..7d37d1704c1
--- /dev/null
+++ b/addons/profile_accounting/profile_accounting.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<terp>
+    <data>
+        <record id="view_confirm_install_module_form" model="ir.ui.view">
+            <field name="name">Install extra modules</field>
+            <field name="model">config.install_extra_modules</field>
+            <field name="type">form</field>
+            <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_crossover"/>
+                    <field name="account_asset"/>
+                    <separator string="Services Management" colspan="4"/>
+                    <field name="hr_timesheet_invoice"/>
+					<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>
+            </field>
+        </record>
+
+        <record id="action_config_install_module" model="ir.actions.act_window">
+            <field name="name">Install Extra Modules</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">config.install_extra_modules</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+      <record model="ir.module.module.configuration.step"
+            id="config_install_module">
+            <field name="name">Install Extra modules</field>
+            <field name="note">Install more modules. A few modules are proposed according to the service profile you selected. You will be able to install them based on our requirements.</field>
+            <field name="action_id" ref="action_config_install_module"/>
+            <field name="state">open</field>
+        </record>
+    </data>
+</terp>
diff --git a/addons/profile_association/__init__.py b/addons/profile_association/__init__.py
new file mode 100644
index 00000000000..0e719215d97
--- /dev/null
+++ b/addons/profile_association/__init__.py
@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2007 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 profile_association
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/profile_association/__terp__.py b/addons/profile_association/__terp__.py
new file mode 100644
index 00000000000..db1bfc86d97
--- /dev/null
+++ b/addons/profile_association/__terp__.py
@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+{
+    "name":"Association profile",
+    "version":"0.1",
+    "author":"Tiny",
+    "category":"Profile",
+    "depends":["membership", "event", "association_vertical", "board_association"],
+    "demo_xml":[],
+    "update_xml":["profile_association.xml"],
+    "active":False,
+    "installable":True,
+    }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/profile_association/profile_association.py b/addons/profile_association/profile_association.py
new file mode 100644
index 00000000000..cb962c77d3f
--- /dev/null
+++ b/addons/profile_association/profile_association.py
@@ -0,0 +1,73 @@
+##############################################################################
+#
+# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
+#
+# $Id: __terp__.py 8595 2008-06-16 13:00:21Z stw $
+#
+# 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.
+###############################################################################
+
+from osv import fields, osv
+import pooler
+
+
+class config_install_extra_modules(osv.osv_memory):
+    _name='config.install_extra_modules'
+    _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."),
+        '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'),
+        'event' : fields.boolean('Events Organisation'),
+        'crm' : fields.boolean('Fund Raising'),
+    }
+    def action_cancel(self,cr,uid,ids,conect=None):
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.module.module.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+         }
+        
+    
+    def action_install(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]:
+                    ids = mod_obj.search(cr, uid, [('name', '=', r)])
+                    mod_obj.action_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.module.module.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+            }
+    
+    
+config_install_extra_modules()
+
+# 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
new file mode 100644
index 00000000000..3dd394c4ff7
--- /dev/null
+++ b/addons/profile_association/profile_association.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<terp>
+    <data>
+        <record id="view_confirm_install_module_form" model="ir.ui.view">
+            <field name="name">Install extra modules</field>
+            <field name="model">config.install_extra_modules</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Install Extra Module">
+					<separator string="Project Management" colspan="4"/>
+                    <field name="project"/>
+                    <field name="event"/>
+                    <separator string="Resources Management" colspan="4"/>
+                    <field name="hr_expense"/>
+                    <separator string="Relationship Management" colspan="4"/>
+                    <field name="crm_configuration"/>
+                    <field name="crm"/>
+					<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>
+            </field>
+        </record>
+
+        <record id="action_config_install_module" model="ir.actions.act_window">
+            <field name="name">Install Extra Modules</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">config.install_extra_modules</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+      <record model="ir.module.module.configuration.step"
+            id="config_install_module">
+            <field name="name">Install Extra modules</field>
+            <field name="note">Install more modules. A few modules are proposed according to the service profile you selected. You will be able to install them based on our requirements.</field>
+            <field name="action_id" ref="action_config_install_module"/>
+            <field name="state">open</field>
+        </record>
+    </data>
+</terp>
diff --git a/addons/profile_auction/__init__.py b/addons/profile_auction/__init__.py
new file mode 100644
index 00000000000..f3762e3825f
--- /dev/null
+++ b/addons/profile_auction/__init__.py
@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 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.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/profile_auction/__terp__.py b/addons/profile_auction/__terp__.py
new file mode 100644
index 00000000000..df4a2f16e2d
--- /dev/null
+++ b/addons/profile_auction/__terp__.py
@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+{
+    "name":"Auction house profile",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Profile",
+    "depends":["auction", "board_auction","account","hr_timesheet_sheet"],
+    "demo_xml":[],
+    "update_xml":[],
+    "active":False,
+    "installable":True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/profile_crm/__init__.py b/addons/profile_crm/__init__.py
new file mode 100644
index 00000000000..f3762e3825f
--- /dev/null
+++ b/addons/profile_crm/__init__.py
@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 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.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/profile_crm/__terp__.py b/addons/profile_crm/__terp__.py
new file mode 100644
index 00000000000..843e660133f
--- /dev/null
+++ b/addons/profile_crm/__terp__.py
@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+{
+    "name":"CRM profile",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Profile",
+    "depends":[
+        "crm_vertical", "board_crm_configuration",
+    ], 
+    "demo_xml":[],
+    "update_xml":[],
+    "active":False,
+    "installable":True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/profile_manufacturing/__init__.py b/addons/profile_manufacturing/__init__.py
index 1497184785b..cbaf21c1bc4 100644
--- a/addons/profile_manufacturing/__init__.py
+++ b/addons/profile_manufacturing/__init__.py
@@ -27,7 +27,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-
+import profile_manufacturing
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/profile_manufacturing/__terp__.py b/addons/profile_manufacturing/__terp__.py
index f8d07a622b2..4cc913ecb9d 100644
--- a/addons/profile_manufacturing/__terp__.py
+++ b/addons/profile_manufacturing/__terp__.py
@@ -33,7 +33,7 @@
     "category":"Profile",
     "depends":["mrp", "crm", "sale", "delivery","board_manufacturing"],
     "demo_xml":[],
-    "update_xml":[],
+    "update_xml":["profile_manufacturing.xml"],
     "active":False,
     "installable":True,
 }
diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py
new file mode 100644
index 00000000000..a489fd74e01
--- /dev/null
+++ b/addons/profile_manufacturing/profile_manufacturing.py
@@ -0,0 +1,75 @@
+##############################################################################
+#
+# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
+#
+# $Id: __terp__.py 8595 2008-06-16 13:00:21Z stw $
+#
+# 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.
+###############################################################################
+
+from osv import fields, osv
+import pooler
+
+
+class config_install_extra_modules(osv.osv_memory):
+    _name='config.install_extra_modules'
+    _columns = {
+        'name':fields.char('Name', size=64),
+        'mrp_jit':fields.boolean('Just in Time Scheduling'),
+        'sale_margin':fields.boolean('Margins on Sales Order'),
+        'crm_configuration':fields.boolean('CRM & Calendars'),
+        'sale_journal':fields.boolean('Manage by Journals'),
+        'project':fields.boolean('Project Management'),
+    }
+    def action_cancel(self,cr,uid,ids,conect=None):
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.module.module.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+         }
+        
+    
+    def action_install(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]:
+                    ids = mod_obj.search(cr, uid, [('name', '=', r)])
+                    mod_obj.action_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.module.module.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+            }
+    
+    
+config_install_extra_modules()
+
+# 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
new file mode 100644
index 00000000000..dd976b823f2
--- /dev/null
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<terp>
+    <data>
+        <record id="view_confirm_install_module_form" model="ir.ui.view">
+            <field name="name">Install extra modules</field>
+            <field name="model">config.install_extra_modules</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Install Extra Module">
+					<separator string="Manufacturing Management" colspan="4"/>
+                    <field name="mrp_jit"/>
+                    <separator string="Sale Management" colspan="4"/> 
+                    <field name="sale_margin"/>
+                    <field name="sale_journal"/>
+                    <separator string="Relationship Management" colspan="4"/> 
+                    <field name="crm_configuration"/>                    
+                    <separator string="Project Management" colspan="4"/>
+                    <field name="project"/>
+					<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>
+            </field>
+        </record>
+
+        <record id="action_config_install_module" model="ir.actions.act_window">
+            <field name="name">Install Extra Modules</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">config.install_extra_modules</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+      <record model="ir.module.module.configuration.step"
+            id="config_install_module">
+            <field name="name">Install Extra modules</field>
+            <field name="note">Install more modules. A few modules are proposed according to the service profile you selected. You will be able to install them based on our requirements.</field>
+            <field name="action_id" ref="action_config_install_module"/>
+            <field name="state">open</field>
+        </record>
+    </data>
+</terp>
diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index 585105c3308..95ac4cd6d99 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -30,67 +30,19 @@
 from osv import fields, osv
 import pooler
 
-##class config_install_extra_modules(osv.osv_memory):
-##    _name='config.install_extra_modules'
-##    def _get_uninstall_modules(self,cr,uid,context=None):
-##        module_obj=self.pool.get('ir.module.module')
-##        line_obj=self.pool.get('config.install_extra_modules.line')
-##        uninstall_module_ids=module_obj.search(cr,uid,[('state', 'in', ['uninstalled', 'uninstallable'])])
-##        res=[]
-##        for id in uninstall_module_ids:
-##            res.append(line_obj.create(cr,uid,{'module_id':id},context=None))
-##        print res
-##        return res
-##    _columns = {
-##        'name':fields.char('Name', size=64),
-##        'module_ids':fields.one2many('config.install_extra_modules.line', 'config_id', 'Modules'),
-##
-##    }
-##    _defaults={
-##       'module_ids':_get_uninstall_modules
-##    }
-##    def action_install(self, cr, uid, ids, context=None):
-##        res=self.read(cr,uid,ids)[0]
-##        mod_obj = self.pool.get('ir.module.module')
-##        line_obj=self.pool.get('config.install_extra_modules.line')
-##        if 'module_ids' in res:
-##            module_ids=res['module_ids']
-##            lines=line_obj.read(cr,uid,module_ids)
-##            for line in lines:
-##                if 'install' in line and 'module_id' and line and line['install']:
-##                    mod_obj.download(cr, uid, [line['module_id']], context=context)
-##                    cr.commit()
-##                    db, pool = pooler.restart_pool(cr.dbname, update_module=True)
-##        return {
-##                'view_type': 'form',
-##                "view_mode": 'form',
-##                'res_model': 'ir.module.module.configuration.wizard',
-##                'type': 'ir.actions.act_window',
-##                'target':'new',
-##            }
-##
-##config_install_extra_modules()
-#
-#class config_install_extra_modules_line(osv.osv_memory):
-#    _name='config.install_extra_modules.line'
-#    _columns = {
-#        'name':fields.char('Name', size=64),
-#        'install':fields.boolean('Install'),
-#        'config_id': fields.many2one('config.install_extra_modules', 'Configuration Module Wizard'),
-#        'module_id':fields.many2one('ir.module.module', 'Module',readonly=True,required=True),
-#
-#    }
-#
-#
-#config_install_extra_modules_line()
-
 class config_install_extra_modules(osv.osv_memory):
     _name='config.install_extra_modules'
+    _rec_name = 'crm_configuration'
     _columns = {
-        'name':fields.char('Name', size=64),
-        'timesheets_module':fields.boolean('Timesheets Management'),
-        'holidays_module':fields.boolean('Hollidays Management'),
-
+        '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."),
+        'hr_timesheet':fields.boolean('Timesheets', help="Timesheets allows you to track time and costs spent on different projects, represented by analytic accounts."),
+        'hr_timesheet_invoice':fields.boolean('Invoice on Timesheets', help="There are different invoicing methods in OpenERP: from sale orders, from shippings, ... Install this module if you plan to invoice your customers based on time spent on projects."),
+        'hr_holidays':fields.boolean('Holidays Management', help="Tracks the full holidays management process, from the employee's request to the global planning."),
+        '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."),
+        'account_budget_crossover':fields.boolean('Analytic Budgets', help="Allows you to manage analytic budgets by journals. This module is used to manage budgets of your projects."),
+        'project_gtd':fields.boolean('Getting Things Done', help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
+        'scrum':fields.boolean('Scrum Methodology', help="Scrum is an 'agile development methodology', mainly used in IT projects. It helps you to manage teams, long term roadmaps, sprints, and so on."),
+        'base_contact':fields.boolean('Contacts Management', help="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."),
     }
     def action_cancel(self,cr,uid,ids,conect=None):
         return {
@@ -101,18 +53,15 @@ class config_install_extra_modules(osv.osv_memory):
                 'target':'new',
          }
     def action_install(self, cr, uid, ids, context=None):
-        res=self.read(cr,uid,ids)[0]
+        result=self.read(cr,uid,ids)        
         mod_obj = self.pool.get('ir.module.module')
-        if 'timesheets_module' in res and res['timesheets_module']:
-            ids = mod_obj.search(cr, uid, [('name', '=', 'hr_timesheet')])
-            mod_obj.download(cr, uid, ids, context=context)
-            cr.commit()
-            #db, pool = pooler.restart_pool(cr.dbname, update_module=True)
-        if  'hr_holidays_module' in res and res['hr_holidays_module']:
-            ids = mod_obj.search(cr, uid, [('name', '=', 'hr_holidays')])
-            mod_obj.download(cr, uid, ids, context=context)
-            cr.commit()
-            #db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+        for res in result:
+            for r in res:
+                if r<>'id' and res[r]:                
+                    ids = mod_obj.search(cr, uid, [('name', '=', r)])   
+                    mod_obj.action_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',
@@ -120,7 +69,6 @@ class config_install_extra_modules(osv.osv_memory):
                 'type': 'ir.actions.act_window',
                 'target':'new',
             }
-
 config_install_extra_modules()
 
 # 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 3603841cee5..e3a4dbc26b1 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -7,11 +7,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Install Extra Module">
-                    <separator colspan="4" string="Install More Modules"/>
-                    <field name="timesheets_module"/>
-                    <field name="holidays_module"/>
-					<separator string="" colspan="4"/>
-					<label string="" colspan="2"/>
+                    <separator string="Services Management" colspan="4"/>
+                    <field name="hr_timesheet"/>
+                    <field name="hr_timesheet_invoice"/>
+                    <field name="project_gtd"/>
+                    <field name="scrum"/>
+
+                    <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"/>
+
+                    <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"/>
@@ -32,7 +44,7 @@
       <record model="ir.module.module.configuration.step"
             id="config_install_module">
             <field name="name">Install Extra modules</field>
-            <field name="note">Install more modules. A few modules are proposed according to the service profile you selected. You will be able to install them based on our requirements.</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"/>
             <field name="state">open</field>
         </record>
diff --git a/addons/project/project.py b/addons/project/project.py
index 971f4eddcd9..e0177fbb467 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -92,6 +92,16 @@ class project(osv.osv):
         pricelist = self.pool.get('res.partner').browse(cr, uid, part).property_product_pricelist.id
         return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist}}
 
+    def _progress_rate(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for project in self.browse(cursor, user, ids, context=context):
+            tot = 0.0
+            if project.state not in ('cancelled'):
+                tot += project.effective_hours * 100.0 / project.planned_hours
+            res[project.id] = tot
+        return res
+
+
     _columns = {
         'name': fields.char("Project name", size=128, required=True),
         'active': fields.boolean('Active'),
@@ -105,6 +115,7 @@ class project(osv.osv):
         'child_id': fields.one2many('project.project', 'parent_id', 'Subproject'),
         'planned_hours': fields.function(_calc_planned, method=True, string='Planned hours'),
         'effective_hours': fields.function(_calc_effective, method=True, string='Hours spent'),
+        'progress_rate': fields.function(_progress_rate, method=True, string='Progress', type='float'),
         'date_start': fields.date('Project started on'),
         'date_end': fields.date('Project should end on'),
         'tariff': fields.float('Sales price'),
@@ -123,7 +134,7 @@ class project(osv.osv):
         'warn_footer': fields.text('Mail footer'),
         'notes': fields.text('Notes'),
         'timesheet_id': fields.many2one('hr.timesheet.group', 'Working hours'),
-        'state': fields.selection([('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True),
+        'state': fields.selection([('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', required=True),
      }
 
     _defaults = {
@@ -203,14 +214,23 @@ class task(osv.osv):
             res[task_id] = sum
         return res
 
+    def _progress_rate(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for task in self.browse(cursor, user, ids, context=context):
+            tot = 0.0
+            if task.state not in ('draft','cancelled'):
+                tot += task.effective_hours * 100.0 / task.planned_hours
+            res[task.id] = tot
+        return res
+
     _columns = {
-        'name': fields.char('Task summary', size=128, required=True),
         'active': fields.boolean('Active'),
+        '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'),
         'type': fields.many2one('project.task.type', 'Type'),
-        'state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State'),
+        'state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status'),
         'date_start': fields.datetime('Date'),
         'date_deadline': fields.datetime('Deadline'),
         'date_close': fields.datetime('Date Closed', readonly=True),
@@ -222,6 +242,7 @@ class task(osv.osv):
         'start_sequence': fields.boolean('Wait for previous sequences'),
         'planned_hours': fields.float('Plan. hours'),
         'effective_hours': fields.function(_hours_effect, method=True, string='Eff. Hours'),
+        'progress_rate': fields.function(_progress_rate, method=True, string='Progress', type='float'),
         'progress': fields.integer('Progress (0-100)'),
         'billable': fields.boolean('To be invoiced'),
         'invoice_id': fields.many2one('account.invoice','Generated Invoice'),
@@ -237,6 +258,7 @@ class task(osv.osv):
         'sequence': lambda *a: 10,
         'active': lambda *a: True,
         'date_start': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'start_sequence': lambda *a: True
     }
     _order = "state, sequence, priority, date_deadline, id"
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4ebf181b159..b49885c4bd7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,8 +2,8 @@
 <terp>
     <data>
         <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
-        <menuitem  id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="1"/>
-        
+        <menuitem id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="1"/>
+
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
             <field name="name">project.project.form</field>
@@ -74,7 +74,7 @@
                                             <field name="effective_hours" widget="float_time"/>
                                             <separator colspan="4" string="Description"/>
                                             <field colspan="4" name="description" nolabel="1"/>
-                                            
+
                                             <group col="11" colspan="4">
                                                 <field name="state" select="1"/>
                                                 <button name="do_draft" states="open" string="Set Draft" type="object"/>
@@ -117,6 +117,7 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="date_deadline"/>
+                                    <field name="progress_rate" widget="progressbar"/>
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="state"/>
@@ -143,6 +144,7 @@
                     <field name="partner_id"/>
                     <field name="planned_hours" widget="float_time"/>
                     <field name="effective_hours" widget="float_time"/>
+                    <field name="progress_rate" widget="progressbar"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -155,7 +157,7 @@
             <field name="view_id" ref="view_project"/>
         </record>
         <menuitem action="open_view_all_project" id="menu_all_project" parent="project.menu_main"/>
-        
+
         <record id="open_view_all_project_unclosed" model="ir.actions.act_window">
             <field name="name">Unclosed projects</field>
             <field name="res_model">project.project</field>
@@ -164,8 +166,8 @@
             <field name="view_id" ref="view_project"/>
         </record>
         <menuitem action="open_view_all_project_unclosed" id="menu_all_project_unclosed" parent="project.menu_all_project"/>
-        
-        
+
+
         <record id="open_view_all_project_unclosed_open" model="ir.actions.act_window">
             <field name="name">Open projects</field>
             <field name="res_model">project.project</field>
@@ -174,8 +176,8 @@
             <field name="view_id" ref="view_project"/>
         </record>
         <menuitem action="open_view_all_project_unclosed_open" id="menu_all_project_unclosed_open" parent="project.menu_all_project_unclosed"/>
-        
-        
+
+
         <record id="open_view_project_open" model="ir.actions.act_window">
             <field name="name">Open projects</field>
             <field name="res_model">project.project</field>
@@ -184,8 +186,8 @@
             <field name="view_id" ref="view_project"/>
         </record>
         <menuitem id="next_id_54" name="Projects" parent="project.menu_definitions"/><menuitem action="open_view_project_open" id="menu_open_view_project_open" parent="next_id_54"/>
-        
-        
+
+
         <record id="open_view_project" model="ir.actions.act_window">
             <field name="name">Projects</field>
             <field name="res_model">project.project</field>
@@ -194,7 +196,7 @@
             <field name="view_id" ref="view_project"/>
         </record>
         <menuitem action="open_view_project" id="menu_open_view_project" parent="project.menu_definitions"/>
-        
+
         <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>
@@ -208,7 +210,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_task_work_tree" model="ir.ui.view">
             <field name="name">project.task.work.tree</field>
             <field name="model">project.task.work</field>
@@ -222,7 +224,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_my_project" model="ir.ui.view">
             <field name="name">project.project.tree</field>
             <field name="model">project.project</field>
@@ -234,6 +236,7 @@
                     <field name="partner_id"/>
                     <field name="planned_hours" widget="float_time"/>
                     <field name="effective_hours" widget="float_time"/>
+                    <field name="progress_rate" widget="progressbar"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -246,8 +249,8 @@
             <field name="view_id" ref="view_my_project"/>
         </record>
         <menuitem action="open_view_my_project" id="menu_open_view_my_project" parent="project.menu_main"/>
-        
-        
+
+
         <record id="open_view_my_project_open_unclosed" model="ir.actions.act_window">
             <field name="name">My unclosed projects</field>
             <field name="res_model">project.project</field>
@@ -256,8 +259,8 @@
             <field name="view_id" ref="view_my_project"/>
         </record>
         <menuitem action="open_view_my_project_open_unclosed" id="menu_open_view_my_project_open_unclosed" parent="project.menu_open_view_my_project"/>
-        
-        
+
+
         <record id="open_view_my_project_open" model="ir.actions.act_window">
             <field name="name">My open projects</field>
             <field name="res_model">project.project</field>
@@ -266,7 +269,7 @@
             <field name="view_id" ref="view_my_project"/>
         </record>
         <menuitem action="open_view_my_project_open" id="menu_open_view_my_project_open" parent="project.menu_open_view_my_project_open_unclosed"/>
-        
+
         <!-- Task -->
         <record id="view_task_form2" model="ir.ui.view">
             <field name="name">project.task.form</field>
@@ -298,7 +301,7 @@
                                 <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action"/>
                                 <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
-                                
+
                             </group>
                         </page>
                         <page groups="base.group_extended" string="Delegations">
@@ -345,6 +348,7 @@
                     <field name="project_id"/>
                     <field name="user_id"/>
                     <field name="date_deadline"/>
+                    <field name="progress_rate" widget="progressbar"/>
                     <field name="planned_hours" sum="Planned hours" widget="float_time"/>
                     <field name="effective_hours" sum="Effective hours" widget="float_time"/>
                     <field name="priority"/>
@@ -352,7 +356,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_task_calendar" model="ir.ui.view">
             <field name="name">project.task.calendar</field>
             <field name="model">project.task</field>
@@ -365,7 +369,7 @@
                 </calendar>
             </field>
         </record>
-        
+
         <record id="action_view_task" model="ir.actions.act_window">
             <field name="name">All Tasks</field>
             <field name="res_model">project.task</field>
@@ -374,7 +378,7 @@
             <field eval="False" name="view_id"/>
         </record>
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_main"/>
-        
+
         <record id="action_view_task2" model="ir.actions.act_window">
             <field name="name">Unbilled closed tasks</field>
             <field name="res_model">project.task</field>
@@ -383,9 +387,9 @@
             <field name="domain">[('state','=','done'), ('billable','=',True), ('invoice_id','=',False)]</field>
         </record>
         <menuitem groups="base.group_extended" id="menu_action_billable" name="Billable Tasks" parent="project.menu_action_view_task"/>
-        
+
         <menuitem action="action_view_task2" id="menu_action_view_task2" parent="project.menu_action_billable"/>
-        
+
         <record id="action_view_task3" model="ir.actions.act_window">
             <field name="name">Unbilled open tasks</field>
             <field name="res_model">project.task</field>
@@ -394,7 +398,7 @@
             <field name="domain">[('state','=','open'), ('billable','=',True), ('invoice_id','=',False)]</field>
         </record>
         <menuitem action="action_view_task3" id="menu_action_view_task3" parent="project.menu_action_billable"/>
-        
+
         <record id="action_view_task4" model="ir.actions.act_window">
             <field name="name">My Tasks</field>
             <field name="res_model">project.task</field>
@@ -403,7 +407,7 @@
             <field name="domain">[('user_id', '=', uid)]</field>
         </record>
         <menuitem action="action_view_task4" id="menu_action_view_task4" parent="project.menu_main"/>
-        
+
         <record id="action_view_task5_pending" model="ir.actions.act_window">
             <field name="name">My Pending Tasks</field>
             <field name="res_model">project.task</field>
@@ -412,7 +416,7 @@
             <field name="domain">[('user_id', '=', uid),('state','=','pending')]</field>
         </record>
         <menuitem action="action_view_task5_pending" id="menu_tasks_yours_pending" parent="menu_action_view_task4"/>
-        
+
         <record id="action_view_task5" model="ir.actions.act_window">
             <field name="name">My Open Tasks</field>
             <field name="res_model">project.task</field>
@@ -421,7 +425,7 @@
             <field name="domain">[('user_id', '=', uid),('state','=','open')]</field>
         </record>
         <menuitem action="action_view_task5" id="menu_tasks_yours" parent="menu_action_view_task4"/>
-        
+
         <record id="action_view_task5_prog" model="ir.actions.act_window">
             <field name="name">My Tasks in Progress</field>
             <field name="res_model">project.task</field>
@@ -438,7 +442,7 @@
             <field name="view_mode">form,tree</field>
         </record>
         <menuitem action="action_view_task_new" id="menu_action_view_task_new" parent="menu_action_view_task4"/>
-                
+
         <record id="action_view_task6" model="ir.actions.act_window">
             <field name="name">Open Tasks</field>
             <field name="res_model">project.task</field>
@@ -447,7 +451,7 @@
             <field name="domain">[('state', '=', 'open')]</field>
         </record>
         <menuitem action="action_view_task6" id="menu_action_view_task6" parent="project.menu_action_view_task"/>
-        
+
         <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>
@@ -456,7 +460,7 @@
             <field name="domain">[('state', '=', 'progress')]</field>
         </record>
         <menuitem action="action_view_task6_prog" id="menu_action_view_task6_prog" parent="project.menu_action_view_task"/>
-        
+
         <record id="action_view_task7" model="ir.actions.act_window">
             <field name="name">Unassigned Tasks</field>
             <field name="res_model">project.task</field>
@@ -465,7 +469,7 @@
             <field name="domain">[('user_id', '=', False)]</field>
         </record>
         <menuitem action="action_view_task7" id="menu_action_view_task7" parent="project.menu_action_view_task"/>
-        
+
         <!-- Opening task when double clicking on project -->
         <record id="dblc_proj" model="ir.actions.act_window">
             <field name="res_model">project.task</field>
@@ -481,7 +485,7 @@
             <field eval="'ir.actions.act_window,'+str(dblc_proj)" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
+
         <!-- Task types -->
         <record id="task_type_edit" model="ir.ui.view">
             <field name="name">project.task.type.form</field>
@@ -511,14 +515,14 @@
             <field name="view_id" ref="task_type_tree"/>
         </record>
         <menuitem action="open_task_type_form" id="menu_task_types" parent="project.menu_definitions"/>
-        
+
         <act_window domain="[('manager', '=', active_id)]" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
-        
+
         <act_window domain="[('project_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_project_project_2_project_task_opened" name="Opened tasks" res_model="project.task" src_model="project.project" view_mode="tree,form" view_type="form"/>
-        
+
         <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" 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>
 </terp>
diff --git a/addons/project_gtd/__init__.py b/addons/project_gtd/__init__.py
new file mode 100644
index 00000000000..816ec923fe1
--- /dev/null
+++ b/addons/project_gtd/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+import project_gtd
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_gtd/__terp__.py b/addons/project_gtd/__terp__.py
new file mode 100644
index 00000000000..c236f95943e
--- /dev/null
+++ b/addons/project_gtd/__terp__.py
@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Getting Things Done - Time Management Module",
+    "version": "1.0",
+    "author" : "Tiny",
+    "category" : "Generic Modules/Projects & Services",
+    "depends" : ["project"],
+    "description": "",
+    "init_xml" : [],
+    "demo_xml" : ["project_gtd_demo.xml"],
+    "update_xml": ["project_gtd_view.xml","project_gtd_wizard.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
new file mode 100644
index 00000000000..5af6b328e60
--- /dev/null
+++ b/addons/project_gtd/project_gtd.py
@@ -0,0 +1,187 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: project.py 1011 2005-07-26 08:11:45Z nicoe $
+#
+# 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.
+#
+##############################################################################
+
+from xml import dom
+
+
+from mx import DateTime
+from mx.DateTime import now
+import time
+
+import netsvc
+from osv import fields, osv
+import ir
+
+
+class one2many_mod(fields.one2many):
+    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
+        if not context:
+            context = {}
+        res = {}
+        num = name[4]
+        for obj in obj.browse(cr, user, ids, context=context):
+            res[obj.id] = []
+            v = getattr(obj,'context'+num+'_id').id
+            if v:
+                ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'=',obj.id),('context_id','=',v)], limit=self._limit)
+                for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
+                    res[r[self._fields_id]].append( r['id'] )
+        return res
+
+class project_gtd_context(osv.osv):
+    _name = "project.gtd.context"
+    _columns = {
+        'name': fields.char('Context', size=64, required=True, select=1),
+        'sequence': fields.integer('Sequence'),
+        'project_default_id': fields.many2one('project.project', 'Default Project', required=True),
+    }
+    _defaults = {
+        'sequence': lambda *args: 1
+    }
+    _order = "sequence, name"
+project_gtd_context()
+
+
+class project_gtd_timebox(osv.osv):
+    _name = "project.gtd.timebox"
+    _columns = {
+        'name': fields.char('Timebox', size=64, required=True, select=1),
+        'user_id': fields.many2one('res.users', 'User', required=True, select=1),
+        'child_ids': fields.one2many('project.gtd.timebox', 'parent_id', 'Childs Timebox'),
+        'parent_id': fields.many2one('project.gtd.timebox', 'Parent Timebox'),
+        'task_ids': fields.one2many('project.task', 'timebox_id', 'Tasks'),
+        'type': fields.selection([('daily','Daily'),('weekly','Weekly'),('monthly','Monthly'),('other','Other')], 'Type', required=True),
+        'task1_ids': one2many_mod('project.task', 'timebox_id', 'Tasks'),
+        'task2_ids': one2many_mod('project.task', 'timebox_id', 'Tasks'),
+        'task3_ids': one2many_mod('project.task', 'timebox_id', 'Tasks'),
+        'task4_ids': one2many_mod('project.task', 'timebox_id', 'Tasks'),
+        'task5_ids': one2many_mod('project.task', 'timebox_id', 'Tasks'),
+        'task6_ids': one2many_mod('project.task', 'timebox_id', 'Tasks'),
+        'context1_id': fields.many2one('project.gtd.context', 'Context 1', required=True),
+        'context2_id': fields.many2one('project.gtd.context', 'Context 2'),
+        'context3_id': fields.many2one('project.gtd.context', 'Context 3'),
+        'context4_id': fields.many2one('project.gtd.context', 'Context 4'),
+        'context5_id': fields.many2one('project.gtd.context', 'Context 5'),
+        'context6_id': fields.many2one('project.gtd.context', 'Context 6'),
+        'col_project': fields.boolean('Project'),
+        'col_date_start': fields.boolean('Date Start'),
+        'col_priority': fields.boolean('Priority'),
+        'col_deadline': fields.boolean('Deadline'),
+        'col_planned_hours': fields.boolean('Planned Hours'),
+        'col_effective_hours': fields.boolean('Effective Hours'),
+    }
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+        res = super(project_gtd_timebox,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+        if (res['type']=='form') and ('record_id' in context):
+            if context['record_id']:
+                rec = self.browse(cr, uid, int(context['record_id']), context)
+            else:
+                iids = self.search(cr,uid, [('user_id','=',uid),('parent_id','=',False)], context=context)
+                if len(iids):
+                    rec = self.browse(cr, uid, int(iids[0]), context=context)
+                else:
+                    return res
+            res['arch'] = """
+    <form string="Daily Timebox">
+        <field name="name" readonly="1"/>
+        <notebook position="top">
+            """
+            for i in range(1,7):
+                if not getattr(rec, 'context%d_id'%i):
+                    continue
+                res['arch']+= """
+            <page string="%s">
+                <field name="%s" colspan="4" nolabel="1">
+                    <tree editable="bottom" colors="grey:state in ('done','pending');red:state=='cancelled'" string="Tasks">
+                        <field name="name"/>
+                """ % (getattr(rec, 'context%d_id'%(i,)).name, 'task%d_ids'%(i,))
+                if rec.col_project:
+                    res['arch'] += '<field name="project_id" required="1"/>\n'
+                if rec.col_date_start:
+                    res['arch'] += '<field name="date_start"/>\n'
+                if rec.col_priority:
+                    res['arch'] += '<field name="priority"/>\n'
+                if rec.col_deadline:
+                    res['arch'] += '<field name="date_deadline"/>\n'
+                if rec.col_planned_hours:
+                    res['arch'] += '<field name="planned_hours"  widget="float_time" sum="Est. Hours"/>\n'
+                if rec.col_effective_hours:
+                    res['arch'] += '<field name="effective_hours"  widget="float_time" sum="Eff. Hours"/>\n'
+                res['arch'] += """
+                        <field name="state" readonly="1"/>
+                    </tree>
+                </field>
+            </page>
+                """
+
+            res['arch']+="""
+        </notebook>
+    </form>
+            """
+        doc = dom.minidom.parseString(res['arch'])
+        xarch, xfields = self._view_look_dom_arch(cr, uid, doc, context=context)
+        res['arch'] = xarch
+        res['fields'] = xfields
+        return res
+    _defaults = {
+        'type': lambda *args: 'daily',
+        'col_project': lambda *args: True,
+        'col_date_start': lambda *args: True,
+        'col_priority': lambda *args: True,
+        'col_deadline': lambda *args: False,
+        'col_planned_hours': lambda *args: True,
+        'col_effective_hours': lambda *args: False
+    }
+project_gtd_timebox()
+
+class project_task(osv.osv):
+    _inherit = "project.task"
+    _columns = {
+        'timebox_id': fields.many2one('project.gtd.timebox', "Timebox"),
+        'context_id': fields.many2one('project.gtd.context', "Context"),
+     }
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default['timebox_id']=False
+        default['context_id']=False
+        return super(project_task,self).copy(cr, uid, id, default, context)
+    def _get_context(self,cr, uid, ctx):
+        ids = self.pool.get('project.gtd.context').search(cr, uid, [], context=ctx)
+        return ids and ids[0] or False
+    _defaults = {
+        'context_id': _get_context
+    }
+    # Override read for using this method if context set !!!
+    #_order = "((55-ascii(coalesce(priority,'2')))*2 +  coalesce((date_start::date-current_date)/2,8))"
+project_task()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml
new file mode 100644
index 00000000000..56d8dda0b19
--- /dev/null
+++ b/addons/project_gtd/project_gtd_demo.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+
+	<record model="project.gtd.context" id="context_office">
+		<field name="name">Office</field>
+		<field name="sequence">0</field>
+		<field name="project_default_id" ref="project.project_project_9"/>
+	</record>
+	<record model="project.gtd.context" id="context_travel">
+		<field name="name">Travel</field>
+		<field name="sequence">2</field>
+		<field name="project_default_id" ref="project.project_project_9"/>
+	</record>
+	<record model="project.gtd.context" id="context_car">
+		<field name="name">Car</field>
+		<field name="sequence">1</field>
+		<field name="project_default_id" ref="project.project_project_9"/>
+	</record>
+	<record model="project.gtd.context" id="context_home">
+		<field name="name">Home</field>
+		<field name="sequence">3</field>
+		<field name="project_default_id" ref="project.project_project_9"/>
+	</record>
+
+	<record model="project.gtd.timebox" id="timebox_daily">
+		<field name="name">Daily</field>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="type">daily</field>
+		<field name="context1_id" ref="context_office"/>
+		<field name="context2_id" ref="context_car"/>
+		<field name="context3_id" ref="context_travel"/>
+		<field name="context4_id" ref="context_home"/>
+		<field name="col_project" eval="False"/>
+		<field name="col_effective_hours" eval="True"/>
+		<field name="col_date_start" eval="False"/>
+	</record>
+	<record model="project.gtd.timebox" id="timebox_weekly">
+		<field name="name">Weekly</field>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="parent_id" ref="timebox_daily"/>
+		<field name="type">weekly</field>
+		<field name="context1_id" ref="context_office"/>
+		<field name="context2_id" ref="context_car"/>
+		<field name="context3_id" ref="context_travel"/>
+		<field name="context4_id" ref="context_home"/>
+		<field name="col_deadline" eval="True"/>
+		<field name="col_effective_hours" eval="True"/>
+	</record>
+	<record model="project.gtd.timebox" id="timebox_monthly">
+		<field name="name">Monthly</field>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="type">other</field>
+		<field name="parent_id" ref="timebox_weekly"/>
+		<field name="context1_id" ref="context_office"/>
+		<field name="context2_id" ref="context_car"/>
+		<field name="context3_id" ref="context_travel"/>
+		<field name="context4_id" ref="context_home"/>
+		<field name="col_deadline" eval="True"/>
+		<field name="col_effective_hours" eval="True"/>
+	</record>
+	<record model="project.gtd.timebox" id="timebox_lt">
+		<field name="name">Long Term</field>
+		<field name="user_id" ref="base.user_admin"/>
+		<field name="type">other</field>
+		<field name="parent_id" ref="timebox_monthly"/>
+		<field name="context1_id" ref="context_office"/>
+		<field name="context2_id" ref="context_car"/>
+		<field name="context3_id" ref="context_travel"/>
+		<field name="context4_id" ref="context_home"/>
+		<field name="col_deadline" eval="True"/>
+		<field name="col_effective_hours" eval="True"/>
+	</record>
+
+	</data>
+</terp>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
new file mode 100644
index 00000000000..5dc47b2b6e1
--- /dev/null
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+
+
+		<record model="ir.ui.view" id="view_gtd_context_tree">
+			<field name="name">project.gtd.context.tree</field>
+			<field name="model">project.gtd.context</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Context">
+					<field name="name"/>
+					<field name="project_default_id"/>
+				</tree>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="view_gtd_context_form">
+			<field name="name">project.gtd.context.form</field>
+			<field name="model">project.gtd.context</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Context">
+					<field name="name"/>
+					<field name="sequence"/>
+					<field name="project_default_id"/>
+				</form>
+			</field>
+		</record>
+		<record model="ir.actions.act_window" id="open_gtd_context_tree">
+			<field name="name">Contexts</field>
+			<field name="res_model">project.gtd.context</field>
+		</record>
+		<record model="ir.actions.act_window" id="open_gtd_context_tree_my">
+			<field name="name">My Contexts</field>
+			<field name="res_model">project.gtd.context</field>
+			<field name="domain">[('user_id','=',uid)]</field>
+		</record>
+		
+		<menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions"/>
+		<menuitem name="Contexts" id="menu_open_gtd_time_contexts" parent="menu_open_gtd_time" action="open_gtd_context_tree"/>		
+		<menuitem name="My Contexts" id="menu_open_gtd_time_my_contexts" parent="menu_open_gtd_time_contexts" action="open_gtd_context_tree_my"/>	
+
+		<record model="ir.ui.view" id="view_gtd_timebox_tree">
+			<field name="name">project.gtd.timebox.tree</field>
+			<field name="model">project.gtd.timebox</field>
+			<field name="type">tree</field>
+			<field name="field_parent">child_ids</field>
+			<field name="arch" type="xml">
+				<tree string="Timebox">
+					<field name="name"/>
+					<field name="type"/>
+					<field name="user_id"/>
+					<field name="parent_id"/>
+				</tree>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_gtd_timebox_form">
+			<field name="name">project.gtd.timebox.form</field>
+			<field name="model">project.gtd.timebox</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Timeboxes">
+					<separator string="Timebox Definition" colspan="4"/>
+					<field name="name"/>
+					<field name="type"/>
+					<field name="user_id"/>
+					<field name="parent_id"/>
+					<separator string="Contexts" colspan="4"/>
+					<field name="context1_id"/><newline/>
+					<field name="context2_id"/><newline/>
+					<field name="context3_id"/><newline/>
+					<field name="context4_id"/><newline/>
+					<field name="context5_id"/><newline/>
+					<field name="context6_id"/>
+					<separator string="Visible Columns" colspan="4"/>
+					<field name="col_project"/>
+					<field name="col_date_start"/>
+					<field name="col_priority"/>
+					<field name="col_deadline"/>
+					<field name="col_planned_hours"/>
+					<field name="col_effective_hours"/>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="open_gtd_timebox_tree">
+			<field name="name">Timeboxes</field>
+			<field name="res_model">project.gtd.timebox</field>
+			<field name="view_type">tree</field>
+			<field name="domain">[('parent_id','=',False)]</field>
+		</record>
+		<record model="ir.actions.act_window" id="open_gtd_timebox_tree_my">
+			<field name="name">My Timeboxes</field>
+			<field name="res_model">project.gtd.timebox</field>
+			<field name="domain">[('user_id','=',uid)]</field>
+		</record>
+		
+		<menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="menu_open_gtd_time" action="open_gtd_timebox_tree"/>		
+		<menuitem name="My Timeboxes" id="menu_open_gtd_time_my_timeboxes" parent="menu_open_gtd_time_timeboxes" action="open_gtd_timebox_tree_my"/>	
+
+		<record model="ir.ui.view" id="task_inbox_view">
+			<field name="name">project.task.gtd.inbox.tree</field>
+			<field name="model">project.task</field>
+			<field name="type">tree</field>
+			<field name="priority" eval="20"/>
+			<field name="arch" type="xml">
+				<tree string="Tasks" editable="bottom" colors="blue:timebox_id">
+					<field name="name"/>
+					<field name="timebox_id" required="1"/>
+					<field name="context_id" required="1"/>
+					<field name="date_start"/>
+					<field name="priority"/>
+					<field name="date_deadline"/>
+					<field name="planned_hours"  widget="float_time" sum="Est. Hours"/>
+					<field name="state"/>
+				</tree>
+			</field>
+		</record>
+		<record model="ir.actions.act_window" id="open_gtd_task_inbox">
+			<field name="name">Inbox Tasks</field>
+			<field name="res_model">project.task</field>
+			<field name="domain">[('user_id','=',uid),('timebox_id','=',False),('state','in',('open','draft'))]</field>
+			<field name="context">{'gtd_sort':True}</field>
+			<field name="view_id" ref="task_inbox_view"/>
+		</record>
+		
+		<menuitem name="Time Management" id="menu_open_time" parent="project.menu_main"/>
+		<menuitem name="My Inbox" id="menu_open_time_myinbox" parent="menu_open_time" action="open_gtd_task_inbox"/>
+
+		<record model="ir.ui.view" id="view_gtd_timebox_treelist">
+			<field name="name">project.gtd.timebox.treelist</field>
+			<field name="model">project.gtd.timebox</field>
+			<field name="type">tree</field>
+			<field name="priority">50</field>
+			<field name="arch" type="xml">
+				<tree string="Timeboxes">
+					<field name="name"/>
+				</tree>
+			</field>
+		</record>
+
+
+		<record model="ir.actions.act_window" id="open_gtd_timebox_all">
+			<field name="name">My Timeboxes</field>
+			<field name="res_model">project.gtd.timebox</field>
+			<field name="domain">[('user_id','=',uid)]</field>
+			<field name="view_type">form</field>
+			<field name="view_id" ref="view_gtd_timebox_treelist"/>
+			<field name="context">{'record_id':False}</field>
+		</record>
+		
+		<menuitem name="All My Timeboxes" id="menu_open_time_allinbox" parent="menu_open_time" action="open_gtd_timebox_all"/>
+
+	<record model="ir.ui.view" id="project_task">
+		<field name="name">project.task.form.timebox</field>
+		<field name="model">project.task</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="project.view_task_form2" />
+		<field name="arch" type="xml">
+			<field name="date_close" position="after">
+				<newline/>
+				<field name="timebox_id" select="1"/>
+				<field name="context_id" select="2"/>
+			</field>
+		</field>
+	</record>
+
+	<act_window name="My Inbox"
+		domain="[('user_id', '=', uid),('timebox_id','=',False),('state','in',('draft','open'))]"
+		res_model="project.task"
+		src_model="project.gtd.timebox"
+		view_type="form"
+		view_mode="tree,form"
+		id="act_timebox_tasks_my_inbox"/>
+	<act_window name="My Open Tasks"
+		domain="[('user_id', '=', uid),('state','in',('draft','open'))]"
+		res_model="project.task"
+		src_model="project.gtd.timebox"
+		view_type="form"
+		view_mode="tree,form"
+		id="act_timebox_tasks_my_open"/>
+	<act_window name="My Pending Tasks"
+		domain="[('user_id', '=', uid),('state','=','pending')]"
+		res_model="project.task"
+		src_model="project.gtd.timebox"
+		view_type="form"
+		view_mode="tree,form"
+		id="act_timebox_tasks_my_pending"/>
+
+	<act_window name="My Deadlines"
+		domain="[('user_id', '=', uid),('state','in',('draft','open','pending')),('date_deadline','&lt;&gt;',False)]"
+		res_model="project.task"
+		src_model="project.gtd.timebox"
+		view_type="form"
+		view_mode="tree,form"
+		id="act_timebox_tasks_my_deadline_open"/>
+
+	<act_window name="Timebox Tasks"
+		domain="[('timebox_id', '=', active_id)]"
+		res_model="project.task"
+		src_model="project.gtd.timebox"
+		view_type="form"
+		view_mode="tree,form"
+		id="act_timebox_tasks"/>
+
+
+
+	</data>
+</terp>
diff --git a/addons/project_gtd/project_gtd_wizard.xml b/addons/project_gtd/project_gtd_wizard.xml
new file mode 100644
index 00000000000..8d3338c52ca
--- /dev/null
+++ b/addons/project_gtd/project_gtd_wizard.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+
+		<wizard string="My Daily Timebox"
+			model="ir.ui.menu"
+			name="project.gtd.timebox.daily"
+			multi="True"
+			id="open_gtd_timebox_daily"/>
+
+		<menuitem name="My Daily Timebox" id="menu_open_time_daily_inbox" 
+				parent="menu_open_time" action="open_gtd_timebox_daily"
+				 icon="STOCK_JUSTIFY_FILL" type="wizard"/>
+				 
+		<wizard string="Plannify Timebox"
+			model="project.gtd.timebox"
+			name="project.gtd.timebox.fill"
+			id="open_gtd_timebox_fill"/>
+
+
+		<wizard string="Empty Timebox"
+			model="project.gtd.timebox"
+			name="project.gtd.timebox.empty"
+			id="open_gtd_timebox_empty"/>
+
+
+	</data>
+</terp>
diff --git a/addons/project_gtd/wizard/__init__.py b/addons/project_gtd/wizard/__init__.py
new file mode 100644
index 00000000000..e848e2f31e6
--- /dev/null
+++ b/addons/project_gtd/wizard/__init__.py
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: hr_timesheet.py 5490 2007-01-29 16:05:51Z pinky $
+#
+# 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 project_gtd_daily
+import project_gtd_empty
+import project_gtd_fill
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_gtd/wizard/project_gtd_daily.py b/addons/project_gtd/wizard/project_gtd_daily.py
new file mode 100644
index 00000000000..54b68cd95a2
--- /dev/null
+++ b/addons/project_gtd/wizard/project_gtd_daily.py
@@ -0,0 +1,73 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: sign_in_out.py 2871 2006-04-25 14:08:22Z ged $
+#
+# 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 netsvc
+import time
+import pooler
+from osv import osv
+
+class wiz_timebox_open(wizard.interface):
+    def _open_timebox(self, cr, uid, data, context):
+        tbtype = 'daily'
+        pool = pooler.get_pool(cr.dbname)
+        ids = pool.get('project.gtd.timebox').search(cr, uid, [('user_id','=',uid),('type','=',tbtype)])
+        if not len(ids):
+            raise wizard.except_wizard('Error !', 'No timebox of the type "%s" defined !')
+        view_type = 'form,tree'
+        if len(ids) >= 1:
+            domain = "[('id','in',["+','.join(map(str,ids))+"])]"
+        else:
+            domain = "[('user_id', '=', uid)]"
+        value = {
+            'domain': domain,
+            'name': 'Timebox',
+            'view_type': 'form',
+            'view_mode': view_type,
+            'res_model': 'project.gtd.timebox',
+            'view_id': False,
+            'type': 'ir.actions.act_window'
+        }
+        if len(ids) == 1:
+            value['res_id'] = ids[0]
+            value['context'] = {'record_id':ids[0]}
+        return value
+
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type':'action', 'action':_open_timebox, 'state':'end'}
+        }
+    }
+wiz_timebox_open('project.gtd.timebox.daily')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_gtd/wizard/project_gtd_empty.py b/addons/project_gtd/wizard/project_gtd_empty.py
new file mode 100644
index 00000000000..57b87c17ddf
--- /dev/null
+++ b/addons/project_gtd/wizard/project_gtd_empty.py
@@ -0,0 +1,70 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: sign_in_out.py 2871 2006-04-25 14:08:22Z fp $
+#
+# 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 netsvc
+import time
+import pooler
+from osv import osv
+
+class wiz_timebox_empty(wizard.interface):
+    def _empty(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        ids = pool.get('project.gtd.timebox').search(cr, uid, [('parent_id','=',data['id'])])
+        if not len(ids):
+            raise wizard.except_wizard('Error !', 'No timebox child of this one !')
+        tids = pool.get('project.task').search(cr, uid, [('timebox_id','=',data['id'])])
+        close = []
+        up = []
+        for task in pool.get('project.task').browse(cr, uid, tids, context):
+            if (task.state in ('cancel','done')) or (task.user_id.id<>uid):
+                close.append(task.id)
+            else:
+                up.append(task.id)
+        if up:
+            print 'UP', up
+            pool.get('project.task').write(cr, uid, up, {'timebox_id':ids[0]})
+        if close:
+            print 'CLOSE', close
+            pool.get('project.task').write(cr, uid, close, {'timebox_id':False})
+        return {}
+
+    states = {
+        'init' : {
+            'actions' : [_empty],
+            'result' : {'type':'state', 'state':'end'}
+        }
+    }
+wiz_timebox_empty('project.gtd.timebox.empty')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
new file mode 100644
index 00000000000..75b108b0bf7
--- /dev/null
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -0,0 +1,86 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: sign_in_out.py 2871 2006-04-25 14:08:22Z fp $
+#
+# 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 pooler
+from osv import osv
+
+_gtd_field = {
+    'task_ids': {'relation':'project.task', 'type':'many2many', 'string':'Tasks selection'},
+    'timebox_to_id': {'relation':'project.gtd.timebox', 'type':'many2one', 'string':'Set to Timebox'},
+    'timebox_id': {'relation':'project.gtd.timebox', 'type':'many2one', 'string':'Get from Timebox'}
+}
+
+_gtd_arch = """
+    <form string="Timebox tasks selection" width="780">
+        <field name="timebox_id" required="1"/>
+        <field name="timebox_to_id" required="1"/>
+        <field name="task_ids" nolabel="1" colspan="4" height="450" domain="[('timebox_id','=',timebox_id),('state','=','open')]"/>
+    </form>
+"""
+
+class wiz_timebox_fill(wizard.interface):
+    def _fill(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        ids = pool.get('project.gtd.timebox').search(cr, uid, [('parent_id','=',data['id']),('user_id','=',uid)], context=context)
+        return {
+            'timebox_id': ids and ids[0] or False,
+            'timebox_to_id': data['id']
+        }
+
+    def _process(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        ids = data['form']['task_ids']
+        pool.get('project.task').write(cr, uid, ids[0][2], {'timebox_id':data['form']['timebox_to_id']})
+        return {}
+
+    states = {
+        'init' : {
+            'actions' : [_fill],
+            'result' : {
+                'type':'form',
+                'arch':_gtd_arch,
+                'fields':_gtd_field,
+                'state':[
+                    ('end','Cancel'),
+                    ('process','Add to Timebox')
+                ]
+            }
+        },
+        'process' : {
+            'actions' : [_process],
+            'result' : {'type':'state', 'state':'end'}
+        }
+    }
+wiz_timebox_fill('project.gtd.timebox.fill')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_mrp/__init__.py b/addons/project_mrp/__init__.py
new file mode 100644
index 00000000000..9ec8e64af35
--- /dev/null
+++ b/addons/project_mrp/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+import mrp
+import project
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_mrp/__terp__.py b/addons/project_mrp/__terp__.py
new file mode 100644
index 00000000000..bd94ef30710
--- /dev/null
+++ b/addons/project_mrp/__terp__.py
@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Project Management - MRP Link",
+    "version": "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com/module_project.html",
+    "category" : "Generic Modules/Projects & Services",
+    "depends" : ["project", 'mrp'],
+    "description": "Link between project and mrp",
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml": ["project_workflow.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_mrp/mrp.py b/addons/project_mrp/mrp.py
new file mode 100644
index 00000000000..d7e222de826
--- /dev/null
+++ b/addons/project_mrp/mrp.py
@@ -0,0 +1,53 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: project.py 1011 2005-07-26 08:11:45Z nicoe $
+#
+# 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.
+#
+##############################################################################
+
+from osv import fields, osv, orm
+
+class mrp_procurement(osv.osv):
+    _name = "mrp.procurement"
+    _inherit = "mrp.procurement"
+    
+    def action_produce_assign_service(self, cr, uid, ids, context={}):
+        for procurement in self.browse(cr, uid, ids):
+            self.write(cr, uid, [procurement.id], {'state':'running'})
+            task_id = self.pool.get('project.task').create(cr, uid, {
+                'name': procurement.name,
+                'date_deadline': procurement.date_planned,
+                'state': 'open',
+                'planned_hours': procurement.product_qty,
+                'user_id': procurement.product_id.product_manager.id,
+                'notes': procurement.origin,
+                'procurement_id': procurement.id
+            })
+        return task_id
+mrp_procurement()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_mrp/project.py b/addons/project_mrp/project.py
new file mode 100644
index 00000000000..79205b3b850
--- /dev/null
+++ b/addons/project_mrp/project.py
@@ -0,0 +1,58 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: project.py 1011 2005-07-26 08:11:45Z nicoe $
+#
+# 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.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class task(osv.osv):
+    _name = "project.task"
+    _inherit = "project.task"
+    _columns = {
+        'procurement_id': fields.many2one('mrp.procurement', 'Procurement', ondelete='set null')
+    }
+    def do_close(self, cr, uid, ids, *args):
+        res = super(task, self).do_close(cr, uid, ids, *args)
+        tasks = self.browse(cr, uid, ids)
+        for task in tasks:
+            if task.procurement_id:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'mrp.procurement', task.procurement_id.id, 'subflow.done', cr)
+        return res
+
+    def do_cancel(self, cr, uid, ids, *args):
+        res = super(task, self).do_cancel(cr, uid, ids, *args)
+        tasks = self.browse(cr, uid, ids)
+        for task in tasks:
+            if task.procurement_id:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'mrp.procurement', task.procurement_id.id, 'subflow.cancel', cr)
+        return True
+task()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_mrp/project_workflow.xml b/addons/project_mrp/project_workflow.xml
new file mode 100644
index 00000000000..944f6e9c518
--- /dev/null
+++ b/addons/project_mrp/project_workflow.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+	<record model="workflow.transition" id="mrp.trans_produce_service_make_done">
+		<field name="act_from" ref="mrp.act_produce_service"/>
+		<field name="act_to" ref="mrp.act_make_done"/>
+		<field name="signal">subflow.done</field>
+	</record>
+</data>
+</terp>
+
diff --git a/addons/project_retro_planning/__init__.py b/addons/project_retro_planning/__init__.py
new file mode 100644
index 00000000000..dcf1ca18f71
--- /dev/null
+++ b/addons/project_retro_planning/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import project_retro_planning
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_retro_planning/__terp__.py b/addons/project_retro_planning/__terp__.py
new file mode 100644
index 00000000000..2b9924a3e44
--- /dev/null
+++ b/addons/project_retro_planning/__terp__.py
@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Project Retro planning",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "category" : "Generic Modules/Project Retro Planning",
+    "description": """
+        - Stop date of project is change will change all the tasks of that project to same number of days """,
+    "depends" : [
+        "base", "project"
+        ],
+    "demo_xml" : [],
+    "init_xml" : [],
+    "update_xml" : [],
+    "active" : False,
+    "installable" : True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_retro_planning/project_retro_planning.py b/addons/project_retro_planning/project_retro_planning.py
new file mode 100644
index 00000000000..3f285c84b11
--- /dev/null
+++ b/addons/project_retro_planning/project_retro_planning.py
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+from datetime import date,timedelta
+import time
+from osv import fields, osv
+from datetime import datetime
+
+class project_project(osv.osv):
+    _inherit = 'project.project'
+    _description = 'project.project'
+
+    def write(self, cr, uid, ids,vals, *args, **kwargs):
+        if 'date_end' in vals and vals['date_end']:
+            data_project = self.browse(cr,uid,ids)
+            for prj in data_project:
+                c= date(*time.strptime(vals['date_end'],'%Y-%m-%d')[:3])
+                if prj.date_end:
+                    d= date(*time.strptime(prj.date_end,'%Y-%m-%d')[:3])
+                    for task in prj.tasks:
+                        if task.date_deadline:
+                            f = (datetime(*time.strptime(task.date_deadline,'%Y-%m-%d  %H:%M:%S')[:6])+(c-d)).strftime('%Y-%m-%d %H:%M:%S')
+                            self.pool.get('project.task').write(cr,uid,task.id,{'date_deadline':f})
+        return super(project_project,self).write(cr, uid, ids,vals, *args, **kwargs)
+
+project_project()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_timesheet/__init__.py b/addons/project_timesheet/__init__.py
new file mode 100644
index 00000000000..586dfe69d8d
--- /dev/null
+++ b/addons/project_timesheet/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+import project_timesheet
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_timesheet/__terp__.py b/addons/project_timesheet/__terp__.py
new file mode 100644
index 00000000000..98f265d5f12
--- /dev/null
+++ b/addons/project_timesheet/__terp__.py
@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Project Timesheet",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com",
+    "category" : "Generic Modules/HR",
+    "description": """
+        This module lets you transfer the entries under tasks defined for Project Management to
+        the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways.
+
+    """,
+    "depends" : ["base", "project", "hr_timesheet"],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
new file mode 100644
index 00000000000..2a22b337359
--- /dev/null
+++ b/addons/project_timesheet/project_timesheet.py
@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+from osv import fields, osv
+import time
+import datetime
+import pooler
+
+
+class project_work(osv.osv):
+    _inherit = "project.task.work"
+    _description = "Task Work"
+    def create(self, cr, uid, vals, *args, **kwargs):
+
+        obj = self.pool.get('hr.analytic.timesheet')
+        vals_line={}
+        obj_task = self.pool.get('project.task').browse(cr, uid, vals['task_id'])
+
+        vals_line['name']=vals['name']
+        vals_line['user_id']=vals['user_id']
+        c_date=datetime.date(int(vals['date'][:4]),int(vals['date'][5:7]),int(vals['date'][8:10]))
+        vals_line['date']=c_date
+        vals_line['unit_amount']=vals['hours']
+        vals_line['account_id']=obj_task.project_id.category_id.id
+        vals_line['amount']=00.0
+        timeline_id=obj.create(cr, uid,vals_line,{})
+
+        vals_line['amount']=(-1) * vals['hours']*obj.browse(cr,uid,timeline_id).product_id.standard_price
+        obj.write(cr, uid,[timeline_id],vals_line,{})
+        vals['hr_analytic_timesheet_id']=timeline_id
+
+        return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
+
+    def write(self, cr, uid, ids,vals,context={}):
+        vals_line={}
+
+        line_id=self.pool.get('project.task.work').browse(cr,uid,ids)[0].hr_analytic_timesheet_id
+        # in case,if a record is deleted from timesheet,but we change it from tasks!
+        list_avail_ids=self.pool.get('hr.analytic.timesheet').search(cr,uid,[])
+        if line_id in list_avail_ids:
+            obj = self.pool.get('hr.analytic.timesheet')
+            vals_line['name']=vals['name']
+            vals_line['user_id']=vals['user_id']
+            c_date=datetime.date(int(vals['date'][:4]),int(vals['date'][5:7]),int(vals['date'][8:10]))
+            vals_line['date']=c_date
+            vals_line['unit_amount']=vals['hours']
+            vals_line['amount']=(-1) * vals['hours'] * obj.browse(cr,uid,line_id).product_id.standard_price
+            obj.write(cr, uid,[line_id],vals_line,{})
+
+        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)
+
+        return super(project_work,self).unlink(cr, uid, ids,*args, **kwargs)
+
+    _columns={
+        'hr_analytic_timesheet_id':fields.integer('Related Timeline Id')
+    }
+
+
+project_work()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py
index e7eae7b083d..53fb104445e 100644
--- a/addons/purchase/__terp__.py
+++ b/addons/purchase/__terp__.py
@@ -45,7 +45,8 @@
         "purchase_report.xml", 
         "purchase_wizard.xml",
         "stock_view.xml",
-        "purchase_security.xml"
+        "purchase_security.xml",
+        "partner_view.xml"
     ],
     "active": False,
     "installable": True
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 9ae85eacd22..e726b3476ac 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -38,10 +38,10 @@ class res_partner(osv.osv):
           'product.pricelist',
           type='many2one', 
           relation='product.pricelist', 
+          domain=[('type','=','purchase')],
           string="Purchase Pricelist", 
           method=True,
           view_load=True,
-          group_name="Pricelists Properties",
           help="This pricelist will be used, instead of the default one, for purchases from the current partner"),
     }
 res_partner()
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
new file mode 100644
index 00000000000..cdab52d471f
--- /dev/null
+++ b/addons/purchase/partner_view.xml
@@ -0,0 +1,20 @@
+<terp>
+    <data>
+
+        <record id="view_partner_property_form" model="ir.ui.view">
+            <field name="name">res.partner.purchase.property.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+				<page string="Sales &amp; Purchases" position="inside">
+					<group colspan="2" col="2">
+						<separator string="Purchases" colspan="2"/>
+						<field name="property_product_pricelist_purchase"/>
+					</group>
+                </page>
+            </field>
+        </record>
+
+    </data>
+</terp>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 36db7bb9a02..6d68ccdf665 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -77,7 +77,7 @@ class purchase_order(osv.osv):
 
     def _amount_total(self, cr, uid, ids, field_name, arg, context):
         res = {}
-        untax = self._amount_untaxed(cr, uid, ids, field_name, arg, context) 
+        untax = self._amount_untaxed(cr, uid, ids, field_name, arg, context)
         tax = self._amount_tax(cr, uid, ids, field_name, arg, context)
         cur_obj=self.pool.get('res.currency')
         for id in ids:
@@ -86,6 +86,48 @@ class purchase_order(osv.osv):
             res[id] = cur_obj.round(cr, uid, cur, untax.get(id, 0.0) + tax.get(id, 0.0))
         return res
 
+    def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for purchase in self.browse(cursor, user, ids, context=context):
+            tot = 0.0
+
+            if purchase.invoice_id.state not in ('draft','cancel'):
+                tot += purchase.invoice_id.amount_untaxed
+            if tot:
+                res[purchase.id] = tot * 100.0 / purchase.amount_untaxed
+            else:
+                res[purchase.id] = 0.0
+        return res
+
+    def _shipped_rate(self, cr, uid, ids, name, arg, context=None):
+        if not ids: return {}
+        res = {}
+        for id in ids:
+            res[id] = [0.0,0.0]
+        cr.execute('''SELECT
+                p.purchase_id,sum(m.product_qty), m.state
+            FROM
+                stock_move m
+            LEFT JOIN
+                stock_picking p on (p.id=m.picking_id)
+            WHERE
+                p.purchase_id in ('''+','.join(map(str,ids))+''')
+            GROUP BY m.state, p.purchase_id''')
+        for oid,nbr,state in cr.fetchall():
+            if state=='cancel':
+                continue
+            if state=='done':
+                res[oid][0] += nbr or 0.0
+                res[oid][1] += nbr or 0.0
+            else:
+                res[oid][1] += nbr or 0.0
+        for r in res:
+            if not res[r][1]:
+                res[r] = 0.0
+            else:
+                res[r] = 100.0 * res[r][0] / res[r][1]
+        return res
+
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True, select=True),
         'origin': fields.char('Origin', size=64),
@@ -99,16 +141,18 @@ class purchase_order(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'posted':[('readonly',True)]}),
         'location_id': fields.many2one('stock.location', 'Delivery destination', required=True),
 
-        'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',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."),
 
-        'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Confirmed'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order 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 State', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
+        'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Confirmed'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order Status', 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={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'notes': fields.text('Notes'),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
         'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
         'shipped':fields.boolean('Received', readonly=True, select=True),
+        'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
         'invoiced':fields.boolean('Invoiced & Paid', readonly=True, select=True),
+        'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
         'invoice_method': fields.selection([('manual','Manual'),('order','From order'),('picking','From picking')], 'Invoicing Control', required=True),
 
         'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'),
@@ -164,7 +208,7 @@ class purchase_order(osv.osv):
         for id in ids:
             self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
         return True
-    
+
     def wkf_warn_buyer(self, cr, uid, ids):
         self.write(cr, uid, ids, {'state' : 'wait', 'validator' : uid})
         request = pooler.get_pool(cr.dbname).get('res.request')
@@ -175,7 +219,7 @@ class purchase_order(osv.osv):
                 if manager and not (manager.id in managers):
                     managers.append(manager.id)
             for manager_id in managers:
-                request.create(cr, uid, 
+                request.create(cr, uid,
                       {'name' : "Purchase amount over the limit",
                        'act_from' : uid,
                        'act_to' : manager_id,
@@ -310,7 +354,7 @@ class purchase_order_line(osv.osv):
             cur = line.order_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur, line.price_unit * line.product_qty)
         return res
-    
+
     _columns = {
         'name': fields.char('Description', size=64, required=True),
         'product_qty': fields.float('Quantity', required=True, digits=(16,2)),
@@ -331,7 +375,7 @@ class purchase_order_line(osv.osv):
     }
     _table = 'purchase_order_line'
     _name = 'purchase.order.line'
-    _description = 'Purchase Order line'
+    _description = 'Purchase Order lines'
     def copy(self, cr, uid, id, default=None,context={}):
         if not default:
             default = {}
@@ -366,6 +410,22 @@ class purchase_order_line(osv.osv):
         res = {'value': {'price_unit': price, 'name':prod_name, 'taxes_id':prod['supplier_taxes_id'], 'date_planned': dt,'notes':prod['description_purchase'], 'product_uom': uom}}
         domain = {}
 
+        if res['value']['taxes_id']:
+            taxes = self.pool.get('account.tax').browse(cr, uid,
+                    [x.id for x in product.supplier_taxes_id])
+            taxep = None
+            if partner_id:
+                taxep = self.pool.get('res.partner').browse(cr, uid,
+                        partner_id).property_account_supplier_tax
+            if not taxep or not taxep.id:
+                res['value']['taxes_id'] = [x.id for x in product.taxes_id]
+            else:
+                res5 = [taxep.id]
+                for t in taxes:
+                    if not t.tax_group==taxep.tax_group:
+                        res5.append(t.id)
+                res['value']['taxes_id'] = res5
+
         res2 = self.pool.get('product.uom').read(cr, uid, [uom], ['category_id'])
         res3 = self.pool.get('product.uom').read(cr, uid, [prod_uom_po], ['category_id'])
         domain = {'product_uom':[('category_id','=',res2[0]['category_id'][0])]}
diff --git a/addons/purchase/purchase_report.xml b/addons/purchase/purchase_report.xml
index af9cdcaa871..a6a236ce390 100644
--- a/addons/purchase/purchase_report.xml
+++ b/addons/purchase/purchase_report.xml
@@ -2,6 +2,6 @@
 <terp>
     <data>
         <report auto="False" id="report_purchase_quotation" model="purchase.order" name="purchase.quotation" rml="purchase/report/request_quotation.rml" string="Request for Quotation"/>
-        <report auto="False" id="report_purchase_order" model="purchase.order" name="purchase.order" rml="purchase/report/order.rml" string="Print Order"/>
+        <report auto="False" id="report_purchase_order" model="purchase.order" name="purchase.order" rml="purchase/report/order.rml" string="Purchase Order"/>
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 57bdae954ec..4ae5a9e8eb2 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,35 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record id="category_supplier" model="res.partner.category">
-            <field name="name">Suppliers</field>
-        </record>
-        
         <menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"/>
-        
+
         <record id="purchase_order_form" model="ir.ui.view">
             <field name="name">purchase.order.form</field>
             <field name="model">purchase.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Purchase Order">
-                    <notebook>
+					<group col="6" colspan="4">
+						<field name="name" select="1"/>
+						<field name="shipped" select="2"/>
+						<field name="invoiced" select="2"/>
+						<newline/>
+						<field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)"/>
+						<field name="origin" select="2"/>
+						<field name="date_order" select="2"/>
+					</group>
+                    <notebook colspan="4">
                         <page string="Purchase Order">
-                            <field name="name" select="1"/>
-                            <group col="4" colspan="2">
-                                <field name="shipped" select="2"/>
-                                <field name="invoiced" select="2"/>
-                            </group>
-                            <newline/>
-                            <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)"/>
-                            <field name="date_order" select="2"/>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" domain="[('category_id','child_of', [%(category_supplier)d])]"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" domain="[('supplier','=', 1)]"/>
                             <field name="partner_address_id"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id"/>
                             <field name="partner_ref" select="2"/>
                             <newline/>
                             <field colspan="4" name="order_line" nolabel="1" widget="one2many_list"/>
-                            <separator colspan="4" select="2" string="Document State"/>
                             <group col="7" colspan="4">
                                 <field name="amount_untaxed" sum="Untaxed amount"/>
                                 <field name="amount_tax"/>
@@ -42,19 +38,21 @@
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order"/>
-                                
+
                                 <button name="purchase_cancel" states="approved" string="Cancel Purchase Order"/>
-                                
+
                                 <button name="shipping_ok" states="except_shipping" string="Shipping Done"/>
                                 <button name="invoice_ok" states="except_invoice" string="Invoice Done"/>
                             </group>
                         </page>
-                        <page string="Extra Infos">
+                        <page string="Delivery &amp; Invoices">
+							<separator string="Delivery" colspan="2"/>
+							<separator string="Invoice Control" colspan="2"/>
                             <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
-                            <field name="location_id"/>
                             <field name="invoice_method"/>
-                            <field name="origin" select="2"/>
+                            <field name="location_id"/>
                             <newline/>
+							<separator string="Purchase Control" colspan="4"/>
                             <field name="validator"/>
                             <field name="date_approve"/>
                         </page>
@@ -65,7 +63,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="purchase_form_action" model="ir.actions.act_window">
             <field name="name">Purchase Orders</field>
             <field name="type">ir.actions.act_window</field>
@@ -112,7 +110,7 @@
         </record>
         <menuitem action="purchase_form_action_new" id="menu_purchase_form_action_new" parent="purchase.menu_purchase_root"/>
 
-        
+
         <record id="purchase_order_tree" model="ir.ui.view">
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.order</field>
@@ -123,15 +121,15 @@
                     <field name="date_order"/>
                     <field name="partner_id"/>
                     <field name="location_id"/>
-                    <field name="invoiced" string="Paid"/>
-                    <field name="shipped"/>
+                    <field name="invoiced_rate" widget="progressbar"/>
+                    <field name="shipped_rate" widget="progressbar"/>
                     <field name="amount_untaxed"/>
                     <field name="origin"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
-        
+
         <record id="purchase_order_line_form" model="ir.ui.view">
             <field name="name">purchase.order.line.form</field>
             <field name="model">purchase.order.line</field>
@@ -157,7 +155,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="purchase_order_line_tree" model="ir.ui.view">
             <field name="name">purchase.order.line.tree</field>
             <field name="model">purchase.order.line</field>
@@ -174,7 +172,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <act_window context="{'partner_id': active_id}" domain="[('partner_id', '=', active_id)]" id="act_res_partner_2_purchase_order" name="Purchase orders" res_model="purchase.order" src_model="res.partner"/>
     </data>
 </terp>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index e906b709542..768a28cf6ce 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -1,3 +1,3 @@
 <?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="42.0" y1="42.0" width="511" height="758"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau6"><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"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau5"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="11"/><paraStyle name="P2" fontName="Times-BoldItalic" fontSize="6.0" leading="8"/><paraStyle name="P3" fontName="Times-Roman" fontSize="9.0" leading="11"/><paraStyle name="P4" fontName="Times-Roman" fontSize="10.0" leading="13"/><paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P6" fontName="Times-Roman" fontSize="4.0" leading="5"/><paraStyle name="P7" fontName="Times-Roman" fontSize="16.0" leading="20"/><paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P9" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P10" fontName="Times-Roman"/><paraStyle name="P11" fontName="Times-Bold" fontSize="8.0" leading="10"/><paraStyle name="P12" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/><paraStyle name="P13" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/><paraStyle name="P14" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P15" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/><paraStyle name="P16" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/><paraStyle name="P17" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P18" fontName="Times-BoldItalic" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14" 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><images/><story><para style="P1">[[ repeatIn(objects,'order') ]]</para><para style="P2">[[ setLang(order.partner_id.lang) ]]</para><blockTable colWidths="241.0,57.0,213.0" style="Tableau6"><tr><td><para style="P3"><font color="white"> </font></para></td><td><para style="P3"><font color="white"> </font></para></td><td><para style="P4">[[ order.partner_id.title ]][[ order.partner_id.name ]]</para><para style="P5">[[ order.partner_address_id.title ]][[ order.partner_address_id.name ]]</para><para style="P5">[[ order.partner_address_id.street ]][[ order.partner_address_id.street2 ]]</para><para style="P5">[[ order.partner_address_id.zip ]][[ order.partner_address_id.city ]]</para><para style="P5">[[ order.partner_address_id.state_id.code ]][[ order.partner_address_id.country_id.code ]]</para><para style="P6"><font color="white"> </font></para><para style="P4">Tel.&#xA0;: [[ order.partner_address_id.phone ]]</para><para style="P4">Fax&#xA0;: [[ order.partner_address_id.fax ]]</para><para style="P4">TVA&#xA0;: [[ order.partner_id.vat ]]</para></td></tr></blockTable><para style="P7">Request for Quotation [[ order.name ]]</para><para style="P8"><font color="white"> </font></para><para style="P8">Other reference :[[ order.ref ]]</para><para style="P9">Printed: [[ time.strftime('%d/%m/%Y') ]]</para><para style="P9"><font color="white"> </font></para><para style="P8">Please find hereby a request for quotation.</para><para style="P10"><font color="white"> </font></para><blockTable colWidths="358.0,70.0,82.0" repeatRows="1" style="Tableau2"><tr><td><para style="P11">Product</para></td><td><para style="P12">Date</para></td><td><para style="P12">Qty</para></td></tr></blockTable><section><para style="P13">[[ repeatIn(order.order_line,'order_line') ]]</para><blockTable colWidths="358.0,70.0,82.0" style="Tableau3"><tr><td><para style="P14">[[ order_line.product_id.default_code ]] - [[ order_line.name ]]</para></td><td><para style="P15">[[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d'))  ]]</para></td><td><para style="P16">[[ order_line.product_qty ]][[ order_line.product_uom.name ]]</para></td></tr></blockTable><blockTable colWidths="428.0,82.0" style="Tableau5"><tr><td><para style="P17">[[ order_line.notes ]]</para></td><td><para style="P18"><font color="white"> </font></para></td></tr></blockTable></section><para style="P8"><font color="white"> </font></para><para style="P19">[[ order.notes ]]</para><para style="P19"><font color="white"> </font></para><para style="P8">Thanks,</para><para style="P8"><font color="white"> </font></para><para style="P8">[[ user.signature ]]</para></story></document>
+<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="42.0" y1="42.0" width="511" height="758"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau6"><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"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau5"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="11"/><paraStyle name="P2" fontName="Times-BoldItalic" fontSize="6.0" leading="8"/><paraStyle name="P3" fontName="Times-Roman" fontSize="9.0" leading="11"/><paraStyle name="P4" fontName="Times-Roman" fontSize="10.0" leading="13"/><paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P6" fontName="Times-Roman" fontSize="4.0" leading="5"/><paraStyle name="P7" fontName="Times-Roman" fontSize="16.0" leading="20"/><paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P9" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P10" fontName="Times-Roman"/><paraStyle name="P11" fontName="Times-Bold" fontSize="8.0" leading="10"/><paraStyle name="P12" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/><paraStyle name="P13" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/><paraStyle name="P14" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P15" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/><paraStyle name="P16" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/><paraStyle name="P17" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P18" fontName="Times-BoldItalic" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14" 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><images/><story><para style="P1">[[ repeatIn(objects,'order') ]]</para><para style="P2">[[ setLang(order.partner_id.lang) ]]</para><blockTable colWidths="241.0,57.0,213.0" style="Tableau6"><tr><td><para style="P3"><font color="white"> </font></para></td><td><para style="P3"><font color="white"> </font></para></td><td><para style="P4">[[ order.partner_id.title ]][[ order.partner_id.name ]]</para><para style="P5">[[ order.partner_address_id.title ]][[ order.partner_address_id.name ]]</para><para style="P5">[[ order.partner_address_id.street ]][[ order.partner_address_id.street2 ]]</para><para style="P5">[[ order.partner_address_id.zip ]][[ order.partner_address_id.city ]]</para><para style="P5">[[ (order.partner_address_id.state_id and order.partner_address_id.state_id.name) or '' ]][[ (order.partner_address_id.country_id and order.partner_address_id.country_id.name) or '' ]]</para><para style="P6"><font color="white"> </font></para><para style="P4">Tel.&#xA0;: [[ order.partner_address_id.phone ]]</para><para style="P4">Fax&#xA0;: [[ order.partner_address_id.fax ]]</para><para style="P4">TVA&#xA0;: [[ order.partner_id.vat ]]</para></td></tr></blockTable><para style="P7">Request for Quotation [[ order.name ]]</para><para style="P8"><font color="white"> </font></para><para style="P8">Other reference :[[ order.ref ]]</para><para style="P9">Printed: [[ time.strftime('%d/%m/%Y') ]]</para><para style="P9"><font color="white"> </font></para><para style="P8">Please find hereby a request for quotation.</para><para style="P10"><font color="white"> </font></para><blockTable colWidths="358.0,70.0,82.0" repeatRows="1" style="Tableau2"><tr><td><para style="P11">Product</para></td><td><para style="P12">Date</para></td><td><para style="P12">Qty</para></td></tr></blockTable><section><para style="P13">[[ repeatIn(order.order_line,'order_line') ]]</para><blockTable colWidths="358.0,70.0,82.0" style="Tableau3"><tr><td><para style="P14">[[ order_line.product_id.default_code ]] - [[ order_line.name ]]</para></td><td><para style="P15">[[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d'))  ]]</para></td><td><para style="P16">[[ order_line.product_qty ]][[ order_line.product_uom.name ]]</para></td></tr></blockTable><blockTable colWidths="428.0,82.0" style="Tableau5"><tr><td><para style="P17">[[ order_line.notes ]]</para></td><td><para style="P18"><font color="white"> </font></para></td></tr></blockTable></section><para style="P8"><font color="white"> </font></para><para style="P19">[[ order.notes ]]</para><para style="P19"><font color="white"> </font></para><para style="P8">Thanks,</para><para style="P8"><font color="white"> </font></para><para style="P8">[[ user.signature ]]</para></story></document>
 
diff --git a/addons/purchase_analytic_plans/__init__.py b/addons/purchase_analytic_plans/__init__.py
new file mode 100644
index 00000000000..4701fbe69be
--- /dev/null
+++ b/addons/purchase_analytic_plans/__init__.py
@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+#----------------------------------------------------------
+# Init Sales
+#----------------------------------------------------------
+
+import purchase_analytic_plans
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/purchase_analytic_plans/__terp__.py b/addons/purchase_analytic_plans/__terp__.py
new file mode 100644
index 00000000000..87321288c75
--- /dev/null
+++ b/addons/purchase_analytic_plans/__terp__.py
@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Purchase Analytic Distribution Management",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com/module_sale.html",
+    "depends" : ["purchase","account_analytic_plans"],
+    "category" : "Generic Modules/Sales & Purchases",
+    "init_xml" : [],
+    "demo_xml" : [],
+    "description": """
+    The base module to manage analytic distribution and purchase orders.
+    """,
+    "update_xml" : [
+        "purchase_analytic_plans_view.xml",
+    ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans.py b/addons/purchase_analytic_plans/purchase_analytic_plans.py
new file mode 100644
index 00000000000..a1ddba8629f
--- /dev/null
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans.py
@@ -0,0 +1,61 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+# 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.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import time
+import netsvc
+
+import ir
+from mx import DateTime
+import pooler
+from tools import config
+
+class purchase_order_line(osv.osv):
+    _name='purchase.order.line'
+    _inherit='purchase.order.line'
+    _columns = {
+        'analytics_id':fields.many2one('account.analytic.plan.instance','Analytic Distribution'),
+    }
+
+purchase_order_line()
+
+class purchase_order(osv.osv):
+    _name='purchase.order'
+    _inherit='purchase.order'
+
+    def inv_line_create(self,a,ol):
+        res=super(purchase_order,self).inv_line_create(a,ol)
+        res[2]['analytics_id']=ol.analytics_id.id
+        return res
+
+purchase_order()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
new file mode 100644
index 00000000000..d924dee431b
--- /dev/null
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+	<record model="ir.ui.view" id="purchase_order_line_form_inherit">
+		<field name="name">purchase.order.line.form.inherit</field>
+		<field name="model">purchase.order.line</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="purchase.purchase_order_line_form"/>
+		<field name="arch" type="xml">
+			<field name="account_analytic_id" position="replace">
+				<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+			</field>
+		</field>
+	</record>
+
+</data>
+</terp>
diff --git a/addons/report_analytic_planning/report_analytic_planning.py b/addons/report_analytic_planning/report_analytic_planning.py
index 6cd4f164cdd..f58704322aa 100644
--- a/addons/report_analytic_planning/report_analytic_planning.py
+++ b/addons/report_analytic_planning/report_analytic_planning.py
@@ -45,7 +45,7 @@ class report_account_analytic_planning(osv.osv):
         'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
         'stat_user_ids': fields.one2many('report_account_analytic.planning.stat.user', 'planning_id', 'Planning by user', readonly=True),
         'stat_account_ids': fields.one2many('report_account_analytic.planning.stat.account', 'planning_id', 'Planning by account', readonly=True),
-        'state': fields.selection([('open','Open'),('done','Done')], 'State', required=True)
+        'state': fields.selection([('open','Open'),('done','Done')], 'Status', required=True)
     }
     _defaults = {
         'name': lambda *a: time.strftime('%Y-%m-%d'),
diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py
index 86dbb990c86..7acd0d1b5da 100644
--- a/addons/report_crm/report_crm.py
+++ b/addons/report_crm/report_crm.py
@@ -51,7 +51,7 @@ class report_crm_case_user(osv.osv):
         '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, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'delay_close': fields.char('Delay to close', size=20, readonly=True),
     }
     _order = 'name desc, user_id, section_id'
@@ -89,7 +89,7 @@ class report_crm_case_categ(osv.osv):
         '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, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'delay_close': fields.char('Delay Close', size=20, readonly=True),
     }
     _order = 'name desc, categ_id, section_id'
diff --git a/addons/report_purchase/report_purchase.py b/addons/report_purchase/report_purchase.py
index 947cbd31f34..591e9b43ebf 100644
--- a/addons/report_purchase/report_purchase.py
+++ b/addons/report_purchase/report_purchase.py
@@ -72,6 +72,7 @@ class report_purchase_order_product(osv.osv):
                 from purchase_order s
                     left join purchase_order_line l on (s.id=l.order_id)
                     left join product_uom u on (u.id=l.product_uom)
+                where l.product_id is not null
                 group by l.product_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
             )
         """)
@@ -117,6 +118,7 @@ class report_purchase_order_category(osv.osv):
                     left join product_product p on (p.id=l.product_id)
                     left join product_template t on (t.id=p.product_tmpl_id)
                     left join product_uom u on (u.id=l.product_uom)
+                where l.product_id is not null
                 group by t.categ_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
              )
         """)
diff --git a/addons/report_sale/report_sale.py b/addons/report_sale/report_sale.py
index 8328b7f037c..9407acddcd8 100644
--- a/addons/report_sale/report_sale.py
+++ b/addons/report_sale/report_sale.py
@@ -71,15 +71,6 @@ class report_sale_order_product(osv.osv):
                 group by l.product_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
             )
         """)
-# Done in the _auto_init
-#       for k in self._columns:
-#           f = self._columns[k]
-#           cr.execute("select id from ir_model_fields where model=%s and name=%s", (self._name,k))
-#           if not cr.rowcount:
-#               cr.execute("select id from ir_model where model='%s'" % self._name)
-#               model_id = cr.fetchone()[0]
-#               cr.execute("INSERT INTO ir_model_fields (model_id, model, name, field_description, ttype, relate,relation,group_name,view_load) VALUES (%d,%s,%s,%s,%s,%s,%s,%s,%s)", (model_id, self._name, k, f.string.replace("'", " "), f._type, (f.relate and 'True') or 'False', f._obj or 'NULL', f.group_name or '', (f.view_load and 'True') or 'False'))
-
 report_sale_order_product()
 
 class report_sale_order_category(osv.osv):
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index f68e7cd28f7..52e50f95027 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -37,12 +37,24 @@
                 </tree>
             </field>
         </record>
+
+        <record id="view_order_product_graph" model="ir.ui.view">
+             <field name="name">report.sale.order.product.graph</field>
+             <field name="model">report.sale.order.product</field>
+             <field name="type">graph</field>
+             <field name="arch" type="xml">
+                 <graph string="Sales by Product" type="pie">
+                     <field name="product_id"/>
+                     <field name="price_average"/>
+                 </graph>
+             </field>
+        </record>
         
         <record id="action_order_product_tree" model="ir.actions.act_window">
             <field name="name">Sales by Product (this month)</field>
             <field name="res_model">report.sale.order.product</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">graph,tree</field>
             <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
         <menuitem id="next_id_80" name="Reporting" parent="sale.menu_sale_root"/><menuitem id="next_id_81" name="This Month" parent="next_id_80"/><menuitem action="action_order_product_tree" id="menu_report_order_product" parent="next_id_81"/>
@@ -50,7 +62,7 @@
             <field name="name">Sales by Product</field>
             <field name="res_model">report.sale.order.product</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">graph,tree</field>
         </record>
         <menuitem id="next_id_82" name="All Months" parent="report_sale.next_id_80"/><menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_82"/>
         
@@ -105,7 +117,7 @@
             <field name="name">Sales by Category of Product (this month)</field>
             <field name="res_model">report.sale.order.category</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">graph,tree</field>
             <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
         <menuitem action="action_order_category_tree" id="menu_report_order_category" parent="report_sale.next_id_81"/>
@@ -113,16 +125,27 @@
             <field name="name">Sales by Category of Products</field>
             <field name="res_model">report.sale.order.category</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">graph,tree</field>
         </record>
         <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_sale.next_id_82"/>
         
         <!-- Sales of the month -->
+        <record id="view_order_graph" model="ir.ui.view">
+             <field name="name">sale.order.graph</field>
+             <field name="model">sale.order</field>
+             <field name="type">graph</field>
+             <field name="arch" type="xml">
+                 <graph string="Sales orders" type="pie">
+                     <field name="partner_id"/>
+                     <field name="amount_untaxed"/>
+                 </graph>
+             </field>
+        </record>
         <record id="action_order_sale_list" model="ir.actions.act_window">
             <field name="name">Sales of the Month</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <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_81"/>
@@ -131,4 +154,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py
index 01fb6167966..615f267d479 100644
--- a/addons/report_task/report_task.py
+++ b/addons/report_task/report_task.py
@@ -40,7 +40,7 @@ class  report_task_user_pipeline_open (osv.osv):
         'task_hrs': fields.float('Task Hours', readonly=True),
         'task_progress': fields.float('Task Progress', readonly=True),
         'company_id' : fields.many2one('res.company', 'Company'),
-        'task_state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done'),('no','No Task')], 'State', readonly=True),
+        'task_state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done'),('no','No Task')], 'Status', readonly=True),
     }
 
     def init(self, cr):
diff --git a/addons/sale/partner.py b/addons/sale/partner.py
index 84805640811..790c0a69281 100644
--- a/addons/sale/partner.py
+++ b/addons/sale/partner.py
@@ -32,15 +32,15 @@
 from osv import fields, osv
 
 
-class res_partner(osv.osv):
-    _name = 'res.partner'
-    _inherit = 'res.partner'
-    _columns = {
-        'sales': fields.one2many('sale.order', 'partner_id', 'Sales'),
-    }
-
-res_partner()
-
+#class res_partner(osv.osv):
+#    _name = 'res.partner'
+#    _inherit = 'res.partner'
+#    _columns = {
+#        'sales': fields.one2many('sale.order', 'partner_id', 'Sales'),
+#    }
+#
+#res_partner()
+#
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 98629c30481..df8a41e9748 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -102,6 +102,48 @@ class sale_order(osv.osv):
             res[id] = cur_obj.round(cr, uid, cur, untax.get(id, 0.0) + tax.get(id, 0.0))
         return res
 
+    def _picked_rate(self, cr, uid, ids, name, arg, context=None):
+        if not ids: return {}
+        res = {}
+        for id in ids:
+            res[id] = [0.0,0.0]
+        cr.execute('''SELECT
+                p.sale_id,sum(m.product_qty), m.state
+            FROM
+                stock_move m
+            LEFT JOIN
+                stock_picking p on (p.id=m.picking_id)
+            WHERE
+                p.sale_id in ('''+','.join(map(str,ids))+''')
+            GROUP BY m.state, p.sale_id''')
+        for oid,nbr,state in cr.fetchall():
+            if state=='cancel':
+                continue
+            if state=='done':
+                res[oid][0] += nbr or 0.0
+                res[oid][1] += nbr or 0.0
+            else:
+                res[oid][1] += nbr or 0.0
+        for r in res:
+            if not res[r][1]:
+                res[r] = 0.0
+            else:
+                res[r] = 100.0 * res[r][0] / res[r][1]
+        return res
+
+    def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for sale in self.browse(cursor, user, ids, context=context):
+            tot = 0.0
+            for invoice in sale.invoice_ids:
+                if invoice.state not in ('draft','cancel'):
+                    tot += invoice.amount_untaxed
+            if tot:
+                res[sale.id] = tot * 100.0 / sale.amount_untaxed
+            else:
+                res[sale.id] = 0.0
+        return res
+
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
@@ -185,8 +227,10 @@ class sale_order(osv.osv):
 
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoice', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
-        'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Packing List', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
+        'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Packings', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
         'shipped':fields.boolean('Picked', readonly=True),
+        'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
+        'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, method=True, string='Paid',
             fnct_search=_invoiced_search, type='boolean'),
         'note': fields.text('Notes'),
@@ -194,6 +238,7 @@ class sale_order(osv.osv):
         'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
         'amount_total': fields.function(_amount_total, method=True, string='Total'),
         'invoice_quantity': fields.selection([('order','Ordered Quantities'),('procurement','Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."),
+        'payment_term' : fields.many2one('account.payment.term', 'Payment Term'),
     }
     _defaults = {
         'picking_policy': lambda *a: 'direct',
@@ -236,10 +281,11 @@ class sale_order(osv.osv):
 
     def onchange_partner_id(self, cr, uid, ids, part):
         if not part:
-            return {'value':{'partner_invoice_id': False, 'partner_shipping_id':False, 'partner_order_id':False}}
+            return {'value':{'partner_invoice_id': False, 'partner_shipping_id':False, 'partner_order_id':False, 'payment_term' : False}}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['delivery','invoice','contact'])
         pricelist = self.pool.get('res.partner').browse(cr, uid, part).property_product_pricelist.id
-        return {'value':{'partner_invoice_id': addr['invoice'], 'partner_order_id':addr['contact'], 'partner_shipping_id':addr['delivery'], 'pricelist_id': pricelist}}
+        payment_term = self.pool.get('res.partner').browse(cr, uid, part).property_payment_term.id
+        return {'value':{'partner_invoice_id': addr['invoice'], 'partner_order_id':addr['contact'], 'partner_shipping_id':addr['delivery'], 'pricelist_id': pricelist, 'payment_term' : payment_term}}
 
     def button_dummy(self, cr, uid, ids, context={}):
         return True
@@ -253,8 +299,8 @@ class sale_order(osv.osv):
 
     def _make_invoice(self, cr, uid, order, lines):
         a = order.partner_id.property_account_receivable.id
-        if order.partner_id and order.partner_id.property_payment_term.id:
-            pay_term = order.partner_id.property_payment_term.id
+        if order.payment_term:
+            pay_term = order.payment_term.id
         else:
             pay_term = False
         for preinv in order.invoice_ids:
@@ -609,7 +655,7 @@ class sale_order_line(osv.osv):
         'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number packages'),
         'notes': fields.text('Notes'),
         'th_weight' : fields.float('Weight'),
-        'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled')], 'State', required=True, readonly=True),
+        'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled')], 'Status', required=True, readonly=True),
     }
     _order = 'sequence, id'
     _defaults = {
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index cf5b2eeab39..dbe1662fe86 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -51,11 +51,11 @@
             <field name="arch" type="xml">
                 <tree string="Sales orders">
                     <field name="date_order"/>
-                    <field name="name"/>
+                    <field name="name" string="Reference"/>
                     <field name="partner_id"/>
                     <field name="partner_shipping_id"/>
-                    <field name="shipped"/>
-                    <field name="invoiced"/>
+                    <field name="picked_rate" widget="progressbar"/>
+                    <field name="invoiced_rate" widget="progressbar"/>
                     <field name="amount_untaxed"/>
                     <field name="state"/>
                 </tree>
@@ -68,16 +68,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales order">
-                    <notebook>
+					<group col="6" colspan="4">
+						<field name="name" select="1"/>
+						<field name="client_order_ref"/>
+						<field name="shipped" select="2"/>
+						<field name="shop_id" on_change="onchange_shop_id(shop_id)" select="2"/>
+						<field name="date_order" select="1"/>
+						<field name="invoiced" select="2"/>
+					</group>
+                    <notebook colspan="4">
                         <page string="Sale Order">
-                            <field name="name" select="1"/>
-                            <group col="4" colspan="2">
-                                <field name="shipped" select="2"/>
-                                <field name="invoiced" select="2"/>
-                            </group>
-                            <newline/>
-                            <field name="date_order" select="1"/>
-                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" select="2"/>
+
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" select="1"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
@@ -166,14 +167,13 @@
                             <field name="order_policy"/>
                             <field groups="base.group_extended" name="origin"/>
                             <field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','picking')]}"/>
-                            <field name="client_order_ref"/>
+							<field name="payment_term"/>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page groups="base.group_extended" string="History">
                             <separator colspan="4" string="Related invoices"/>
                             <field colspan="4" name="invoice_ids" nolabel="1"/>
-                            <separator colspan="4" string="Related packings"/>
                             <field colspan="4" name="picking_ids" nolabel="1"/>
                         </page>
                     </notebook>
diff --git a/addons/sale/sale_wizard.xml b/addons/sale/sale_wizard.xml
index 6a0d388e75f..ece746bfa12 100644
--- a/addons/sale/sale_wizard.xml
+++ b/addons/sale/sale_wizard.xml
@@ -2,9 +2,21 @@
 <terp>
     <data>
         
-        <wizard id="wizard_sale_order_make_invoice" keyword="client_action_multi" model="sale.order" name="sale.order.make_invoice" string="Make invoices"/>
+        <wizard
+			id="wizard_sale_order_make_invoice" 
+			keyword="client_action_multi" 
+			model="sale.order" 
+			name="sale.order.make_invoice" 
+			multi="True"
+			string="Make invoices"/>
         
-        <wizard id="wizard_sale_order_line_invoice" keyword="client_action_multi" model="sale.order.line" name="sale.order.line.make_invoice" string="Make invoices"/>
+        <wizard
+			id="wizard_sale_order_line_invoice" 
+			keyword="client_action_multi"
+			model="sale.order.line" 
+			name="sale.order.line.make_invoice" 
+			multi="True"
+			string="Make invoices"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/sale_analytic_plans/__init__.py b/addons/sale_analytic_plans/__init__.py
new file mode 100644
index 00000000000..3d0ad667a77
--- /dev/null
+++ b/addons/sale_analytic_plans/__init__.py
@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+#----------------------------------------------------------
+# Init Sales
+#----------------------------------------------------------
+
+import sale_analytic_plans
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_analytic_plans/__terp__.py b/addons/sale_analytic_plans/__terp__.py
new file mode 100644
index 00000000000..7a828f772d7
--- /dev/null
+++ b/addons/sale_analytic_plans/__terp__.py
@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Sales Analytic Distribution Management",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com/module_sale.html",
+    "depends" : ["sale","account_analytic_plans"],
+    "category" : "Generic Modules/Sales & Purchases",
+    "init_xml" : [],
+    "demo_xml" : [],
+    "description": """
+    The base module to manage analytic distribution and sales orders.
+    """,
+    "update_xml" : [
+        "sale_analytic_plans_view.xml",
+    ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
new file mode 100644
index 00000000000..fae958cbcbf
--- /dev/null
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -0,0 +1,52 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+# 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 netsvc
+from osv import fields, osv
+import ir
+from mx import DateTime
+from tools import config
+
+class sale_order_line(osv.osv):
+    _name='sale.order.line'
+    _inherit='sale.order.line'
+    _columns = {
+        'analytics_id':fields.many2one('account.analytic.plan.instance','Analytic Distribution'),
+    }
+    def invoice_line_create(self, cr, uid, ids, context={}):
+        create_ids=super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
+        i=0
+        for line in self.browse(cr, uid, ids, context):
+            self.pool.get('account.invoice.line').write(cr,uid,[create_ids[i]],{'analytics_id':line.analytics_id.id})
+            i=i+1
+        return create_ids
+sale_order_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
new file mode 100644
index 00000000000..3a7fbd3e697
--- /dev/null
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<terp>
+<data>
+
+	<record model="ir.ui.view" id="view_order_form_inherit">
+		<field name="name">sale.order.form.inherit</field>
+		<field name="model">sale.order</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="sale.view_order_form"/>
+		<field name="arch" type="xml">
+			<field name="project_id" select="2" position="replace"/>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_order_form_inherit2">
+		<field name="name">sale.order.form.inherit2</field>
+		<field name="model">sale.order</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="sale.view_order_form"/>
+		<field name="arch" type="xml">
+			<field name="product_id"
+				on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order)"
+				context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
+				select="1" position="after">
+				<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+			</field>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_order_line_form2_inherit">
+		<field name="name">sale.order.line.form2.inherit</field>
+		<field name="model">sale.order.line</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="sale.view_order_line_form2"/>
+		<field name="arch" type="xml">
+			<field name="product_id" readonly="1" select="1" position="after">
+				<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+			</field>
+		</field>
+	</record>
+
+</data>
+</terp>
diff --git a/addons/sale_crm/__init__.py b/addons/sale_crm/__init__.py
new file mode 100644
index 00000000000..f9e10c31ca6
--- /dev/null
+++ b/addons/sale_crm/__init__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_crm/__terp__.py b/addons/sale_crm/__terp__.py
new file mode 100644
index 00000000000..abb4374837d
--- /dev/null
+++ b/addons/sale_crm/__terp__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Sale CRM Stuff",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com/module_sale.html",
+    "depends" : ["sale", "crm", "product", "account"],
+    "category" : "Generic Modules/Sales & Purchases",
+    "description": """
+    This module adds a shortcut on one or several cases in the CRM.
+    This shortcut allows you to generate a sale order based the selected case.
+    If different cases are open (a list), it generates one sale order by
+    case.
+    The case is then closed and linked to the generated sale order.
+
+    It also add a shortcut on one or several partners.
+    This shorcut allows you to generate a CRM case for the partners.
+    """,
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ["sale_crm_wizard.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_crm/sale_crm_wizard.xml b/addons/sale_crm/sale_crm_wizard.xml
new file mode 100644
index 00000000000..5a51f092567
--- /dev/null
+++ b/addons/sale_crm/sale_crm_wizard.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<terp>
+	<data>
+
+		<wizard
+			string="Make Sale Order"
+			model="crm.case"
+			name="crm.case.make_order"
+			keyword="client_action_multi"
+			id="sale_crm_wizard"/>
+
+		<wizard
+			string="Make Case"
+			model="res.partner"
+			name="sale_crm.make_case"
+			keyword="client_action_multi"
+			id="sale_crm_make_case_wizard"/>
+	</data>
+</terp>
diff --git a/addons/sale_crm/wizard/__init__.py b/addons/sale_crm/wizard/__init__.py
new file mode 100644
index 00000000000..d794d5a5fa2
--- /dev/null
+++ b/addons/sale_crm/wizard/__init__.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: __init__.py 1070 2005-07-29 12:41:24Z nicoe $
+#
+# 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 makesale
+import makecase
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_crm/wizard/makecase.py b/addons/sale_crm/wizard/makecase.py
new file mode 100644
index 00000000000..bfdfb2584d2
--- /dev/null
+++ b/addons/sale_crm/wizard/makecase.py
@@ -0,0 +1,100 @@
+# -*- encoding: utf-8 -*-
+'''Make case wizard'''
+##############################################################################
+#
+# Copyright (c) 2007 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 pooler
+
+def _get_default(obj, cursor, uid, data, context=None):
+    '''Get default value'''
+    return {'user': uid}
+
+def _make_case(obj, cursor, uid, data, context=None):
+    '''Create case'''
+    pool = pooler.get_pool(cursor.dbname)
+    case_obj = pool.get('crm.case')
+    mod_obj = pool.get('ir.model.data')
+    act_obj = pool.get('ir.actions.act_window')
+
+    new_id = []
+
+    for partner_id in data['ids']:
+        new_id.append(case_obj.create(cursor, uid, {
+            'name': data['form']['name'],
+            'section_id': data['form']['section'],
+            'partner_id': partner_id,
+            'description': data['form']['description'],
+            }))
+
+    result = mod_obj._get_id(cursor, uid, 'crm', 'crm_case_categ0-act')
+    res_id = mod_obj.read(cursor, uid, [result], ['res_id'])[0]['res_id']
+    result = act_obj.read(cursor, uid, [res_id])[0]
+    result['domain'] = str([('id', 'in', new_id)])
+    return result
+
+
+class MakeCase(wizard.interface):
+    '''Wizard that create case on partner'''
+
+    case_form = """<?xml version="1.0"?>
+<form string="Make Case">
+    <field name="name"/>
+    <field name="section"/>
+    <field name="user"/>
+    <field name="description" colspan="4"/>
+</form>"""
+
+    case_fields = {
+        'name': {'string': 'Case Description', 'type': 'char', 'size': 64,
+            'required': True},
+        'section': {'string': 'Case Section', 'type': 'many2one',
+            'relation': 'crm.case.section', 'required': True},
+        'user': {'string': 'User Responsible', 'type': 'many2one',
+            'relation': 'res.users'},
+        'description': {'string': 'Your action', 'type': 'text'},
+    }
+
+    states = {
+        'init': {
+            'actions': [_get_default],
+            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
+                'state': [
+                    ('end', 'Cancel'),
+                    ('create', 'Create')
+                ]
+            }
+        },
+        'create': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _make_case, 'state': 'end'}
+        }
+    }
+
+MakeCase('sale_crm.make_case')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
new file mode 100644
index 00000000000..0cfd65a5dfe
--- /dev/null
+++ b/addons/sale_crm/wizard/makesale.py
@@ -0,0 +1,156 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: makesale.py 1183 2005-08-23 07:43:32Z pinky $
+#
+# 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.
+#
+##############################################################################
+
+from mx.DateTime import now
+
+import wizard
+import netsvc
+import ir
+import pooler
+
+sale_form = """<?xml version="1.0"?>
+<form string="Make Sale Order">
+    <field name="name"/>
+    <field name="close"/>
+    <field name="partner_id" required="True"/>
+    <field name="shop_id" required="True"/>
+    <field name="analytic_account"/>
+    <field name="picking_policy" required="True"/>
+    <newline/>
+    <field name="products" colspan="4"/>
+</form>"""
+
+sale_fields = {
+    'name': {'string': 'Order name', 'type': 'char',
+        'help': 'Keep empty for default value'},
+    'shop_id': {'string': 'Shop', 'type': 'many2one', 'relation': 'sale.shop'},
+    'partner_id': {'string': 'Default partner', 'type': 'many2one',
+        'relation': 'res.partner',
+        'help': 'Use this partner if there is no partner on the case'},
+    'picking_policy': {'string': 'Packing policy', 'type': 'selection',
+        'selection': [('direct','Direct Delivery'),('one','All at once')]},
+    'products': {'string': 'Products', 'type': 'many2many',
+        'relation': 'product.product'},
+    'analytic_account': {'string': 'Analytic account', 'type': 'many2one',
+        'relation': 'account.analytic.account'},
+    'close': {'string': 'Close', 'type': 'boolean', 'default': lambda *a: 1,
+        'help': 'Select to close the case'},
+}
+
+
+class make_sale(wizard.interface):
+
+    def _selectPartner(self, cr, uid, data, context):
+        case_obj = pooler.get_pool(cr.dbname).get('crm.case')
+        case = case_obj.read(cr, uid, data['ids'], ['partner_id'])
+        return {'partner_id': case[0]['partner_id']}
+
+    def _makeOrder(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        case_obj = pool.get('crm.case')
+        sale_obj = pool.get('sale.order')
+        partner_obj = pool.get('res.partner')
+        sale_line_obj = pool.get('sale.order.line')
+
+        default_partner_addr = partner_obj.address_get(cr, uid, [data['form']['partner_id']],
+                ['invoice', 'delivery', 'contact'])
+        default_pricelist = partner_obj.browse(cr, uid, data['form']['partner_id'],
+                    context).property_product_pricelist.id
+
+        new_ids = []
+
+        for case in case_obj.browse(cr, uid, data['ids']):
+            if case.partner_id and case.partner_id.id:
+                partner_id = case.partner_id.id
+                partner_addr = partner_obj.address_get(cr, uid, [case.partner_id.id],
+                        ['invoice', 'delivery', 'contact'])
+                pricelist = partner_obj.browse(cr, uid, case.partner_id.id,
+                        context).property_product_pricelist.id
+            else:
+                partner_id = data['form']['partner_id']
+                partner_addr = default_partner_addr
+                pricelist = default_pricelist
+
+            vals = {
+                'origin': 'CRM:%s' % str(case.id),
+                'picking_policy': data['form']['picking_policy'],
+                'shop_id': data['form']['shop_id'],
+                'partner_id': partner_id,
+                'pricelist_id': pricelist,
+                'partner_invoice_id': partner_addr['invoice'],
+                'partner_order_id': partner_addr['contact'],
+                'partner_shipping_id': partner_addr['delivery'],
+                'order_policy': 'manual',
+                'date_order': now(),
+            }
+            if data['form']['name']:
+                vals['name'] = data['form']['name']
+            if data['form']['analytic_account']:
+                vals['project_id'] = data['form']['analytic_account']
+            new_id = sale_obj.create(cr, uid, vals)
+
+            for product_id in data['form']['products'][0][2]:
+                value = sale_line_obj.product_id_change(cr, uid, [], pricelist,
+                        product_id, qty=1, partner_id=partner_id)['value']
+                value['product_id'] = product_id
+                value['order_id'] = new_id
+                sale_line_obj.create(cr, uid, value)
+
+            case_obj.write(cr, uid, case.id, {'ref': 'sale.order,%s' % new_id})
+            new_ids.append(new_id)
+
+        if data['form']['close']:
+            case_obj.case_close(cr, uid, data['ids'])
+
+        value = {
+            'domain': str([('id', 'in', new_ids)]),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'sale.order',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+        }
+        return value
+
+    states = {
+        'init': {
+            'actions': [_selectPartner],
+            'result': {'type': 'form', 'arch': sale_form, 'fields': sale_fields,
+                'state' : [('end', 'Cancel'),('order', 'Make Sale Order')]}
+        },
+        'order': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _makeOrder, 'state': 'end'}
+        }
+    }
+
+make_sale('crm.case.make_order')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_journal/__init__.py b/addons/sale_journal/__init__.py
new file mode 100644
index 00000000000..d77d98f7b59
--- /dev/null
+++ b/addons/sale_journal/__init__.py
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 sale_journal
+import sale_journal_inherit
+import sale_journal_report
+import sale_journal_picking_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_journal/__terp__.py b/addons/sale_journal/__terp__.py
new file mode 100644
index 00000000000..e439e1b312a
--- /dev/null
+++ b/addons/sale_journal/__terp__.py
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+#
+# Use the custom module to put your specific code in a separate module.
+#
+{
+    "name" : "Managing sales and deliveries by journal",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "category" : "Generic Modules/Sales & Purchases",
+    "website": "http://www.tinyerp.com",
+    "depends" : ["stock","sale"],
+    "demo_xml" : ['sale_journal_demo.xml'],
+    "init_xml" : ['sale_journal_data.xml'],
+    "update_xml" : ["sale_journal_view.xml","picking_journal_view.xml","picking_journal_view_report.xml"],
+    "description" : """
+    The sale journal modules allows you to categorize your
+    sales and deliveries (packing lists) between different journals.
+    This module is very helpfull for bigger companies that
+    works by departments.
+
+    You can use journal for different purposes, some examples:
+    * isolate sales of different departments
+    * journals for deliveries by truck or by UPS
+
+    Journals have a responsible and evolves between different status:
+    * draft, open, cancel, done.
+
+    Batch operations can be processed on the different journals to
+    confirm all sales at once, to validate or invoice packings, ...
+
+    It also supports batch invoicing methods that can be configured by
+    partners and sales orders, examples:
+    * daily invoicing,
+    * monthly invoicing, ...
+
+    Some statistics by journals are provided.
+    """,
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
new file mode 100644
index 00000000000..36a5830503a
--- /dev/null
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -0,0 +1,122 @@
+<terp>
+<data>
+
+	<record model="ir.ui.view" id="view_picking_journal_form">
+		<field name="name">sale_journal.picking.journal.form</field>
+		<field name="model">sale_journal.picking.journal</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Packing Journal">
+				<notebook>
+				<page string="Journal">
+					<separator string="Journal Information" colspan="4"/>
+					<field name="name" select="1"/>
+					<field name="code" select="1"/>
+					<field name="user_id" select="1"/>
+					<field name="date" select="1"/>
+					<field name="date_created" select="1"/>
+					<field name="date_validation" select="1"/>
+					<separator string="States" colspan="4"/>
+					<field name="state"/>
+					<group col="3" colspan="2">
+						<button name="button_open" string="Open Journal" states="draft" type="object"/>
+						<button name="button_close" string="Close Journal" states="open" type="object"/>
+						<button name="button_draft" string="Set to Draft" states="close,open" type="object"/>
+					</group>
+				</page>
+				<page string="Packings">
+					<button string="Cancel Packings" name="button_picking_cancel" states="draft,open" type="object"/>
+					<newline/>
+					<field name="picking_stats_ids" colspan="4" nolabel="1"/>
+				</page><page string="Notes">
+					<field name="note" colspan="4" nolabel="1"/>
+				</page>
+				</notebook>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_picking_journal_tree">
+		<field name="name">sale_journal.picking.journal.tree</field>
+		<field name="model">sale_journal.picking.journal</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Packing Journal">
+				<field name="name" select="1"/>
+				<field name="code" select="1"/>
+				<field name="user_id" select="1"/>
+				<field name="date" select="1"/>
+				<field name="state"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_definition_picking_journal">
+		<field name="name">Packings journals</field>
+		<field name="res_model">sale_journal.picking.journal</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+	
+	<menuitem name="Configuration" id="menu_definition_journal_configuration" parent="sale_wo_production.menu_sale_wo_inventory"/>
+	<menuitem name="Packings Journals" id="menu_definition_journal_picking" parent="menu_definition_journal_configuration" action="action_definition_picking_journal"/>
+
+	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree">
+		<field name="name">Packings by journal</field>
+		<field name="res_model">sale_journal.picking.journal</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[]</field>
+	</record>
+	
+	<menuitem name="Packing Lists" id="menu_definition_journal_packing_lists" parent="sale_wo_production.menu_sale_wo_inventory"/>
+	<menuitem name="Packings by Journal" id="menu_definition_journal_picking_byjournal" parent="menu_definition_journal_packing_lists" action="action_definition_picking_journal_tree"/>
+
+	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_my">
+		<field name="name">My open packing journals</field>
+		<field name="res_model">sale_journal.picking.journal</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
+	</record>
+	
+	<menuitem name="My Open Journals" id="menu_definition_journal_picking_byjournal_my" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_my"/>
+	
+	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_all">
+		<field name="name">Packings by journal</field>
+		<field name="res_model">sale_journal.picking.journal</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','=','open')]</field>
+	</record>
+	
+	<menuitem name="All Open Journals" id="menu_definition_journal_picking_byjournal_all" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_all"/>
+
+	<record model="ir.actions.act_window" id="action_invoice_type_tree">
+		<field name="name">Packings by invoice_method</field>
+		<field name="name">sale_journal.invoice.type.tree</field>
+		<field name="res_model">sale_journal.invoice.type</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">tree</field>
+	</record>
+	
+	<menuitem name="Sending Goods" id="menu_definition_journal_picking_sending_goods" parent="menu_definition_journal_packing_lists"/>
+	<menuitem name="Packings to Invoice" id="menu_definition_journal_picking_invoice" parent="menu_definition_journal_picking_sending_goods"/>
+	<menuitem name="Packings 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">Packings to invoice</field>
+		<field name="res_model">stock.picking</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
+	</record>
+	<record model="ir.values" id="ir_open_invoice_type">
+		<field name="key2">tree_but_open</field>
+		<field name="model">sale_journal.invoice.type</field>
+		<field name="name">Packings to invoice</field>
+		<field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
+		<field name="object" eval="True"/>
+	</record>
+
+</data>
+</terp>
diff --git a/addons/sale_journal/picking_journal_view_report.xml b/addons/sale_journal/picking_journal_view_report.xml
new file mode 100644
index 00000000000..c73b8ab4198
--- /dev/null
+++ b/addons/sale_journal/picking_journal_view_report.xml
@@ -0,0 +1,134 @@
+<terp>
+<data>
+
+	#
+	# Packings by invoice type
+	#
+
+	<record model="ir.ui.view" id="view_picking_invoice_type_stats_form">
+		<field name="name">sale_journal.invoice.type.stats.form</field>
+		<field name="model">sale_journal.invoice.type.stats</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Packings by invoice method">
+				<field name="name" select="1"/>
+				<field name="invoice_state" select="1"/>
+				<field name="state" select="1"/>
+				<field name="invoice_type_id" select="1"/>
+				<field name="quantity"/>
+				<field name="count"/>
+				<field name="price_total"/>
+				<field name="price_average"/>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_picking_invoice_type_stats_tree">
+		<field name="name">sale_journal.invoice.type.stats.tree</field>
+		<field name="model">sale_journal.invoice.type.stats</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Packings by invoice method">
+				<field name="name"/>
+				<field name="invoice_state"/>
+				<field name="state"/>
+				<field name="invoice_type_id"/>
+				<field name="quantity"/>
+				<field name="count"/>
+				<field name="price_total"/>
+				<field name="price_average"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open">
+		<field name="name">Statistics on packings to invoice</field>
+		<field name="res_model">sale_journal.invoice.type.stats</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open_menu_month">
+		<field name="name">Packings by invoice method</field>
+		<field name="res_model">sale_journal.invoice.type.stats</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+	</record>
+	
+	<menuitem name="Reporting" id="menu_definition_journal_reporting" parent="sale_wo_production.menu_sale_wo_inventory"/>
+	<menuitem name="This Month" id="menu_definition_journal_reporting_this" parent="menu_definition_journal_reporting"/>
+	<menuitem name="Packings by Invoice Method" id="menu_invoice_type_picking_stats_open_menu" parent="menu_definition_journal_reporting_this" action="action_invoice_type_picking_stats_open_menu_month"/>
+
+	<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open_menu_all">
+		<field name="name">Packings by invoice method</field>
+		<field name="res_model">sale_journal.invoice.type.stats</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+	
+	<menuitem name="All Months" id="menu_definition_journal_reporting_all" parent="menu_definition_journal_reporting"/>
+	<menuitem name="Packings by Invoice Method" id="menu_invoice_type_picking_stats_open_all" parent="menu_definition_journal_reporting_all" action="action_invoice_type_picking_stats_open_menu_all"/>
+
+	#
+	# Packings by journal
+	#
+
+	<record model="ir.ui.view" id="view_picking_journal_stats_form">
+		<field name="name">sale_journal.picking.stats.form</field>
+		<field name="model">sale_journal.picking.stats</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Packings by journals">
+				<field name="name" select="1"/>
+				<field name="state" select="1"/>
+				<field name="journal_id" select="1"/>
+				<field name="quantity"/>
+				<field name="count"/>
+				<field name="price_total"/>
+				<field name="price_average"/>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_picking_journal_stats_tree">
+		<field name="name">sale_journal.picking.stats.tree</field>
+		<field name="model">sale_journal.picking.stats</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Packings by journals">
+				<field name="name"/>
+				<field name="state"/>
+				<field name="journal_id"/>
+				<field name="quantity"/>
+				<field name="count"/>
+				<field name="price_total"/>
+				<field name="price_average"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_picking_picking_stats_open_menu_month">
+		<field name="name">Packings by journal</field>
+		<field name="res_model">sale_journal.picking.stats</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+	</record>
+	
+	<menuitem name="Packings by Journal" id="menu_picking_picking_stats_open_menu" parent="menu_definition_journal_reporting_this" action="action_picking_picking_stats_open_menu_month"/>
+	
+	<record model="ir.actions.act_window" id="action_picking_picking_stats_open_menu_all">
+		<field name="name">Packings by journal</field>
+		<field name="res_model">sale_journal.picking.stats</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+	
+	<menuitem name="Packings by Journal" id="menu_picking_picking_stats_open_all" parent="menu_definition_journal_reporting_all" action="action_picking_picking_stats_open_menu_all"/>
+
+</data>
+</terp>
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
new file mode 100644
index 00000000000..ad14ce6d337
--- /dev/null
+++ b/addons/sale_journal/sale_journal.py
@@ -0,0 +1,142 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+
+class sale_journal_invoice_type(osv.osv):
+    _name = 'sale_journal.invoice.type'
+    _description = 'Invoice Types'
+    _columns = {
+        'name': fields.char('Invoice Type', size=64, required=True),
+        'active': fields.boolean('Active'),
+        'note': fields.text('Note'),
+        'invoicing_method': fields.selection([('simple','Non grouped'),('grouped','Grouped')], 'Invoicing method', required=True),
+    }
+    _defaults = {
+        'active': lambda *a: True,
+        'invoicing_method': lambda *a:'simple'
+    }
+sale_journal_invoice_type()
+
+class sale_journal(osv.osv):
+    _name = 'sale_journal.sale.journal'
+    _description = 'Sale Journal'
+    _columns = {
+        'name': fields.char('Journal', size=64, required=True),
+        'code': fields.char('Code', size=16, required=True),
+        'user_id': fields.many2one('res.users', 'Responsible', required=True),
+        'date': fields.date('Journal date', required=True),
+        'date_created': fields.date('Creation date', readonly=True, required=True),
+        'date_validation': fields.date('Validation date', readonly=True),
+        'sale_stats_ids': fields.one2many("sale_journal.sale.stats", "journal_id", 'Sale Stats', readonly=True),
+        'state': fields.selection([
+            ('draft','Draft'),
+            ('open','Open'),
+            ('done','Done'),
+        ], 'State', required=True),
+        'note': fields.text('Note'),
+    }
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'date_created': lambda *a: time.strftime('%Y-%m-%d'),
+        'user_id': lambda self,cr,uid,context: uid,
+        'state': lambda self,cr,uid,context: 'draft',
+    }
+    def button_sale_cancel(self, cr, uid, ids, context={}):
+        for id in ids:
+            sale_ids = self.pool.get('sale.order').search(cr, uid, [('journal_id','=',id),('state','=','draft')])
+            for saleid in sale_ids:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'sale.order', saleid, 'cancel', cr)
+        return True
+    def button_sale_confirm(self, cr, uid, ids, context={}):
+        for id in ids:
+            sale_ids = self.pool.get('sale.order').search(cr, uid, [('journal_id','=',id),('state','=','draft')])
+            for saleid in sale_ids:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'sale.order', saleid, 'order_confirm', cr)
+        return True
+
+    def button_open(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'open'})
+        return True
+    def button_draft(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'draft'})
+        return True
+    def button_close(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'done', 'date_validation':time.strftime('%Y-%m-%d')})
+        return True
+sale_journal()
+
+class picking_journal(osv.osv):
+    _name = 'sale_journal.picking.journal'
+    _description = 'Packings Journal'
+    _columns = {
+        'name': fields.char('Journal', size=64, required=True),
+        'code': fields.char('Code', size=16, required=True),
+        'user_id': fields.many2one('res.users', 'Responsible', required=True),
+        'date': fields.date('Journal date', required=True),
+        'date_created': fields.date('Creation date', readonly=True, required=True),
+        'date_validation': fields.date('Validation date', readonly=True),
+        'picking_stats_ids': fields.one2many("sale_journal.picking.stats", "journal_id", 'Journal Stats', readonly=True),
+        'state': fields.selection([
+            ('draft','Draft'),
+            ('open','Open'),
+            ('done','Done'),
+        ], 'Creation date', required=True),
+        'note': fields.text('Note'),
+    }
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'date_created': lambda *a: time.strftime('%Y-%m-%d'),
+        'user_id': lambda self,cr,uid,context: uid,
+        'state': lambda self,cr,uid,context: 'draft',
+    }
+    def button_picking_cancel(self, cr, uid, ids, context={}):
+        for id in ids:
+            pick_ids = self.pool.get('stock.picking').search(cr, uid, [('journal_id','=',id)])
+            for pickid in pick_ids:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_cancel', cr)
+        return True
+    def button_open(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'open'})
+        return True
+    def button_draft(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'draft'})
+        return True
+    def button_close(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'done', 'date_validation':time.strftime('%Y-%m-%d')})
+        return True
+picking_journal()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_journal/sale_journal_data.xml b/addons/sale_journal/sale_journal_data.xml
new file mode 100644
index 00000000000..2eef0a0f1bd
--- /dev/null
+++ b/addons/sale_journal/sale_journal_data.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+
+	<record model="ir.property" id="property_invoice_type_def">
+		<field name="name">property_invoice_type</field>
+		<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_invoice_type')]"/>
+		<field name="value" eval="False"/>
+	</record>
+
+</data>
+</terp>
diff --git a/addons/sale_journal/sale_journal_demo.xml b/addons/sale_journal/sale_journal_demo.xml
new file mode 100644
index 00000000000..268000d880c
--- /dev/null
+++ b/addons/sale_journal/sale_journal_demo.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+
+	<record model="sale_journal.invoice.type" id="daily">
+		<field name="name">Daily invoicing</field>
+	</record>
+	<record model="sale_journal.invoice.type" id="monthly">
+		<field name="name">Monthly invoicing</field>
+		<field name="invoicing_method">grouped</field>
+	</record>
+
+	<record model="ir.property" id="sale_journal.property_invoice_type_def">
+		<field name="value" eval="'sale_journal.invoice.type,'+str(daily)"/>
+	</record>
+
+</data>
+</terp>
diff --git a/addons/sale_journal/sale_journal_inherit.py b/addons/sale_journal/sale_journal_inherit.py
new file mode 100644
index 00000000000..55898dca2ef
--- /dev/null
+++ b/addons/sale_journal/sale_journal_inherit.py
@@ -0,0 +1,81 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+
+from osv import osv, fields
+
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    _columns = {
+        'property_invoice_type': fields.property(
+        'sale_journal.invoice.type',
+        type='many2one',
+        relation='sale_journal.invoice.type',
+        string="Invoicing Method",
+        method=True,
+        view_load=True,
+        group_name="Accounting Properties",
+        help="The type of journal used for sales and packings."),
+    }
+res_partner()
+
+class picking(osv.osv):
+    _inherit="stock.picking"
+    _columns = {
+        'journal_id': fields.many2one('sale_journal.picking.journal', 'Journal'),
+        'sale_journal_id': fields.many2one('sale_journal.sale.journal', 'Sale Journal'),
+        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
+    }
+picking()
+
+class sale(osv.osv):
+    _inherit="sale.order"
+    _columns = {
+        'journal_id': fields.many2one('sale_journal.sale.journal', 'Journal'),
+        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type')
+    }
+    def action_ship_create(self, cr, uid, ids, *args):
+        result = super(sale, self).action_ship_create(cr, uid, ids, *args)
+        for order in self.browse(cr, uid, ids, context={}):
+            pids = [ x.id for x in order.picking_ids]
+            self.pool.get('stock.picking').write(cr, uid, pids, {
+                'invoice_type_id': order.invoice_type_id.id,
+                'sale_journal_id': order.journal_id.id
+            })
+        return result
+
+    def onchange_partner_id(self, cr, uid, ids, part):
+        result = super(sale, self).onchange_partner_id(cr, uid, ids, part)
+        if part:
+            itype = self.pool.get('res.partner').browse(cr, uid, part).property_invoice_type.id
+            result['value']['invoice_type_id'] = itype
+        return result
+sale()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_journal/sale_journal_picking_report.py b/addons/sale_journal/sale_journal_picking_report.py
new file mode 100644
index 00000000000..4bd4f1e6c69
--- /dev/null
+++ b/addons/sale_journal/sale_journal_picking_report.py
@@ -0,0 +1,122 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: sale.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+# 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.
+#
+##############################################################################
+
+from osv import fields,osv
+
+class report_sale_journal_invoice_type_stats(osv.osv):
+    _name = "sale_journal.invoice.type.stats"
+    _description = "Stats on packings by invoice method"
+    _auto = False
+    _columns = {
+        'name': fields.date('Month', readonly=True),
+        'invoice_state':fields.selection([
+            ("invoiced","invoiced"),
+            ("2binvoiced","to be invoiced"),
+            ("none","None")
+        ], "Invoice state", readonly=True),
+        'state': fields.selection([
+            ('draft','draft'),
+            ('auto','waiting'),
+            ('confirmed','confirmed'),
+            ('assigned','assigned'),
+            ('done','done'),
+            ('cancel','cancel'),
+        ], 'State', readonly=True),
+        'invoice_type_id':fields.many2one('sale_journal.invoice.type', 'Invoicing method', readonly=True),
+        'quantity': fields.float('Quantities', readonly=True),
+        'price_total': fields.float('Total Price', readonly=True),
+        'price_average': fields.float('Average Price', readonly=True),
+        'count': fields.integer('# of Lines', readonly=True),
+    }
+    _order = 'state,invoice_state,name desc'
+    def init(self, cr):
+        cr.execute("""
+            create or replace view sale_journal_invoice_type_stats as (
+                select
+                    min(l.id) as id,
+                    to_char(s.date, 'YYYY-MM-01') as name,
+                    s.state,
+                    s.invoice_state,
+                    s.invoice_type_id,
+                    sum(l.product_qty) as quantity,
+                    count(*) as count,
+                    sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0)) as price_total,
+                    (sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0))/sum(l.product_qty))::decimal(16,2) as price_average
+                from stock_picking s
+                    left join stock_move l on (s.id=l.picking_id)
+                    left join sale_order_line ol on (l.sale_line_id=ol.id)
+                group by s.invoice_type_id, to_char(s.date, 'YYYY-MM-01'),s.state, s.invoice_state
+                order by s.invoice_type_id, s.invoice_state, s.state
+            )
+        """)
+report_sale_journal_invoice_type_stats()
+
+class report_sale_journal_picking(osv.osv):
+    _name = "sale_journal.picking.stats"
+    _description = "Packing lists by Journal"
+    _auto = False
+    _columns = {
+        'name': fields.date('Month', readonly=True),
+        'state': fields.selection([
+            ('draft','draft'),
+            ('auto','waiting'),
+            ('confirmed','confirmed'),
+            ('assigned','assigned'),
+            ('done','done'),
+            ('cancel','cancel'),
+        ], 'State', readonly=True),
+        'journal_id':fields.many2one('sale_journal.picking.journal', 'Journal', readonly=True),
+        'quantity': fields.float('Quantities', readonly=True),
+        'price_total': fields.float('Total Price', readonly=True),
+        'price_average': fields.float('Average Price', readonly=True),
+        'count': fields.integer('# of Lines', readonly=True),
+    }
+    _order = 'journal_id,name desc,price_total desc'
+    def init(self, cr):
+        cr.execute("""
+            create or replace view sale_journal_picking_stats as (
+                select
+                    min(l.id) as id,
+                    to_char(s.date, 'YYYY-MM-01') as name,
+                    s.state,
+                    s.journal_id,
+                    sum(l.product_qty) as quantity,
+                    count(*) as count,
+                    sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0)) as price_total,
+                    (sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0))/sum(l.product_qty))::decimal(16,2) as price_average
+                from stock_picking s
+                    right join stock_move l on (s.id=l.picking_id)
+                    right join sale_order_line ol on (l.sale_line_id=ol.id)
+                group by s.journal_id, to_char(s.date, 'YYYY-MM-01'),s.state
+            )
+        """)
+report_sale_journal_picking()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_journal/sale_journal_report.py b/addons/sale_journal/sale_journal_report.py
new file mode 100644
index 00000000000..a8701bead27
--- /dev/null
+++ b/addons/sale_journal/sale_journal_report.py
@@ -0,0 +1,77 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: sale.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+# 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.
+#
+##############################################################################
+
+from osv import fields,osv
+
+class report_sale_journal_sale(osv.osv):
+    _name = "sale_journal.sale.stats"
+    _description = "Sales Orders by Journal"
+    _auto = False
+    _columns = {
+        'name': fields.date('Month', readonly=True),
+        'state': fields.selection([
+            ('draft','Quotation'),
+            ('waiting_date','Waiting Schedule'),
+            ('manual','Manual in progress'),
+            ('progress','In progress'),
+            ('shipping_except','Shipping Exception'),
+            ('invoice_except','Invoice Exception'),
+            ('done','Done'),
+            ('cancel','Cancel')
+        ], 'Order State', readonly=True),
+        'journal_id':fields.many2one('sale_journal.sale.journal', 'Journal', readonly=True),
+        'quantity': fields.float('Quantities', readonly=True),
+        'price_total': fields.float('Total Price', readonly=True),
+        'price_average': fields.float('Average Price', readonly=True),
+        'count': fields.integer('# of Lines', readonly=True),
+    }
+    _order = 'journal_id,name desc,price_total desc'
+    def init(self, cr):
+        cr.execute("""
+            create or replace view sale_journal_sale_stats as (
+                select
+                    min(l.id) as id,
+                    to_char(s.date_order, 'YYYY-MM-01') as name,
+                    s.state,
+                    s.journal_id,
+                    sum(l.product_uom_qty) as quantity,
+                    count(*),
+                    sum(l.product_uom_qty*l.price_unit) as price_total,
+                    (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty))::decimal(16,2) as price_average
+                from sale_order s
+                    right join sale_order_line l on (s.id=l.order_id)
+                group by s.journal_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
+            )
+        """)
+report_sale_journal_sale()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
new file mode 100644
index 00000000000..2a80d4befd3
--- /dev/null
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -0,0 +1,284 @@
+<terp>
+<data>
+	<record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
+		<field name="name">sale_journal.invoice.type.form</field>
+		<field name="model">sale_journal.invoice.type</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Invoice Type">
+				<field name="name" select="1"/>
+				<field name="active" select="1"/>
+				<field name="invoicing_method" select="1"/>
+				<newline/>
+				<field name="note" colspan="4"/>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
+		<field name="name">sale_journal.invoice.type.tree</field>
+		<field name="model">sale_journal.invoice.type</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Invoice Type">
+				<field name="name"/>
+				<field name="invoicing_method"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
+		<field name="res_model">sale_journal.invoice.type</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+	
+	<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>
+		<field name="model">sale_journal.sale.journal</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Sale Journal">
+				<notebook>
+				<page string="Journal">
+					<separator string="Journal Information" colspan="4"/>
+					<field name="name" select="1"/>
+					<field name="code" select="1"/>
+					<field name="user_id" select="1"/>
+					<field name="date" select="1"/>
+					<field name="date_created" select="1"/>
+					<field name="date_validation" select="1"/>
+					<separator string="States" colspan="4"/>
+					<field name="state"/>
+					<group col="3" colspan="2">
+						<button name="button_open" string="Open Journal" states="draft" type="object"/>
+						<button name="button_close" string="Close Journal" states="open" type="object"/>
+						<button name="button_draft" string="Set to Draft" states="close,open" type="object"/>
+					</group>
+				</page>
+				<page string="Sales">
+					<button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object"/>
+					<button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object"/>
+					<newline/>
+					<field name="sale_stats_ids" colspan="4" nolabel="1">
+						<tree string="Sales">
+							<field name="name"/>
+							<field name="quantity"/>
+							<field name="price_total"/>
+							<field name="price_average"/>
+							<field name="count"/>
+							<field name="state"/>
+						</tree>
+					</field>
+				</page><page string="Notes">
+					<field name="note" colspan="4" nolabel="1"/>
+				</page>
+				</notebook>
+			</form>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_sale_journal_tree">
+		<field name="name">sale_journal.sale.journal.tree</field>
+		<field name="model">sale_journal.sale.journal</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Sale Journal">
+				<field name="name" select="1"/>
+				<field name="code" select="1"/>
+				<field name="user_id" select="1"/>
+				<field name="date" select="1"/>
+				<field name="state"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.actions.act_window" id="action_definition_journal">
+		<field name="res_model">sale_journal.sale.journal</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+	
+	<menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>
+
+	<record model="ir.actions.act_window" id="action_definition_journal_tree">
+		<field name="res_model">sale_journal.sale.journal</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[]</field>
+	</record>
+	
+	<menuitem name="Sales by Journal" id="menu_definition_journal_sales" parent="sale.menu_sale_root" action="action_definition_journal_tree"/>
+
+	<record model="ir.actions.act_window" id="action_definition_journal_tree_my">
+		<field name="name">My open journals</field>
+		<field name="res_model">sale_journal.sale.journal</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
+	</record>
+	
+	<menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my"/>
+
+	<record model="ir.actions.act_window" id="action_definition_journal_tree_all">
+		<field name="name">Open journals</field>
+		<field name="res_model">sale_journal.sale.journal</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','=','open')]</field>
+	</record>
+	
+	<menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all"/>
+
+	<record model="ir.ui.view" id="sale_journal_sale_order">
+		<field name="name">sale.order.journal.view.form</field>
+		<field name="type">form</field>
+		<field name="model">sale.order</field>
+		<field name="inherit_id" ref="sale.view_order_form" />
+		<field name="arch" type="xml">
+			<field name="client_order_ref" position="after">
+				<field name="journal_id" select="1"/>
+				<field name="invoice_type_id" select="1"/>
+			</field>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="sale_journal_sale_order_tree">
+		<field name="name">sale.order.journal.view.tree</field>
+		<field name="type">tree</field>
+		<field name="model">sale.order</field>
+		<field name="inherit_id" ref="sale.view_order_tree" />
+		<field name="arch" type="xml">
+			<field name="state" position="after">
+				<field name="journal_id"/>
+				<field name="invoice_type_id"/>
+			</field>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="sale_journal_picking_order">
+		<field name="name">stock.picking.journal.view.form</field>
+		<field name="type">form</field>
+		<field name="model">stock.picking</field>
+		<field name="inherit_id" ref="stock.view_picking_form" />
+		<field name="arch" type="xml">
+			<field name="origin" position="after">
+				<field name="invoice_type_id" select="1"/>
+				<field name="sale_journal_id" select="1"/>
+				<field name="journal_id" select="1"/>
+			</field>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="sale_journal_picking_order_tree">
+		<field name="name">stock.picking.journal.view.tree</field>
+		<field name="type">tree</field>
+		<field name="model">stock.picking</field>
+		<field name="inherit_id" ref="stock.vpicktree" />
+		<field name="arch" type="xml">
+			<field name="invoice_state" position="after">
+				<field name="sale_journal_id" select="1"/>
+				<field name="invoice_type_id" select="1"/>
+				<field name="journal_id" select="1"/>
+			</field>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_sale_journal_sale_stats_tree">
+		<field name="name">sale_journal.sale.stats.tree</field>
+		<field name="model">sale_journal.sale.stats</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Sales by Journal">
+				<field name="name"/>
+				<field name="state"/>
+				<field name="journal_id"/>
+				<field name="quantity"/>
+				<field name="count"/>
+				<field name="price_total"/>
+				<field name="price_average"/>
+			</tree>
+		</field>
+	</record>
+	<record model="ir.ui.view" id="view_sale_journal_sale_stats_form">
+		<field name="name">sale_journal.sale.stats.form</field>
+		<field name="model">sale_journal.sale.stats</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Sales by Journal">
+				<field name="name" select="1"/>
+				<field name="state" select="1"/>
+				<field name="journal_id" select="1"/>
+				<field name="quantity"/>
+				<field name="count"/>
+				<field name="price_total"/>
+				<field name="price_average"/>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_month">
+		<field name="name">Sales by journal (this month)</field>
+		<field name="res_model">sale_journal.sale.stats</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+	</record>
+	
+	<menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
+	<menuitem name="This Month" id="menu_definition_report_sales_this_month" parent="menu_definition_report_sales"/>
+	<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales_this_month" action="action_sale_sale_stats_open_menu_month"/>
+
+	<record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_all">
+		<field name="res_model">sale_journal.sale.stats</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+	
+	<menuitem name="All Months" id="menu_definition_report_sales_all_month" parent="menu_definition_report_sales"/>
+	<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales_all_month" action="action_sale_sale_stats_open_menu_all"/>
+
+	<act_window name="Monthly sales"
+		domain="[('journal_id', '=', active_id)]"
+		res_model="sale_journal.sale.stats"
+		src_model="sale_journal.sale.journal"
+		id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
+
+	<act_window name="Assigned packings"
+		domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
+		res_model="stock.picking"
+		src_model="sale_journal.picking.journal"
+		id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
+
+	<act_window name="Confirmed packings"
+		domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
+		res_model="stock.picking"
+		src_model="sale_journal.picking.journal"
+		id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
+
+	<act_window name="Assigned packings"
+		domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
+		res_model="stock.picking"
+		src_model="sale_journal.sale.journal"
+		id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
+
+	<act_window name="Confirmed packings"
+		domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
+		res_model="stock.picking"
+		src_model="sale_journal.sale.journal"
+		id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
+
+	<act_window name="Draft sales"
+		domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
+		res_model="sale.order"
+		src_model="sale_journal.sale.journal"
+		id="act_sale_journal_sale_journal_2_sale_order_draft"/>
+
+	<act_window name="Approved sales"
+		domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
+		res_model="sale.order"
+		src_model="sale_journal.sale.journal"
+		id="act_sale_journal_sale_journal_2_sale_order_approved"/>
+
+
+</data>
+</terp>
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index f56b316bdfe..bbc788f4531 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -107,7 +107,7 @@ class scrum_sprint(osv.osv):
         'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)'),
         'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'),
         'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours'),
-        'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'State', required=True),
+        'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'Status', required=True),
     }
     _defaults = {
         'state': lambda *a: 'draft',
@@ -175,7 +175,7 @@ class scrum_product_backlog(osv.osv):
         'sequence' : fields.integer('Sequence'),
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority'),
         'tasks_id': fields.one2many('scrum.task', 'product_backlog_id', 'Tasks Details'),
-        'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'State', required=True),
+        'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'Status', required=True),
         'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)'),
         'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'),
         'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours')
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index ae57231c0a5..7e41b9f65a5 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -36,14 +36,16 @@
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
-        "stock_workflow.xml",
-        "stock_data.xml",
+        "stock_workflow.xml", 
+        "stock_data.xml", 
         "stock_incoterms.xml",
-        "stock_wizard.xml",
-        "stock_view.xml",
-        "stock_report.xml",
-        "stock_sequence.xml",
+        "stock_wizard.xml", 
+        "stock_view.xml", 
+        "stock_report.xml", 
+        "stock_sequence.xml", 
         "product_data.xml",
+        "product_view.xml",
+        "partner_view.xml",
         "ir.model.access.csv",
     ],
     "active": False,
diff --git a/addons/stock/partner.py b/addons/stock/partner.py
index d3770697f62..41c06fcb557 100644
--- a/addons/stock/partner.py
+++ b/addons/stock/partner.py
@@ -42,7 +42,6 @@ class res_partner(osv.osv):
           string="Customer Location", 
           method=True,
           view_load=True,
-          group_name="Inventory Properties",
           help="This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"),
         'property_stock_supplier': fields.property(
           'stock.location',
@@ -51,7 +50,6 @@ class res_partner(osv.osv):
           string="Supplier Location", 
           method=True,
           view_load=True,
-          group_name="Inventory Properties",
           help="This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner"),
     }
 res_partner()
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
new file mode 100644
index 00000000000..0fce0ccf7e0
--- /dev/null
+++ b/addons/stock/partner_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<terp>
+    <data>
+        <!--
+        Partners Extension
+    -->
+        
+        <record id="view_partner_property_form" model="ir.ui.view">
+            <field name="name">res.partner.stock.property.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+				<page string="Sales &amp; Purchases" position="inside">
+					<group colspan="2" col="2">
+						<separator string="Stock Properties" colspan="2"/>
+						<field name="property_stock_customer"/>
+						<field name="property_stock_supplier"/>
+					</group>
+                </page>
+            </field>
+        </record>
+
+    </data>
+</terp>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index f90a1be63a9..5834a187c22 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -42,7 +42,6 @@ class product_product(osv.osv):
             string="Procurement Location",
             method=True,
             view_load=True,
-            group_name="Inventory Properties",
             help="For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by procurements"),
         'property_stock_production': fields.property(
             'stock.location',
@@ -51,7 +50,6 @@ class product_product(osv.osv):
             string="Production Location",
             method=True,
             view_load=True,
-            group_name="Inventory Properties",
             help="For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders"),
         'property_stock_inventory': fields.property(
             'stock.location',
@@ -60,17 +58,14 @@ class product_product(osv.osv):
             string="Inventory Location",
             method=True,
             view_load=True,
-            group_name="Inventory Properties",
             help="For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory"),
         'property_stock_account_input': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Input Account', method=True, view_load=True,
-            group_name='Stock Accounting Properties',
             help='This account will be used, instead of the default one, to value input stock'),
         'property_stock_account_output': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Output Account', method=True, view_load=True,
-            group_name='Stock Accounting Properties',
             help='This account will be used, instead of the default one, to value output stock'),
     }
 
@@ -83,17 +78,14 @@ class product_category(osv.osv):
         'property_stock_journal': fields.property('account.journal',
             relation='account.journal', type='many2one',
             string='Stock journal', method=True, view_load=True,
-            group_name="Accounting Properties",
             help="This journal will be used for the accounting move generated by stock move"),
         'property_stock_account_input_categ': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Input Account', method=True, view_load=True,
-            group_name='Stock Accounting Properties',
             help='This account will be used to value the input stock'),
         'property_stock_account_output_categ': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Output Account', method=True, view_load=True,
-            group_name='Stock Accounting Properties',
             help='This account will be used to value the output stock'),
     }
 
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
new file mode 100644
index 00000000000..1eb0b03f75a
--- /dev/null
+++ b/addons/stock/product_view.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<terp>
+    <data>
+
+        <record id="view_category_property_form" model="ir.ui.view">
+            <field name="name">product.category.stock.property.form.inherit</field>
+            <field name="model">product.category</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_category_form_view"/>
+            <field name="arch" type="xml">
+                <form position="inside">
+                    <group col="2" colspan="2">
+                        <separator string="Accounting Stock Properties" colspan="2"/>
+                        <field name="property_stock_account_input_categ"/>
+                        <field name="property_stock_account_output_categ"/>
+                        <field name="property_stock_journal"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+
+
+        <record id="view_template_property_form" model="ir.ui.view">
+            <field name="name">product.template.stock.property.form.inherit</field>
+            <field name="model">product.template</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
+            <field name="arch" type="xml">
+                <page string="Properties" position="inside">
+                    <separator string="Counter-Part Locations" colspan="4"/>
+                    <field name="property_stock_procurement"/>
+                    <field name="property_stock_production"/>
+                    <field name="property_stock_inventory"/>
+                    <separator string="Accounting Entries" colspan="4"/>
+                    <field name="property_stock_account_input"/>
+                    <field name="property_stock_account_output"/>
+                </page>
+            </field>
+        </record>
+
+
+        <record id="view_normal_property_acc.form" model="ir.ui.view">
+            <field name="name">product.normal.stock.acc.property.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="property_account_expense" position="after">
+                    <field name="property_stock_account_input"/>
+                    <field name="property_stock_account_output"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_normal_stock_property_form" model="ir.ui.view">
+            <field name="name">product.normal.stock.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">
+                <group name="status" position="after">
+                    <group colspan="2" col="2">
+                    <separator string="Stocks" colspan="4"/>
+                        <field name="qty_available"/>
+                        <field name="virtual_available"/>
+                        <field name="incoming_qty"/>
+                        <field name="outgoing_qty"/>
+                    </group>
+                </group>
+            </field>
+        </record>
+
+        <record id="view_normal_property_form" model="ir.ui.view">
+            <field name="name">product.normal.stock.property.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">
+                <group name="store" position="after">
+                    <group col="2" colspan="2" name="store">
+                        <separator string="Counter-Part Locations" colspan="2"/>
+                        <field name="property_stock_procurement"/>
+                        <field name="property_stock_production"/>
+                        <field name="property_stock_inventory"/>
+                    </group>
+                </group>
+            </field>
+        </record>
+
+
+    </data>
+</terp>
diff --git a/addons/stock/report/lot_move_label.xsl b/addons/stock/report/lot_move_label.xsl
index e69de29bb2d..1a6c65b8b0f 100644
--- a/addons/stock/report/lot_move_label.xsl
+++ b/addons/stock/report/lot_move_label.xsl
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:variable name="initial_bottom_pos">24.5</xsl:variable>
+	<xsl:variable name="initial_left_pos">1</xsl:variable>
+	<xsl:variable name="height_increment">3.8</xsl:variable>
+	<xsl:variable name="width_increment">7</xsl:variable>
+	<xsl:variable name="frame_height">3.5cm</xsl:variable>
+	<xsl:variable name="frame_width">6.5cm</xsl:variable>
+	<xsl:variable name="number_columns">3</xsl:variable>
+	<xsl:variable name="max_frames">21</xsl:variable>
+
+	<xsl:template match="/">
+		<xsl:apply-templates select="lots"/>
+	</xsl:template>
+
+	<xsl:template match="lots">
+		<document>
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Address list" author="Generated by Tiny ERP">
+				<pageTemplate id="all">
+					<pageGraphics/>
+					<xsl:apply-templates select="lot-line" mode="frames"/>
+				</pageTemplate>
+			</template>
+			<stylesheet>
+				<paraStyle name="nospace" fontName="Courier" fontSize="10" spaceBefore="0" spaceAfter="0"/>
+			</stylesheet>
+			<story>
+				<xsl:apply-templates select="lot-line" mode="story"/>
+			</story>
+		</document>
+	</xsl:template>
+
+	<xsl:template match="lot-line" mode="frames">
+		<xsl:if test="position() &lt; $max_frames + 1">
+			<frame>
+				<xsl:attribute name="width">
+					<xsl:value-of select="$frame_width"/>
+				</xsl:attribute>
+				<xsl:attribute name="height">
+					<xsl:value-of select="$frame_height"/>
+				</xsl:attribute>
+				<xsl:attribute name="x1">
+					<xsl:value-of select="$initial_left_pos + ((position()-1) mod $number_columns) * $width_increment"/>
+					<xsl:text>cm</xsl:text>
+				</xsl:attribute>
+				<xsl:attribute name="y1">
+					<xsl:value-of select="$initial_bottom_pos - floor((position()-1) div $number_columns) * $height_increment"/>
+					<xsl:text>cm</xsl:text>
+				</xsl:attribute>
+			</frame>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="lot-line" mode="story">
+		<para style="nospace"><xsl:value-of select="code"/><xsl:text>, </xsl:text><xsl:value-of select="quantity"/><xsl:text> </xsl:text><xsl:value-of select="uom"/></para>
+		<para style="nospace"><xsl:value-of select="product"/><xsl:text> </xsl:text><xsl:value-of select="variant"/></para>
+		<para style="nospace">Serial: <xsl:value-of select="serial"/></para>
+		<para style="nospace">Tracking: <xsl:value-of select="serial"/></para>
+		<spacer length="0.3cm"/>
+		<barCode><xsl:value-of select="tracking"/></barCode>
+		<nextFrame/>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0ae82a7876b..c3cd2d63b4f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -76,7 +76,7 @@ class stock_location(osv.osv):
     _description = "Location"
     _parent_name = "location_id"
     _columns = {
-        'name': fields.char('Location Name', size=64, required=True),
+        'name': fields.char('Location Name', size=64, required=True, translate=True),
         'active': fields.boolean('Active'),
         'usage': fields.selection([('supplier','Supplier Location'),('view','View'),('internal','Internal Location'),('customer','Customer Location'),('inventory','Inventory'),('procurement','Procurement'),('production','Production')], 'Location type'),
         'allocation_method': fields.selection([('fifo','FIFO'),('lifo','LIFO'),('nearest','Nearest')], 'Allocation Method', required=True),
@@ -392,7 +392,7 @@ class stock_picking(osv.osv):
             ('assigned','Assigned'),
             ('done','Done'),
             ('cancel','Cancel'),
-            ], 'State', readonly=True, select=True),
+            ], 'Status', readonly=True, select=True),
         'date':fields.datetime('Date create'),
 
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines'),
@@ -402,7 +402,7 @@ class stock_picking(osv.osv):
         'invoice_state':fields.selection([
             ("invoiced","Invoiced"),
             ("2binvoiced","To be invoiced"),
-            ("none","Not from Packing")], "Invoice state", 
+            ("none","Not from Packing")], "Invoice Status", 
             select=True),
     }
     _defaults = {
@@ -478,6 +478,13 @@ class stock_picking(osv.osv):
         # TODO: Check locations to see if in the same location ?
         return True
 
+    def button_confirm(self, cr, uid, ids, *args):
+        for id in ids:
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'stock.picking', id, 'button_confirm', cr)
+        self.force_assign(cr, uid, ids, *args)
+        return True
+
     def action_assign(self, cr, uid, ids, *args):
         for pick in self.browse(cr, uid, ids):
             move_ids = [x.id for x in pick.move_lines if x.state=='confirmed']
@@ -606,15 +613,14 @@ class stock_picking(osv.osv):
         for picking in self.browse(cursor, user, ids, context=context):
             if picking.invoice_state != '2binvoiced':
                 continue
-
+            payment_term_id = False
             partner = picking.address_id.partner_id
             if type in ('out_invoice', 'out_refund'):
                 account_id = partner.property_account_receivable.id
+                payment_term_id= picking.sale_id.payment_term.id
             else:
                 account_id = partner.property_account_payable.id
-            payment_term_id = False
-            if partner.property_payment_term:
-                payment_term_id = partner.property_payment_term.id
+#                payment_term_id = picking.purchase_id.payment_term.id
 
             address_contact_id, address_invoice_id = \
                     self._get_address_invoice(cursor, user, picking).values()
@@ -795,7 +801,7 @@ class stock_move(osv.osv):
 
         'note': fields.text('Notes'),
 
-        'state': fields.selection([('draft','Draft'),('waiting','Waiting'),('confirmed','Confirmed'),('assigned','Assigned'),('done','Done'),('cancel','cancel')], 'State', readonly=True, select=True),
+        'state': fields.selection([('draft','Draft'),('waiting','Waiting'),('confirmed','Confirmed'),('assigned','Assigned'),('done','Done'),('cancel','cancel')], 'Status', readonly=True, select=True),
         'price_unit': fields.float('Unit Price',
             digits=(16, int(config['price_accuracy']))),
     }
@@ -1035,7 +1041,7 @@ class stock_inventory(osv.osv):
         'date_done': fields.datetime('Date done'),
         'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=True, states={'draft':[('readonly',False)]}),
         'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
-        'state': fields.selection( (('draft','Draft'),('done','Done')), 'State', readonly=True),
+        'state': fields.selection( (('draft','Draft'),('done','Done')), 'Status', readonly=True),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -1136,6 +1142,8 @@ class product_product(osv.osv):
     # Utiliser browse pour limiter les queries !
     #
     def view_header_get(self, cr, user, view_id, view_type, context):
+        res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
+        if res: return res
         if (not context.get('location', False)):
             return False
         cr.execute('select name from stock_location where id=%d', (context['location'],))
@@ -1188,35 +1196,22 @@ product_product()
 #    get confirm or assign stock move lines of partner and put in current picking.
 class stock_picking_move_wizard(osv.osv_memory):
     _name='stock.picking.move.wizard'
-    def _get_picking(self,cr, uid, ctx):
-        if 'action_id' in ctx:
+    def _get_picking(self,cr, uid, ctx):        
+        if ctx.get('action_id',False):
             return ctx['action_id']
-        return False 
-    def _get_move_lines(self,cr,uid,ctx):
-        move_obj=self.pool.get('stock.move')
-        picking_obj=self.pool.get('stock.picking')
-        if 'action_id' in ctx:
-            picking=picking_obj.browse(cr,uid,[ctx['action_id']])
-            if picking and len(picking):
-                move_line_ids=move_obj.search(cr,uid,[('state','in',['confirmed','assigned']),('address_id','=',picking[0].address_id.id)])                
-                move_lines=move_obj.read(cr,uid,move_line_ids)
-                #res=[]
-                #for move_line in move_lines:
-                #    res.append((0,0,move_line))
-                return [{'move_ids':(0,0,move_lines)}]
-        return []
+        return False     
     def _get_picking_address(self,cr,uid,ctx):        
-        picking_obj=self.pool.get('stock.picking')
-        if 'action_id' in ctx:
-            picking=picking_obj.browse(cr,uid,[ctx['action_id']])[0]
-            return picking.address_id and picking.address_id.id
+        picking_obj=self.pool.get('stock.picking')        
+        if ctx.get('action_id',False):
+            picking=picking_obj.browse(cr,uid,[ctx['action_id']])[0]            
+            return picking.address_id and picking.address_id.id or False        
         return False
             
             
     _columns={
         'name':fields.char('Name',size=64,invisible=True),
         #'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines',readonly=True),
-        'move_ids': fields.many2many('stock.move', 'picking_move_wizard_rel', 'picking_move_wizard_id', 'move_id', 'Move lines'),
+        'move_ids': fields.many2many('stock.move', 'picking_move_wizard_rel', 'picking_move_wizard_id', 'move_id', 'Move lines',required=True),
         'address_id' : fields.many2one('res.partner.address', 'Dest. Address',invisible=True),
         'picking_id': fields.many2one('stock.picking', 'Packing list', select=True,invisible=True),
     }
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index fc994c64e4c..5ce84ad03c0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -55,21 +55,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Lot Inventory">
-                    <notebook>
-                        <page string="General Informations">
-                            <field name="name" select="1"/>
-                            <field name="date" select="1"/>
-                            <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list"/>
-                            <field name="state" select="1"/>
-                            <group col="2" colspan="2">
-                                <button name="action_done" states="draft" string="Confirm Inventory" type="object"/>
-                                <button name="action_cancel" states="done" string="Cancel Inventory" type="object"/>
-                            </group>
-                        </page>
-                        <page string="Posted Inventory">
-                            <field colspan="4" name="move_ids" nolabel="1"/>
-                        </page>
+                    <field name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <notebook colspan="4">
+                    <page string="General Informations">
+                        <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list"/>
+                    </page><page string="Posted Inventory">
+                        <field colspan="4" name="move_ids" nolabel="1"/>
+                    </page>
                     </notebook>
+					<field name="state" select="1"/>
+					<group col="2" colspan="2">
+						<button name="action_done" states="draft" string="Confirm Inventory" type="object"/>
+						<button name="action_cancel" states="done" string="Cancel Inventory" type="object"/>
+					</group>
                 </form>
             </field>
         </record>
@@ -185,7 +184,6 @@
                     <field name="name" select="1"/>
                     <field name="ref" select="1"/>
                     <field name="date" select="1"/>
-                    <separator colspan="4" string="Revisions"/>
                     <field colspan="4" name="revisions" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
@@ -310,27 +308,27 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock location">
-                    <notebook>
-                        <page string="General Informations">
-                            <field name="name" select="1"/>
-                            <field name="active" select="2"/>
-                            <field name="usage" select="1"/>
-                            <field name="account_id" select="1"/>
-                            <field name="location_id"/>
-                            <field name="address_id"/>
-                            <field name="chained_location_type"/>
-                            <field name="chained_location_id"/>
-                            <field name="chained_auto_packing"/>
-                            <field name="chained_delay"/>
-                            <newline/>
-                            <field colspan="4" name="comment"/>
-                        </page>
-                        <page string="Localisation">
-                            <field name="posx"/>
-                            <field name="posy"/>
-                            <field name="posz"/>
-                        </page>
-                    </notebook>
+                    <field name="name" select="1"/>
+                    <field name="active" select="2"/>
+                    <field name="usage" select="1"/>
+                    <field name="account_id" select="1"/>
+                    <field name="location_id"/>
+                    <field name="address_id"/>
+                    <group col="2" colspan="2">
+                        <separator string="Chained Locations" colspan="2"/>
+                        <field name="chained_location_type"/>
+                        <field name="chained_location_id"/>
+                        <field name="chained_auto_packing"/>
+                        <field name="chained_delay"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Localisation" colspan="2"/>>
+                        <field name="posx"/>
+                        <field name="posy"/>
+                        <field name="posz"/>
+                    </group>
+                    <separator string="Additional Information" colspan="4"/>
+                    <field colspan="4" name="comment" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -419,7 +417,39 @@
             <field name="view_id" ref="view_warehouse_tree"/>
         </record>
         <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_stock_configuration"/>
-        
+		
+        ==============================
+        Wizard to Fill From Unreceived Products
+        ===============================
+        <record id="stock_picking_move_wizard_form" model="ir.ui.view">
+            <field name="name">stock.picking.move.wizard.form</field>
+            <field name="model">stock.picking.move.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Move Lines">   
+                    <field name="address_id" invisible="True"/>
+                    <field name="picking_id" invisible="True"/>
+                    <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned'])]" name="move_ids" select="1"/><newline/>
+                    <group colspan="4">
+                        <button special="cancel" string="Cancel"/>
+                        <button name="action_move" string="Add" type="object"/>                        
+                    </group>
+                </form>
+               </field>
+        </record>
+        <record id="act_stock_picking_move_wizard" model="ir.actions.act_window">
+            <field name="name">Fill From Unreceived Products</field>
+            <field name="res_model">stock.picking.move.wizard</field>
+            <field name="src_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="auto_refresh" eval="1"/>
+            <field name="target">new</field>
+            <field name="context">{'action_id': active_id}</field>
+        </record>
+
+		
         =============================
         Packing
         =============================
@@ -538,12 +568,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Packing list">
-                    <notebook>
+                    <field name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <newline/>
+                    <field name="address_id" select="2"/>
+                    <notebook colspan="4">
                         <page string="General Information">
-                            <field name="name" select="1"/>
-                            <field name="date" select="1"/>
-                            <newline/>
-                            <field name="address_id" select="2"/>
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list">
                                 <form string="Stock Moves">
                                     <separator colspan="4" string="Move Information"/>
@@ -693,12 +723,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Packing list">
-                    <notebook>
+                    <field name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <newline/>
+                    <field name="address_id" select="2"/>
+                    <notebook colspan="4">
                         <page string="General Information">
-                            <field name="name" select="1"/>
-                            <field name="date" select="1"/>
-                            <newline/>
-                            <field name="address_id" select="2"/>
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list">
                                 <form string="Stock Moves">
                                     <separator colspan="4" string="Move Information"/>
@@ -845,15 +875,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Input Packing List">
-                    <notebook>
+                    <field name="address_id" on_change="onchange_partner_in(address_id)" select="2"/>
+                    <field name="name" readonly="1" select="1"/>
+                    <field name="location_id"/>
+                    <field domain="[('usage','=','internal')]" name="location_dest_id"/>
+                    <field name="invoice_state" select="2" string="Supplier Invoice Control"/>
+                    <field name="origin" select="2"/>
+                    <notebook colspan="4">
                         <page string="General Information">
-                            <field name="address_id" on_change="onchange_partner_in(address_id)" select="2"/>
-                            <field name="name" readonly="1" select="1"/>
-                            <field name="location_id"/>
-                            <field domain="[('usage','=','internal')]" name="location_dest_id"/>
-                            <field name="invoice_state" select="2" string="Supplier Invoice Control"/>
-                            <field name="origin" select="2"/>
-                            
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list">
                                 <tree string="Stock Moves">
                                     <field name="product_id"/>
@@ -884,7 +913,6 @@
                                     <newline/>
                                     <label/>
                                     <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action"/>
-                                    
                                     <separator colspan="4" string="Move State"/>
                                     <field name="state" select="1"/>
                                     <group>
@@ -895,12 +923,11 @@
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="5"/>
-                                <button name="llk" string="Fill From Unreceived Products" type="action"/>
-                                <button groups="base.group_extended" name="%(move_split)d" string="Split move lines in two" type="action"/>
+                                <button name="%(act_stock_picking_move_wizard)d" string="Fill From Unreceived Products" type="action"/>
                             </group>
                             <group col="8" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="button_confirm" states="draft" string="Confirm"/>
+                                <button name="button_confirm" states="draft" string="Confirm" type="object"/>
                                 <button name="action_assign" states="confirmed" string="Assign" type="object"/>
                                 <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
                                 <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
@@ -970,6 +997,7 @@
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
             <field name="view_id" ref="view_picking_in_form"/>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="domain">[('type','=','in')]</field>
@@ -1184,34 +1212,7 @@
             <field name="name">Products</field>
             <field eval="'ir.actions.act_window,%d'%act_product_location_open" name="value"/>
             <field eval="True" name="object"/>
-        </record>
+        </record>     
 
-		<record id="stock_picking_move_wizard_form" model="ir.ui.view">
-            <field name="name">stock.picking.move.wizard.form</field>
-            <field name="model">stock.picking.move.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-				<form string="Move Lines">   
-                     <field name="address_id" invisible="True"/>
-					<field name="picking_id" invisible="True"/>
-                    <field domain="[('picking_id','&lt;&gt;',picking_id),('address_id','=',address_id),('state','in',['confirmed','assigned'])]" name="move_ids" select="1"/><newline/>
-					<group colspan="4">
-						<button special="cancel" string="Cancel"/>
-	                    <button name="action_move" string="Add" type="object"/>						
-					</group>
-                </form>
-            </field>
-        </record>
-
-		<act_window name="Get move lines"
-		context="{'action_id': active_id}"
-		res_model="stock.picking.move.wizard"
-		src_model="stock.picking"
-		view_mode="form"
-		target="new"
-		id="act_stock_picking_move_wizard"/>
-        
-        
-        
     </data>
 </terp>
diff --git a/addons/stock_back_order/__init__.py b/addons/stock_back_order/__init__.py
new file mode 100644
index 00000000000..b4cb8ab55a4
--- /dev/null
+++ b/addons/stock_back_order/__init__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 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 stock
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock_back_order/__terp__.py b/addons/stock_back_order/__terp__.py
new file mode 100644
index 00000000000..8919e2c1c84
--- /dev/null
+++ b/addons/stock_back_order/__terp__.py
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Stock Back Order",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "depends" : ["base", "stock",],
+    "category" : "Generic Modules/Inventory Control",
+    "description":"""
+    To manage all back-orders (means partial pickings):
+    When products coming from suppliers arrive but some are missing, we have to make a partial picking.
+    The remaining products are called "back-orders" and have to be separated from normal waiting picking (in a predefined list called "Back-Orders").
+    The same process has to be done for sending goods.
+
+    """,
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ["stock_view.xml","stock_wizard.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock_back_order/stock.py b/addons/stock_back_order/stock.py
new file mode 100644
index 00000000000..91d7a109484
--- /dev/null
+++ b/addons/stock_back_order/stock.py
@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 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.
+#
+##############################################################################
+
+from osv import fields,osv
+import tools
+import ir
+import pooler
+
+
+
+class stock_picking(osv.osv):
+    _name = "stock.picking"
+    _inherit ='stock.picking'
+    _columns = {
+        'back_order_id' : fields.many2one('stock.picking', 'Back Order', readonly=True),
+        'backorder':fields.boolean('Backorder',readonly=True),
+
+    }
+    _defaults = {
+         'type':lambda *a: 'internal',
+         'backorder':lambda *a: False,
+
+      }
+
+
+stock_picking()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock_back_order/stock_view.xml b/addons/stock_back_order/stock_view.xml
new file mode 100644
index 00000000000..52434746cc2
--- /dev/null
+++ b/addons/stock_back_order/stock_view.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+	#--------------------------------------
+	# picking form view
+	#--------------------------------------
+	<record model="ir.ui.view" id="view_picking_form_inherited">
+		<field name="name">stock.picking.form.inherit</field>
+		<field name="model">stock.picking</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="stock.view_picking_form"/>
+		<field name="arch" type="xml">
+
+					<field name="name" position="after">
+							<field name="back_order_id" />
+					</field>
+
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_picking_tree_inherited">
+		<field name="name">stock.picking.tree.inherit</field>
+		<field name="model">stock.picking</field>
+		<field name="type">tree</field>
+		<field name="inherit_id" ref="stock.vpicktree"/>
+		<field name="arch" type="xml">
+
+					<field name="name" position="after">
+							<field name="back_order_id" />
+					</field>
+
+		</field>
+	</record>
+
+	#--------------------------------------
+	# report back order
+	#--------------------------------------
+
+		<record model="ir.actions.act_window" id="action_report_stock_out_picking_back_order_tree">
+		<field name="name">Back Orders (sending goods)</field>
+		<field name="res_model">stock.picking</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','&lt;&gt;','done'),('type','=','out'),('backorder','=',True)]</field>
+
+		</record>
+		
+		<menuitem name="Inventory Control" id="menu_report_inventory_control"/>
+		<menuitem name="Packing Lists" id="menu_report_inventory_packing_list" parent="menu_report_inventory_control"/>
+		<menuitem name="Sending Goods" id="menu_report_inventory_goods_list" parent="menu_report_inventory_packing_list"/>
+		<menuitem name="Back Orders" id="menu_report_inventory_orders_list" parent="menu_report_inventory_goods_list" action="action_report_stock_out_picking_back_order_tree"/>
+		
+		<record model="ir.actions.act_window" id="action_report_stock_in_picking_back_order_tree">
+		<field name="name">Back Orders (getting goods)</field>
+		<field name="res_model">stock.picking</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','&lt;&gt;','done'),('type','=','in'),('backorder','=',True)]</field>
+
+		</record>
+		
+		<menuitem name="Getting Goods" id="menu_report_inventory_getting_goods_list" parent="menu_report_inventory_packing_list"/>
+		<menuitem name="Back Orders" id="menu_report_inventory_back_orders_list" parent="menu_report_inventory_getting_goods_list" action="action_report_stock_in_picking_back_order_tree"/>
+		
+		<record model="ir.actions.act_window" id="action_report_stock_internal_picking_back_order_tree">
+		<field name="name">Back Orders (internal goods)</field>
+		<field name="res_model">stock.picking</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+		<field name="domain">[('state','&lt;&gt;','done'),('type','=','internal'),('backorder','=',True)]</field>
+
+		</record>
+		
+		<menuitem name="Internal" id="menu_report_inventory_internal_list" parent="menu_report_inventory_packing_list"/>
+		<menuitem name="Back Orders" id="menu_report_inventory_internal_back_orders_list" parent="menu_report_inventory_internal_list" action="action_report_stock_internal_picking_back_order_tree"/>
+		
+	</data>
+</terp>
\ No newline at end of file
diff --git a/addons/stock_back_order/stock_wizard.xml b/addons/stock_back_order/stock_wizard.xml
new file mode 100644
index 00000000000..466e518b79a
--- /dev/null
+++ b/addons/stock_back_order/stock_wizard.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<terp>
+	<data>
+<wizard string="Partial picking" multi="True" model="stock.picking" name="stock.back_order.partial_picking" id="stock.partial_picking" />
+		</data>
+	</terp>
diff --git a/addons/stock_back_order/wizard/__init__.py b/addons/stock_back_order/wizard/__init__.py
new file mode 100644
index 00000000000..99467cbd864
--- /dev/null
+++ b/addons/stock_back_order/wizard/__init__.py
@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 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 wizard_partial_picking
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock_back_order/wizard/wizard_partial_picking.py b/addons/stock_back_order/wizard/wizard_partial_picking.py
new file mode 100644
index 00000000000..856b020933f
--- /dev/null
+++ b/addons/stock_back_order/wizard/wizard_partial_picking.py
@@ -0,0 +1,210 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: wizard_partial_picking.py 6118 2007-04-25 16:08:50Z ced $
+#
+# 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 netsvc
+from tools.misc import UpdateableStr
+import pooler
+
+import wizard
+from osv import osv
+from osv.osv import except_osv
+
+_moves_arch = UpdateableStr()
+_moves_fields = {}
+
+_moves_arch_end = '''<?xml version="1.0"?><form string="Picking Result"><label string="The picking has been successfully made !" colspan="4" /></form>'''
+_moves_fields_end = {}
+
+def make_default(val):
+    def fct(uid, data, state):
+        return val
+    return fct
+
+def _get_moves(self, cr, uid, data, context):
+    pick_obj = pooler.get_pool(cr.dbname).get('stock.picking')
+    pick = pick_obj.browse(cr, uid, [data['id']])[0]
+    res = {}
+    _moves_fields.clear()
+    _moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make picking">']
+    for m in pick.move_lines:
+        quantity = m.product_qty
+        if m.state<>'assigned':
+            quantity = 0
+        _moves_arch_lst.append('<field name="move%s" />' % (m.id,))
+        _moves_fields['move%s' % m.id] = {'string' : '%s - %s' % (m.product_id.code, m.product_id.name), 'type' : 'float', 'required' : True, 'default' : make_default(quantity)}
+        if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+            price=0
+            if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
+                price=m.purchase_line_id.price_unit
+            currency=0
+            if hasattr(pick, 'purchase_id') and pick.purchase_id:
+                currency=pick.purchase_id.pricelist_id.currency_id.id
+            _moves_arch_lst.append('<group><field name="price%s"/>' % (m.id,))
+            _moves_fields['price%s' % m.id] = {'string': 'Unit Price', 'type': 'float', 'required': True, 'default': make_default(price)}
+            _moves_arch_lst.append('<field name="currency%d"/></group>' % (m.id,))
+            _moves_fields['currency%s' % m.id] = {'string': 'Currency', 'type': 'many2one', 'relation': 'res.currency', 'required': True, 'default': make_default(currency)}
+        _moves_arch_lst.append('<newline/>')
+        res.setdefault('moves', []).append(m.id)
+    _moves_arch_lst.append('</form>')
+    _moves_arch.string = '\n'.join(_moves_arch_lst)
+    return res
+
+def _do_print(self, cr, uid, data, context):
+    pick_obj = pooler.get_pool(cr.dbname).get('stock.picking')
+    pick = pick_obj.browse(cr, uid, [data['id']])[0]
+    if pick.type=='out':
+        return 'print'
+    return 'end'
+def _do_split(self, cr, uid, data, context):
+    move_obj = pooler.get_pool(cr.dbname).get('stock.move')
+    pick_obj = pooler.get_pool(cr.dbname).get('stock.picking')
+    pick = pick_obj.browse(cr, uid, [data['id']])[0]
+    new_picking = None
+    new_moves = []
+
+    complete, too_many, too_few = [], [], []
+    for move in move_obj.browse(cr, uid, data['form'].get('moves',[])):
+        if move.product_qty == data['form']['move%s' % move.id]:
+            complete.append(move)
+        elif move.product_qty > data['form']['move%s' % move.id]:
+            too_few.append(move)
+        else:
+            too_many.append(move)
+
+        #
+        # Average price computation
+        #
+        if (pick.type == 'in') and (move.product_id.cost_method == 'average'):
+            product_obj = pooler.get_pool(cr.dbname).get('product.product')
+            currency_obj = pooler.get_pool(cr.dbname).get('res.currency')
+            users_obj = pooler.get_pool(cr.dbname).get('res.users')
+
+            product = product_obj.browse(cr, uid, [move.product_id.id])[0]
+            user = users_obj.browse(cr, uid, [uid])[0]
+
+            qty = data['form']['move%s' % move.id]
+            price = data['form']['price%s' % move.id]
+            currency = data['form']['currency%s' % move.id]
+
+            if qty > 0:
+                new_price = currency_obj.compute(cr, uid, currency, user.company_id.currency_id.id, price)
+                new_std_price = ((product.standard_price * product.qty_available) + (new_price * qty))/(product.qty_available + qty)
+                product_obj.write(cr, uid, [product.id], {'standard_price': new_std_price})
+
+
+    for move in too_few:
+        if not new_picking:
+            new_picking = pick_obj.copy(cr, uid, pick.id, {'backorder':True,'name' : '%s (splitted)' % pick.name, 'move_lines' : [],'back_order_id':data['id'], 'state':'draft'})
+            pick.write(cr, uid, [pick.id], {'back_order_id' : new_picking})
+        new_obj = move_obj.copy(cr, uid, move.id, {'product_qty' : move.product_qty - data['form']['move%s' % move.id], 'product_uos_qty':move.product_qty - data['form']['move%s' % move.id], 'picking_id' : new_picking, 'state': 'assigned', 'move_dest_id': False})
+        move_obj.write(cr, uid, [move.id], {'product_qty' : data['form']['move%s' % move.id], 'product_uos_qty':data['form']['move%s' % move.id]})
+
+    if new_picking:
+        move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': pick.id})
+        for move in too_many:
+            move_obj.write(cr, uid, [move.id], {'product_qty' : data['form']['move%s' % move.id],'product_uos_qty':data['form']['move%s' % move.id] , 'picking_id': pick.id})
+    else:
+        for move in too_many:
+            move_obj.write(cr, uid, [move.id], {'product_qty' : data['form']['move%s' % move.id],'product_uos_qty':data['form']['move%s' % move.id]})
+
+    # At first we confirm the new picking (if necessary)
+    wf_service = netsvc.LocalService("workflow")
+    if new_picking:
+        wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
+    # Then we finish the good picking
+    try:
+        if new_picking:
+            pick_obj.action_move(cr, uid, [pick.id])
+            wf_service.trg_validate(uid, 'stock.picking',pick.id , 'button_done', cr)
+            wf_service.trg_write(uid, 'stock.picking', new_picking, cr)
+        else:
+            pick_obj.action_move(cr, uid, [pick.id])
+            wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
+    except except_osv, e:
+        raise wizard.except_wizard(e.name, e.value)
+
+    return {}
+
+#   for move in too_few:
+#       if not new_picking:
+#           new_picking = pick_obj.copy(cr, uid, pick.id, {'name' : '%s (splitted)' % pick.name, 'move_lines' : [],'back_order_id':data['id'], 'state':'draft'})
+#           pick.write(cr, uid, [pick.id], {'backorder':True,'back_order_id' : new_picking})
+#       new_obj = move_obj.copy(cr, uid, move.id, {'product_qty' : data['form']['move%s' % move.id], 'product_uos_qty':data['form']['move%s' % move.id], 'picking_id' : new_picking, 'state': 'assigned', 'move_dest_id': False})
+#       move_obj.write(cr, uid, [move.id], {'product_qty' : move.product_qty - data['form']['move%s' % move.id], 'product_uos_qty':move.product_qty - data['form']['move%s' % move.id]})
+#
+#   if new_picking:
+#       move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
+#       for move in too_many:
+#           move_obj.write(cr, uid, [move.id], {'product_qty' : data['form']['move%s' % move.id],'product_uos_qty':data['form']['move%s' % move.id] , 'picking_id': new_picking})
+#   else:
+#       for move in too_many:
+#           move_obj.write(cr, uid, [move.id], {'product_qty' : data['form']['move%s' % move.id],'product_uos_qty':data['form']['move%s' % move.id]})
+#
+#   # At first we confirm the new picking (if necessary)
+#   wf_service = netsvc.LocalService("workflow")
+#   if new_picking:
+#       wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
+#   # Then we finish the good picking
+#   try:
+#       if new_picking:
+#           pick_obj.action_move(cr, uid, [new_picking])
+#           wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
+#           wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
+#       else:
+#           pick_obj.action_move(cr, uid, [pick.id])
+#           wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
+#   except except_osv, e:
+#       raise wizard.except_wizard(e.name, e.value)
+
+    #service = netsvc.LocalService("wizard.stock.picking.delivery.report")
+    #res = service.execute(cr.dbname, uid,{'id': new_picking})
+
+
+    #return {}
+
+class partial_picking(wizard.interface):
+
+    states = {
+        'init' : {
+            'actions' : [ _get_moves ],
+            'result' : { 'type' : 'form', 'arch' : _moves_arch, 'fields' : _moves_fields, 'state' : (('end', 'Cancel'),('split', 'Make Picking') )},
+        },
+        'split': {
+            'actions': [_do_split],
+            'result': {'type': 'state', 'state': 'end'},
+        },
+
+    }
+
+partial_picking('stock.back_order.partial_picking')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock_invoice_directly/__init__.py b/addons/stock_invoice_directly/__init__.py
new file mode 100644
index 00000000000..f9e10c31ca6
--- /dev/null
+++ b/addons/stock_invoice_directly/__init__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# 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 wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock_invoice_directly/__terp__.py b/addons/stock_invoice_directly/__terp__.py
new file mode 100644
index 00000000000..436a012fd6d
--- /dev/null
+++ b/addons/stock_invoice_directly/__terp__.py
@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Invoice Picking Directly",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://tinyerp.com/module_sale.html",
+    "depends" : ["delivery"],
+    "category" : "Generic Modules/Sales & Purchases",
+    "description": """
+        When you send or deliver goods, this module automatically launch
+        the invoicing wizard if the delivery is to be invoiced.
+    """,
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock_invoice_directly/wizard/__init__.py b/addons/stock_invoice_directly/wizard/__init__.py
new file mode 100644
index 00000000000..bb071591304
--- /dev/null
+++ b/addons/stock_invoice_directly/wizard/__init__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: __init__.py 1070 2005-07-29 12:41:24Z nicoe $
+#
+# 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 stock_invoice
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
new file mode 100644
index 00000000000..660b09fcad3
--- /dev/null
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -0,0 +1,84 @@
+# -*- encoding: utf-8 -*-
+'''Make case wizard'''
+##############################################################################
+#
+# Copyright (c) 2007 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 pooler
+import netsvc
+
+class invoice_directly(wizard.interface):
+    def _test_action(obj, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        pick = pool.get('stock.picking').browse(cr, uid, data['id'], context=context)
+        if not pick.invoice_state == '2binvoiced':
+            return 'end_final'
+        return 'invoice'
+
+    def _open_action(obj, cr, uid, data, context):
+        res = {
+            'name': 'stock.invoice_onshipping',
+            'type': 'ir.actions.wizard',
+            'wiz_name': 'stock.invoice_onshipping'
+        }
+        if data['form'].get('new_picking', False):
+            res['context'] = "{'new_picking':%d}" % (data['form']['new_picking'],)
+        return res
+
+    end_final = {
+        'actions':[],
+        'result': {
+            'type': 'state',
+            'state': 'end',
+        }
+    }
+
+    choice = {
+        'actions':[],
+        'result': {
+            'type': 'choice',
+            'next_state': _test_action,
+        }
+    }
+
+    call_invoice = {
+        'actions':[],
+        'result': {
+            'type': 'action',
+            'action': _open_action,
+            'state': 'end'
+        }
+    }
+    def __init__(self, *args):
+        service = netsvc.LocalService("wizard.stock.partial_picking")
+        service._service.states['split']['result']['state'] = 'test_choice'
+        service._service.states['invoice'] = self.call_invoice
+        service._service.states['test_choice'] = self.choice
+        service._service.states['end_final'] = self.end_final
+invoice_directly('stock.picking.invoice.directly')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index e07154f9dae..eba26fd95e7 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -42,7 +42,7 @@ class subscription_document(osv.osv):
     _columns = {
         'name': fields.char('Name', size=60, required=True),
         'active': fields.boolean('Active'),
-        'model': fields.many2one('ir.model', 'Model', required=True),
+        'model': fields.many2one('ir.model', 'Object', required=True),
         'field_ids': fields.one2many('subscription.document.fields', 'document_id', 'Fields')
     }
     _defaults = {
@@ -79,7 +79,7 @@ class subscription_subscription(osv.osv):
         'interval_type': fields.selection([('days', 'Days'), ('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
         'exec_init': fields.integer('Number of documents'),
         'date_init': fields.datetime('First Date'),
-        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State'),
+        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status'),
         'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128),
         'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True),
         'cron_id': fields.many2one('ir.cron', 'Cron Job')