diff --git a/addons/account/account.py b/addons/account/account.py
index 625bcd1a6a8..28fff33a4bc 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -686,6 +686,27 @@ class account_journal(osv.osv):
             vals.update({'sequence_id' : self.create_sequence(cr, uid, vals, context)})
         return super(account_journal, self).create(cr, uid, vals, context)
 
+    def name_get(self, cr, user, ids, context={}):
+        """
+        Returns a list of tupples containing id, name.
+        result format : {[(id, name), (id, name), ...]}
+        
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param ids: list of ids for which name should be read
+        @param context: context arguments, like lang, time zone
+        
+        @return: Returns a list of tupples containing id, name
+        """
+        result = self.browse(cr, user, ids, context)
+        res = []
+        for rs in result:
+            name = rs.name 
+            if rs.currency:
+                name = "%s (%s)" % (rs.name, rs.currency.name)
+            res += [(rs.id, name)]
+        return res
+    
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args = []
@@ -2659,6 +2680,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         vals_journal['type'] = 'sale'
         vals_journal['code'] = _('SAJ')
         vals_journal['sequence_id'] = seq_id_sale
+        vals_journal['company_id'] =  company_id
 
         if obj_multi.chart_template_id.property_account_receivable:
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
@@ -2672,6 +2694,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         vals_journal['code'] = _('EXJ')
         vals_journal['sequence_id'] = seq_id_purchase
         vals_journal['view_id'] = view_id
+        vals_journal['company_id'] =  company_id
 
         if obj_multi.chart_template_id.property_account_payable:
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
@@ -2723,6 +2746,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             vals_journal['code']= _('BNK') + str(current_num)
             vals_journal['sequence_id'] = seq_id
             vals_journal['type'] = 'cash'
+            vals_journal['company_id'] =  company_id
+            
             if line.currency_id:
                 vals_journal['view_id'] = view_id_cur
                 vals_journal['currency'] = line.currency_id.id
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 5a8ee0d4e8c..be1e5ec65e6 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -51,7 +51,6 @@ class account_analytic_line(osv.osv):
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if context is None:
             context = {}
-
         if context.get('from_date',False):
             args.append(['date', '>=',context['from_date']])
 
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 53c08525a6a..e2dafa57ef8 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -214,22 +214,121 @@ class account_bank_statement(osv.osv):
         self.write(cr, uid, ids, {}, context)
         return True
 
-    def button_confirm_bank(self, cr, uid, ids, context=None):
-        done = []
+
+    def create_move_from_st_line(self, cr, uid, st_line, company_currency_id, next_number, context=None):
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         account_analytic_line_obj = self.pool.get('account.analytic.line')
         account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
+
+        st = st_line.statement_id
+        
+        context.update({'date': st_line.date})
+        move_id = account_move_obj.create(cr, uid, {
+            'journal_id': st.journal_id.id,
+            'period_id': st.period_id.id,
+            'date': st_line.date,
+        }, context=context)
+        account_bank_statement_line_obj.write(cr, uid, [st_line.id], {
+            'move_ids': [(4, move_id, False)]
+        })
+
+        torec = []
+        if st_line.amount >= 0:
+            account_id = st.journal_id.default_credit_account_id.id
+        else:
+            account_id = st.journal_id.default_debit_account_id.id
+        acc_cur = ((st_line.amount<=0) and st.journal_id.default_debit_account_id) or st_line.account_id
+        amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                company_currency_id, st_line.amount, context=context,
+                account=acc_cur)
+
+        val = {
+            'name': st_line.name,
+            'date': st_line.date,
+            'ref': st_line.ref,
+            'move_id': move_id,
+            'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False,
+            'account_id': (st_line.account_id) and st_line.account_id.id,
+            'credit': ((amount>0) and amount) or 0.0,
+            'debit': ((amount<0) and -amount) or 0.0,
+            'statement_id': st.id,
+            'journal_id': st.journal_id.id,
+            'period_id': st.period_id.id,
+            'currency_id': st.currency.id,
+            'analytic_account_id': st_line.analytic_account_id and st_line.analytic_account_id.id or False
+        }
+
+        amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                company_currency_id, st_line.amount, context=context,
+                account=acc_cur)
+        if st.currency.id <> company_currency_id:
+            amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                        st.currency.id, amount, context=context,
+                        account=acc_cur)
+            val['amount_currency'] = -amount_cur
+
+        if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id:
+            val['currency_id'] = st_line.account_id.currency_id.id
+            if company_currency_id==st_line.account_id.currency_id.id:
+                amount_cur = st_line.amount
+            else:
+                amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                        st_line.account_id.currency_id.id, amount, context=context,
+                        account=acc_cur)
+            val['amount_currency'] = amount_cur
+
+        move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
+        torec.append(move_line_id)
+        
+        # Fill the secondary amount/currency
+        # if currency is not the same than the company
+        amount_currency = False
+        currency_id = False
+        if st.currency.id <> company_currency_id:
+            amount_currency = st_line.amount
+            currency_id = st.currency.id
+        account_move_line_obj.create(cr, uid, {
+            'name': st_line.name,
+            'date': st_line.date,
+            'ref': st_line.ref,
+            'move_id': move_id,
+            'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False,
+            'account_id': account_id,
+            'credit': ((amount < 0) and -amount) or 0.0,
+            'debit': ((amount > 0) and amount) or 0.0,
+            'statement_id': st.id,
+            'journal_id': st.journal_id.id,
+            'period_id': st.period_id.id,
+            'amount_currency': amount_currency,
+            'currency_id': currency_id,
+            }, context=context)
+
+        for line in account_move_line_obj.browse(cr, uid, [x.id for x in
+                account_move_obj.browse(cr, uid, move_id,
+                    context=context).line_id],
+                context=context):
+            if line.state <> 'valid':
+                raise osv.except_osv(_('Error !'),
+                        _('Journal Item "%s" is not valid') % line.name)
+
+        move_name = next_number + ' - ' + str(st_line.sequence)
+        account_move_obj.write(cr, uid, [move_id], {'name': move_name}) 
+        # Bank statements will not consider boolean on journal entry_posted
+        account_move_obj.post(cr, uid, [move_id], context=context)
+        return move_id
+
+    def button_confirm_bank(self, cr, uid, ids, context=None):
+        done = []
         obj_seq = self.pool.get('ir.sequence')
 
         if context is None:
             context = {}
-        company_currency_id = res_users_obj.browse(cr, uid, uid,
-                context=context).company_id.currency_id.id
 
         for st in self.browse(cr, uid, ids, context):
+            company_currency_id = st.journal_id.company_id.currency_id.id
             if not st.state=='draft':
                 continue
 
@@ -245,181 +344,24 @@ class account_bank_statement(osv.osv):
             if not st.name == '/':
                 next_number = st.name
             else:
-                next_number = obj_seq.get(cr, uid, 'account.bank.statement')
+                if st.journal_id.sequence_id:
+                    c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
+                    next_number = obj_seq.get_id(cr, uid, st.journal_id.sequence_id.id, context=c)
+                else:
+                    next_number = obj_seq.get(cr, uid, 'account.bank.statement')
 
             for line in st.move_line_ids:
                 if line.state <> 'valid':
                     raise osv.except_osv(_('Error !'),
                             _('The account entries lines are not in valid state.'))
-            # for bank.statement.lines
-            # In line we get reconcile_id on bank.ste.rec.
-            # in bank stat.rec we get line_new_ids on bank.stat.rec.line
-            for move in st.line_ids:
-                if move.analytic_account_id:
+            for st_line in st.line_ids:
+                if st_line.analytic_account_id:
                     if not st.journal_id.analytic_journal_id:
                         raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
-
-                context.update({'date': move.date})
-                move_id = account_move_obj.create(cr, uid, {
-                    'journal_id': st.journal_id.id,
-                    'period_id': st.period_id.id,
-                    'date': move.date,
-                }, context=context)
-                account_bank_statement_line_obj.write(cr, uid, [move.id], {
-                    'move_ids': [(4, move_id, False)]
-                })
-                if not move.amount:
+                if not st_line.amount:
                     continue
 
-                torec = []
-                if move.amount >= 0:
-                    account_id = st.journal_id.default_credit_account_id.id
-                else:
-                    account_id = st.journal_id.default_debit_account_id.id
-                acc_cur = ((move.amount<=0) and st.journal_id.default_debit_account_id) or move.account_id
-                amount = res_currency_obj.compute(cr, uid, st.currency.id,
-                        company_currency_id, move.amount, context=context,
-                        account=acc_cur)
-                if move.reconcile_id and move.reconcile_id.line_new_ids:
-                    for newline in move.reconcile_id.line_new_ids:
-                        amount += newline.amount
-
-                val = {
-                    'name': move.name,
-                    'date': move.date,
-                    'ref': move.ref,
-                    'move_id': move_id,
-                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
-                    'account_id': (move.account_id) and move.account_id.id,
-                    'credit': ((amount>0) and amount) or 0.0,
-                    'debit': ((amount<0) and -amount) or 0.0,
-                    'statement_id': st.id,
-                    'journal_id': st.journal_id.id,
-                    'period_id': st.period_id.id,
-                    'currency_id': st.currency.id,
-                    'analytic_account_id': move.analytic_account_id and move.analytic_account_id.id or False
-                }
-
-                amount = res_currency_obj.compute(cr, uid, st.currency.id,
-                        company_currency_id, move.amount, context=context,
-                        account=acc_cur)
-                if st.currency.id <> company_currency_id:
-                    amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
-                                st.currency.id, amount, context=context,
-                                account=acc_cur)
-                    val['amount_currency'] = -amount_cur
-
-                if move.account_id and move.account_id.currency_id and move.account_id.currency_id.id <> company_currency_id:
-                    val['currency_id'] = move.account_id.currency_id.id
-                    if company_currency_id==move.account_id.currency_id.id:
-                        amount_cur = move.amount
-                    else:
-                        amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
-                                move.account_id.currency_id.id, amount, context=context,
-                                account=acc_cur)
-                    val['amount_currency'] = amount_cur
-
-                move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
-                torec.append(move_line_id)
-
-                if move.analytic_account_id:
-                    anal_val = {}
-                    amt = (val['credit'] or  0.0) - (val['debit'] or 0.0)
-                    anal_val = {
-                        'name': val['name'],
-                        'ref': val['ref'],
-                        'date': val['date'],
-                        'amount': amt,
-                        'account_id': val['analytic_account_id'],
-                        'currency_id': val['currency_id'],
-                        'general_account_id': val['account_id'],
-                        'journal_id': st.journal_id.analytic_journal_id.id,
-                        'period_id': val['period_id'],
-                        'user_id': uid,
-                        'move_id': move_line_id
-                                }
-                    if val.get('amount_currency', False):
-                        anal_val['amount_currency'] = val['amount_currency']
-                    account_analytic_line_obj.create(cr, uid, anal_val, context=context)
-
-                if move.reconcile_id and move.reconcile_id.line_new_ids:
-                    for newline in move.reconcile_id.line_new_ids:
-                        account_move_line_obj.create(cr, uid, {
-                            'name': newline.name or move.name,
-                            'date': move.date,
-                            'ref': move.ref,
-                            'move_id': move_id,
-                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
-                            'account_id': (newline.account_id) and newline.account_id.id,
-                            'debit': newline.amount>0 and newline.amount or 0.0,
-                            'credit': newline.amount<0 and -newline.amount or 0.0,
-                            'statement_id': st.id,
-                            'journal_id': st.journal_id.id,
-                            'period_id': st.period_id.id,
-                            'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False,
-
-                        }, context=context)
-
-                # Fill the secondary amount/currency
-                # if currency is not the same than the company
-                amount_currency = False
-                currency_id = False
-                if st.currency.id <> company_currency_id:
-                    amount_currency = move.amount
-                    currency_id = st.currency.id
-                account_move_line_obj.create(cr, uid, {
-                    'name': move.name,
-                    'date': move.date,
-                    'ref': move.ref,
-                    'move_id': move_id,
-                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
-                    'account_id': account_id,
-                    'credit': ((amount < 0) and -amount) or 0.0,
-                    'debit': ((amount > 0) and amount) or 0.0,
-                    'statement_id': st.id,
-                    'journal_id': st.journal_id.id,
-                    'period_id': st.period_id.id,
-                    'amount_currency': amount_currency,
-                    'currency_id': currency_id,
-                    }, context=context)
-
-                for line in account_move_line_obj.browse(cr, uid, [x.id for x in
-                        account_move_obj.browse(cr, uid, move_id,
-                            context=context).line_id],
-                        context=context):
-                    if line.state <> 'valid':
-                        raise osv.except_osv(_('Error !'),
-                                _('Journal Item "%s" is not valid') % line.name)
-
-                if move.reconcile_id and move.reconcile_id.line_ids:
-                    ## Search if move has already a partial reconciliation
-                    previous_partial = False
-                    for line_reconcile_move in move.reconcile_id.line_ids:
-                        if line_reconcile_move.reconcile_partial_id:
-                            previous_partial = True
-                            break
-                    ##
-                    torec += map(lambda x: x.id, move.reconcile_id.line_ids)
-                    #try:
-                    if abs(move.reconcile_amount-move.amount)<0.0001:
-
-                        writeoff_acc_id = False
-                        #There should only be one write-off account!
-                        for entry in move.reconcile_id.line_new_ids:
-                            writeoff_acc_id = entry.account_id.id
-                            break
-                        ## If we have already a partial reconciliation
-                        ## We need to make a partial reconciliation
-                        ## To add this amount to previous paid amount
-                        if previous_partial:
-                            account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
-                        ## If it's the first reconciliation, we do a full reconciliation as regular
-                        else:
-                            account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
-                    else:
-                        account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
-                move_name = next_number + ' - ' + str(move.sequence)
-                account_move_obj.write(cr, uid, [move_id], {'name': move_name, 'state': 'posted'}) # Bank statements will not consider boolean on journal entry_posted
+                self.create_move_from_st_line(cr, uid, st_line, company_currency_id, next_number, context)
 
             self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
             done.append(st.id)
@@ -474,175 +416,6 @@ class account_bank_statement(osv.osv):
 
 account_bank_statement()
 
-class account_bank_statement_reconcile(osv.osv):
-    _name = "account.bank.statement.reconcile"
-    _description = "Statement Reconcile"
-
-    def _total_entry(self, cursor, user, ids, name, attr, context=None):
-        result = {}
-        for o in self.browse(cursor, user, ids, context=context):
-            result[o.id] = 0.0
-            for line in o.line_ids:
-                result[o.id] += line.debit - line.credit
-        return result
-
-    def _total_new(self, cursor, user, ids, name, attr, context=None):
-        result = {}
-        for o in self.browse(cursor, user, ids, context=context):
-            result[o.id] = 0.0
-            for line in o.line_new_ids:
-                result[o.id] += line.amount
-        return result
-
-    def _total_balance(self, cursor, user, ids, name, attr, context=None):
-        result = {}
-        for o in self.browse(cursor, user, ids, context=context):
-            result[o.id] = o.total_new - o.total_entry + o.total_amount
-        return result
-
-    def _total_amount(self, cursor, user, ids, name, attr, context=None):
-        res = {}
-        res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
-
-        company_currency_id = res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-        currency_id = context.get('currency_id', company_currency_id)
-
-        acc_cur = None
-        if context.get('journal_id', False) and context.get('account_id',False):
-            st =self.pool.get('account.journal').browse(cursor, user, context['journal_id'])
-            acc = self.pool.get('account.account').browse(cursor, user, context['account_id'])
-            acc_cur = (( context.get('amount',0.0)<=0) and st.default_debit_account_id) or acc
-
-        for reconcile_id in ids:
-            res[reconcile_id] = res_currency_obj.compute(cursor, user,
-                    currency_id, company_currency_id,
-                    context.get('amount', 0.0), context=context, account=acc_cur)
-        return res
-
-    def _default_amount(self, cursor, user, context=None):
-        if context is None:
-            context = {}
-        res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
-
-        company_currency_id = res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-        currency_id = context.get('currency_id', company_currency_id)
-
-        acc_cur = None
-        if context.get('journal_id', False) and context.get('account_id',False):
-            st =self.pool.get('account.journal').browse(cursor, user, context['journal_id'])
-            acc = self.pool.get('account.account').browse(cursor, user, context['account_id'])
-            acc_cur = (( context.get('amount',0.0)<=0) and st.default_debit_account_id) or acc
-
-        return res_currency_obj.compute(cursor, user,
-                currency_id, company_currency_id,
-                context.get('amount', 0.0), context=context, account=acc_cur)
-
-    def _total_currency(self, cursor, user, ids, name, attrs, context=None):
-        res = {}
-        res_users_obj = self.pool.get('res.users')
-
-        company_currency_id = res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-
-        for reconcile_id in ids:
-            res[reconcile_id] = company_currency_id
-        return res
-
-    def _default_currency(self, cursor, user, context=None):
-        res_users_obj = self.pool.get('res.users')
-
-        return res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-
-
-    def _total_second_amount(self, cursor, user, ids, name, attr,
-            context=None):
-        res = {}
-        for reconcile_id in ids:
-            res[reconcile_id] = context.get('amount', 0.0)
-        return res
-
-    def _total_second_currency(self, cursor, user, ids, name, attr, context=None):
-        res = {}
-        for reconcile_id in ids:
-            res[reconcile_id] = context.get('currency_id', False)
-        return res
-
-    def name_get(self, cursor, user, ids, context=None):
-        res= []
-        for o in self.browse(cursor, user, ids, context=context):
-            result = 0.0
-            res_currency = ''
-            for line in o.line_ids:
-                if line.amount_currency and line.currency_id:
-                    result += line.amount_currency
-                    res_currency = line.currency_id.code
-                else:
-                    result += line.debit - line.credit
-            if res_currency:
-                res_currency = ' ' + res_currency
-            res.append((o.id, '[%.2f'% (result - o.total_new,) + res_currency + ']' ))
-        return res
-
-    _columns = {
-        'name': fields.char('Date', size=64, required=True),
-        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'line_new_ids': fields.one2many('account.bank.statement.reconcile.line',
-            'line_id', 'Write-Off'),
-        'total_entry': fields.function(_total_entry, method=True,
-            string='Total entries'),
-        'total_new': fields.function(_total_new, method=True,
-            string='Total write-off'),
-        'total_second_amount': fields.function(_total_second_amount,
-            method=True, string='Payment amount',
-            help='The amount in the currency of the journal'),
-        'total_second_currency': fields.function(_total_second_currency, method=True,
-            string='Currency', type='many2one', relation='res.currency',
-            help='The currency of the journal'),
-        'total_amount': fields.function(_total_amount, method=True,
-            string='Payment amount'),
-        'total_currency': fields.function(_total_currency, method=True,
-            string='Currency', type='many2one', relation='res.currency'),
-        'total_balance': fields.function(_total_balance, method=True,
-            string='Balance'),
-        #line_ids define in account.py
-        'statement_line': fields.one2many('account.bank.statement.line',
-             'reconcile_id', 'Bank Statement Line'),
-    }
-    _defaults = {
-        'name': lambda *a: time.strftime('%Y-%m-%d'),
-        'partner_id': lambda obj, cursor, user, context=None: \
-                context.get('partner', False),
-        'total_amount': _default_amount,
-        'total_currency': _default_currency,
-        'total_second_amount':  lambda obj, cursor, user, context=None: \
-                context.get('amount', 0.0),
-        'total_second_currency': lambda obj, cursor, user, context=None: \
-                context.get('currency_id', False),
-        'total_balance': _default_amount,
-    }
-account_bank_statement_reconcile()
-
-class account_bank_statement_reconcile_line(osv.osv):
-    _name = "account.bank.statement.reconcile.line"
-    _description = "Statement reconcile line"
-    _columns = {
-        'name': fields.char('Description', size=64, required=True),
-        'account_id': fields.many2one('account.account', 'Account', required=True),
-        'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'),
-        'amount': fields.float('Amount', required=True),
-        'analytic_id': fields.many2one('account.analytic.account',"Analytic Account", domain=[('parent_id', '!=', False)])
-    }
-    _defaults = {
-        'name': 'Write-Off',
-    }
-account_bank_statement_reconcile_line()
-
-
 class account_bank_statement_line(osv.osv):
 
     def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, context=None):
@@ -683,25 +456,6 @@ class account_bank_statement_line(osv.osv):
             res['value']['amount'] = balance
         return res
 
-    def _reconcile_amount(self, cursor, user, ids, name, args, context=None):
-        if not ids:
-            return {}
-        res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
-
-        res = {}
-        company_currency_id = res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-
-        for line in self.browse(cursor, user, ids, context=context):
-            if line.reconcile_id:
-                res[line.id] = res_currency_obj.compute(cursor, user,
-                        company_currency_id, line.statement_id.currency.id,
-                        line.reconcile_id.total_entry, context=context)
-            else:
-                res[line.id] = 0.0
-        return res
-
     _order = "statement_id desc, sequence"
     _name = "account.bank.statement.line"
     _description = "Bank Statement Line"
@@ -719,16 +473,12 @@ class account_bank_statement_line(osv.osv):
             required=True),
         'statement_id': fields.many2one('account.bank.statement', 'Statement',
             select=True, required=True, ondelete='cascade'),
-        'reconcile_id': fields.many2one('account.bank.statement.reconcile',
-            'Reconcile'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
         'move_ids': fields.many2many('account.move',
             'account_bank_statement_line_move_rel', 'move_id','statement_id',
             'Moves'),
         'ref': fields.char('Reference', size=32),
         'note': fields.text('Notes'),
-        'reconcile_amount': fields.function(_reconcile_amount,
-            string='Amount reconciled', method=True, type='float'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."),
         'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
     }
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 8cdb20aa225..2fd80348404 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -270,7 +270,7 @@ class account_cash_statement(osv.osv):
             super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs))
         return True
 
-    def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}):
+    def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
         """ Changes balance start and starting details if journal_id changes"
         @param statement_id: Changed statement_id
         @param journal_id: Changed journal_id
@@ -288,7 +288,7 @@ class account_cash_statement(osv.osv):
                 'balance_start': balance_start
             })
             return res
-        res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context)
+        res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context=context)
         return res
 
     def _equal_balance(self, cr, uid, ids, statement, context={}):
@@ -454,25 +454,25 @@ class account_cash_statement(osv.osv):
                 move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
                 torec.append(move_line_id)
 
-                if move.analytic_account_id:
-                    anal_val = {}
-                    amt = (val['credit'] or  0.0) - (val['debit'] or 0.0)
-                    anal_val = {
-                        'name': val['name'],
-                        'ref': val['ref'],
-                        'date': val['date'],
-                        'amount': amt,
-                        'account_id': val['analytic_account_id'],
-                        'currency_id': val['currency_id'],
-                        'general_account_id': val['account_id'],
-                        'journal_id': st.journal_id.analytic_journal_id.id,
-                        'period_id': val['period_id'],
-                        'user_id': uid,
-                        'move_id': move_line_id
-                                }
-                    if val.get('amount_currency', False):
-                        anal_val['amount_currency'] = val['amount_currency']
-                    account_analytic_line_obj.create(cr, uid, anal_val, context=context)
+#                if move.analytic_account_id:
+#                    anal_val = {}
+#                    amt = (val['credit'] or  0.0) - (val['debit'] or 0.0)
+#                    anal_val = {
+#                        'name': val['name'],
+#                        'ref': val['ref'],
+#                        'date': val['date'],
+#                        'amount': amt,
+#                        'account_id': val['analytic_account_id'],
+#                        'currency_id': val['currency_id'],
+#                        'general_account_id': val['account_id'],
+#                        'journal_id': st.journal_id.analytic_journal_id.id,
+#                        'period_id': val['period_id'],
+#                        'user_id': uid,
+#                        'move_id': move_line_id
+#                                }
+#                    if val.get('amount_currency', False):
+#                        anal_val['amount_currency'] = val['amount_currency']
+#                    account_analytic_line_obj.create(cr, uid, anal_val, context=context)
 
                 if move.reconcile_id and move.reconcile_id.line_new_ids:
                     for newline in move.reconcile_id.line_new_ids:
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index a262dc5eb7f..a9de51c3afb 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -8,13 +8,13 @@
             <field name="arch" type="xml">
             <data>
                 <form position="attributes">
-                    <attribute name="string">Accounting Modules Configuration</attribute>
+                    <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
-                    <attribute name="string">Configure Your Accounting System</attribute>
+                    <attribute name="string">Configure Your Accounting Chart</attribute>
                 </separator>
                 <xpath expr="//label[@string='description']" position="attributes">
-                    <attribute name="string">Configure your accounting system. By default, Chart of Account is matching to your country. If there are not chart of account certified for your county, you can install the generic chart of account.</attribute>
+                    <attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute>
                 </xpath>
                 <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Configure</attribute>
@@ -66,13 +66,17 @@
             <field name="arch" type="xml">
                 <data>
                     <form position="attributes">
-                        <attribute name="string">Accounting Modules Configuration</attribute>
+                        <attribute name="string">Accounting Application Configuration</attribute>
                     </form>
                     <separator string="title" position="attributes">
-                        <attribute name="string">Extra Accounting Modules</attribute>
+                         <attribute name="string">Configure Your Accounting Application</attribute>
+
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">From this screen, you can install extra accounting modules in your accounting system. Select the modules to directly install them. If you do not think you need any of these right now, you can easily install them later.</attribute>
+                        <attribute name="string">Add extra Accounting Addons to the ones already installed. Remember you can always install them at a later stage.</attribute>
+                    </xpath>
+                    <xpath expr="//button[@string='Install Modules']" position="attributes">
+                        <attribute name="string">Configure</attribute>
                     </xpath>
                     <xpath expr='//separator[@string="vsep"]' position='attributes'>
                         <attribute name='string'></attribute>
@@ -100,7 +104,7 @@
         </record>
 
         <record id="action_account_installer" model="ir.actions.act_window">
-            <field name="name">Accounting Modules Installation</field>
+            <field name="name">Accounting Application Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.installer.modules</field>
             <field name="view_id" ref="view_account_modules_installer"/>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 81391e796b9..aeb9a7112ec 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -150,7 +150,7 @@
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
                     <group col="8" colspan="4">
-                        <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
+                        <field domain="[('type', '=', 'purchase')]" name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
@@ -161,14 +161,14 @@
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
                         <field name="date_invoice"/>
-                        <field name="period_id" groups="account.group_account_user"/>
+                        <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
                         <group colspan="2" col="1" groups="account.group_account_user">
                             <label align="0.0" string="(keep empty to use the current period)"/>
                         </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
-                           <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user"/>
+                           <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user"/>
                             <field name="reference_type" nolabel="1" size="0"/>
                             <field name="reference" nolabel="1"/>
                             <field name="date_due"/>
@@ -221,7 +221,6 @@
                         </page>
                         <page string="Other Info">
                             <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
-
                             <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             <newline/>
                             <field name="payment_term" widget="selection"/>
@@ -260,7 +259,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice">
                     <group colspan="4" col="8">
-                    <field name="journal_id" groups="base.group_user"/>
+                    <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
@@ -271,14 +270,14 @@
                     <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                     <newline/>
                     <field name="date_invoice"/>
-                    <field name="period_id" groups="account.group_account_user"/>
+                    <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
                     <group colspan="2" col="1" groups="account.group_account_user">
                         <label align="0.0" string="(keep empty to use the current period)"/>
                     </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
-                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user"/>
+                            <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
                             <field name="name"/>
                             <field name="payment_term" widget="selection"/>
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
@@ -316,7 +315,7 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection"  groups="base.group_multi_company"/>
+                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             <newline/>
                             <field name="date_due"/>
                             <field name="user_id"/>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 990dd277d65..bb208e4e231 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -131,7 +131,8 @@ class account_move_line(osv.osv):
                     'general_account_id': obj_line.account_id.id,
                     'journal_id': obj_line.journal_id.analytic_journal_id.id,
                     'ref': obj_line.ref,
-                    'move_id':obj_line.id
+                    'move_id':obj_line.id,
+                    'user_id': uid
                 }
                 new_id = self.pool.get('account.analytic.line').create(cr,uid,vals_lines)
         return True
@@ -1181,6 +1182,7 @@ class account_move_line(osv.osv):
                         'general_account_id': vals.get('account_id', False),
                         'journal_id': journal.analytic_journal_id.id,
                         'ref': vals.get('ref', False),
+                        'user_id': uid
                     })]
 
         result = super(osv.osv, self).create(cr, uid, vals, context)
@@ -1257,13 +1259,5 @@ class account_move_line(osv.osv):
         return result
 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/account_view.xml b/addons/account/account_view.xml
index bcd5d8b233b..40f8fd277a8 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -521,7 +521,7 @@
                             attrs="{'invisible':[('state','=','confirm')]}"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Transaction">
+                        <page string="Transaction" name="statement_line_ids">
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" readonly="1"/>
@@ -533,8 +533,6 @@
                                     <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
                                     <field name="analytic_account_id" groups="base.group_extended"/>
                                     <field name="amount"/>
-                                    <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'currency_id': parent.currency, 'journal_id': parent.journal_id, 'date':date}" name="reconcile_id"/>
-                                    <field invisible="1" name="reconcile_amount"/>
                                 </tree>
                                 <form string="Statement lines">
                                     <field name="date"/>
@@ -544,7 +542,6 @@
                                     <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
                                     <field name="analytic_account_id" groups="base.group_extended" />
                                     <field name="amount"/>
-                                    <field context="{'partner_id':partner_id,'amount':amount,'account_id':account_id,'currency_id': parent.currency,'journal_id':parent.journal_id, 'date':date}" name="reconcile_id"/>
                                     <field name="ref"/>
                                     <field name="sequence" readonly="0"/>
                                     <separator colspan="4" string="Notes"/>
@@ -552,7 +549,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Journal Entries">
+                        <page string="Journal Entries" name="move_live_ids">
                             <field colspan="4" name="move_line_ids" nolabel="1"/>
                         </page>
                     </notebook>
@@ -657,38 +654,6 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <record id="view_bank_statement_reconcile" model="ir.ui.view">
-            <field name="name">account.bank.statement.reconcile.form</field>
-            <field name="model">account.bank.statement.reconcile</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Reconcile">
-                    <field name="name" select="1"/>
-                    <newline/>
-                    <field name="total_second_amount"/>
-                    <field name="total_second_currency"/>
-                    <newline/>
-                    <field name="total_amount"/>
-                    <field name="total_currency"/>
-                    <newline/>
-                    <separator colspan="4" string="Entries"/>
-                    <field colspan="4" domain="[('partner_id','=',context.get('partner_id', False)),('state','=','valid'),('account_id','=',context.get('account_id', False)),('reconcile_id', '=', False)]" name="line_ids" nolabel="1" view_mode="tree"/>
-                    <field colspan="4" name="line_new_ids" nolabel="1">
-                        <tree editable="bottom" string="Write-Off">
-                            <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="amount"/>
-                            <field name="name"/>
-                        </tree>
-                    </field>
-                    <group col="7" colspan="4">
-                        <field name="total_entry"/>
-                        <field name="total_new"/>
-                        <field name="total_balance"/>
-                        <button name="dummy" string="Compute" icon="terp-stock_format-scientific"/>
-                    </group>
-                </form>
-            </field>
-        </record>
         <!--
     Account Types
     -->
@@ -2375,11 +2340,11 @@
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Generate Chart of Accounts from a Chart Template</attribute>
+                  <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
                 <attribute name="string"
-                       >Generate Chart of Accounts from a Chart Template</attribute>
+                       >Generate Your Accounting Chart from a Chart Template</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index c0c898d4987..d4abad7d924 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -187,8 +187,8 @@
 			            <field name="code">1104</field>
 			            <field name="name">Bank Current Account</field>
 			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">view</field>
-			            <field name="user_type" ref="account_type_asset_view1"/>
+			            <field name="type">liquidity</field>
+			            <field name="user_type" ref="conf_account_type_asset"/>
 			        </record>
 
 		        <record id="conf_cli" model="account.account.template">
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 415879e6de8..1d96120b4b0 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -73,6 +73,21 @@ class account_installer(osv.osv_memory):
             return user.company_id.id
         return False
 
+    def _get_default_charts(self, cr, uid, context={}):
+        module_name = False
+        company_id = self._default_company(cr, uid, context=context)
+        company = self.pool.get('res.company').browse(cr, uid, company_id)
+        address_id = self.pool.get('res.partner').address_get(cr, uid, [company.partner_id.id])
+        if address_id['default']:
+            address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default'])
+            code = address.country_id.code
+            module_name = (code and 'l10n_' + code.lower()) or False
+        if module_name:
+            module_id = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', module_name)])
+            if module_id:
+                return module_name
+        return 'configurable'
+
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
@@ -80,7 +95,8 @@ class account_installer(osv.osv_memory):
         'sale_tax':lambda *a:0.0,
         'purchase_tax':lambda *a:0.0,
         'company_id': _default_company,
-        'bank_accounts_id':_get_default_accounts
+        'bank_accounts_id':_get_default_accounts, 
+        'charts': _get_default_charts
     }
 
     def on_change_tax(self, cr, uid, id, tax):
@@ -195,7 +211,7 @@ class account_installer(osv.osv_memory):
             vals={
                 'name': (obj_acc_root.id == account_template.id) and company_id.name or account_template.name,
                 #'sign': account_template.sign,
-                'currency_id': account_template.currency_id and account_template.currency_id.id or False,
+                #'currency_id': account_template.currency_id and account_template.currency_id.id or False,
                 'code': code_acc,
                 'type': account_template.type,
                 'user_type': account_template.user_type and account_template.user_type.id or False,
@@ -209,6 +225,19 @@ class account_installer(osv.osv_memory):
             new_account = obj_acc.create(cr, uid, vals)
             acc_template_ref[account_template.id] = new_account
             if account_template.name == 'Bank Current Account':
+                b_vals={
+                    'name': 'Bank Accounts',
+                    'code': '110500',
+                    'type': 'view',
+                    'user_type': account_template.parent_id.user_type and account_template.user_type.id or False,
+                    'shortcut': account_template.shortcut,
+                    'note': account_template.note,
+                    'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
+                    'tax_ids': [(6,0,tax_ids)],
+                    'company_id': company_id.id,
+                }
+                bank_account = obj_acc.create(cr, uid, b_vals)
+                
                 view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal View')])[0] #why fixed name here?
                 view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here?
                 ref_acc_bank = obj_multi.bank_account_view_id
@@ -265,10 +294,10 @@ class account_installer(osv.osv_memory):
 
                     vals_bnk = {'name': val.acc_name or '',
                         'currency_id': val.currency_id.id or False,
-                        'code': str(110400 + code_cnt),
+                        'code': str(110500 + code_cnt),
                         'type': 'liquidity',
                         'user_type': type,
-                        'parent_id':new_account,
+                        'parent_id':bank_account,
                         'company_id': company_id.id }
                     child_bnk_acc = obj_acc.create(cr, uid, vals_bnk)
                     vals_seq_child = {
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 44a57c2e11d..42e4bee12b6 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -138,16 +138,17 @@ class account_invoice(osv.osv):
 
         return res
 
+    # Give Journal Items related to the payment reconciled to this invoice
+    # Return ids of partial and total payments related to the selected invoices
     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
+        for invoice in self.browse(cr, uid, ids, context=context):
+            id = invoice.id
             res[id] = []
-            data_lines = self.pool.get('account.move.line').browse(cr, uid, move_lines)
-            partial_ids = []# Keeps the track of ids where partial payments are done with payment terms
+            if not invoice.move_id:
+                continue
+            data_lines = invoice.move_id.line_id
+            partial_ids = []
             for line in data_lines:
                 ids_line = []
                 if line.reconcile_id:
@@ -174,17 +175,17 @@ class account_invoice(osv.osv):
     def _compute_lines(self, cr, uid, ids, name, args, context=None):
         result = {}
         for invoice in self.browse(cr, uid, ids, context):
-            moves = self.move_line_id_payment_get(cr, uid, [invoice.id])
             src = []
             lines = []
-            for m in self.pool.get('account.move.line').browse(cr, uid, moves, context):
-                temp_lines = []#Added temp list to avoid duplicate records
-                if m.reconcile_id:
-                    temp_lines = map(lambda x: x.id, m.reconcile_id.line_id)
-                elif m.reconcile_partial_id:
-                    temp_lines = map(lambda x: x.id, m.reconcile_partial_id.line_partial_ids)
-                lines += [x for x in temp_lines if x not in lines]
-                src.append(m.id)
+            if invoice.move_id:
+                for m in invoice.move_id.line_id:
+                    temp_lines = []
+                    if m.reconcile_id:
+                        temp_lines = map(lambda x: x.id, m.reconcile_id.line_id)
+                    elif m.reconcile_partial_id:
+                        temp_lines = map(lambda x: x.id, m.reconcile_partial_id.line_partial_ids)
+                    lines += [x for x in temp_lines if x not in lines]
+                    src.append(m.id)
 
             lines = filter(lambda x: x not in src, lines)
             result[invoice.id] = lines
@@ -452,6 +453,17 @@ class account_invoice(osv.osv):
                         _('Can not select currency that is not related to current company.\nPlease select accordingly !.'))
         return {}
 
+    def onchange_journal_id(self, cr, uid, ids, journal_id=False):
+        result = {}
+        if journal_id:
+            journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
+            currency_id = journal.currency and journal.currency.id or journal.company_id.currency_id.id
+            result = {'value': {
+                    'currency_id': currency_id,
+                    }
+                }
+        return result
+
     def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
         if not payment_term_id:
             return {}
@@ -550,7 +562,6 @@ class account_invoice(osv.osv):
                 val['currency_id'] = False
             else:
                 val['currency_id'] = currency.id
-
         if company_id:
             company = self.pool.get('res.company').browse(cr, uid, company_id)
             if company.currency_id.company_id and company.currency_id.company_id.id != company_id:
@@ -584,15 +595,22 @@ class account_invoice(osv.osv):
     # return the ids of the move lines which has the same account than the invoice
     # whose id is in ids
     def move_line_id_payment_get(self, cr, uid, ids, *args):
-        res = []
+        if not ids: return []
+        result = self.move_line_id_payment_gets(cr, uid, ids, *args)
+        return result.get(ids[0], [])
+
+    def move_line_id_payment_gets(self, cr, uid, ids, *args):
+        res = {}
         if not ids: return res
-        cr.execute('SELECT l.id '\
+        cr.execute('SELECT i.id, l.id '\
                    'FROM account_move_line l '\
                    'LEFT JOIN account_invoice i ON (i.move_id=l.move_id) '\
                    'WHERE i.id IN %s '\
                    'AND l.account_id=i.account_id',
                    (tuple(ids),))
-        res = map(itemgetter(0), cr.fetchall())
+        for r in cr.fetchall():
+            res.setdefault(r[0], [])
+            res[r[0]].append( r[1] )
         return res
 
     def copy(self, cr, uid, id, default={}, context=None):
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index e49c47034fb..f313704bc8a 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -43,6 +43,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
         self.init_query = data['form']['initial_bal_query']
         self.init_balance = data['form']['initial_balance']
         self.display_account = data['form']['display_account']
+        self.target_move = data['form'].get('target_move', 'all')
         if (data['model'] == 'ir.ui.menu'):
             new_ids = [data['form']['chart_account_id']]
             objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
@@ -78,14 +79,14 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
         self.context = context
 
     def _sum_currency_amount_account(self, account):
-        self.cr.execute("SELECT sum(l.amount_currency) AS tot_currency "\
-                "FROM account_move_line l "\
-                "WHERE l.account_id = %s AND %s" %(account.id, self.query))
+        self.cr.execute('SELECT sum(l.amount_currency) AS tot_currency \
+                FROM account_move_line l \
+                WHERE l.account_id = %s AND %s' %(account.id, self.query))
         sum_currency = self.cr.fetchone()[0] or 0.0
         if self.init_balance:
-            self.cr.execute("SELECT sum(l.amount_currency) AS tot_currency "\
-                            "FROM account_move_line l "\
-                            "WHERE l.account_id = %s AND %s "%(account.id, self.init_query))
+            self.cr.execute('SELECT sum(l.amount_currency) AS tot_currency \
+                            FROM account_move_line l \
+                            WHERE l.account_id = %s AND %s '%(account.id, self.init_query))
             sum_currency += self.cr.fetchone()[0] or 0.0
         return str(sum_currency)
 
@@ -117,13 +118,23 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
 
     def lines(self, account):
         """ Return all the account_move_line of account with their account code counterparts """
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted', '']
         # First compute all counterpart strings for every move_id where this account appear.
         # Currently, the counterpart info is used only in landscape mode
         sql = """
             SELECT m1.move_id,
-            array_to_string(ARRAY(SELECT DISTINCT a.code FROM account_move_line m2 LEFT JOIN account_account a ON (m2.account_id=a.id) WHERE m2.move_id = m1.move_id AND m2.account_id<>%%s), ', ') AS counterpart
-            FROM (SELECT move_id FROM account_move_line l WHERE %s AND l.account_id = %%s GROUP BY move_id) m1
-        """ % self.query
+                array_to_string(ARRAY(SELECT DISTINCT a.code
+                                          FROM account_move_line m2
+                                          LEFT JOIN account_account a ON (m2.account_id=a.id)
+                                          WHERE m2.move_id = m1.move_id
+                                          AND m2.account_id<>%%s), ', ') AS counterpart
+                FROM (SELECT move_id
+                        FROM account_move_line l
+                        LEFT JOIN account_move am ON (am.id = l.move_id)
+                        WHERE am.state IN %s and %s AND l.account_id = %%s GROUP BY move_id) m1
+        """% (tuple(move_state), self.query)
         self.cr.execute(sql, (account.id, account.id))
         counterpart_res = self.cr.dictfetchall()
         counterpart_accounts = {}
@@ -143,13 +154,13 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number,
             p.name AS partner_name
             FROM account_move_line l
-            LEFT JOIN account_move m on (l.move_id=m.id)
+            JOIN account_move m on (l.move_id=m.id)
             LEFT JOIN res_currency c on (l.currency_id=c.id)
             LEFT JOIN res_partner p on (l.partner_id=p.id)
             LEFT JOIN account_invoice i on (m.id =i.move_id)
             JOIN account_journal j on (l.journal_id=j.id)
-            WHERE %s AND l.account_id = %%s ORDER by %s
-        """ % (self.query, sql_sort)
+            WHERE %s AND m.state IN %s AND l.account_id = %%s ORDER by %s
+        """ %(self.query, tuple(move_state), sql_sort)
         self.cr.execute(sql, (account.id,))
         res_lines = self.cr.dictfetchall()
         res_init = []
@@ -167,8 +178,8 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
                 LEFT JOIN res_partner p on (l.partner_id=p.id)
                 LEFT JOIN account_invoice i on (m.id =i.move_id)
                 JOIN account_journal j on (l.journal_id=j.id)
-                WHERE %s AND l.account_id = %%s
-            """ %(self.init_query)
+                WHERE %s AND m.state IN %s AND l.account_id = %%s
+            """ %(self.init_query, tuple(move_state))
 
             self.cr.execute(sql, (account.id,))
             res_init = self.cr.dictfetchall()
@@ -192,40 +203,73 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
         return res
 
     def _sum_debit_account(self, account):
-        self.cr.execute("SELECT sum(debit) "\
-                "FROM account_move_line l "\
-                "WHERE l.account_id = %s AND %s "%(account.id, self.query))
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted','']
+        self.cr.execute('SELECT sum(debit) \
+                FROM account_move_line l \
+                JOIN account_move am ON (am.id = l.move_id) \
+                WHERE (l.account_id = %s) \
+                AND (am.state IN %s) \
+                AND '+ self.query +' '
+                ,(account.id, tuple(move_state)))
         sum_debit = self.cr.fetchone()[0] or 0.0
         if self.init_balance:
-            self.cr.execute("SELECT sum(debit) "\
-                    "FROM account_move_line l "\
-                    "WHERE l.account_id = %s AND %s "%(account.id, self.init_query))
+            self.cr.execute('SELECT sum(debit) \
+                    FROM account_move_line l \
+                    JOIN account_move am ON (am.id = l.move_id) \
+                    WHERE (l.account_id = %s) \
+                    AND (am.state IN %s) \
+                    AND '+ self.init_query +' '
+                    ,(account.id, tuple(move_state)))
             # Add initial balance to the result
             sum_debit += self.cr.fetchone()[0] or 0.0
         return sum_debit
 
     def _sum_credit_account(self, account):
-        self.cr.execute("SELECT sum(credit) "\
-                "FROM account_move_line l "\
-                "WHERE l.account_id = %s AND %s "%(account.id, self.query))
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted','']
+        self.cr.execute('SELECT sum(credit) \
+                FROM account_move_line l \
+                JOIN account_move am ON (am.id = l.move_id) \
+                WHERE (l.account_id = %s) \
+                AND (am.state IN %s) \
+                AND '+ self.query +' '
+                ,(account.id, tuple(move_state)))
         sum_credit = self.cr.fetchone()[0] or 0.0
         if self.init_balance:
-            self.cr.execute("SELECT sum(credit) "\
-                    "FROM account_move_line l "\
-                    "WHERE l.account_id = %s AND %s "%(account.id, self.init_query))
+            self.cr.execute('SELECT sum(credit) \
+                    FROM account_move_line l \
+                    JOIN account_move am ON (am.id = l.move_id) \
+                    WHERE (l.account_id = %s) \
+                    AND (am.state IN %s) \
+                    AND '+ self.init_query +' '
+                    ,(account.id, tuple(move_state)))
             # Add initial balance to the result
             sum_credit += self.cr.fetchone()[0] or 0.0
         return sum_credit
 
     def _sum_balance_account(self, account):
-        self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_balance "\
-                "FROM account_move_line l "\
-                "WHERE l.account_id = %s AND %s"%(account.id, self.query))
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted','']
+        self.cr.execute('SELECT (sum(debit) - sum(credit)) as tot_balance \
+                FROM account_move_line l \
+                JOIN account_move am ON (am.id = l.move_id) \
+                WHERE (l.account_id = %s) \
+                AND (am.state IN %s) \
+                AND '+ self.query +' '
+                ,(account.id, tuple(move_state)))
         sum_balance = self.cr.fetchone()[0] or 0.0
         if self.init_balance:
-            self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_balance "\
-                    "FROM account_move_line l "\
-                    "WHERE l.account_id = %s AND %s "%(account.id, self.init_query))
+            self.cr.execute('SELECT (sum(debit) - sum(credit)) as tot_balance \
+                    FROM account_move_line l \
+                    JOIN account_move am ON (am.id = l.move_id) \
+                    WHERE (l.account_id = %s) \
+                    AND (am.state IN %s) \
+                    AND '+ self.init_query +' '
+                    ,(account.id, tuple(move_state)))
             # Add initial balance to the result
             sum_balance += self.cr.fetchone()[0] or 0.0
         return sum_balance
diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml
index 35205440993..9c495dd4834 100644
--- a/addons/account/report/account_tax_code.rml
+++ b/addons/account/report/account_tax_code.rml
@@ -1,32 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Tax Code" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Accounting Entries" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="700"/>
-       <header>
-			<pageGraphics>
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">Accounting Entries-[[ company.currency_id.name ]]</drawRightString>
-
-				<!-- Header -->
-
-
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
-				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
-				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-
-
-			    <lineMode width="0.7"/>
-				<lines>1cm 27.7cm 20cm 27.7cm</lines>
-				<setFont name="Helvetica" size="8"/>
-
-			</pageGraphics>
-		</header>
+      <frame id="first" x1="28.0" y1="42.0" width="539" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -34,28 +10,20 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Title_Table">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Line_Title">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="5,0" stop="5,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="6,0" stop="6,0"/>
-
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,1" stop="2,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,1" stop="3,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,1" stop="4,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,1" stop="5,-1"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Line_Content_Detail">
       <blockAlignment value="LEFT"/>
@@ -71,19 +39,19 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="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"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -95,59 +63,82 @@
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-  	<para style="P8">[[ repeatIn(objects, 'o') ]]</para>
-  	<para style="terp_tblheader_Details">
-    <font color="white"></font>
-    </para>
-    <blockTable colWidths="162.0,222.0,154.0" repeatRows="1" style="Table_Title_Table">
+    <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
+    <blockTable colWidths="539.0" repeatRows="1" style="Table2">
       <tr>
-        <td><para style="terp_header">[[ o.company_id.name ]]</para></td>
-        <td><para style="terp_header"><font face="Times-Roman" size="11.0"/></para></td>
-        <td><para style="terp_header">Accounting Entries-[[ o.company_id.currency_id.name ]]</para></td>
+        <td>
+          <para style="terp_header_Centre">Accounting Entries-[[ company.currency_id.name ]]</para>
+        </td>
       </tr>
     </blockTable>
-    <para style="terp_tblheader_Details">
-    <font color="white"></font>
-    </para>
-    <para style="terp_tblheader_Details">[[ o.name ]]</para>
-    <para style="terp_tblheader_Details">
-    <font color="white"></font>
-    </para>
-    <section>
-    <blockTable colWidths="55.0,43.0,57.0,125.0,127.0,65.0,67.0" repeatRows="1" style="Table_Line_Title">
-      <tr>
-        <td><para style="terp_tblheader_Details_Centre">Date</para></td>
-        <td><para style="terp_tblheader_Details">Voucher Nb</para></td>
-        <td><para style="terp_tblheader_Details">Account Number</para></td>
-        <td><para style="terp_tblheader_Details">Third party (Country)</para></td>
-        <td><para style="terp_tblheader_Details">Entry label</para></td>
-        <td><para style="terp_tblheader_Details_Right">Debit</para></td>
-        <td><para style="terp_tblheader_Details_Right">Credit</para></td>
-      </tr>
-	   <tr>
-	      <td><para style="terp_default_9">[[ repeatIn(get_line(o),'line') ]]<font>[[ not line and removeParentNode('tr') ]]</font>[[ formatLang(line['date'],date=True) ]]</para></td>
-	      <td><para style="terp_default_9">[[ line['ref'] ]]</para></td>
-	      <td><para style="terp_default_9">[[ line['acode'] ]]</para></td>
-	      <td><para style="terp_default_9">[[ line['pname'] ]]<font>([[ line['country'] ]] )</font></para></td>
-	      <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
-	      <td><para style="terp_default_Right_9">[[ formatLang(line['debit']) ]]</para></td>
-	      <td><para style="terp_default_Right_9">[[ formatLang(line['credit']) ]]</para></td>
-	   </tr>
-    </blockTable>
-    </section>
-    <para style="terp_default_8">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
+    <blockTable colWidths="52.0,68.0,55.0,110.0,130.0,64.0,60.0" repeatRows="1" style="Table_Line_Title">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Voucher No</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">A/c Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Third Party (Country)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Entry Label</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit<font face="Helvetica" size="8.0">([[ company.currency_id.name ]])</font></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit<font face="Helvetica" size="8.0">([[ company.currency_id.name ]])</font></para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_line(o),'line') ]]</para>
+      <blockTable colWidths="52.0,68.0,54.0,110.0,131.0,63.0,60.0" style="Table_Line_Content_Detail">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ not line and removeParentNode('blockTable') ]] [[ formatLang(line['date'],date=True) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['ref'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['acode'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['pname'] ]] ([[ line['country'] ]] )</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
   </story>
-</document>
-
+</document>
\ No newline at end of file
diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml
index 5f461cd9768..fad5c27ec79 100644
--- a/addons/account/report/overdue.rml
+++ b/addons/account/report/overdue.rml
@@ -187,7 +187,7 @@
             <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and (line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index b87f0e45cd3..11c83ff48fd 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -29,8 +29,6 @@
 "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,0,0,0
 "access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
-"access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_account_user",1,1,1,1
-"access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_account_user",1,1,1,1
 "access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0
 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
 "access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
@@ -182,7 +180,6 @@
 "access_account_tax_code_accounting_accountant","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0
 "access_account_bank_statement_accounting_accountant","account.bank.statement","model_account_bank_statement","account.group_accounting_accountant",1,1,1,1
 "access_account_cashbox_line_accounting_accountant","account.cashbox.line","model_account_cashbox_line","account.group_accounting_accountant",1,1,1,1
-"access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_accounting_accountant",1,1,1,1
 "access_account_bank_statement_line_accounting_accountant","account.bank.statement.line","model_account_bank_statement_line","account.group_accounting_accountant",1,1,1,1
 "access_account_invoice_report_accounting_accountant","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0
 "access_report_account_receivable_accounting_accountant","report.account.receivable","model_report_account_receivable","account.group_accounting_accountant",1,0,0,0
@@ -197,7 +194,6 @@
 "access_account_analytic_account_accounting_accountant","account.analytic.account","analytic.model_account_analytic_account","account.group_accounting_accountant",1,0,0,0
 "access_account_analytic_line_accounting_accountant","account.analytic.line","analytic.model_account_analytic_line","account.group_accounting_accountant",1,0,0,0
 "access_account_analytic_journal_accounting_accountant","account.analytic.journal","model_account_analytic_journal","account.group_accounting_accountant",1,0,0,0
-"access_account_bank_statement_reconcile_accounting_accountant","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_accounting_accountant",1,1,1,1
 "access_account_analytic_journal_analytic_accounting","account.analytic.journal","model_account_analytic_journal","analytic.group_analytic_accounting",1,1,1,1
 "access_account_account_analytic_accounting","account.account","model_account_account","analytic.group_analytic_accounting",1,0,0,0
 "access_product_product_analytic_accounting","product.product","product.model_product_product","analytic.group_analytic_accounting",1,0,0,0
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 3f99a66d719..59cbfdafc0b 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -21,16 +21,23 @@
 -
   I made modification in journal so it can move entries
 -
-  !record {model: account.journal, id: account.sales_journal}:
+  !record {model: account.journal, id: account.close_journal}:
+    name: End of Year
+    code: NEW
+    type: situation
+    sequence_id: sequence_journal
+    default_debit_account_id: cash
+    default_credit_account_id: cash
+    company_id: base.main_company
+    view_id: account_journal_bank_view
     centralisation: 1
-
 -
   I called the Generate Fiscalyear Opening Entries wizard
 -
   !record {model: account.fiscalyear.close, id: account_fiscalyear_close_0}:
     fy2_id: account_fiscalyear_fiscalyear0
     fy_id: account.data_fiscalyear
-    journal_id: account.sales_journal
+    journal_id: account.close_journal
     period_id: account_period_jan11
     report_name: End of Fiscal Year Entry
 -
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 44899ec1d8d..0048de7af46 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -25,29 +25,30 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-voucher-report.'+format), 'wb+').write(data)
 
-#-
-#  Demo data for Account tax code
-#-
-#  !record {model: account.tax.code, id: account_tax_code_0}:
-#    name : Tax Code Test
-#-
-# Print Tax Code entries report
-#- 
-#  !python {model: account.tax.code}: |
-#    import netsvc, tools, os
-#    (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref('account.account_tax_code_0')], {}, {})
-#    if tools.config['test_report_directory']:
-#        file(os.path.join(tools.config['test_report_directory'], 'account-tax-code-entries.'+format), 'wb+').write(data)
+-
+  Demo data for Account tax code
+-
+  !record {model: account.tax.code, id: account_tax_code_0}:
+    name : Tax Code Test
+-
+ Print Tax Code entries report
+- 
+  !python {model: account.tax.code}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref('account_tax_code_0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account-tax-code-entries.'+format), 'wb+').write(data)
+
+-
+  Print Vat Declaration Report
+-
+   !python {model: account.tax.code}: |
+    import netsvc, tools, os
+    data_dict = {'model': 'ir.ui.menu', 'form': {'based_on': 'invoices','company_id':ref('base.main_company'),'periods':[]}}
+    (data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account_tax_code_0")], data_dict, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'account-vat-declaration.'+format), 'wb+').write(data)
 
-#-
-#  Print Vat Declaration Report
-#-
-#   !python {model: account.tax.code}: |
-#    import netsvc, tools, os
-#    data_dict = {'model': 'ir.ui.menu', 'form': {'based_on': 'invoices','company_id':ref('base.main_company'),'periods':[]}}
-#   (data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account.account_tax_code0")], data_dict, {})
-#    if tools.config['test_report_directory']:
-#       file(os.path.join(tools.config['test_report_directory'], 'account-vat-declaration.'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on an invoice, we will print an invoice
 - 
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index 84683d17b30..bf10838b9c8 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -54,14 +54,14 @@ class account_chart(osv.osv_memory):
 
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
         res = {}
-        res['value'] = {'period_from': False, 'period_to': False}
+        res['value'] = {}
         if fiscalyear_id:
             start_period = end_period = False
             cr.execute('''
-                SELECT * FROM (SELECT p.id 
-                               FROM account_period p 
-                               LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id) 
-                               WHERE f.id = %s 
+                SELECT * FROM (SELECT p.id
+                               FROM account_period p
+                               LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id)
+                               WHERE f.id = %s
                                ORDER BY p.date_start ASC
                                LIMIT 1) AS period_start
                 UNION
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index eb662058f32..f35a2c5480c 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -9,11 +9,11 @@
                 <form string="Account charts">
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
+                        <field name="target_move"/>
                         <label align="0.7" colspan="4" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
                         <separator string="Periods" colspan="4"/>
-                        <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear)]"/>
-                        <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear)]"/>
-                        <field name="target_move"/>
+                        <field name="period_from"/>
+                        <field name="period_to"/>
                     </group>
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="6">
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index cef1860b45b..99983654c82 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -37,14 +37,11 @@ class account_aged_trial_balance(osv.osv_memory):
         'direction_selection': fields.selection([('past','Past'),
                                                  ('future','Future')],
                                                  'Analysis Direction', required=True),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
     }
     _defaults = {
         'period_length': 30,
         'date_from' : time.strftime('%Y-%m-%d'),
         'direction_selection': 'past',
-        'target_move': 'all',
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -64,7 +61,7 @@ class account_aged_trial_balance(osv.osv_memory):
             context = {}
 
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['period_length', 'direction_selection', 'target_move'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['period_length', 'direction_selection'])[0])
 
         period_length = data['form']['period_length']
         if period_length<=0:
@@ -81,7 +78,7 @@ class account_aged_trial_balance(osv.osv_memory):
                     'name': (i!=0 and (str((5-(i+1)) * period_length) + '-' + str((5-i) * period_length)) or ('+'+str(4 * period_length))),
                     'stop': start.strftime('%Y-%m-%d'),
                     'start': (i!=0 and stop.strftime('%Y-%m-%d') or False),
-                    }
+                }
                 start = stop - RelativeDateTime(days=1)
         else:
             for i in range(5):
@@ -90,7 +87,7 @@ class account_aged_trial_balance(osv.osv_memory):
                     'name' : (i!=4 and str((i) * period_length)+'-' + str((i+1) * period_length) or ('+'+str(4 * period_length))),
                     'start': start.strftime('%Y-%m-%d'),
                     'stop': (i!=4 and stop.strftime('%Y-%m-%d') or False),
-                    }
+                }
                 start = stop + RelativeDateTime(days=1)
         data['form'].update(res)
 
@@ -98,7 +95,7 @@ class account_aged_trial_balance(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account.aged_trial_balance',
             'datas': data
-                }
+        }
 
 account_aged_trial_balance()
 
diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index fe71ccb08f2..64bbde2cdd3 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -30,15 +30,19 @@ class account_common_partner_report(osv.osv_memory):
                                               ('supplier','Payable Accounts'),
                                               ('customer_supplier' ,'Receivable and Payable Accounts')],
                                               "Partner's", required=True),
+        'target_move': fields.selection([('all', 'All Entries'),
+                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
     }
+
     _defaults = {
         'result_selection': 'customer',
+        'target_move': 'all'
     }
 
     def pre_print_report(self, cr, uid, ids, data, query_line, context=None):
         if context is None:
             context = {}
-        data['form'].update(self.read(cr, uid, ids, ['result_selection'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['result_selection', 'target_move'])[0])
         return data
 
 account_common_partner_report()
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index 9f8a548c5ba..ada80db1762 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -32,12 +32,15 @@ class account_report_general_ledger(osv.osv_memory):
                                           help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
         'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
+        'target_move': fields.selection([('all', 'All Entries'),
+                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
     }
     _defaults = {
         'landscape': True,
         'amount_currency': True,
         'sortby': 'sort_date',
         'initial_balance': False,
+        'target_move': 'all',
     }
 
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear=False, context=None):
@@ -50,7 +53,7 @@ class account_report_general_ledger(osv.osv_memory):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['landscape',  'initial_balance', 'amount_currency', 'sortby'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['landscape',  'initial_balance', 'amount_currency', 'sortby', 'target_move'])[0])
         if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record
             data['form'].update({'initial_balance': False})
         if data['form']['landscape']:
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index 87953a367df..42256912add 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
                    <field name="display_account"/>
+                   <field name="target_move"/>
                    <field name="sortby"/>
                    <field name="landscape"/>
                    <field name="initial_balance" attrs="{'readonly':[('fiscalyear_id','=', False)]}"/>
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index 5e5ca64173b..744e8bf5fc1 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -33,25 +33,23 @@ class account_partner_balance(osv.osv_memory):
 #                                    ,help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]
                                     ,'Display Partners'),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
-                }
+    }
+
     _defaults = {
 #        'initial_balance': True,
         'display_partner': 'non-zero_balance',
-        'target_move': 'all'
-                }
+    }
 
     def _print_report(self, cr, uid, ids, data, query_line, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['display_partner', 'target_move'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['display_partner'])[0])
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.partner.balance',
             'datas': data,
-                }
+    }
 
 account_partner_balance()
 
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 53dbf12c348..e0e3778966b 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -35,28 +35,25 @@ class account_partner_ledger(osv.osv_memory):
         'reconcil': fields.boolean('Include Reconciled Entries', help='Consider reconciled entries'),
         'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
 
     }
     _defaults = {
        'reconcil': True,
        'initial_balance': True,
        'page_split': False,
-       'target_move': 'all'
     }
 
     def _print_report(self, cr, uid, ids, data, query_line, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency', 'target_move'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'])[0])
         if data['form']['page_split']:
             return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.third_party_ledger',
                 'datas': data,
-            }
+        }
         return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.third_party_ledger_other',
diff --git a/addons/account_reporting/report/account_report_bs.rml b/addons/account_reporting/report/account_report_bs.rml
index 59caba5ab76..b33ebb4bcc8 100644
--- a/addons/account_reporting/report/account_report_bs.rml
+++ b/addons/account_reporting/report/account_report_bs.rml
@@ -10,14 +10,52 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table_Company_Name">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+ 	<blockTableStyle id="Table2a">
+      <blockValign value="TOP"/>
+      <blockAlignment value="RIGHT"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+	<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+    </blockTableStyle>
+
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -25,7 +63,7 @@
 	   <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
 	   <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
 	   <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-	   <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
+	   <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
@@ -41,26 +79,32 @@
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="15.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P2" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="12.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3a" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="12.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P6" fontName="Helvetica" fontSize="12.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P7" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT"/>
     <paraStyle name="P8" fontName="Helvetica" fontSize="12.0" leading="14" alignment="RIGHT"/>
     <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
     <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P12" fontName="Helvetica" fontSize="12.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12a" fontName="Helvetica" fontSize="12.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12b" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P13" fontName="Helvetica" fontSize="12.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="12.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P15" fontName="Helvetica" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P16" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P19" fontName="Helvetica" fontSize="12.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P20" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -69,63 +113,49 @@
     <paraStyle name="Index" fontName="Helvetica"/>
   </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">
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Company_Name">
       <tr>
         <td>
-          <para style="Table Contents">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P1"><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]]</font></para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_header_Centre">Account Balance</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="131.0,280.0,131.0" style="Table7">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table2">
       <tr>
         <td>
-          <para style="P12a" ><font color='blue'>Code</font></para>
+          <para style="terp_tblheader_General_Centre">Company Name</para>
         </td>
         <td>
-          <para style="P12a"><font color='blue'>Account Name</font></para>
+          <para style="terp_tblheader_General_Centre">Printing date</para>
         </td>
         <td>
-          <para style="P13"><font color='blue'>Balance</font></para>
+          <para style="terp_tblheader_General_Centre">Currency</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Name</para>
         </td>
       </tr>
-    </blockTable>
-    <blockTable colWidths="131.0,280.0,131.0" style="Table4">
+  </blockTable>
+    <blockTable colWidths="132.0,134.0,135.0,135.0"  style="Table3">
       <tr>
         <td>
-          <para style="P10"><font>[[ repeatIn(lines(data['form'],object=o), 'a') ]]</font><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['code'] ]]</font></para>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
         </td>
         <td>
-          <para style="P17"><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['name'] ]]</font></para>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]]</para>
         </td>
         <td>
-          <para style="P18"><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]][[ '%.2f'% a['balance'] ]]</font></para>
+          <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8"><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]]</font></para>
         </td>
       </tr>
     </blockTable>
@@ -135,6 +165,27 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
+    <blockTable colWidths="80.0,382.0,80.0" style="Table2a" repeatRows="1">
+      <tr noRowsplits="1">
+        <td>
+          <para style="P12a">Code</para>
+        </td>
+        <td>
+          <para style="P12a">Account Name</para>
+        </td>
+        <td>
+          <para style="P12b">Balance([[company.currency_id.code]])</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ (a['level']&gt;4 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><i>[[ a['code'] or removeParentNode('tr')]]</i></para>
+        </td>
+        <td><para style="P14"><font>[[ (a['level']&gt;4 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font> </para></td>
+        <td>
+          <para style="P3"><font>[[ (a['level']&gt;4 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font >[[ formatLang(a['balance']) ]] [[company.currency_id.symbol]]</font></para>
+        </td>
+      </tr>
+    </blockTable>
   </story>
 </document>
-
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 824ca746f37..752bb74f90c 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -52,6 +52,7 @@
 #         "test/account_voucher.yml",
 #          "test/sales_receipt.yml",
 #          "test/sales_payment.yml",
+            "test/account_voucher_report.yml"
     ],
     'certificate': '0037580727101',
     "active": False,
diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
new file mode 100644
index 00000000000..eddb313c776
--- /dev/null
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -0,0 +1,34 @@
+-
+  Demo for Account Voucher
+-
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    account_id: account.cash
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: Voucher Axelor
+    narration: Basic PC
+    amount: 1000.0
+    line_ids:
+      - account_id: account.cash
+        amount: 1000.0
+        name: Voucher Axelor
+    period_id: account.period_6
+
+-
+  In order to test the PDF reports defined on a account_voucher, we will print account voucher amount Report
+-
+  !python {model: account.voucher}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.voucher.cash_amount').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account_voucher-amount.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a account_voucher, we will print account voucher Report
+-
+  !python {model: account.voucher}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.voucher.cash_receipt.drcr').create(cr, uid, [ref("account_voucher_voucheraxelor0")], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account_voucher-report.'+format), 'wb+').write(data)
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 57b74d948d8..ebc709e3ff6 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -45,7 +45,7 @@ account_move_line()
 
 class account_voucher(osv.osv):
     def _get_type(self, cr, uid, ids, context={}):
-        return context.get('type')
+        return context.get('type', False)
         
     def _get_period(self, cr, uid, context={}):
         if context.get('period_id', False):
@@ -101,7 +101,8 @@ class account_voucher(osv.osv):
     
     def _get_narration(self, cr, uid, context={}):
         return context.get('narration', False)
-        
+       
+ 
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
@@ -308,7 +309,7 @@ class account_voucher(osv.osv):
             tr_type = 'receipt'
 
         default['value']['account_id'] = account_id
-        default['value']['type'] = tr_type
+        default['value']['type'] = ttype or tr_type
         
         vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context)
         default['value'].update(vals.get('value'))
@@ -810,3 +811,43 @@ class account_voucher_line(osv.osv):
         })
         return values
 account_voucher_line()
+
+class account_bank_statement(osv.osv):
+    _inherit = 'account.bank.statement'
+
+    def create_move_from_st_line(self, cr, uid, st_line, company_currency_id, next_number, context=None):
+        if st_line.voucher_id:
+            return self.pool.get('account.voucher').proforma_voucher(cr, uid, [st_line.voucher_id.id])
+        return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line, company_currency_id, next_number, context=context)
+
+account_bank_statement()
+
+class account_bank_statement_line(osv.osv):
+    _inherit = 'account.bank.statement.line'
+
+    def _amount_reconciled(self, cursor, user, ids, name, args, context=None):
+        if not ids:
+            return {}
+        res_currency_obj = self.pool.get('res.currency')
+        res = {}
+        company_currency_id = False
+
+        for line in self.browse(cursor, user, ids, context=context):
+            if not company_currency_id:
+                company_currency_id = line.company_id.id
+            if line.voucher_id:
+                res[line.id] = res_currency_obj.compute(cursor, user,
+                        company_currency_id, line.statement_id.currency.id,
+                        line.voucher_id.amount, context=context)
+            else:
+                res[line.id] = 0.0
+        return res
+
+    _columns = {
+        'amount_reconciled': fields.function(_amount_reconciled,
+            string='Amount reconciled', method=True, type='float'),
+        'voucher_id': fields.many2one('account.voucher', 'Payment'),
+
+    }
+
+account_bank_statement_line()
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index fd79598a286..6cca62c0d57 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -80,6 +80,72 @@
                 </search>
             </field>
         </record>
+        <record model="ir.ui.view" id="view_low_priority_payment_form">
+            <field name="name">account.voucher.payment.low.priority.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="priority">1</field>
+            <field name="arch" type="xml">
+                <form string="Bill Payment">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" context="{'invoice_currency':currency_id}" string="Vendor"/>
+                        <field name="journal_id"
+                            domain="[('type','in',['bank', 'cash'])]"
+                            widget="selection" select="1"
+                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"
+                            string="Payment Method"/>
+                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/>
+                        <field name="reference" select="1" string="Payment Ref"/>
+                        <field name="name" colspan="4"/>
+                        <field name="account_id"
+                            widget="selection"
+                            invisible="True"/>
+                        <field name="pre_line" invisible="1"/>
+                        <field name="type" invisible="True"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Payment Information">
+                            <field name="line_dr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
+                                <tree string="Vendor Invoices and Outstanding transactions" editable="bottom">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        />
+                                    <field name="account_id" groups="base.group_extended" domain="[('type','=','payable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+                                    <field name="amount" sum="Payment"/>
+                                </tree>
+                                <form string="Payment Information">
+                                    <label string="Form view not available for Payment Lines"/>
+                                </form>
+                            </field>
+                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
+                                <tree string="Credits" editable="bottom">
+                                    <field name="move_line_id"/>
+                                    <field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
+                                    <field name="date_original"/>
+                                    <field name="amount_original"/>
+                                    <field name="amount" sum="Payment"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Internal Notes" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Information" colspan="2"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
+                                <field name="currency_id" invisible="True"/>
+                                <field name="number"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
         <record model="ir.ui.view" id="view_vendor_payment_form">
             <field name="name">account.voucher.payment.form</field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 7dd79c2d829..b72faa46d46 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -102,6 +102,7 @@
                         <field name="name" colspan="4"/>
                         <field name="date" on_change="onchange_date(date)"/>
                         <field name="type" invisible="True"/>
+                        <field name="currency_id" invisible="True" nolabel="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Information">
@@ -133,7 +134,7 @@
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
                                     <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label string="" colspan="1"/><field name="currency_id" invisible="True" nolabel="1"/><field name="amount" string="Total"/>
+                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
                         </page>
@@ -211,6 +212,7 @@
                         <field name="reference" select="1"/>
                         <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
                         <field name="type" invisible="True"/>
+                        <field name="currency_id" invisible="True" nolabel="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Bill Information">
@@ -235,7 +237,7 @@
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
                                     <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label string="" colspan="1"/><field name="currency_id" invisible="True" nolabel="1"/><field name="amount" string="Total"/>
+                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 94b257775c1..449fefa2de5 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -147,6 +147,17 @@
             <field name="view_id" eval="view_voucher_tree"/>
             <field name="search_view_id" ref="view_voucher_filter"/>
         </record>
+        <record id="action_journal_voucher_tree" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_voucher_list"/>
+        </record>
+        <record id="action_journal_voucher_form" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_voucher_form"/>
+            <field name="act_window_id" ref="action_voucher_list"/>
+        </record>
         <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
 
         <act_window
@@ -168,5 +179,19 @@
             <field name="search_view_id" ref="view_voucher_filter"/>
         </record>
 
+
+        <record id="view_bank_statement_form_voucher" model="ir.ui.view">
+            <field name="name">account.bank.statement.voucher.form.inherit</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                    <field name="voucher_id" context="{'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                    <field name="amount_reconciled"/>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index a149cfb0952..8460cfa6cc9 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -2,21 +2,21 @@
 <openerp>
     <data>
         <record id="view_confirm_install_module_form" model="ir.ui.view">
-            <field name="name">Association Profile : Install extra modules</field>
+            <field name="name">Association Application Configuration</field>
             <field name="model">profile.association.config.install_modules_wizard</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Association Profile Configuration</attribute>
+                  <attribute name="string">Association Application Configuration</attribute>
                 </form>
                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
                   </xpath>
                 <xpath expr="//label[@string='description']"
                        position="attributes">
-                  <attribute name="string">Install more modules. A few modules are proposed according to the Association Profile you selected. You will be able to install them based on our requirements.</attribute>
+                  <attribute name="string">Here are specific applications related to the Association Profile you selected.</attribute>
                 </xpath>
                 <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Configure</attribute>
@@ -37,7 +37,7 @@
         </record>
 
         <record id="action_config_install_module" model="ir.actions.act_window">
-            <field name="name">Association Profile : Install Extra Modules</field>
+            <field name="name">Association Application Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">profile.association.config.install_modules_wizard</field>
             <field name="view_id" ref="view_confirm_install_module_form"/>
diff --git a/addons/auction/test/auction_report.yml b/addons/auction/test/auction_report.yml
index 4d5110c03a1..0219af369b4 100644
--- a/addons/auction/test/auction_report.yml
+++ b/addons/auction/test/auction_report.yml
@@ -5,7 +5,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.artists').create(cr, uid, [ref('auction.auction_deposit_1_lot_1'),ref('auction.auction_deposit_1_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_artist_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_artist_report.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on auction, we will print a auction Bid
@@ -14,7 +14,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.bids').create(cr, uid, [ref('auction.auction_date_1_bid_3'),ref('auction.auction_date_1_bid_4')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_bid_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_bid_report.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on auction, we will print a lots list Report
@@ -23,7 +23,8 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.lots.list').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_3_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'lots_list_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_lots_list_report.'+format), 'wb+').write(data)
+        
 -
   In order to test the PDF reports defined on auction, we will print a lots inventory Report
 - 
@@ -31,7 +32,8 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.lots.list.inventory').create(cr, uid, [ref('auction.auction_deposit_4_lot_1'),ref('auction.auction_deposit_4_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'lots_inventory_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_lots_inventory_report.'+format), 'wb+').write(data)
+        
 -
   In order to test the PDF reports defined on auction, we will print a deposit seller Report
 - 
@@ -39,7 +41,8 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.deposit.seller').create(cr, uid, [ref('auction.auction_deposit_5_lot_1'),ref('auction.auction_deposit_5_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'deposit_seller_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_deposit_seller_report.'+format), 'wb+').write(data)
+
 -
   In order to test the PDF reports defined on auction, we will print a catalog
 -
@@ -47,7 +50,8 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.cat_flagy').create(cr, uid, [ref('auction.auction_date_1'),ref('auction.auction_date_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'auction-catalog_list.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_catalog_list.'+format), 'wb+').write(data)
+
 -
   In order to test the PDF reports defined on auction, we will print buyer form report
 -
@@ -55,7 +59,8 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.buyer_form_report').create(cr, uid, [ref('auction.auction_deposit_6_lot_1'),ref('auction.auction_deposit_6_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'auction-buyer_form.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_buyer_form.'+format), 'wb+').write(data)
+
 -
   In order to test the PDF reports defined on auction, we will print bids phones report
 -
@@ -63,7 +68,8 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.bids.phones.details').create(cr, uid, [ref('auction.auction_deposit_7_lot_1'),ref('auction.auction_deposit_7_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'auction-bids_phones_details.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_bids_phones_details.'+format), 'wb+').write(data)
+
 -
   In order to test the PDF reports defined on a auction, we will print a Auction Total
 - 
@@ -71,7 +77,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.total.rml').create(cr, uid, [ref('auction.auction_deposit_8_lot_1'),ref('auction.auction_deposit_8_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_total_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_total_report.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on a auction, we will print a Auction Result
@@ -80,7 +86,7 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.auction.result').create(cr, uid, [ref('auction.auction_deposit_9_lot_1'),ref('auction.auction_deposit_9_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_result_report.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_result_report.'+format), 'wb+').write(data)
 
 -
   In order to test the PDF reports defined on a auction, we will print a Auction Lot
@@ -89,4 +95,31 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.bids.lots').create(cr, uid, [ref('auction.auction_deposit_10_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'action_lot_report.'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_lot_report.'+format), 'wb+').write(data)        
+
+-
+  In order to test the PDF reports defined on a auction, we will print a Auction Buyer list report
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.buyer.list').create(cr, uid, [ref('auction.auction_deposit_10_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_buyer_list_report.'+format), 'wb+').write(data)        
+
+-
+  In order to test the PDF reports defined on a auction, we will print a Auction Flagey Hussier report
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.flagey.huissier').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_flagey_hussier_report.'+format), 'wb+').write(data)
+
+-
+  In order to test the PDF reports defined on a auction, we will print Auction Seller Form report
+- 
+  !python {model: auction.lots}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.seller_form_report').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'auction-auction_seller_form_report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/base_contact/base_contact_installer.py b/addons/base_contact/base_contact_installer.py
index 31cebb61ba5..4f4e2b2896c 100644
--- a/addons/base_contact/base_contact_installer.py
+++ b/addons/base_contact/base_contact_installer.py
@@ -29,7 +29,6 @@ class base_contact_installer(osv.osv_memory):
     _columns = {
         'name': fields.char('Name', size=64),
         'migrate': fields.boolean('Migrate', help="If you select this, all addresses will be migrated."),
-        'nomigrate': fields.boolean('NoMigrate', help="If you select this, all addresses will not be migrated."),
     }
 
     def execute(self, cr, uid, ids, context=None):
@@ -54,15 +53,12 @@ class base_contact_installer(osv.osv_memory):
                             END;
                             $contactjob$ LANGUAGE plpgsql;
                             CREATE TRIGGER contactjob AFTER INSERT ON res_partner_contact FOR EACH ROW EXECUTE PROCEDURE add_to_job();""")
-            cr.commit()
 
             cr.execute("INSERT into res_partner_contact (name, title, email, first_name, website)  (SELECT coalesce(name, 'Noname'), title, email, function , to_char(id, '99999999') from res_partner_address)")
-            cr.commit()
 
             cr.execute("DROP TRIGGER  IF EXISTS contactjob  on res_partner_contact")
             cr.execute("DROP LANGUAGE  IF EXISTS  plpgsql CASCADE;")
             cr.execute("DROP FUNCTION IF EXISTS  add_to_job()")
-            cr.commit()
 
 base_contact_installer()
 
diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml
index 87a8033d837..672c43745fb 100644
--- a/addons/base_contact/base_contact_installer_view.xml
+++ b/addons/base_contact/base_contact_installer_view.xml
@@ -31,9 +31,7 @@
                             <label string="Otherwise these details will not be visible from address/contact."  colspan="4"/>
                             <label string="Do you want to migrate your Address data in Contact Data?" colspan="4" />
                             <group colspan="6">
-                                <label string="Migrate:" colspan="1"/>
-                                <field name="migrate" string="Yes" colspan="1"/>
-                                <field name="nomigrate" string="No" colspan="1"/>
+                                <field name="migrate" string="Migrate" colspan="1"/>
                             </group>
                         </group>
                     </group>
@@ -54,6 +52,7 @@
         <record id="base_contact_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_base_contact_installer"/>
             <field name="sequence">3</field>
+            <field name="state">skip</field>
         </record>
 
     </data>
diff --git a/addons/base_module_doc_rst/module_report.xml b/addons/base_module_doc_rst/module_report.xml
index d8bbe51bf46..e3d4e342472 100644
--- a/addons/base_module_doc_rst/module_report.xml
+++ b/addons/base_module_doc_rst/module_report.xml
@@ -3,7 +3,7 @@
     <data>
 
         <report auto="False" id="base.ir_module_reference_print" model="ir.module.module" name="ir.module.reference.graph" rml="base_module_doc_rst/report/ir_module_reference_graph.rml" string="Technical guide"/>
-        <report id="report_proximity_graph" model="ir.module.module" name="proximity.graph" string="Proximity grpah"/>
+        <report id="report_proximity_graph" model="ir.module.module" name="proximity.graph" string="Proximity graph"/>
 
     </data>
 </openerp>
diff --git a/addons/base_report_designer/__init__.py b/addons/base_report_designer/__init__.py
index 46a0a1e2476..2a14d2821ae 100644
--- a/addons/base_report_designer/__init__.py
+++ b/addons/base_report_designer/__init__.py
@@ -18,8 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-
-import base_report_designer
 import wizard
+import base_report_designer
+import installer
+import openerp_sxw2rml
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index 50fe73f753f..9d39bba8a61 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -36,8 +36,9 @@ upload the report using the same wizard.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['base_report_data.xml'],
-    'update_xml': ['base_report_designer_wizard.xml'],
+    'init_xml': ['security/base_report_security.xml',
+                 'wizard/base_report_design_view.xml'],
+    'update_xml': ['base_report_designer_installer.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
index a4a135c4299..283c8ec7e23 100644
--- a/addons/base_report_designer/base_report_designer.py
+++ b/addons/base_report_designer/base_report_designer.py
@@ -20,13 +20,13 @@
 ##############################################################################
 
 from osv import osv
-from wizard.tiny_sxw2rml import sxw2rml
+from openerp_sxw2rml import sxw2rml
 from StringIO import StringIO
 from report import interface
 import base64
 import pooler
 import tools
-
+import addons
 
 class report_xml(osv.osv):
     _inherit = 'ir.actions.report.xml'
@@ -37,12 +37,9 @@ class report_xml(osv.osv):
         '''
         sxwval = StringIO(base64.decodestring(file_sxw))
         if file_type=='sxw':
-            fp = tools.file_open('normalized_oo2rml.xsl', 
-                    subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
+            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_oo2rml.xsl'),'rb')
         if file_type=='odt':
-            fp = tools.file_open('normalized_odt2rml.xsl', 
-                    subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
-
+            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb')
         return  {'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read()))}
 
     def upload_report(self, cr, uid, report_id, file_sxw, file_type, context):
@@ -52,11 +49,9 @@ class report_xml(osv.osv):
         pool = pooler.get_pool(cr.dbname)
         sxwval = StringIO(base64.decodestring(file_sxw))
         if file_type=='sxw':
-            fp = tools.file_open('normalized_oo2rml.xsl', 
-                    subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
+            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_oo2rml.xsl'),'rb')
         if file_type=='odt':
-            fp = tools.file_open('normalized_odt2rml.xsl', 
-                    subdir='addons/base_report_designer/wizard/tiny_sxw2rml')
+            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb')
         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())), 
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
new file mode 100644
index 00000000000..21537d3d63c
--- /dev/null
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+
+    <record id="view_report_designer_installer" model="ir.ui.view">
+      <field name="name">Form View: OpenERP Report Designer Installation</field>
+      <field name="model">base_report_designer.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="arch" type="xml">
+          <data>
+              <form position="attributes">
+                  <attribute name="string">OpenERP Report Designer Configuration</attribute>
+              </form>
+              <separator string="title" position="attributes">
+                   <attribute name="string">OpenERP Report Designer</attribute>
+              </separator>
+              <xpath expr="//label[@string='description']" position="attributes">
+                  <attribute name="string">This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer.</attribute>
+              </xpath>
+	          <xpath expr="//button[@string='Install Modules']" position="replace">
+                <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
+                <button name="action_next" icon="gtk-go-forward"
+                        type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+              </xpath>
+              <xpath expr="//button[@string='Skip']" position="replace">
+                <button name="action_skip" icon="gtk-jump-to" special="cancel"
+                        type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+              </xpath>
+              <xpath expr='//separator[@string="vsep"]' position='attributes'>
+		  		<attribute name='string'></attribute>
+		  		<attribute name='rowspan'>15</attribute>
+		  	  </xpath>
+		  	  <group colspan="8" position="replace">
+              <group colspan="8" height="450" width="750">
+                  <field name="name" invisible="1"/>
+                  <field name="plugin_file" filename="name"/>
+                  <separator string="Installation and Configuration Steps" colspan="4"/>
+                  <field name="description" nolabel="1" colspan="8"/>
+              </group>
+              </group>
+          </data>
+      </field>
+    </record>
+
+    <record id="action_report_designer_installer" model="ir.actions.act_window">
+      <field name="name">OpenERP Report Designer Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">base_report_designer.installer</field>
+      <field name="view_id" ref="view_report_designer_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="report_designer_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_report_designer_installer"/>
+      <field name="sequence">3</field>
+    </record>
+
+
+
+    <record id="action_report_designer_wizard" model="ir.actions.act_window">
+      <field name="name">OpenERP Report Designer</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">base_report_designer.installer</field>
+      <field name="view_id" ref="view_report_designer_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+      <field name="context">{'menu':True}</field> 
+    </record>
+
+    
+    <menuitem icon="terp-graph" id="base.reporting_menu"
+            name="Reporting" sequence="30" />
+
+    <menuitem id="base.next_id_50" name="Configuration"
+        parent="base.reporting_menu"  sequence="3" />
+
+    <menuitem parent="base.next_id_50" name="Report Designer"
+        action="action_report_designer_wizard"
+        id="menu_action_report_designer_wizard" sequence="70" />
+
+   <menuitem parent="base.next_id_50" name="Modify an existing report"
+            action="action_view_base_report_sxw"
+            id="menu_wizard_report_designer_modify" sequence="70" groups="base.group_extended"/>
+
+  </data>
+</openerp>
+
+
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
deleted file mode 100644
index c1bb7c35270..00000000000
--- a/addons/base_report_designer/base_report_designer_wizard.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <wizard string="Modify an existing report"
-            model="ir.actions.report.xml" name="base_report_designer.modify"
-            id="wizard_report_designer_modify" />
-
-        <menuitem icon="terp-graph" id="base.reporting_menu"
-            name="Reporting" sequence="30" />
-
-        <menuitem id="base.next_id_50" name="Configuration"
-            parent="base.reporting_menu" groups="base.group_system" sequence="3" />
-
-        <menuitem parent="base.next_id_50" name="Report Designer"
-            action="wizard_report_designer_modify" type="wizard"
-            id="menu_wizard_report_designer_modify" sequence="70" />
-
-    </data>
-</openerp>
-
-
diff --git a/addons/base_report_designer/installer.py b/addons/base_report_designer/installer.py
new file mode 100644
index 00000000000..082383bde8c
--- /dev/null
+++ b/addons/base_report_designer/installer.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import base64
+from tools.translate import _
+import addons
+
+class base_report_designer_installer(osv.osv_memory):
+    _name = 'base_report_designer.installer'
+    _inherit = 'res.config.installer'
+
+    def default_get(self, cr, uid, fields, context={}):
+        data = super(base_report_designer_installer, self).default_get(cr, uid, fields, context)
+        plugin_file = open(addons.get_module_resource('base_report_designer','plugin', 'openerp_report_designer.zip'),'rb')
+        data['plugin_file'] = base64.encodestring(plugin_file.read())
+        return data
+
+    _columns = {
+        'name':fields.char('File name', size=34),
+        'plugin_file':fields.binary('OpenObject Report Designer Plug-in', readonly=True, help="OpenObject Report Designer plug-in file. Save as this file and install this plug-in in OpenOffice."),
+        'description':fields.text('Description', readonly=True)
+    }
+
+    _defaults = {
+        'name' : 'openerp_report_designer.zip',
+        'description' : """
+        * Save the OpenERP Report Designer plug-­in.
+        * Follow these steps to install plug-­in.
+            1. Open Extension Manager window from Menu Bar of Openoffice writer, Open Tools > Extension Menu.
+            2. Click on "Add" button.
+            3. Select path where the openerp_report_designer.zip is located.
+            4. On the completion of adding package you will get your package under 'Extension Manager' and the status of your package become 'Enabled'.
+            5. Restart openoffice writer.
+        * Follow the steps to configure OpenERP Report Designer plug-­in in Openoffice writer.
+            1. Connect OpenERP Server from Menu bar , OpenERP Report Designer > Server parameter.
+            2. Select Server url, database and provide user name and password
+            3. Click "Connect".
+            4. if your connection success, A message appears like 'You can start creating your report in current document.'.
+        """
+    }
+base_report_designer_installer()
+# 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/openerp_sxw2rml/__init__.py
similarity index 96%
rename from addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
rename to addons/base_report_designer/openerp_sxw2rml/__init__.py
index ce14b22af8f..797fa7f8ccf 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
+++ b/addons/base_report_designer/openerp_sxw2rml/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-from tiny_sxw2rml import sxw2rml
+from openerp_sxw2rml import sxw2rml
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl b/addons/base_report_designer/openerp_sxw2rml/normalized_odt2rml.xsl
similarity index 100%
rename from addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
rename to addons/base_report_designer/openerp_sxw2rml/normalized_odt2rml.xsl
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl b/addons/base_report_designer/openerp_sxw2rml/normalized_oo2rml.xsl
similarity index 100%
rename from addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
rename to addons/base_report_designer/openerp_sxw2rml/normalized_oo2rml.xsl
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/office.dtd b/addons/base_report_designer/openerp_sxw2rml/office.dtd
similarity index 100%
rename from addons/base_report_designer/wizard/tiny_sxw2rml/office.dtd
rename to addons/base_report_designer/openerp_sxw2rml/office.dtd
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
similarity index 96%
rename from addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
rename to addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
index 1a29324fb83..c51602cd82d 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
+++ b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
@@ -22,17 +22,11 @@
 ##############################################################################
 #!/usr/bin/python
 """
-Tiny SXW2RML - The OpenERP's report engine
+OpenERP SXW2RML - The OpenERP'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
+OpenERP SXW2RML is part of the OpenERP Report Project.
+OpenERP 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'
 
@@ -341,8 +335,8 @@ def sxw2rml(sxw_file, xsl, output='.', save_pict=False):
 if __name__ == "__main__":
     import optparse
     parser = optparse.OptionParser(
-        version="Tiny Report v%s" % __version__,
-        usage = 'tiny_sxw2rml.py [options] file.sxw')
+        version="OpenERP Report v%s" % __version__,
+        usage = 'openerp_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()
diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/plugin/openerp_report_designer.zip
new file mode 100644
index 00000000000..22c0b7768f2
Binary files /dev/null and b/addons/base_report_designer/plugin/openerp_report_designer.zip differ
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/README b/addons/base_report_designer/plugin/openerp_report_designer/README
new file mode 100644
index 00000000000..41e02733da1
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/README
@@ -0,0 +1,40 @@
+About OpenERP Report Designer Plugin
+===================================================================
+OpenERP Report Desinger Plugin is a Package of OpenOffice Writer.
+Using this Plugin , we can modify existing OpenERP Reports and also we can make new nice OpenERP Reports.
+
+
+How to Install OpenERP Report Designer Plugin into Openoffice 3.2 in Linux?
+=====================================================================
+- In Openoffice writer, Open Extension Manager window from Tools > Extension Menu
+
+- Click on "Add" button and select path where the openerp_report_designer.zip is located.
+
+- On the completion of adding package you will get your package
+  under 'Extension Manager' and the status of your package become 'Enabled'
+
+- Close openoffice writer.
+
+- Restart openoffice writer, Now you will find one new menu "OpenERP Report Designer" in Menubar.
+
+
+How to install the plugin with OpenOffice 2.4 on Windows
+========================================================
+
+If you get an error for the installation of the plugin, edit the pythonloader.py file
+in $(OPEN_OFFICE_DIR)\program\ and change the value of DEBUG to None.
+
+If you get an error for the uno.exe in window then just close the Quick starter
+	Openoffice.2.4.1 Too\Option\Openoffic.org in that select the Memory
+	in that Openoffice.org.QuickStarter
+	if checked mark is there then just remove it..
+
+If you are using OpenOffice 3.0 and install the Report Desinger with make all
+	command then change  path in makefile
+
+	sh /opt/openoffice.org3/program/unopkg add or remove both
+
+	And for previous version of Openoffice used
+
+	sh /usr/lib/openoffice/program/unopkg add -v $(ZIP_FILE)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile b/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile
new file mode 100755
index 00000000000..d3a55804819
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile
@@ -0,0 +1,42 @@
+ZIP_FILE=../../openerp_report_designer.zip
+
+all: pack uninstall install
+
+create:
+	cat script/import \
+	    script/lib/actions.py \
+	    script/lib/error.py \
+	    script/lib/functions.py \
+	    script/lib/gui.py \
+	    script/lib/tools.py \
+	    script/lib/logreport.py\
+	    script/lib/rpc.py\
+	    script/lib/tiny_socket.py\
+	    script/Repeatln.py \
+	    script/Fields.py \
+	    script/Expression.py \
+	    script/modify.py \
+	    script/ServerParameter.py \
+	    script/Change.py \
+	    script/NewReport.py \
+	    script/LoginTest.py \
+	    script/ModifyExistingReport.py \
+	    script/SendToServer.py \
+	    script/About.py \
+	    script/ConvertBracesToField.py \
+	    script/ConvertFieldsToBraces.py \
+	    script/ExportToRML.py \
+	    script/Translation.py \
+	    script/AddAttachment.py > package/OpenERPReport.py
+
+pack: clean create
+	zip $(ZIP_FILE) `find package/ | grep -v svn` 
+	
+install:
+	sh /opt/openoffice.org3/program/unopkg add -v $(ZIP_FILE)
+	
+uninstall:
+	sh /opt/openoffice.org3/program/unopkg remove -v  $(ZIP_FILE)
+
+clean:
+	rm -f $(ZIP_FILE)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh b/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh
new file mode 100755
index 00000000000..a22ff96cf53
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+ooffice "-accept=socket,host=localhost,port=2002;urp;"
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu b/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu
new file mode 100644
index 00000000000..121c49af167
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu
@@ -0,0 +1,636 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    oor:name="Addons" oor:package="org.openoffice.Office">
+    <node oor:name="AddonUI">
+        <node oor:name="OfficeMenuBar">
+            <node oor:name="org.openoffice.openerp.report" oor:op="replace">
+                <prop oor:name="Title" oor:type="xs:string">
+                    <value/>
+                    <value xml:lang="en-US">OpenERP Report Designer</value>
+                    <value xml:lang="fr_FR">OpenERP Rapport Designer</value>
+                </prop>
+                <prop oor:name="Target" oor:type="xs:string">
+                    <value>_self</value>
+                </prop>
+                <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                    <value/>
+                </prop>
+                <node oor:name="Submenu">
+                    <node oor:name="m11" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Server parameters</value>
+                            <value xml:lang="fr_FR">Paramètres serveur</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m12" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m21" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.repeatln?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add a loop</value>
+                           <value xml:lang="fr_FR"> Ajouter une boucle</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m22" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.fields?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add a field</value>
+                            <value xml:lang="fr_FR">Ajouter un champ</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+
+                    <node oor:name="m23" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.expression?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add an expression</value>
+                            <value xml:lang="fr_FR">Ajouter une expression</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+
+                    <node oor:name="m24" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.langtag?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add a lang tag</value>
+                            <value xml:lang="fr_FR">Ajouter un tag lang</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m25" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.modify?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Modify</value>
+                            <value xml:lang="fr_FR">Modifier</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m26" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m31" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.convertFB?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Conversion Fields -> Brackets</value>
+                            <value xml:lang="fr_FR">Conversion champs -> crochets</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m32" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.convertBF?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Conversion Brackets -> Fields</value>
+                            <value xml:lang="fr_FR">Conversion crochets -> champs</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m33" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.exporttorml?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Export to RML</value>
+                            <value xml:lang="fr_FR">Exporter en RML</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m34" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.addattachment?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Add Attachment</value>
+                            <value xml:lang="fr_FR">Envoyer comme attachement</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m35" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m41" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.sendtoserver?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Send to the server</value>
+                            <value xml:lang="fr_FR">Envoyer au serveur</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m42" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.opennewreport?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Open a new report</value>
+                            <value xml:lang="fr_FR">Nouveau rapport</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m43" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.modifyreport?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Modify Existing Report</value>
+                            <value xml:lang="fr_FR">Modifier un rapport</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m45" oor:op="replace">
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m51" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>service:org.openoffice.openerp.report.about?execute</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">About</value>
+                            <value xml:lang="fr_FR">À propos de</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument</value>
+                        </prop>
+                    </node>
+                </node>
+            </node>
+        </node>
+
+        <node oor:name="OfficeToolBar">
+            <node oor:name="org.openoffice.openerp.report" oor:op="replace">
+                <node oor:name="m11" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Server parameters</value>
+                        <value xml:lang="fr_FR">Paramètres serveur</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+
+
+                <node oor:name="m12" oor:op="replace">
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>private:separator</value>
+                    </prop>
+                </node>
+                <node oor:name="m21" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.repeatln?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add a loop</value>
+                        <value xml:lang="fr_FR">Ajouter une boucle</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m22" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.fields?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add a field</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+
+                <node oor:name="m23" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.expression?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add an expression</value>
+                        <value xml:lang="fr_FR">Ajouter une expression</value>>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m24" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.langtag?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Add a lang tag</value>
+                        <value xml:lang="fr_FR">Ajouter un tag lang</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m25" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.modify?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Modify</value>
+                        <value xml:lang="fr_FR">Modifier</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m26" oor:op="replace">
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>private:separator</value>
+                    </prop>
+                </node>
+                <node oor:name="m31" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.convertFB?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Conversion Fields -> Brackets</value>
+                        <value xml:lang="fr_FR">Domaines de conversion -> Supports</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m32" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.convertBF?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Conversion Brackets -> Fields</value>
+                        <value xml:lang="fr_FR">Supports de conversion -> Domaines</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m33" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.exporttorml?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">Export to RML</value>
+                        <value xml:lang="fr_FR">RML à l'exportation</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+                <node oor:name="m45" oor:op="replace">
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>private:separator</value>
+                    </prop>
+                </node>
+                <node oor:name="m51" oor:op="replace">
+                    <prop oor:name="URL" oor:type="xs:string">
+                        <value>service:org.openoffice.openerp.report.about?execute</value>
+                    </prop>
+                    <prop oor:name="ImageIdentifier" oor:type="xs:string">
+                        <value/>
+                    </prop>
+                    <prop oor:name="Title" oor:type="xs:string">
+                        <value/>
+                        <value xml:lang="en-US">About</value>
+                        <value xml:lang="fr_FR">À propos de</value>
+                    </prop>
+                    <prop oor:name="Target" oor:type="xs:string">
+                        <value>_self</value>
+                    </prop>
+                    <prop oor:name="Context" oor:type="xs:string">
+                        <value>com.sun.star.text.TextDocument</value>
+                    </prop>
+                </node>
+            </node>
+        </node>
+        <node oor:name="Images">
+            <node oor:name="org.openoffice.openerp.report.image1" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.expression?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/expression_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/expression_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image2" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.repeatln?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/loop_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/loop_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image3" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.fields?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/field_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/field_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image4" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.exporttorml?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/export_rml_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/export_rml_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image5" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.convertFB?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/convetFtoB_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/convetFtoB_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image6" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.convertBF?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/convetBtoF_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/convetBtoF_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image7" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.modify?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/modify_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
+                        <value>%origin%/images/modify_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image8" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.serverparam?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/logo_1.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string" oor:width="100">
+                        <value>%origin%/images/logo_s.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image9" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.about?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/aboutus_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string" oor:width="100">
+                        <value>%origin%/images/aboutus_b.png</value>
+                    </prop>
+                </node>
+            </node>
+            <node oor:name="org.openoffice.openerp.report.image10" oor:op="replace">
+                <prop oor:name="URL">
+                    <value>service:org.openoffice.openerp.report.langtag?execute</value>
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
+                        <value>%origin%/images/lang_s.png</value>
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string" oor:width="100">
+                        <value>%origin%/images/lang_b.png</value>
+                    </prop>
+                </node>
+            </node>
+        </node>
+
+    </node>
+</oor:component-data>
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
new file mode 100644
index 00000000000..319a1d6703c
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
@@ -0,0 +1,111 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+from com.sun.star.task import XJobExecutor
+
+if __name__<>'package':
+    from lib.gui import *
+
+class About(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        self.win = DBModalDialog(60, 50, 175, 115, "About OpenERP Report Designer")
+
+        fdBigFont = createUnoStruct("com.sun.star.awt.FontDescriptor")
+        fdBigFont.Width = 20
+        fdBigFont.Height = 25
+        fdBigFont.Weight = 120
+        fdBigFont.Family= 3
+
+        oLabelTitle1 = self.win.addFixedText("lblTitle1", 1, 1, 35, 30)
+        oLabelTitle1.Model.TextColor = 16056320
+        oLabelTitle1.Model.FontDescriptor = fdBigFont
+        oLabelTitle1.Model.FontRelief = 1
+        oLabelTitle1.Text = "Open"
+
+        oLabelTitle2 = self.win.addFixedText("lblTitle2", 35, 1, 30, 30)
+        oLabelTitle2.Model.TextColor = 1
+        oLabelTitle2.Model.FontDescriptor = fdBigFont
+        oLabelTitle2.Model.FontRelief = 1
+        oLabelTitle2.Text = "ERP"
+
+        oLabelProdDesc = self.win.addFixedText("lblProdDesc", 1, 30, 173, 75)
+        oLabelProdDesc.Model.TextColor = 1
+        fdBigFont.Width = 10
+        fdBigFont.Height = 11
+        fdBigFont.Weight = 76
+        oLabelProdDesc.Model.FontDescriptor = fdBigFont
+        oLabelProdDesc.Model.Align = 1
+        oLabelProdDesc.Model.FontRelief = 1
+        oLabelProdDesc.Model.MultiLine = True
+        oLabelProdDesc.Text = "This  package  helps  you  to  create  or  modify\nreports  in  OpenERP.  Once  connected  to  the\nserver, you can design your template of reports\nusing fields  and expressions  and  browsing the\ncomplete structure of OpenERP object database."
+
+        oLabelFooter = self.win.addFixedText("lblFooter", -1, -1, 173, 25)
+        oLabelFooter.Model.TextColor = 255
+        #oLabelFooter.Model.BackgroundColor = 1
+        oLabelFooter.Model.Border = 2
+        oLabelFooter.Model.BorderColor = 255
+        fdBigFont.Width = 8
+        fdBigFont.Height = 9
+        fdBigFont.Weight = 100
+        oLabelFooter.Model.FontDescriptor = fdBigFont
+        oLabelFooter.Model.Align = 1
+        oLabelFooter.Model.FontRelief = 1
+        oLabelFooter.Model.MultiLine = True
+        sMessage = "OpenERP Report Designer v1.0 \nCopyright 2007-TODAY Tiny sprl \nThis product is free software, under the GNU Affero General Public License."
+        oLabelFooter.Text = sMessage
+
+        self.win.doModalDialog("",None)
+
+if __name__<>"package" and __name__=="__main__":
+    About(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( About, "org.openoffice.openerp.report.about", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
new file mode 100644
index 00000000000..d42cb4614aa
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
@@ -0,0 +1,277 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import os
+import uno
+import unohelper
+import xmlrpclib
+import base64
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.tools import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+class AddAttachment(unohelper.Base, XJobExecutor ):
+    Kind = {
+        'PDF' : 'pdf',
+        'OpenOffice': 'sxw',
+    }
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.aSearchResult = []
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        if docinfo.getUserFieldValue(2) <> "" and docinfo.getUserFieldValue(3) <> "":
+            self.win = DBModalDialog(60, 50, 180, 70, "Add Attachment to Server")
+            self.win.addFixedText("lblResourceType", 2 , 5, 100, 10, "Select Appropriate Resource Type:")
+            self.win.addComboListBox("lstResourceType", -2, 25, 176, 15,True)
+            self.win.addButton('btnOkWithoutInformation', -2 , -5, 25 , 15,'OK' ,actionListenerProc = self.btnOkWithoutInformation_clicked )
+        else:
+            self.win = DBModalDialog(60, 50, 180, 190, "Add Attachment to Server")
+            self.win.addFixedText("lblModuleName",2 , 9, 42, 20, "Select Module:")
+            self.win.addComboListBox("lstmodel", -2, 5, 134, 15,True)
+            self.lstModel = self.win.getControl( "lstmodel" )
+            self.dModel = {}
+
+            # Open a new connexion to the server
+
+            ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_model'),('state', '=', 'installed')])
+            if not len(ids):
+                # If the module 'base_report_model' is not installed, use the default model
+                self.dModel = {
+                    "Partner":'res.partner',
+                }
+            else:
+
+                ids =self.sock.execute(database, uid, self.password, 'base.report.model' , 'search', [])
+                res = self.sock.execute(database, uid, self.password, 'base.report.model' , 'read', ids, ['name','model_id'])
+                models = self.sock.execute(database, uid, self.password, 'ir.model' , 'read', map(lambda x:x['model_id'][0], res), ['model'])
+                models = dict(map(lambda x:(x['id'],x['model']), models))
+                self.dModel = dict(map(lambda x: (x['name'],models[x['model_id'][0]]), res))
+
+            for item in self.dModel.keys():
+                self.lstModel.addItem(item, self.lstModel.getItemCount())
+
+            self.win.addFixedText("lblSearchName",2 , 25, 60, 10, "Enter Search String:")
+            self.win.addEdit("txtSearchName", 2, 35, 149, 15,)
+            self.win.addButton('btnSearch', -2 , 35, 25 , 15,'Search' ,actionListenerProc = self.btnSearch_clicked )
+
+            self.win.addFixedText("lblSearchRecord", 2 , 55, 60, 10, "Search Result:")
+            self.win.addComboListBox("lstResource", -2, 65, 176, 70, False )
+            self.lstResource = self.win.getControl( "lstResource" )
+
+            self.win.addFixedText("lblResourceType", 2 , 137, 100, 20, "Select Appropriate Resource Type:")
+            self.win.addComboListBox("lstResourceType", -2, 147, 176, 15,True )
+
+            self.win.addButton('btnOkWithInformation', -2 , -5, 25 , 15,'OK' ,actionListenerProc = self.btnOkWithInformation_clicked )
+
+        self.lstResourceType = self.win.getControl( "lstResourceType" )
+        for kind in self.Kind.keys():
+            self.lstResourceType.addItem( kind, self.lstResourceType.getItemCount() )
+
+        self.win.addButton('btnCancel', -2 - 27 , -5 , 30 , 15, 'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.doModalDialog("lstResourceType", self.Kind.keys()[0])
+
+    def btnSearch_clicked( self, oActionEvent ):
+        modelSelectedItem = self.win.getListBoxSelectedItem("lstmodel")
+        if modelSelectedItem == "":
+            return
+
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+
+        self.aSearchResult =self.sock.execute( database, uid, self.password, self.dModel[modelSelectedItem], 'name_search', self.win.getEditText("txtSearchName"))
+        self.win.removeListBoxItems("lstResource", 0, self.win.getListBoxItemCount("lstResource"))
+        if self.aSearchResult == []:
+            ErrorDialog("No search result found !!!", "", "Search ERROR" )
+            return
+
+        for result in self.aSearchResult:
+            self.lstResource.addItem(result[1],result[0])
+
+    def _send_attachment( self, name, data, res_model, res_id ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        params = {
+            'name': name,
+            'datas': base64.encodestring( data ),
+            'datas_fname': name,
+            'res_model' : res_model,
+            'res_id' : int(res_id),
+        }
+
+        return self.sock.execute( database, uid, self.password, 'ir.attachment', 'create', params )
+
+    def send_attachment( self, model, resource_id ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        if oDoc2.getURL() == "":
+            ErrorDialog("Please save your file", "", "Saving ERROR" )
+            return None
+
+        url = oDoc2.getURL()
+        if self.Kind[self.win.getListBoxSelectedItem("lstResourceType")] == "pdf":
+            url = self.doc2pdf(url[7:])
+
+        if url == None:
+            ErrorDialog( "Ploblem in creating PDF", "", "PDF Error" )
+            return None
+
+        url = url[7:]
+        data = read_data_from_file( get_absolute_file_path( url ) )
+        return self._send_attachment( os.path.basename( url ), data, model, resource_id )
+
+    def btnOkWithoutInformation_clicked( self, oActionEvent ):
+        desktop = getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo = oDoc2.getDocumentInfo()
+
+        if self.win.getListBoxSelectedItem("lstResourceType") == "":
+            ErrorDialog("Please select resource type", "", "Selection ERROR" )
+            return
+
+        res = self.send_attachment( docinfo.getUserFieldValue(3), docinfo.getUserFieldValue(2) )
+        self.win.endExecute()
+
+    def btnOkWithInformation_clicked(self,oActionEvent):
+        if self.win.getListBoxSelectedItem("lstResourceType") == "":
+            ErrorDialog( "Please select resource type", "", "Selection ERROR" )
+            return
+
+        if self.win.getListBoxSelectedItem("lstResource") == "" or self.win.getListBoxSelectedItem("lstmodel") == "":
+            ErrorDialog("Please select Model and Resource","","Selection ERROR")
+            return
+
+        resourceid = None
+        for s in self.aSearchResult:
+            if s[1] == self.win.getListBoxSelectedItem("lstResource"):
+                resourceid = s[0]
+                break
+
+        if resourceid == None:
+            ErrorDialog("No resource selected !!!", "", "Resource ERROR" )
+            return
+
+        res = self.send_attachment( self.dModel[self.win.getListBoxSelectedItem('lstmodel')], resourceid )
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def doc2pdf(self, strFile):
+        oDoc = None
+        strFilterSubName = ''
+
+        strUrl = convertToURL( strFile )
+        desktop = getDesktop()
+        oDoc = desktop.loadComponentFromURL( strUrl, "_blank", 0, Array(self._MakePropertyValue("Hidden",True)))
+        if oDoc:
+            strFilterSubName = ""
+            # select appropriate filter
+            if oDoc.supportsService("com.sun.star.presentation.PresentationDocument"):
+                strFilterSubName = "impress_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.sheet.SpreadsheetDocument"):
+                strFilterSubName = "calc_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.WebDocument"):
+                strFilterSubName = "writer_web_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.GlobalDocument"):
+                strFilterSubName = "writer_globaldocument_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.text.TextDocument"):
+                strFilterSubName = "writer_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.drawing.DrawingDocument"):
+                strFilterSubName = "draw_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.formula.FormulaProperties"):
+                strFilterSubName = "math_pdf_Export"
+            elif oDoc.supportsService("com.sun.star.chart.ChartDocument"):
+                strFilterSubName = "chart_pdf_Export"
+            else:
+                pass
+
+            filename = len(strFilterSubName) > 0 and convertToURL( os.path.splitext( strFile )[0] + ".pdf" ) or None
+
+            if len(strFilterSubName) > 0:
+                oDoc.storeToURL( filename, Array(self._MakePropertyValue("FilterName", strFilterSubName ),self._MakePropertyValue("CompressMode", "1" )))
+
+            oDoc.close(True)
+            # Can be None if len(strFilterSubName) <= 0
+            return filename
+
+    def _MakePropertyValue(self, cName = "", uValue = u"" ):
+       oPropertyValue = createUnoStruct( "com.sun.star.beans.PropertyValue" )
+       if cName:
+          oPropertyValue.Name = cName
+       if uValue:
+          oPropertyValue.Value = uValue
+       return oPropertyValue
+
+
+if __name__<>"package" and __name__=="__main__":
+    AddAttachment(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( AddAttachment, "org.openoffice.openerp.report.addattachment", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
new file mode 100644
index 00000000000..7dc26c78505
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -0,0 +1,109 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.rpc import *
+
+class Change:
+    def __init__(self, aVal= None, sURL=""):
+        self.win=DBModalDialog(60, 50, 120, 90, "Connect to Open ERP Server")
+
+        self.win.addFixedText("lblVariable", 38, 12, 60, 15, "Server")
+
+        self.win.addEdit("txtHost",-2,9,60,15,sURL[sURL.find("/")+2:sURL.rfind(":")])
+
+        self.win.addFixedText("lblReportName",45 , 31, 60, 15, "Port")
+        self.win.addEdit("txtPort",-2,28,60,15,sURL[sURL.rfind(":")+1:])
+
+        self.win.addFixedText("lblLoginName", 2, 51, 60, 15, "Protocol Connection")
+
+        self.win.addComboListBox("lstProtocol", -2, 48, 60, 15, True)
+        self.lstProtocol = self.win.getControl( "lstProtocol" )
+
+#        self.lstProtocol.addItem( "XML-RPC", 0)
+        #self.lstProtocol.addItem( "XML-RPC secure", 1)
+        #self.lstProtocol.addItem( "NET-RPC (faster)", 2)
+
+        self.win.addButton( 'btnOK', -2, -5, 30, 15, 'Ok', actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton( 'btnCancel', -2 - 30 - 5 ,-5, 30, 15, 'Cancel', actionListenerProc = self.btnCancel_clicked )
+        self.aVal=aVal
+        self.protocol = {
+            'XML-RPC': 'http://',
+            'XML-RPC secure': 'https://',
+            'NET-RPC': 'socket://',
+        }
+        for i in self.protocol.keys():
+            self.lstProtocol.addItem(i,self.lstProtocol.getItemCount() )
+
+        sValue=self.protocol.keys()[0]
+        if sURL<>"":
+            sValue=self.protocol.keys()[self.protocol.values().index(sURL[:sURL.find("/")+2])]
+
+        self.win.doModalDialog( "lstProtocol", sValue)
+
+    def btnOk_clicked(self,oActionEvent):
+        global url
+        url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
+        self.sock=RPCSession(url)
+        docinfo=doc.getDocumentInfo()        
+        docinfo.setUserFieldValue(0,url)
+        res=self.sock.listdb()
+        if res == -1:
+            self.aVal.append(url)
+        elif res == 0:
+            self.aVal.append("No Database found !!!")
+        else:
+            self.aVal.append(url)
+        self.aVal.append(res)
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
new file mode 100644
index 00000000000..d4e8b5855ff
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
@@ -0,0 +1,285 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import uno
+import unohelper
+import string
+import re
+import base64
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 1
+
+
+
+class ConvertBracesToField( unohelper.Base, XJobExecutor ):
+
+    def __init__(self,ctx):
+
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        self.aReportSyntex=[]
+        self.getBraces(self.aReportSyntex)
+
+        self.setValue()
+
+
+    def setValue(self):
+
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=  doc.getDocumentInfo()
+        count = 0
+        regexes = [
+            ['[a-zA-Z0-9_]+\.[a-zA-Z0-9_.]+',"Field"],
+            ['\\[\\[ *repeatIn\\( *([a-zA-Z0-9_\.]+), *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', "RepeatIn"],
+            ['\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', "Field"]
+            # ['\\[\\[ ([a-zA-Z0-9_]+\.[a-zA-Z1-9]) \\]\\]',"Field"],
+            # ['\\[\\[ [a-zA-Z0-9_\.]+ and ([a-zA-Z0-9_\.]+) or .+? \\]\\]',"Field"],
+            # ['\\[\\[ ([a-zA-Z0-9_\.]+) or .+? \\]\\]',"Field"],
+            # ['\\[\\[ ([a-zA-Z0-9_\.]+) and .+? \\]\\]',"Field"],
+            # ['\\[\\[ .+? or ([a-zA-Z0-9_\.]+) \\]\\]',"Field"],
+            # ['\\[\\[ (.+?) and ([a-zA-Z0-9_\.]+) \\]\\]',"Field"],
+            # ['\\[\\[ .+? % ([a-zA-Z0-9_\.]+) \\]\\]',"Field"]
+        ]
+        oFieldObject = []
+        oRepeatInObjects = []
+        saRepeatInList = []
+        sHost = docinfo.getUserFieldValue(0)
+        nCount = 0
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            nCount += 1
+        getList(oRepeatInObjects,sHost,nCount)
+        for ro in oRepeatInObjects:
+            if ro.find("(")<>-1:
+                saRepeatInList.append( [ ro[:ro.find("(")], ro[ro.find("(")+1:ro.find(")")] ])
+        try:
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    for reg in regexes:
+                        res=re.findall(reg[0],oPar.Items[1])
+                        if len(res) <> 0:
+                            if res[0][0] == "objects":
+                                sTemp = docinfo.getUserFieldValue(3)
+                                sTemp = "|-." + sTemp[sTemp.rfind(".")+1:] + ".-|"
+                                oPar.Items=(sTemp.encode("utf-8"),oPar.Items[1].replace(' ',""))
+                                oPar.update()
+                            elif type(res[0]) <> type(u''):
+
+                                sObject = self.getRes(self.sock, docinfo.getUserFieldValue(3), res[0][0][res[0][0].find(".")+1:].replace(".","/"))
+                                r = self.sock.execute(database, uid, self.password, docinfo.getUserFieldValue(3) , 'fields_get')
+                                sExpr="|-." + r[res[0][0][res[0][0].rfind(".")+1:]]["string"] + ".-|"
+                                oPar.Items=(sExpr.encode("utf-8"),oPar.Items[1].replace(' ',""))
+                                oPar.update()
+                            else:
+
+                                obj = None
+                                for rl in saRepeatInList:
+                                    if rl[0] == res[0][:res[0].find(".")]:
+                                        obj=rl[1]
+                                try:
+                                    sObject = self.getRes(self.sock, obj, res[0][res[0].find(".")+1:].replace(".","/"))
+                                    r = self.sock.execute(database, uid, self.password, sObject , 'read',[1])
+                                except Exception,e:
+                                    r = "TTT"
+                                    self.logobj.log_write('ConvertBracesToField', LOG_ERROR, str(e))
+                                if len(r) <> 0:
+                                    if r <> "TTT":
+                                        if len(res)>1:
+                                            sExpr=""
+                                            print res
+                                            if reg[1] == 'Field':
+                                                for ires in res:
+                                                    try:
+                                                        sExpr=r[0][ires[ires.rfind(".")+1:]]
+                                                        break
+                                                    except Exception,e:
+                                                        import traceback,sys
+                                                        info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                        self.logobj.log_write('ConvertBracesToField', LOG_ERROR,info)
+                                                try:
+                                                    oPar.Items=(sExpr.encode("utf-8") ,oPar.Items[1])
+                                                    oPar.update()
+                                                except:
+                                                    oPar.Items=(str(sExpr) ,oPar.Items[1])
+                                                    oPar.update()
+                                                    import traceback,sys
+                                                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                    self.logobj.log_write('ConvertBracesToField', LOG_ERROR, info)
+
+                                        else:
+                                            sExpr=r[0][res[0][res[0].rfind(".")+1:]]
+                                            try:
+
+                                                if sExpr:
+                                                    oPar.Items=(sExpr.encode("utf-8") ,oPar.Items[1])
+                                                    oPar.update()
+                                                else:
+                                                     oPar.Items=(u"/",oPar.Items[1])
+                                                     oPar.update()
+                                            except:
+                                                oPar.Items=(str(sExpr) ,oPar.Items[1])
+                                                oPar.update()
+                                                import traceback,sys
+                                                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                                                self.logobj.log_write('ConvertBracesToField', LOG_ERROR,info)
+
+                                    else:
+                                        oPar.Items=(u""+r,oPar.Items[1])
+                                        oPar.update()
+                                else:
+                                    oPar.Items=(u"TTT",oPar.Items[1])
+                                    oPar.update()
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ConvertBraceToField', LOG_ERROR, info)
+
+    def getRes(self,sock,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+            myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        for k in key:
+            if (res[k]['type'] in ['many2one']) and k==myval:
+                sObject = self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+        return sObject
+
+    def getBraces(self,aReportSyntex=[]):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        aSearchString=[]
+        aReplaceString=[]
+        aRes=[]
+
+        try:
+            regexes = [
+                ['\\[\\[ *repeatIn\\( *([a-zA-Z0-9_\.]+), *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', "RepeatIn"],
+                ['\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', "Field"],
+                ['\\[\\[ *.+? *\\]\\]', "Expression"]
+            ]
+
+            search = doc.createSearchDescriptor()
+            search.SearchRegularExpression = True
+
+            for reg in regexes:
+                search.SearchString = reg[0]
+                found = doc.findFirst( search )
+                while found:
+                    res=re.findall(reg[0],found.String)
+                    print len(res)
+
+                    if found.String not in [r[0] for r in aReportSyntex] and len(res) == 1 :
+                        text=found.getText()
+                        oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                        if reg[1]<>"Expression":
+                            oInputList.Items=(u""+found.String,u""+found.String)
+                        else:
+                            oInputList.Items=(u"?",u""+found.String)
+                        aReportSyntex.append([oInputList,reg[1]])
+                        text.insertTextContent(found,oInputList,False)
+                        found.String =""
+
+                    else:
+                        aRes.append([res,reg[1]])
+                        found = doc.findNext(found.End, search)
+            search = doc.createSearchDescriptor()
+            search.SearchRegularExpression = False
+
+            for res in aRes:
+                for r in res[0]:
+                    search.SearchString=r
+                    found=doc.findFirst(search)
+                    while found:
+
+                        text=found.getText()
+
+                        oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                        if res[1]<>"Expression":
+                            oInputList.Items=(u""+found.String,u""+found.String)
+                        else:
+                            oInputList.Items=(u"?",u""+found.String)
+                        aReportSyntex.append([oInputList,res[1]])
+                        text.insertTextContent(found,oInputList,False)
+                        found.String =""
+                        found = doc.findNext(found.End, search)
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ConvertBraceToField', LOG_ERROR, info)
+
+if __name__<>"package":
+    ConvertBracesToField(None)
+else:
+    g_ImplementationHelper.addImplementation( ConvertBracesToField, "org.openoffice.openerp.report.convertBF", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
new file mode 100644
index 00000000000..05a794410b6
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
@@ -0,0 +1,85 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import unohelper
+import string
+import re
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    database="test"
+    uid = 3
+
+class ConvertFieldsToBraces( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.aReportSyntex=[]
+        self.getFields()
+
+    def getFields(self):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                oPar.getAnchor().Text.insertString(oPar.getAnchor(),oPar.Items[1],False)
+                oPar.dispose()
+
+if __name__<>"package":
+    ConvertFieldsToBraces(None)
+else:
+    g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),) 
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
new file mode 100644
index 00000000000..875fe210c03
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
@@ -0,0 +1,132 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import os
+import uno
+import unohelper
+import string
+import tempfile
+import base64
+import sys
+
+reload(sys)
+sys.setdefaultencoding("utf8")
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from LoginTest import *
+    from lib.error import *
+    from lib.tools import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+
+class ExportToRML( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        global url
+        self.sock=RPCSession(url)
+
+        # Read Data from sxw file
+        tmpsxw = tempfile.mktemp('.'+"sxw")
+
+        if not doc.hasLocation():
+            mytype = Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),)
+            doc.storeAsURL("file://"+tmpsxw,mytype)
+        data = read_data_from_file( get_absolute_file_path( doc.getURL()[7:] ) )
+        file_type = doc.getURL()[7:].split(".")[-1]
+        if docinfo.getUserFieldValue(2) == "":
+            ErrorDialog("Please Save this file on server","Use Send To Server Option in OpenERP Report Menu","Error")
+            exit(1)
+    	filename = self.GetAFileName()
+    	if not filename:
+    	    exit(1)
+        global passwd
+        self.password = passwd
+        try:
+
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'sxwtorml',base64.encodestring(data),file_type)
+            if res['report_rml_content']:
+                write_data_to_file( get_absolute_file_path( filename[7:] ), res['report_rml_content'] )
+        except Exception,e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ExportToRML',LOG_ERROR, info)
+            ErrorDialog("Can't save the file to the hard drive.", "Exception: %s" % e, "Error" )
+
+    def GetAFileName(self):
+        sFilePickerArgs = Array(10)
+        oFileDialog = createUnoService("com.sun.star.ui.dialogs.FilePicker")
+        oFileDialog.initialize(sFilePickerArgs)
+        oFileDialog.appendFilter("OpenERP Report File Save To ....","*.rml")
+
+        f_path = "OpenERP-"+ os.path.basename( tempfile.mktemp("","") ) + ".rml"
+        initPath = tempfile.gettempdir()
+        oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
+        if oUcb.exists(initPath):
+	    oFileDialog.setDisplayDirectory('file://' + ( os.name == 'nt' and '/' or '' ) + initPath )
+
+        oFileDialog.setDefaultName(f_path )
+
+        sPath = oFileDialog.execute() == 1 and oFileDialog.Files[0] or None
+        oFileDialog.dispose()
+        return sPath
+
+if __name__<>"package" and __name__=="__main__":
+    ExportToRML(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ExportToRML, "org.openoffice.openerp.report.exporttorml", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
new file mode 100644
index 00000000000..43531d10168
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
@@ -0,0 +1,115 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    database="test"
+    uid = 3
+
+class Expression(unohelper.Base, XJobExecutor ):
+    def __init__(self,sExpression="",sName="", bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.win = DBModalDialog(60, 50, 180, 65, "Expression Builder")
+        self.win.addFixedText("lblExpression",17 , 10, 35, 15, "Expression :")
+        self.win.addEdit("txtExpression", -5, 5, 123, 15)
+        self.win.addFixedText("lblName", 2, 30, 50, 15, "Displayed Name :")
+        self.win.addEdit("txtName", -5, 25, 123, 15)
+        self.win.addButton( "btnOK", -5, -5, 40, 15, "OK", actionListenerProc = self.btnOk_clicked )
+        self.win.addButton( "btnCancel", -5 - 40 -5, -5, 40, 15, "Cancel", actionListenerProc = self.btnCancel_clicked )
+        self.bModify=bFromModify
+        if self.bModify==True:
+            self.win.setEditText("txtExpression",sExpression)
+            self.win.setEditText("txtName",sName)
+        self.win.doModalDialog("",None)
+
+
+    def btnOk_clicked( self, oActionEvent ):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        text = doc.Text
+        cursor = doc.getCurrentController().getViewCursor()
+        if self.bModify==True:
+            oCurObj=cursor.TextField
+            sKey=u""+self.win.getEditText("txtName")
+            sValue=u"[[ " + self.win.getEditText("txtExpression") + " ]]"
+            oCurObj.Items = (sKey,sValue)
+            oCurObj.update()
+            self.win.endExecute()
+        else:
+            oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+            if self.win.getEditText("txtName")!="" and self.win.getEditText("txtExpression")!="":
+                sKey=u""+self.win.getEditText("txtName")
+                sValue=u"[[ " + self.win.getEditText("txtExpression") + " ]]"
+                if cursor.TextTable==None:
+                    oInputList.Items = (sKey,sValue)
+                    text.insertTextContent(cursor,oInputList,False)
+                else:
+                    oTable = cursor.TextTable
+                    oCurCell = cursor.Cell
+                    tableText = oTable.getCellByName( oCurCell.CellName )
+                    oInputList.Items = (sKey,sValue)
+                    tableText.insertTextContent(cursor,oInputList,False)
+                self.win.endExecute()
+            else:
+                ErrorDialog("Please Fill appropriate data in Name field or \nExpression field")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    Expression()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( Expression, "org.openoffice.openerp.report.expression", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
new file mode 100644
index 00000000000..4e2f40889c9
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
@@ -0,0 +1,291 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.error import ErrorDialog
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="report"
+    uid = 3
+
+
+class Fields(unohelper.Base, XJobExecutor ):
+    def __init__(self,sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.logobj=Logger()
+        self.win = DBModalDialog(60, 50, 200, 225, "Field Builder")
+
+        self.win.addFixedText("lblVariable", 27, 12, 60, 15, "Variable :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 130, 15,True, itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Variable Fields :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 130, 150, False,True,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+
+        self.win.addFixedText("lblUName", 8, 187, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 185, 130, 15,)
+
+        self.win.addButton('btnOK',-5 ,-5,45,15,'Ok' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-5 - 45 - 5 ,-5,45,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListFields=[]
+        self.aVariableList=[]
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.sMyHost= ""
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost = docinfo.getUserFieldValue(0)
+            self.count = 0
+            oParEnum = doc.getTextFields().createEnumeration()
+
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text = cursor.getText()
+            tcur = text.createTextCursorByRange(cursor)
+
+            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == "Objects", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+                try:
+                    anItem = self.aItemList[i][1]
+                    component = self.aComponentAdd[i]
+
+                    if component == "Document":
+                        sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                        self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextSection:
+                        getRecersiveSection(tcur.TextSection,self.aSectionList)
+                        if component in self.aSectionList:
+                            sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextTable:
+                        if not component == "Document" and component[component.rfind(".")+1:] == tcur.TextTable.Name:
+                            VariableScope(tcur, self.aVariableList, self.aObjectList, self.aComponentAdd, self.aItemList, component)
+                except:
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('Fields', LOG_ERROR, info)
+
+            self.bModify=bFromModify
+            if self.bModify==True:
+                sItem=""
+                for anObject in self.aObjectList:
+                    if anObject[:anObject.find("(")] == sVariable:
+                        sItem = anObject
+                        self.insVariable.setText(sItem)
+                genTree(
+                    sItem[sItem.find("(")+1:sItem.find(")")],
+                    self.aListFields,
+                    self.insField,
+                    self.sMyHost,
+                    2,
+                    ending_excl=['one2many','many2one','many2many','reference'],
+                    recur=['many2one']
+                )
+                self.sValue= self.win.getListBoxItem("lstFields",self.aListFields.index(sFields))
+            for var in self.aVariableList:
+
+                    self.model_ids =self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                    fields=['name','model']
+                    self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                    if self.model_res <> []:
+                        self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 Eg. http://localhost:8069 \nOR \nField-4 Eg. account.invoice")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        try:
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            sItem= self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+                if var[:var.find("(")+1]==sItem[:sItem.find("(")+1]:
+                    sItem = var
+            sMain=self.aListFields[self.win.getListBoxSelectedItemPos("lstFields")]
+            sObject=self.getRes(self.sock,sItem[sItem.find("(")+1:-1],sMain[1:])
+            ids = self.sock.execute(database, uid, self.password, sObject ,  'search', [])
+            res = self.sock.execute(database, uid, self.password, sObject , 'read',[ids[0]])
+            self.win.setEditText("txtUName",res[0][sMain[sMain.rfind("/")+1:]])
+        except:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('Fields', LOG_ERROR, info)
+            self.win.setEditText("txtUName","TTT")
+        if self.bModify:
+            self.win.setEditText("txtUName",self.sGDisplayName)
+
+    def getRes(self,sock ,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+	    myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        if myval in key:
+            if (res[myval]['type'] in ['many2one']):
+                sObject = res[myval]['relation']
+		return self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+            else:
+                return sObject
+
+    def cmbVariable_selected(self,oItemEvent):
+        if self.count > 0 :
+            try:
+                desktop=getDesktop()
+                doc =desktop.getCurrentComponent()
+                docinfo=doc.getDocumentInfo()
+                self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+                self.aListFields=[]
+                tempItem = self.win.getComboBoxText("cmbVariable")
+                for var in self.aVariableList:
+                    if var[:var.find("(")] == tempItem[:tempItem.find("(")]:
+                        sItem=var
+
+                genTree(
+                    sItem[sItem.find("(")+1:sItem.find(")")],
+                    self.aListFields,
+                    self.insField,
+                    self.sMyHost,
+                    2,
+                    ending_excl=['one2many','many2one','many2many','reference'],
+                    recur=['many2one']
+                )
+            except:
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                self.logobj.log_write('Fields', LOG_ERROR, info)
+
+    def btnOk_clicked( self, oActionEvent ):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+        for i in self.win.getListBoxSelectedItemsPos("lstFields"):
+                itemSelected = self.aListFields[i]
+                itemSelectedPos = i
+                txtUName=self.win.getEditText("txtUName")
+                sKey=u""+txtUName
+                if itemSelected != "" and txtUName != "" and self.bModify==True :
+                    txtUName=self.sGDisplayName
+                    sKey=u""+txtUName
+                    txtUName=self.sGDisplayName
+                    oCurObj=cursor.TextField
+                    sObjName=self.insVariable.getText()
+                    sObjName=sObjName[:sObjName.find("(")]
+                    sValue=u"[[ " + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + " ]]"
+                    oCurObj.Items = (sKey,sValue)
+                    oCurObj.update()
+                    self.win.endExecute()
+                elif itemSelected != "" and txtUName != "" :
+
+                    oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                    sObjName=self.win.getComboBoxText("cmbVariable")
+                    sObjName=sObjName[:sObjName.find("(")]
+
+                    widget = ( cursor.TextTable and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text )
+
+                    sValue = u"[[ " + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + " ]]"
+                    oInputList.Items = (sKey,sValue)
+                    widget.insertTextContent(cursor,oInputList,False)
+                    self.win.endExecute()
+                else:
+                    ErrorDialog("Please Fill appropriate data in Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    Fields()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( Fields, "org.openoffice.openerp.report.fields", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
new file mode 100644
index 00000000000..507ec28efb8
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
@@ -0,0 +1,55 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+if __name__<>"package":
+    from ServerParameter import *
+    from lib.gui import *
+
+class LoginTest:
+    def __init__(self):
+        if not loginstatus:
+            ServerParameter(None)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
new file mode 100644
index 00000000000..cc1d30ba6b0
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
@@ -0,0 +1,213 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+import base64, tempfile
+
+
+from com.sun.star.task import XJobExecutor
+import os
+import sys
+if __name__<>'package':
+    from lib.gui import *
+    from lib.error import *
+    from LoginTest import *
+    from lib.logreport import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+
+#
+class ModifyExistingReport(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 120, "Modify Existing Report")
+        self.win.addFixedText("lblReport", 2, 3, 60, 15, "Report Selection")
+        self.win.addComboListBox("lstReport", -1,15,178,80 , False )
+        self.lstReport = self.win.getControl( "lstReport" )
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.logobj=Logger()
+        self.hostname = docinfo.getUserFieldValue(0)
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        # Open a new connexion to the server
+
+
+        ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+        if not len(ids):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            exit(1)
+
+        ids = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'search', [('report_xsl', '=', False),('report_xml', '=', False)])
+
+        fields=['id', 'name','report_name','model']
+
+        self.reports = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'read', ids, fields)
+        self.report_with_id = []
+
+        for report in self.reports:
+            if report['name']<>"":
+                model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=', report['model'])])
+                model_res_other =self.sock.execute(database, uid, self.password, 'ir.model', 'read', model_ids, [ 'name', 'model' ] )
+                if model_res_other <> []:
+                    name = model_res_other[0]['name'] + " - " + report['name']
+                else:
+                    name = report['name'] + " - " + report['model']
+                self.report_with_id.append( (report['id'], name, report['model'] ) )
+
+        self.report_with_id.sort( lambda x, y: cmp( x[1], y[1] ) )
+
+        for id, report_name, model_name in self.report_with_id:
+            self.lstReport.addItem( report_name, self.lstReport.getItemCount() )
+
+        self.win.addButton('btnSave',10,-5,50,15,'Open Report' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-10 ,-5,50,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.addButton('btnDelete',15 -80 ,-5,50,15,'Delete Report',actionListenerProc = self.btnDelete_clicked)
+        self.win.doModalDialog("lstReport",self.report_with_id[0][1] )
+
+    def btnOk_clicked(self, oActionEvent):
+        try:
+            desktop=getDesktop()
+            doc = desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+
+            selectedItemPos = self.win.getListBoxSelectedItemPos( "lstReport" )
+            id = self.report_with_id[ selectedItemPos ][0]
+
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'report_get', id)
+
+            if res['file_type'] in ['sxw','odt'] :
+               file_type = res['file_type']
+            else :
+               file_type = 'sxw'
+
+            fp_name = tempfile.mktemp('.'+file_type)
+            fp_name1="r"+fp_name
+            fp_path=os.path.join(fp_name1).replace("\\","/")
+            fp_win=fp_path[1:]
+
+            filename = ( os.name == 'nt' and fp_win or fp_name )
+            if res['report_sxw_content']:
+                write_data_to_file( filename, base64.decodestring(res['report_sxw_content']))
+            url = "file:///%s" % filename
+
+            arr=Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),)
+            oDoc2 = desktop.loadComponentFromURL(url, "openerp", 55, arr)
+            docinfo2=oDoc2.getDocumentInfo()
+            docinfo2.setUserFieldValue(0, self.hostname)
+            docinfo2.setUserFieldValue(1,self.password)
+            docinfo2.setUserFieldValue(2,id)
+            docinfo2.setUserFieldValue(3,self.report_with_id[selectedItemPos][2])
+
+            oParEnum = oDoc2.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    oPar.SelectedItem = oPar.Items[0]
+                    oPar.update()
+            if oDoc2.isModified():
+                if oDoc2.hasLocation() and not oDoc2.isReadonly():
+                    oDoc2.store()
+
+            ErrorDialog("Download is Completed","Your file has been placed here :\n"+ fp_name,"Download Message")
+            obj=Logger()
+            obj.log_write('Modify Existing Report',LOG_INFO, ':successful download report  %s  using database %s' % (self.report_with_id[selectedItemPos][2], database))
+        except Exception, e:
+            ErrorDialog("Report has not been downloaded", "Report: %s\nDetails: %s" % ( fp_name, str(e) ),"Download Message")
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ModifyExistingReport', LOG_ERROR, info)
+
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnDelete_clicked( self, oActionEvent ):
+         desktop=getDesktop()
+         doc = desktop.getCurrentComponent()
+         docinfo=doc.getDocumentInfo()
+
+         selectedItemPos = self.win.getListBoxSelectedItemPos( "lstReport" )
+         name=self.win.getListBoxSelectedItem ("lstReport")
+         id = self.report_with_id[ selectedItemPos ][0]
+         temp = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'unlink', id,)
+         str_value='ir.actions.report.xml,'+str(id)
+         ids = self.sock.execute(database, uid, self.password, 'ir.values' ,  'search',[('value','=',str_value)])
+         if ids:
+              rec = self.sock.execute(database, uid, self.password, 'ir.values', 'unlink', ids,)
+         else :
+            pass
+         if temp:
+              ErrorDialog("Report","Report has been Delete:\n "+name,"Message")
+              self.logobj.log_write('Delete Report',LOG_INFO, ':successful delete report  %s  using database %s' % (name, database))
+
+         else:
+             ErrorDialog("Report","Report has not Delete:\n"+name," Message")
+         self.win.endExecute()
+
+
+
+if __name__<>"package" and __name__=="__main__":
+    ModifyExistingReport(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ModifyExistingReport, "org.openoffice.openerp.report.modifyreport", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
new file mode 100644
index 00000000000..06ba55275d5
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
@@ -0,0 +1,119 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import uno
+import string
+import unohelper
+import xmlrpclib
+
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from lib.logreport import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="test"
+    uid = 3
+#
+#
+#
+# Start OpenOffice.org, listen for connections and open testing document
+#
+#
+class NewReport(unohelper.Base, XJobExecutor):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        self.win=DBModalDialog(60, 50, 180, 115, "Open New Report")
+        self.win.addFixedText("lblModuleSelection", 2, 2, 60, 15, "Module Selection")
+        self.win.addComboListBox("lstModule", -2,13,176,80 , False)
+        self.lstModule = self.win.getControl( "lstModule" )
+        self.aModuleName=[]
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        ids = self.sock.execute(database, uid, self.password, 'ir.model' , 'search',[])
+        fields = [ 'model','name']
+        res = self.sock.execute(database, uid, self.password, 'ir.model' , 'read', ids, fields)
+        res.sort(lambda x, y: cmp(x['name'],y['name']))
+
+        for i in range(len(res)):
+            self.lstModule.addItem(res[i]['name'],self.lstModule.getItemCount())
+            self.aModuleName.append(res[i]['model'])
+        self.win.addButton('btnOK',-2 ,-5, 70,15,'Use Module in Report' ,actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-2 - 70 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        self.win.doModalDialog("",None)
+
+    def btnOk_clicked(self,oActionEvent):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        docinfo.setUserFieldValue(3,self.aModuleName[self.lstModule.getSelectedItemPos()])
+        self.logobj.log_write('Module Name',LOG_INFO, ':Module use in creating a report %s  using database %s' % (self.aModuleName[self.lstModule.getSelectedItemPos()], database))
+        self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    NewReport(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( \
+            NewReport,
+            "org.openoffice.openerp.report.opennewreport",
+            ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
new file mode 100644
index 00000000000..4e26508f106
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
@@ -0,0 +1,300 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from ServerParameter import *
+    from lib.logreport import *
+    from lib.rpc import *
+    from LoginTest import *
+
+    database="test_db1"
+    uid = 3
+
+
+#class RepeatIn:
+class RepeatIn( unohelper.Base, XJobExecutor ):
+    def __init__(self,sObject="",sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        # Interface Design
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 250, "RepeatIn Builder")
+        self.win.addFixedText("lblVariable", 2, 12, 60, 15, "Objects to loop on :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 120, 15,True, itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Field to loop on :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 120, 150, False,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+
+        self.win.addFixedText("lblName", 12, 187, 60, 15, "Variable name :")
+        self.win.addEdit("txtName", 180-120-2, 185, 120, 15,)
+
+        self.win.addFixedText("lblUName", 8, 207, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 205, 120, 15,)
+
+        self.win.addButton('btnOK',-2 ,-10,45,15,'Ok', actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton('btnCancel',-2 - 45 - 5 ,-10,45,15,'Cancel', actionListenerProc = self.btnCancel_clicked )
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        # Variable Declaration
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGVariable=sVariable
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListRepeatIn=[]
+        self.aVariableList=[]
+        # Call method to perform Enumration on Report Document
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        # Perform checking that Field-1 and Field - 4 is available or not alos get Combobox
+        # filled if condition is true
+        desktop = getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo = doc.getDocumentInfo()
+        # Check weather Field-1 is available if not then exit from application
+        self.sMyHost= ""
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+            self.count=0
+            oParEnum = doc.getTextFields().createEnumeration()
+
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text = cursor.getText()
+            tcur = text.createTextCursorByRange(cursor)
+
+            self.aVariableList.extend( filter( lambda obj: obj[:obj.find(" ")] == "List", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+                try:
+                    anItem = self.aItemList[i][1]
+                    component = self.aComponentAdd[i]
+
+                    if component == "Document":
+                        sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                        self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextSection:
+                        getRecersiveSection(tcur.TextSection,self.aSectionList)
+                        if component in self.aSectionList:
+                            sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+                            self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                    if tcur.TextTable:
+                        if not component == "Document" and component[component.rfind(".") + 1:] == tcur.TextTable.Name:
+                            VariableScope( tcur, self.aVariableList, self.aObjectList, self.aComponentAdd, self.aItemList, component )
+                except :
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('RepeatIn', LOG_ERROR, info)
+            self.bModify=bFromModify
+
+            if self.bModify==True:
+
+                if sObject=="":
+                    self.insVariable.setText("List of "+docinfo.getUserFieldValue(3))
+                    self.insField.addItem("objects",self.win.getListBoxItemCount("lstFields"))
+                    self.win.setEditText("txtName", sVariable)
+                    self.win.setEditText("txtUName",sDisplayName)
+                    self.sValue= "objects"
+                else:
+                    sItem=""
+		    for anObject in self.aObjectList:
+			if anObject[:anObject.find("(")] == sObject:
+			    sItem = anObject
+			    self.insVariable.setText( sItem )
+
+		    genTree(
+			sItem[sItem.find("(")+1:sItem.find(")")],
+			self.aListRepeatIn,
+			self.insField,
+			self.sMyHost,
+			2,
+			ending=['one2many','many2many'],
+			recur=['one2many','many2many']
+		    )
+
+                    self.sValue= self.win.getListBoxItem("lstFields",self.aListRepeatIn.index(sFields))
+
+            for var in self.aVariableList:
+
+		if var[:8] <> 'List of ':
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                else:
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[8:])])
+                fields=['name','model']
+                self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                if self.model_res <> []:
+		    if var[:8]<>'List of ':
+                        self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem('List of ' + self.model_res[0]['name'] ,self.insVariable.getItemCount())
+                else:
+                    self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please Select Appropriate module" ,"Create new report from: \nOpenERP -> Open a New Report")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        sItem=self.win.getListBoxSelectedItem("lstFields")
+        sMain=self.aListRepeatIn[self.win.getListBoxSelectedItemPos("lstFields")]
+
+        if self.bModify==True:
+            self.win.setEditText("txtName", self.sGVariable)
+            self.win.setEditText("txtUName",self.sGDisplayName)
+        else:
+	    self.win.setEditText("txtName",sMain[sMain.rfind("/")+1:])
+	    self.win.setEditText("txtUName","|-."+sItem[sItem.rfind("/")+1:]+".-|")
+
+    def cmbVariable_selected(self,oItemEvent):
+
+        if self.count > 0 :
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+            sItem=self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+		if var[:8]=='List of ':
+		    if var[:8]==sItem[:8]:
+                        sItem = var
+		elif var[:var.find("(")+1] == sItem[:sItem.find("(")+1]:
+                    sItem = var
+            self.aListRepeatIn=[]
+
+	    data = ( sItem[sItem.rfind(" ") + 1:] == docinfo.getUserFieldValue(3) ) and docinfo.getUserFieldValue(3) or sItem[sItem.find("(")+1:sItem.find(")")]
+	    genTree( data, self.aListRepeatIn, self.insField, self.sMyHost, 2, ending=['one2many','many2many'], recur=['one2many','many2many'] )
+
+            self.win.selectListBoxItemPos("lstFields", 0, True )
+
+        else:
+            sItem=self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+                if var[:8]=='List of ' and var[:8] == sItem[:8]:
+                    sItem = var
+            if sItem.find(".")==-1:
+                temp=sItem[sItem.rfind("x_"):]
+            else:
+                temp=sItem[sItem.rfind(".")+1:]
+            self.win.setEditText("txtName",temp)
+            self.win.setEditText("txtUName","|-."+temp+".-|")
+            self.insField.addItem("objects",self.win.getListBoxItemCount("lstFields"))
+            self.win.selectListBoxItemPos("lstFields", 0, True )
+
+    def btnOk_clicked(self, oActionEvent):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+        selectedItem = self.win.getListBoxSelectedItem( "lstFields" )
+        selectedItemPos = self.win.getListBoxSelectedItemPos( "lstFields" )
+        txtName = self.win.getEditText( "txtName" )
+        txtUName = self.win.getEditText( "txtUName" )
+        if selectedItem != "" and txtName != "" and txtUName != "":
+            sKey=u""+ txtUName
+            if selectedItem == "objects":
+                sValue=u"[[ repeatIn(" + selectedItem + ",'" + txtName + "') ]]"
+            else:
+                sObjName=self.win.getComboBoxText("cmbVariable")
+                sObjName=sObjName[:sObjName.find("(")]
+                sValue=u"[[ repeatIn(" + sObjName + self.aListRepeatIn[selectedItemPos].replace("/",".") + ",'" + txtName +"') ]]"
+
+            if self.bModify == True:
+                oCurObj = cursor.TextField
+                oCurObj.Items = (sKey,sValue)
+                oCurObj.update()
+            else:
+                oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+                if self.win.getListBoxSelectedItem("lstFields") == "objects":
+                    oInputList.Items = (sKey,sValue)
+                    doc.Text.insertTextContent(cursor,oInputList,False)
+                else:
+                    sValue=u"[[ repeatIn(" + sObjName + self.aListRepeatIn[selectedItemPos].replace("/",".") + ",'" + txtName +"') ]]"
+                    if cursor.TextTable==None:
+                        oInputList.Items = (sKey,sValue)
+                        doc.Text.insertTextContent(cursor,oInputList,False)
+                    else:
+                        oInputList.Items = (sKey,sValue)
+                        widget = ( cursor.TextTable or selectedItem <> 'objects' ) and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text
+                        widget.insertTextContent(cursor,oInputList,False)
+                self.win.endExecute()
+        else:
+            ErrorDialog("Please Fill appropriate data in Object Field or Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+if __name__<>"package" and __name__=="__main__":
+    RepeatIn()
+elif __name__=="package":
+    g_ImplementationHelper = unohelper.ImplementationHelper()
+    g_ImplementationHelper.addImplementation( RepeatIn, "org.openoffice.openerp.report.repeatln", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
new file mode 100644
index 00000000000..fd8a874749d
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
@@ -0,0 +1,241 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import string
+import unohelper
+import random
+import xmlrpclib
+import base64, tempfile
+from com.sun.star.task import XJobExecutor
+import os
+import sys
+if __name__<>'package':
+    from lib.gui import *
+    from lib.error import *
+    from lib.functions import *
+    from lib.logreport import *
+    from lib.tools import *
+    from LoginTest import *
+    from lib.rpc import *
+    database="report"
+    uid = 3
+
+#
+#
+class SendtoServer(unohelper.Base, XJobExecutor):
+    Kind = {
+        'PDF' : 'pdf',
+        'OpenOffice': 'sxw',
+        'HTML' : 'html'
+    }
+
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        LoginTest()
+        self.logobj=Logger()
+        if not loginstatus and __name__=="package":
+            exit(1)
+
+        global passwd
+        self.password = passwd
+        global url
+        self.sock=RPCSession(url)
+        desktop=getDesktop()
+        oDoc2 = desktop.getCurrentComponent()
+        docinfo=oDoc2.getDocumentInfo()
+
+        self.ids = self.sock.execute(database, uid, self.password, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+        if not len(self.ids):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            exit(1)
+
+        report_name = ""
+        name=""
+        if docinfo.getUserFieldValue(2)<>"" :
+            try:
+                fields=['name','report_name']
+                self.res_other = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'read', [int(docinfo.getUserFieldValue(2))],fields)
+                name = self.res_other[0]['name']
+                report_name = self.res_other[0]['report_name']
+            except:
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                self.logob.log_write('ServerParameter', LOG_ERROR, info)
+        elif docinfo.getUserFieldValue(3) <> "":
+            name = ""
+            result =  "rnd"
+            for i in range(5):
+                result =result + random.choice('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890')
+
+            report_name = docinfo.getUserFieldValue(3) + "." + result
+        else:
+            ErrorDialog("Please select appropriate module...","Note: use OpenERP Report -> Open a new Report", "Module selection ERROR");
+            exit(1)
+
+        self.win = DBModalDialog(60, 50, 180, 100, "Send To Server")
+        self.win.addFixedText("lblName",10 , 9, 40, 15, "Report Name :")
+        self.win.addEdit("txtName", -5, 5, 123, 15,name)
+        self.win.addFixedText("lblReportName", 2, 30, 50, 15, "Technical Name :")
+        self.win.addEdit("txtReportName", -5, 25, 123, 15,report_name)
+        self.win.addCheckBox("chkHeader", 51, 45, 70 ,15, "Corporate Header")
+        self.win.addFixedText("lblResourceType", 2 , 60, 50, 15, "Select Rpt. Type :")
+        self.win.addComboListBox("lstResourceType", -5, 58, 123, 15,True,itemListenerProc=self.lstbox_selected)
+        self.lstResourceType = self.win.getControl( "lstResourceType" )
+        self.txtReportName=self.win.getControl( "txtReportName" )
+        self.txtReportName.Enable=False
+        for kind in self.Kind.keys():
+            self.lstResourceType.addItem( kind, self.lstResourceType.getItemCount() )
+
+        self.win.addButton( "btnSend", -5, -5, 80, 15, "Send Report to Server", actionListenerProc = self.btnOk_clicked)
+        self.win.addButton( "btnCancel", -5 - 80 -5, -5, 40, 15, "Cancel", actionListenerProc = self.btnCancel_clicked)
+
+        self.win.doModalDialog("lstResourceType", self.Kind.keys()[0])
+
+    def lstbox_selected(self,oItemEvent):
+        pass
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnOk_clicked(self, oActionEvent):
+        if self.win.getEditText("txtName") <> "" and self.win.getEditText("txtReportName") <> "":
+            desktop=getDesktop()
+            oDoc2 = desktop.getCurrentComponent()
+            docinfo=oDoc2.getDocumentInfo()
+            self.getInverseFieldsRecord(1)
+            fp_name = tempfile.mktemp('.'+"sxw")
+            if not oDoc2.hasLocation():
+                oDoc2.storeAsURL("file://"+fp_name,Array(makePropertyValue("MediaType","application/vnd.sun.xml.writer"),))
+
+            if docinfo.getUserFieldValue(2)=="":
+                name=self.win.getEditText("txtName"),
+                name_id={}
+                try:
+                    name_id = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml' , 'search',[('name','=',name)])
+                    if not name_id:
+                        id=self.getID()
+                        docinfo.setUserFieldValue(2,id)
+                        rec = {
+                                'name': self.win.getEditText("txtReportName"),
+                                'key': 'action',
+                                'model': docinfo.getUserFieldValue(3),
+                                'value': 'ir.actions.report.xml,'+str(id),
+                                'key2': 'client_print_multi',
+                                'object': True
+                            }
+                        res = self.sock.execute(database, uid, self.password, 'ir.values' , 'create',rec )
+                    else :
+                        ErrorDialog(" Report Name is all ready given !!!\n\n\n Please specify other Name","","Report Name")
+                        self.logobj.log_write('SendToServer',LOG_WARNING, ':Report name all ready given DB %s' % (database))
+                        self.win.endExecute()
+                except Exception,e:
+                    import traceback,sys
+                    info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                    self.logobj.log_write('ServerParameter', LOG_ERROR, info)
+            else:
+
+                id = docinfo.getUserFieldValue(2)
+                vId = self.sock.execute(database, uid, self.password, 'ir.values' ,  'search', [('value','=','ir.actions.report.xml,'+str(id))])
+                rec = { 'name': self.win.getEditText("txtReportName") }
+                res = self.sock.execute(database, uid, self.password, 'ir.values' , 'write',vId,rec)
+            oDoc2.store()
+            data = read_data_from_file( get_absolute_file_path( oDoc2.getURL()[7:] ) )
+            self.getInverseFieldsRecord(0)
+            #sock = xmlrpclib.ServerProxy(docinfo.getUserFieldValue(0) +'/xmlrpc/object')
+
+            file_type = oDoc2.getURL()[7:].split(".")[-1]
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'upload_report', int(docinfo.getUserFieldValue(2)),base64.encodestring(data),file_type,{})
+            params = {
+                'name': self.win.getEditText("txtName"),
+                'model': docinfo.getUserFieldValue(3),
+                'report_name': self.win.getEditText("txtReportName"),
+                'header': (self.win.getCheckBoxState("chkHeader") <> 0),
+                'report_type': self.Kind[self.win.getListBoxSelectedItem("lstResourceType")],
+            }
+            if self.win.getListBoxSelectedItem("lstResourceType")=='OpenOffice':
+                params['report_type']=file_type
+            res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'write', int(docinfo.getUserFieldValue(2)), params)
+            self.logobj.log_write('SendToServer',LOG_INFO, ':Report %s successfully send using %s'%(params['name'],database))
+            self.win.endExecute()
+        else:
+            ErrorDialog("Either Report Name or Technical Name is blank !!!\nPlease specify appropriate Name","","Blank Field ERROR")
+            self.logobj.log_write('SendToServer',LOG_WARNING, ':Either Report Name or Technical Name is blank')
+            self.win.endExecute()
+
+    def getID(self):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        params = {
+            'name': self.win.getEditText("txtName"),
+            'model': docinfo.getUserFieldValue(3),
+            'report_name': self.win.getEditText('txtReportName')
+        }
+
+
+        id=self.sock.execute(database, uid, self.password, 'ir.actions.report.xml' ,'create', params)
+        return id
+
+    def getInverseFieldsRecord(self,nVal):
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        count=0
+        oParEnum = doc.getTextFields().createEnumeration()
+        while oParEnum.hasMoreElements():
+            oPar = oParEnum.nextElement()
+            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                oPar.SelectedItem = oPar.Items[nVal]
+                if nVal==0:
+                    oPar.update()
+
+if __name__<>"package" and __name__=="__main__":
+    SendtoServer(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( SendtoServer, "org.openoffice.openerp.report.sendtoserver", ("com.sun.star.task.Job",),)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
new file mode 100644
index 00000000000..659357ef100
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -0,0 +1,208 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.error import ErrorDialog
+    from lib.functions import *
+    from lib.logreport import *
+    from lib.rpc import *
+    from Change import *
+    database="test"
+
+class ServerParameter( unohelper.Base, XJobExecutor ):
+    def __init__(self,ctx):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+        desktop=getDesktop()
+        log_detail(self)
+        self.logobj=Logger()
+        doc = desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.win=DBModalDialog(60, 50, 160, 108, "Server Connection Parameter")
+
+        self.win.addFixedText("lblVariable", 2, 12, 35, 15, "Server URL")
+        if docinfo.getUserFieldValue(0)=="":
+            docinfo.setUserFieldValue(0,"http://localhost:8069")
+        self.win.addEdit("txtHost",-34,9,91,15,docinfo.getUserFieldValue(0))
+        self.win.addButton('btnChange',-2 ,9,30,15,'Change', actionListenerProc = self.btnChange_clicked )
+
+        self.win.addFixedText("lblDatabaseName", 6, 31, 31, 15, "Database")
+        #self.win.addFixedText("lblMsg", -2,28,123,15)
+#        self.win.addComboListBox("lstDatabase", -2,28,123,15, True)
+#        self.lstDatabase = self.win.getControl( "lstDatabase" )
+        #self.win.selectListBoxItem( "lstDatabase", docinfo.getUserFieldValue(2), True )
+        #self.win.setEnabled("lblMsg",False)
+
+        self.win.addFixedText("lblLoginName", 17, 51, 20, 15, "Login")
+        self.win.addEdit("txtLoginName",-2,48,123,15,docinfo.getUserFieldValue(1))
+
+        self.win.addFixedText("lblPassword", 6, 70, 31, 15, "Password")
+        self.win.addEdit("txtPassword",-2,67,123,15,)
+        self.win.setEchoChar("txtPassword",42)
+
+
+        self.win.addButton('btnOK',-2 ,-5, 60,15,'Connect' ,actionListenerProc = self.btnOk_clicked )
+
+        self.win.addButton('btnCancel',-2 - 60 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
+        sValue=""
+        if docinfo.getUserFieldValue(0)<>"":
+            global url
+            global result
+            url=docinfo.getUserFieldValue(0)
+            self.sock=RPCSession(url)
+            res=self.sock.listdb()
+            result=res
+            if res == -1:
+                self.win.addEdit("lstDatabase",-2,28,123,15)
+#                sValue="Could not connect to the server!"
+#                self.lstDatabase.addItem("Could not connect to the server!",0)
+            elif res == 0:
+                sValue="No Database found !!!"
+                self.lstDatabase.addItem("No Database found !!!",0)
+            else:
+                self.win.addComboListBox("lstDatabase", -2,28,123,15, True)
+                self.lstDatabase = self.win.getControl( "lstDatabase" )
+                self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+                for i in range(len(res)):
+                    self.lstDatabase.addItem(res[i],i)
+                sValue = database
+        if sValue:
+            self.win.doModalDialog("lstDatabase",sValue)
+        else:
+            self.win.doModalDialog("lstDatabase",None)
+
+        #self.win.doModalDialog("lstDatabase",docinfo.getUserFieldValue(2))
+
+    def btnOk_clicked(self,oActionEvent):
+
+
+        sLogin=self.win.getEditText("txtLoginName")
+        sPassword=self.win.getEditText("txtPassword")
+        global url
+        global result
+        if result==-1:
+            sDatabase=self.win.getEditText("lstDatabase")
+        else:
+            sDatabase=self.win.getListBoxSelectedItem("lstDatabase")
+        self.sock=RPCSession(url)
+        UID = self.sock.login(sDatabase,sLogin,sPassword)
+        if not UID :
+            ErrorDialog("Connection Refuse...","Please enter valid Login/Password")
+            self.win.endExecute()
+        try:
+
+            ids  = self.sock.execute(sDatabase,UID,sPassword, 'res.groups' ,  'search', [('name','=','OpenOfficeReportDesigner')])
+            ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
+            dict_groups =self.sock.execute(sDatabase, UID,sPassword, 'res.groups' , 'read',ids,['users'])
+        except :
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            self.logobj.log_write('ServerParameter', LOG_ERROR, info)
+
+        if not len(ids) :
+            ErrorDialog("Group Not Found!!!  Create a group  named  \n\n"'"OpenOfficeReportDesigner"'"  \n\n  ","","Group Name Error")
+            self.logobj.log_write('Group Error',LOG_WARNING, ':Create a  group OpenOfficeReportDesigner   using database %s' % (sDatabase))
+            self.win.endExecute()
+        if not len(ids_module):
+            ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
+            self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in  database %s' % (sDatabase))
+            self.win.endExecute()
+
+        if UID not in dict_groups[0]['users']:
+            ErrorDialog("Connection Refuse...","You have not access these Report Designer")
+            self.logobj.log_write('Connection Refuse',LOG_WARNING, " Not Access Report Designer ")
+            self.win.endExecute()
+        else:
+            desktop=getDesktop()
+            doc = desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            docinfo.setUserFieldValue(0,self.win.getEditText("txtHost"))
+            docinfo.setUserFieldValue(1,self.win.getEditText("txtLoginName"))
+            global passwd
+            passwd=self.win.getEditText("txtPassword")
+            global loginstatus
+            loginstatus=True
+            global database
+            database=sDatabase
+            global uid
+            uid=UID
+            #docinfo.setUserFieldValue(2,self.win.getListBoxSelectedItem("lstDatabase"))
+            #docinfo.setUserFieldValue(3,"")
+
+            ErrorDialog(" You can start creating your report in \n  \t the current document.","After Creating  sending to the server.","Message")
+            self.logobj.log_write('successful login',LOG_INFO, ':successful login from %s  using database %s' % (sLogin, sDatabase))
+            self.win.endExecute()
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+    def btnChange_clicked(self,oActionEvent):
+        aVal=[]
+        url= self.win.getEditText("txtHost")
+        Change(aVal,url)
+        if aVal[1]== -1:
+           self.win.getEditText("lstDatabase")
+        elif aVal[1]==0:
+            ErrorDialog(aVal[0],"")
+        else:
+            self.win.setEditText("txtHost",aVal[0])
+            self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+            for i in range(len(aVal[1])):
+                self.lstDatabase.addItem(aVal[1][i],i)
+
+
+if __name__<>"package" and __name__=="__main__":
+    ServerParameter(None)
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( ServerParameter, "org.openoffice.openerp.report.serverparam", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
new file mode 100644
index 00000000000..e1df582c1e5
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
@@ -0,0 +1,274 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from lib.functions import *
+    from lib.error import ErrorDialog
+    from LoginTest import *
+    from lib.rpc import *
+    database="test_001"
+    uid = 3
+
+
+class AddLang(unohelper.Base, XJobExecutor ):
+    def __init__(self,sVariable="",sFields="",sDisplayName="",bFromModify=False):
+        LoginTest()
+        if not loginstatus and __name__=="package":
+            exit(1)
+        global passwd
+        self.password = passwd
+        self.win = DBModalDialog(60, 50, 180, 225, "Set Lang Builder")
+
+        self.win.addFixedText("lblVariable", 27, 12, 60, 15, "Variable :")
+        self.win.addComboBox("cmbVariable", 180-120-2, 10, 120, 15,True,
+                            itemListenerProc=self.cmbVariable_selected)
+        self.insVariable = self.win.getControl( "cmbVariable" )
+
+        self.win.addFixedText("lblFields", 10, 32, 60, 15, "Variable Fields :")
+        self.win.addComboListBox("lstFields", 180-120-2, 30, 120, 150, False,itemListenerProc=self.lstbox_selected)
+        self.insField = self.win.getControl( "lstFields" )
+        self.win.addFixedText("lblUName", 8, 187, 60, 15, "Displayed name :")
+        self.win.addEdit("txtUName", 180-120-2, 185, 120, 15,)
+
+        self.win.addButton('btnOK',-5 ,-5, 45, 15, 'Ok', actionListenerProc = self.btnOk_clicked )
+        self.win.addButton('btnCancel',-5 - 45 - 5 ,-5,45,15,'Cancel', actionListenerProc = self.btnCancel_clicked )
+        self.sValue=None
+        self.sObj=None
+        self.aSectionList=[]
+        self.sGDisplayName=sDisplayName
+        self.aItemList=[]
+        self.aComponentAdd=[]
+        self.aObjectList=[]
+        self.aListFields=[]
+        self.aVariableList=[]
+        EnumDocument(self.aItemList,self.aComponentAdd)
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        self.sMyHost= ""
+        global url
+        self.sock=RPCSession(url)
+
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+            self.count=0
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    self.count += 1
+            getList(self.aObjectList, self.sMyHost,self.count)
+            cursor = doc.getCurrentController().getViewCursor()
+            text=cursor.getText()
+            tcur=text.createTextCursorByRange(cursor)
+
+	    self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == "Objects", self.aObjectList ) )
+
+            for i in range(len(self.aItemList)):
+		anItem = self.aItemList[i][1]
+		component = self.aComponentAdd[i]
+
+                if component == "Document":
+		    sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+		    self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                if tcur.TextSection:
+                    getRecersiveSection(tcur.TextSection,self.aSectionList)
+                    if component in self.aSectionList:
+			sLVal = anItem[anItem.find(",'") + 2:anItem.find("')")]
+			self.aVariableList.extend( filter( lambda obj: obj[:obj.find("(")] == sLVal, self.aObjectList ) )
+
+                if tcur.TextTable:
+		    if not component == "Document" and component[component.rfind(".") + 1:] == tcur.TextTable.Name:
+                        VariableScope(tcur,self.insVariable,self.aObjectList,self.aComponentAdd,self.aItemList,component)
+
+            self.bModify=bFromModify
+            if self.bModify==True:
+                sItem=""
+		for anObject in self.aObjectList:
+		    if anObject[:anObject.find("(")] == sVariable:
+			sItem = anObject
+			self.insVariable.setText( sItem )
+		genTree(sItem[sItem.find("(")+1:sItem.find(")")],self.aListFields, self.insField,self.sMyHost,2,ending_excl=['one2many','many2one','many2many','reference'], recur=['many2one'])
+                self.sValue= self.win.getListBoxItem("lstFields",self.aListFields.index(sFields))
+
+            for var in self.aVariableList:
+
+		    self.model_ids = self.sock.execute(database, uid, self.password, 'ir.model' ,  'search', [('model','=',var[var.find("(")+1:var.find(")")])])
+                    fields=['name','model']
+                    self.model_res = self.sock.execute(database, uid, self.password, 'ir.model', 'read', self.model_ids,fields)
+                    if self.model_res <> []:
+			self.insVariable.addItem(var[:var.find("(")+1] + self.model_res[0]['name'] + ")" ,self.insVariable.getItemCount())
+                    else:
+                        self.insVariable.addItem(var ,self.insVariable.getItemCount())
+
+            self.win.doModalDialog("lstFields",self.sValue)
+        else:
+            ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 Eg. http://localhost:8069 \nOR \nField-4 Eg. account.invoice")
+            self.win.endExecute()
+
+    def lstbox_selected(self,oItemEvent):
+        try:
+
+            desktop=getDesktop()
+            doc =desktop.getCurrentComponent()
+            docinfo=doc.getDocumentInfo()
+            sItem= self.win.getComboBoxText("cmbVariable")
+            for var in self.aVariableList:
+		if var[:var.find("(")+1]==sItem[:sItem.find("(")+1]:
+                    sItem = var
+            sMain=self.aListFields[self.win.getListBoxSelectedItemPos("lstFields")]
+            t=sMain.rfind('/lang')
+            if t!=-1:
+		sObject=self.getRes(self.sock,sItem[sItem.find("(")+1:-1],sMain[1:])
+                ids = self.sock.execute(database, uid, self.password, sObject ,  'search', [])
+                res = self.sock.execute(database, uid, self.password, sObject , 'read',[ids[0]])
+		self.win.setEditText("txtUName",res[0][sMain[sMain.rfind("/")+1:]])
+            else:
+                 ErrorDialog("Please select the Language Field")
+
+        except:
+            import traceback;traceback.print_exc()
+            self.win.setEditText("txtUName","TTT")
+        if self.bModify:
+            self.win.setEditText("txtUName",self.sGDisplayName)
+
+    def getRes(self,sock ,sObject,sVar):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        docinfo=doc.getDocumentInfo()
+        res = sock.execute(database, uid, self.password, sObject , 'fields_get')
+        key = res.keys()
+        key.sort()
+        myval=None
+        if not sVar.find("/")==-1:
+	    myval=sVar[:sVar.find("/")]
+        else:
+            myval=sVar
+        if myval in key:
+            if (res[myval]['type'] in ['many2one']):
+                sObject = res[myval]['relation']
+		return self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
+            else:
+                return sObject
+
+
+    def cmbVariable_selected(self,oItemEvent):
+        if self.count > 0 :
+            try:
+                desktop=getDesktop()
+                doc =desktop.getCurrentComponent()
+                docinfo=doc.getDocumentInfo()
+                self.win.removeListBoxItems("lstFields", 0, self.win.getListBoxItemCount("lstFields"))
+                self.aListFields=[]
+                tempItem = self.win.getComboBoxText("cmbVariable")
+                for var in self.aVariableList:
+		    if var[:var.find("(")] == tempItem[:tempItem.find("(")]:
+                        sItem=var
+
+		genTree(
+		    sItem[ sItem.find("(") + 1:sItem.find(")")],
+		    self.aListFields,
+		    self.insField,
+		    self.sMyHost,
+		    2,
+		    ending_excl=['one2many','many2one','many2many','reference'],
+		    recur=['many2one']
+		)
+
+            except:
+                import traceback;traceback.print_exc()
+
+    def btnOk_clicked( self, oActionEvent ):
+        self.bOkay = True
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
+        cursor = doc.getCurrentController().getViewCursor()
+
+        itemSelected = self.win.getListBoxSelectedItem( "lstFields" )
+        itemSelectedPos = self.win.getListBoxSelectedItemPos( "lstFields" )
+        txtUName = self.win.getEditText("txtUName")
+        sKey=u""+ txtUName
+
+        if itemSelected != "" and txtUName != "" and self.bModify==True :
+            oCurObj=cursor.TextField
+            sObjName=self.insVariable.getText()
+            sObjName=sObjName[:sObjName.find("(")]
+            sValue=u"[[ setLang" + sObjName + self.aListFields[itemSelectedPos].replace("/",".") + ")" " ]]"
+            oCurObj.Items = (sKey,sValue)
+            oCurObj.update()
+            self.win.endExecute()
+        elif itemSelected != "" and txtUName != "" :
+            oInputList = doc.createInstance("com.sun.star.text.TextField.DropDown")
+            sObjName=self.win.getComboBoxText("cmbVariable")
+            sObjName=sObjName[:sObjName.find("(")]
+
+            widget = ( cursor.TextTable and cursor.TextTable.getCellByName( cursor.Cell.CellName ) or doc.Text )
+
+            sValue = u"[[setLang" + "(" + sObjName + self.aListFields[itemSelectedPos].replace("/",".") +")" " ]]"
+            oInputList.Items = (sKey,sValue)
+            widget.insertTextContent(cursor,oInputList,False)
+
+            self.win.endExecute()
+        else:
+            ErrorDialog("Please Fill appropriate data in Name field \nor select perticular value from the list of fields")
+
+    def btnCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
+
+if __name__<>"package" and __name__=="__main__":
+    AddLang()
+elif __name__=="package":
+    g_ImplementationHelper.addImplementation( AddLang, "org.openoffice.openerp.report.langtag", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
new file mode 100644
index 00000000000..af5e28965ce
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
@@ -0,0 +1,61 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import Expression
+import lib
+import Fields
+import modify
+import Repeatln
+import ServerParameter
+import NewReport
+import LoginTest
+import Change
+import About
+import AddAttachment
+import ConvertBracesToField
+import ConvertFieldsToBraces
+import ExportToRML
+import SendtoServer
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
new file mode 100644
index 00000000000..5a95c61ecae
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
@@ -0,0 +1,49 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+import compileall
+
+compileall.compile_dir('package')
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/import b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/import
new file mode 100644
index 00000000000..e14c925b619
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/import
@@ -0,0 +1,2 @@
+__name__="package"
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py
new file mode 100644
index 00000000000..b67392208fe
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/__init__.py
@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import actions
+import error
+import functions
+import gui
+import logreport
+import rpc
+import tiny_socket
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
new file mode 100644
index 00000000000..8faec4cb5aa
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
@@ -0,0 +1,111 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import unohelper
+import os
+#--------------------------------------------------
+# An ActionListener adapter.
+# This object implements com.sun.star.awt.XActionListener.
+# When actionPerformed is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oActionEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+if __name__<>"package":
+    os.system( "ooffice '-accept=socket,host=localhost,port=2002;urp;'" )
+passwd=""
+database=""
+uid=""
+loginstatus=False
+from com.sun.star.awt import XActionListener
+class ActionListenerProcAdapter( unohelper.Base, XActionListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oActionEvent is a com.sun.star.awt.ActionEvent struct.
+    def actionPerformed( self, oActionEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oActionEvent,) + self.tParams )
+
+#--------------------------------------------------
+# An ItemListener adapter.
+# This object implements com.sun.star.awt.XItemListener.
+# When itemStateChanged is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oItemEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+from com.sun.star.awt import XItemListener
+class ItemListenerProcAdapter( unohelper.Base, XItemListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oItemEvent is a com.sun.star.awt.ItemEvent struct.
+    def itemStateChanged( self, oItemEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oItemEvent,) + self.tParams )
+
+#--------------------------------------------------
+# An TextListener adapter.
+# This object implements com.sun.star.awt.XTextistener.
+# When textChanged is called, this will call an arbitrary
+#  python procedure, passing it...
+#   1. the oTextEvent
+#   2. any other parameters you specified to this object's constructor (as a tuple).
+from com.sun.star.awt import XTextListener
+class TextListenerProcAdapter( unohelper.Base, XTextListener ):
+    def __init__( self, oProcToCall, tParams=() ):
+        self.oProcToCall = oProcToCall # a python procedure
+        self.tParams = tParams # a tuple
+
+    # oTextEvent is a com.sun.star.awt.TextEvent struct.
+    def textChanged( self, oTextEvent ):
+        if callable( self.oProcToCall ):
+            apply( self.oProcToCall, (oTextEvent,) + self.tParams )
+
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
new file mode 100644
index 00000000000..bb51a35caf1
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
@@ -0,0 +1,60 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+if __name__<>"package":
+    from gui import *
+class ErrorDialog:
+    def __init__(self,sErrorMsg, sErrorHelpMsg="",sTitle="Error Message"):
+        self.win = DBModalDialog(50, 50, 150, 90, sTitle)
+        self.win.addFixedText("lblErrMsg", 5, 5, 190, 25, sErrorMsg)
+        self.win.addFixedText("lblErrHelpMsg", 5, 30, 190, 25, sErrorHelpMsg)
+        self.win.addButton('btnOK', 55,-5,40,15,'Ok'
+                     ,actionListenerProc = self.btnOkOrCancel_clicked )
+        self.win.doModalDialog("",None)
+    def btnOkOrCancel_clicked( self, oActionEvent ):
+        self.win.endExecute()
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
new file mode 100644
index 00000000000..2f5f5186828
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
@@ -0,0 +1,264 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import xmlrpclib
+import re
+import socket
+import cPickle
+import marshal
+import tempfile
+if __name__<>"package":
+    from gui import *
+    from logreport import *
+    from rpc import *
+    database="test"
+    uid = 1
+
+def genTree(object,aList,insField,host,level=3, ending=[], ending_excl=[], recur=[], root='', actualroot=""):
+    try:
+        global url
+        sock=RPCSession(url)
+        global passwd
+        res = sock.execute(database, uid, passwd, object , 'fields_get')
+        key = res.keys()
+        key.sort()
+        for k in key:
+            if (not ending or res[k]['type'] in ending) and ((not ending_excl) or not (res[k]['type'] in ending_excl)):
+                insField.addItem(root+'/'+res[k]["string"],len(aList))
+                aList.append(actualroot+'/'+k)
+            if (res[k]['type'] in recur) and (level>0):
+                genTree(res[k]['relation'],aList,insField,host ,level-1, ending, ending_excl, recur,root+'/'+res[k]["string"],actualroot+'/'+k)
+    except:
+        obj=Logger()
+        import traceback,sys
+        info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+        obj.log_write('Function', LOG_ERROR, info)
+
+def VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList,sTableName=""):
+    if sTableName.find(".") != -1:
+	for i in range(len(aItemList)):
+            if aComponentAdd[i]==sTableName:
+		sLVal=aItemList[i][1][aItemList[i][1].find(",'")+2:aItemList[i][1].find("')")]
+                for j in range(len(aObjectList)):
+		    if aObjectList[j][:aObjectList[j].find("(")] == sLVal:
+                        insVariable.append(aObjectList[j])
+	VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList, sTableName[:sTableName.rfind(".")])
+    else:
+	for i in range(len(aItemList)):
+            if aComponentAdd[i]==sTableName:
+		sLVal=aItemList[i][1][aItemList[i][1].find(",'")+2:aItemList[i][1].find("')")]
+                for j in range(len(aObjectList)):
+		    if aObjectList[j][:aObjectList[j].find("(")] == sLVal and sLVal!="":
+                        insVariable.append(aObjectList[j])
+
+def getList(aObjectList,host,count):
+    desktop=getDesktop()
+    doc =desktop.getCurrentComponent()
+    docinfo=doc.getDocumentInfo()
+    sMain=""
+    if not count == 0:
+        if count >= 1:
+            oParEnum = doc.getTextFields().createEnumeration()
+            while oParEnum.hasMoreElements():
+                oPar = oParEnum.nextElement()
+                if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                    sItem=oPar.Items[1]
+                    if sItem[sItem.find("(")+1:sItem.find(",")]=="objects":
+                        sMain = sItem[sItem.find(",'")+2:sItem.find("')")]
+                        oParEnum = doc.getTextFields().createEnumeration()
+                        while oParEnum.hasMoreElements():
+                            oPar = oParEnum.nextElement()
+                            if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+                                sItem=oPar.Items[1]
+                                if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn":
+                                    if sItem[sItem.find("(")+1:sItem.find(",")]=="objects":
+                                        aObjectList.append(sItem[sItem.rfind(",'")+2:sItem.rfind("')")] + "(" + docinfo.getUserFieldValue(3) + ")")
+                                    else:
+                                        sTemp=sItem[sItem.find("(")+1:sItem.find(",")]
+                                        if sMain == sTemp[:sTemp.find(".")]:
+                                            getRelation(docinfo.getUserFieldValue(3), sItem[sItem.find(".")+1:sItem.find(",")], sItem[sItem.find(",'")+2:sItem.find("')")],aObjectList,host)
+                                        else:
+                                            sPath=getPath(sItem[sItem.find("(")+1:sItem.find(",")], sMain)
+                                            getRelation(docinfo.getUserFieldValue(3), sPath, sItem[sItem.find(",'")+2:sItem.find("')")],aObjectList,host)
+    else:
+        aObjectList.append("List of " + docinfo.getUserFieldValue(3))
+
+def getRelation(sRelName, sItem, sObjName, aObjectList, host ):
+        global url
+        sock=RPCSession(url)
+        global passwd
+        res = sock.execute(database, uid, passwd, sRelName , 'fields_get')
+        key = res.keys()
+        for k in key:
+            if sItem.find(".") == -1:
+                if k == sItem:
+                    aObjectList.append(sObjName + "(" + res[k]['relation'] + ")")
+                    return 0
+	    if k == sItem[:sItem.find(".")]:
+		getRelation(res[k]['relation'], sItem[sItem.find(".")+1:], sObjName,aObjectList,host)
+
+
+def getPath(sPath,sMain):
+    desktop=getDesktop()
+    doc =desktop.getCurrentComponent()
+    oParEnum = doc.getTextFields().createEnumeration()
+    while oParEnum.hasMoreElements():
+        oPar = oParEnum.nextElement()
+        if oPar.supportsService("com.sun.star.text.TextField.DropDown"):
+            sItem=oPar.Items[1]
+	    if sPath[:sPath.find(".")] == sMain:
+                break;
+            else:
+                res = re.findall('\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]',sPath)
+                if len(res) <> 0:
+		    if sItem[sItem.find(",'")+2:sItem.find("')")] == sPath[:sPath.find(".")]:
+			sPath =  sItem[sItem.find("(")+1:sItem.find(",")] + sPath[sPath.find("."):]
+                        getPath(sPath, sMain)
+    return sPath
+
+def EnumDocument(aItemList,aComponentAdd):
+    desktop = getDesktop()
+    parent=""
+    bFlag = False
+    Doc =desktop.getCurrentComponent()
+    #oVC = Doc.CurrentController.getViewCursor()
+    oParEnum = Doc.getTextFields().createEnumeration()
+    while oParEnum.hasMoreElements():
+        oPar = oParEnum.nextElement()
+        if oPar.Anchor.TextTable:
+            #parent = oPar.Anchor.TextTable.Name
+            getChildTable(oPar.Anchor.TextTable,aItemList,aComponentAdd)
+        elif oPar.Anchor.TextSection:
+            parent = oPar.Anchor.TextSection.Name
+        elif oPar.Anchor.Text:
+            parent = "Document"
+        sItem=oPar.Items[1].replace(' ',"")
+        if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn" and not oPar.Items in aItemList:
+            templist=oPar.Items[0],sItem
+            aItemList.append( templist )
+        aComponentAdd.append( parent )
+
+def getChildTable(oPar,aItemList,aComponentAdd,sTableName=""):
+    sNames = oPar.getCellNames()
+    bEmptyTableFlag=True
+    for val in sNames:
+        oCell = oPar.getCellByName(val)
+        oCurEnum = oCell.createEnumeration()
+        while oCurEnum.hasMoreElements():
+            try:
+                oCur = oCurEnum.nextElement()
+
+                if oCur.supportsService("com.sun.star.text.TextTable"):
+                    if sTableName=="":
+                        getChildTable(oCur,aItemList,aComponentAdd,oPar.Name)
+                    else:
+                        getChildTable(oCur,aItemList,aComponentAdd,sTableName+"."+oPar.Name)
+                else:
+                    oSecEnum = oCur.createEnumeration()
+                    while oSecEnum.hasMoreElements():
+                        oSubSection = oSecEnum.nextElement()
+                        if oSubSection.supportsService("com.sun.star.text.TextField"):
+                            bEmptyTableFlag=False
+                            sItem=oSubSection.TextField.Items[1]
+                            if sItem[sItem.find("[[ ")+3:sItem.find("(")]=="repeatIn":
+                                if aItemList.__contains__(oSubSection.TextField.Items)==False:
+                                    aItemList.append(oSubSection.TextField.Items)
+                                if sTableName=="":
+                                    if  aComponentAdd.__contains__(oPar.Name)==False:
+                                        aComponentAdd.append(oPar.Name)
+                                else:
+                                    if aComponentAdd.__contains__(sTableName+"."+oPar.Name)==False:
+                                        aComponentAdd.append(sTableName+"."+oPar.Name)
+            except:
+                obj=Logger()
+                import traceback,sys
+                info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+                obj.log_write('Function', LOG_ERROR, info)
+    if bEmptyTableFlag==True:
+        aItemList.append((u'',u''))
+        if sTableName=="":
+            if  aComponentAdd.__contains__(oPar.Name)==False:
+                aComponentAdd.append(oPar.Name)
+        else:
+            if aComponentAdd.__contains__(sTableName+"."+oPar.Name)==False:
+                aComponentAdd.append(sTableName+"."+oPar.Name)
+    return 0
+
+def getRecersiveSection(oCurrentSection,aSectionList):
+        desktop=getDesktop()
+        doc =desktop.getCurrentComponent()
+        oParEnum=doc.getText().createEnumeration()
+        aSectionList.append(oCurrentSection.Name)
+        if oCurrentSection.ParentSection:
+            getRecersiveSection(oCurrentSection.ParentSection,aSectionList)
+        else:
+            return
+
+def GetAFileName():
+    oFileDialog=None
+    iAccept=None
+    sPath=""
+    InitPath=""
+    oUcb=None
+    oFileDialog = createUnoService("com.sun.star.ui.dialogs.FilePicker")
+    oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
+    oFileDialog.appendFilter("OpenERP Report File","*.sxw")
+    oFileDialog.setCurrentFilter("OpenERP Report File")
+    if InitPath == "":
+        InitPath =tempfile.gettempdir()
+    #End If
+    if oUcb.exists(InitPath):
+        oFileDialog.setDisplayDirectory(InitPath)
+    #End If
+    iAccept = oFileDialog.execute()
+    if iAccept == 1:
+        sPath = oFileDialog.Files[0]
+    oFileDialog.dispose()
+    return sPath
+
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
new file mode 100644
index 00000000000..4210f2afe1e
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
@@ -0,0 +1,822 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import uno
+import unohelper
+import pythonloader
+if __name__<>"package":
+    from actions import *
+
+
+#------------------------------------------------------------
+#   Uno ServiceManager access
+#   A different version of this routine and global variable
+#    is needed for code running inside a component.
+#------------------------------------------------------------
+
+
+# The ServiceManager of the running OOo.
+# It is cached in a global variable.
+goServiceManager = False
+pythonloader.DEBUG = 0
+def getServiceManager( cHost="localhost", cPort="2002" ):
+    """Get the ServiceManager from the running OpenOffice.org.
+        Then retain it in the global variable goServiceManager for future use.
+        This is similar to the GetProcessServiceManager() in OOo Basic.
+    """
+    global goServiceManager
+    global pythonloader
+    if not goServiceManager:
+        # Get the uno component context from the PyUNO runtime
+        oLocalContext = uno.getComponentContext()
+        # Create the UnoUrlResolver on the Python side.
+
+        # Connect to the running OpenOffice.org and get its context.
+        if __name__<>"package":
+            oLocalResolver = oLocalContext.ServiceManager.createInstanceWithContext(
+                                    "com.sun.star.bridge.UnoUrlResolver", oLocalContext )
+            oContext = oLocalResolver.resolve( "uno:socket,host=" + cHost + ",port=" + cPort + ";urp;StarOffice.ComponentContext" )
+        # Get the ServiceManager object
+            goServiceManager = oContext.ServiceManager
+        else:
+            goServiceManager=oLocalContext.ServiceManager
+
+    return goServiceManager
+
+
+#------------------------------------------------------------
+#   Uno convenience functions
+#   The stuff in this section is just to make
+#    python progrmaming of OOo more like using OOo Basic.
+#------------------------------------------------------------
+
+
+# This is the same as ServiceManager.createInstance( ... )
+def createUnoService( cClass ):
+    """A handy way to create a global objects within the running OOo.
+    Similar to the function of the same name in OOo Basic.
+    """
+    oServiceManager = getServiceManager()
+    oObj = oServiceManager.createInstance( cClass )
+    return oObj
+
+
+# The StarDesktop object.  (global like in OOo Basic)
+# It is cached in a global variable.
+StarDesktop = None
+def getDesktop():
+    """An easy way to obtain the Desktop object from a running OOo.
+    """
+    global StarDesktop
+    if StarDesktop == None:
+        StarDesktop = createUnoService( "com.sun.star.frame.Desktop" )
+    return StarDesktop
+# preload the StarDesktop variable.
+#getDesktop()
+
+
+# The CoreReflection object.
+# It is cached in a global variable.
+goCoreReflection = False
+def getCoreReflection():
+    global goCoreReflection
+    if not goCoreReflection:
+        goCoreReflection = createUnoService( "com.sun.star.reflection.CoreReflection" )
+    return goCoreReflection
+
+
+def createUnoStruct( cTypeName ):
+    """Create a UNO struct and return it.
+    Similar to the function of the same name in OOo Basic.
+    """
+    oCoreReflection = getCoreReflection()
+    # Get the IDL class for the type name
+    oXIdlClass = oCoreReflection.forName( cTypeName )
+    # Create the struct.
+    oReturnValue, oStruct = oXIdlClass.createObject( None )
+    return oStruct
+
+#------------------------------------------------------------
+#   API helpers
+#------------------------------------------------------------
+
+def hasUnoInterface( oObject, cInterfaceName ):
+    """Similar to Basic's HasUnoInterfaces() function, but singular not plural."""
+
+    # Get the Introspection service.
+    oIntrospection = createUnoService( "com.sun.star.beans.Introspection" )
+
+    # Now inspect the object to learn about it.
+    oObjInfo = oIntrospection.inspect( oObject )
+
+    # Obtain an array describing all methods of the object.
+    oMethods = oObjInfo.getMethods( uno.getConstantByName( "com.sun.star.beans.MethodConcept.ALL" ) )
+    # Now look at every method.
+    for oMethod in oMethods:
+        # Check the method's interface to see if
+        #  these aren't the droids you're looking for.
+        cMethodInterfaceName = oMethod.getDeclaringClass().getName()
+        if cMethodInterfaceName == cInterfaceName:
+            return True
+    return False
+
+def hasUnoInterfaces( oObject, *cInterfaces ):
+    """Similar to the function of the same name in OOo Basic."""
+    for cInterface in cInterfaces:
+        if not hasUnoInterface( oObject, cInterface ):
+            return False
+    return True
+
+#------------------------------------------------------------
+#   High level general purpose functions
+#------------------------------------------------------------
+
+
+def makePropertyValue( cName=None, uValue=None, nHandle=None, nState=None ):
+    """Create a com.sun.star.beans.PropertyValue struct and return it.
+    """
+    oPropertyValue = createUnoStruct( "com.sun.star.beans.PropertyValue" )
+
+    if cName != None:
+        oPropertyValue.Name = cName
+    if uValue != None:
+        oPropertyValue.Value = uValue
+    if nHandle != None:
+        oPropertyValue.Handle = nHandle
+    if nState != None:
+        oPropertyValue.State = nState
+
+    return oPropertyValue
+
+
+def makePoint( nX, nY ):
+    """Create a com.sun.star.awt.Point struct."""
+    oPoint = createUnoStruct( "com.sun.star.awt.Point" )
+    oPoint.X = nX
+    oPoint.Y = nY
+    return oPoint
+
+
+def makeSize( nWidth, nHeight ):
+    """Create a com.sun.star.awt.Size struct."""
+    oSize = createUnoStruct( "com.sun.star.awt.Size" )
+    oSize.Width = nWidth
+    oSize.Height = nHeight
+    return oSize
+
+
+def makeRectangle( nX, nY, nWidth, nHeight ):
+    """Create a com.sun.star.awt.Rectangle struct."""
+    oRect = createUnoStruct( "com.sun.star.awt.Rectangle" )
+    oRect.X = nX
+    oRect.Y = nY
+    oRect.Width = nWidth
+    oRect.Height = nHeight
+    return oRect
+
+
+def Array( *args ):
+    """This is just sugar coating so that code from OOoBasic which
+    contains the Array() function can work perfectly in python."""
+    tArray = ()
+    for arg in args:
+        tArray += (arg,)
+    return tArray
+
+
+def loadComponentFromURL( cUrl, tProperties=() ):
+    """Open or Create a document from it's URL.
+    New documents are created from URL's such as:
+        private:factory/sdraw
+        private:factory/swriter
+        private:factory/scalc
+        private:factory/simpress
+    """
+    StarDesktop = getDesktop()
+    oDocument = StarDesktop.loadComponentFromURL( cUrl, "_blank", 0, tProperties )
+    return oDocument
+
+
+#------------------------------------------------------------
+#   Styles
+#------------------------------------------------------------
+
+
+def defineStyle( oDrawDoc, cStyleFamily, cStyleName, cParentStyleName=None ):
+    """Add a new style to the style catalog if it is not already present.
+    This returns the style object so that you can alter its properties.
+    """
+
+    oStyleFamily = oDrawDoc.getStyleFamilies().getByName( cStyleFamily )
+
+    # Does the style already exist?
+    if oStyleFamily.hasByName( cStyleName ):
+        # then get it so we can return it.
+        oStyle = oStyleFamily.getByName( cStyleName )
+    else:
+        # Create new style object.
+        oStyle = oDrawDoc.createInstance( "com.sun.star.style.Style" )
+
+        # Set its parent style
+        if cParentStyleName != None:
+            oStyle.setParentStyle( cParentStyleName )
+
+        # Add the new style to the style family.
+        oStyleFamily.insertByName( cStyleName, oStyle )
+
+    return oStyle
+
+
+def getStyle( oDrawDoc, cStyleFamily, cStyleName ):
+    """Lookup and return a style from the document.
+    """
+    return oDrawDoc.getStyleFamilies().getByName( cStyleFamily ).getByName( cStyleName )
+
+#------------------------------------------------------------
+#   General Utility functions
+#------------------------------------------------------------
+
+
+def convertToURL( cPathname ):
+    """Convert a Windows or Linux pathname into an OOo URL."""
+    if len( cPathname ) > 1:
+        if cPathname[1:2] == ":":
+            cPathname = "/" + cPathname[0] + "|" + cPathname[2:]
+    cPathname = cPathname.replace( "\\", "/" )
+    cPathname = "file://" + cPathname
+    return cPathname
+
+# The global Awt Toolkit.
+# This is initialized the first time it is needed.
+#goAwtToolkit = createUnoService( "com.sun.star.awt.Toolkit" )
+goAwtToolkit = None
+
+def getAwtToolkit():
+    global goAwtToolkit
+    if goAwtToolkit == None:
+        goAwtToolkit = createUnoService( "com.sun.star.awt.Toolkit" )
+    return goAwtToolkit
+
+# This class builds dialog boxes.
+# This can be used in two different ways...
+# 1. by subclassing it (elegant)
+# 2. without subclassing it (less elegant)
+class DBModalDialog:
+    """Class to build a dialog box from the com.sun.star.awt.* services.
+    This doesn't do anything you couldn't already do using OOo's UNO API,
+     this just makes it much easier.
+    You can change the dialog box size, position, title, etc.
+    You can add controls, and listeners for those controls to the dialog box.
+    This class can be used by subclassing it, or without subclassing it.
+    """
+    def __init__( self, nPositionX=None, nPositionY=None, nWidth=None, nHeight=None, cTitle=None ):
+        self.oDialogModel = createUnoService( "com.sun.star.awt.UnoControlDialogModel" )
+        if nPositionX != None:  self.oDialogModel.PositionX = nPositionX
+        if nPositionY != None:  self.oDialogModel.PositionY = nPositionY
+        if nWidth     != None:  self.oDialogModel.Width     = nWidth
+        if nHeight    != None:  self.oDialogModel.Height    = nHeight
+        if cTitle     != None:  self.oDialogModel.Title     = cTitle
+        self.oDialogControl = createUnoService( "com.sun.star.awt.UnoControlDialog" )
+        self.oDialogControl.setModel( self.oDialogModel )
+
+    def release( self ):
+        """Release resources.
+        After calling this, you can no longer use this object.
+        """
+        self.oDialogControl.dispose()
+
+    #--------------------------------------------------
+    #   Dialog box adjustments
+    #--------------------------------------------------
+
+    def setDialogPosition( self, nX, nY ):
+        self.oDialogModel.PositionX = nX
+        self.oDialogModel.PositionY = nY
+
+    def setDialogSize( self, nWidth, nHeight ):
+        self.oDialogModel.Width = nWidth
+        self.oDialogModel.Height = nHeight
+
+    def setDialogTitle( self, cCaption ):
+        self.oDialogModel.Title = cCaption
+
+    def setVisible( self, bVisible ):
+        self.oDialogControl.setVisible( bVisible )
+
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlButton
+    #--------------------------------------------------
+
+    # After you add a Button control, you can call self.setControlModelProperty()
+    #  passing any of the properties for a...
+    #       com.sun.star.awt.UnoControlButtonModel
+    #       com.sun.star.awt.UnoControlDialogElement
+    #       com.sun.star.awt.UnoControlModel
+    def addButton( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                       cLabel=None,
+                       actionListenerProc=None,
+                       nTabIndex=None ):
+        self.addControl( "com.sun.star.awt.UnoControlButtonModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None, bMultiSelection=None,
+                         cLabel=cLabel,
+                         nTabIndex=nTabIndex )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+    def setButtonLabel( self, cCtrlName, cLabel ):
+        """Set the label of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setLabel( cLabel )
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlEditModel
+    #--------------------------------------------------
+    def addEdit( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        cText=None,
+                        textListenerProc=None ):
+        """Add a Edit control to the window."""
+        self.addControl( "com.sun.star.awt.UnoControlEditModel",
+            cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None)
+
+        if cText != None:
+            self.setEditText( cCtrlName, cText )
+        if textListenerProc != None:
+            self.addTextListenerProc( cCtrlName, textListenerProc )
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlCheckBox
+    #--------------------------------------------------
+
+    # After you add a CheckBox control, you can call self.setControlModelProperty()
+    #  passing any of the properties for a...
+    #       com.sun.star.awt.UnoControlCheckBoxModel
+    #       com.sun.star.awt.UnoControlDialogElement
+    #       com.sun.star.awt.UnoControlModel
+    def addCheckBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                       cLabel=None,
+                       itemListenerProc=None,
+                       nTabIndex=None ):
+        self.addControl( "com.sun.star.awt.UnoControlCheckBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, bDropdown=None,  bMultiSelection=None,
+                         cLabel=cLabel,
+                         nTabIndex=nTabIndex )
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+
+    def setEditText( self, cCtrlName, cText ):
+        """Set the text of the edit box."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setText( cText )
+
+    def getEditText( self, cCtrlName):
+        """Set the text of the edit box."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getText()
+
+    def setCheckBoxLabel( self, cCtrlName, cLabel ):
+        """Set the label of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setLabel( cLabel )
+
+    def getCheckBoxState( self, cCtrlName ):
+        """Get the state of the control."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getState();
+
+    def setCheckBoxState( self, cCtrlName, nState ):
+        """Set the state of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setState( nState )
+
+    def enableCheckBoxTriState( self, cCtrlName, bTriStateEnable ):
+        """Enable or disable the tri state mode of the control."""
+        oControl = self.getControl( cCtrlName )
+        oControl.enableTriState( bTriStateEnable )
+
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlFixedText
+    #--------------------------------------------------
+
+    def addFixedText( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        cLabel=None ):
+        self.addControl( "com.sun.star.awt.UnoControlFixedTextModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                         bDropdown=None, bMultiSelection=None,
+                         cLabel=cLabel )
+
+        return self.getControl( cCtrlName )
+
+    #--------------------------------------------------
+    #   Add Controls to dialog
+    #--------------------------------------------------
+
+    def addControl( self, cCtrlServiceName,
+                        cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=None,
+                        bMultiSelection=None,
+                        cLabel=None,
+                        nTabIndex=None,
+                        sImagePath=None,
+                         ):
+        oControlModel = self.oDialogModel.createInstance( cCtrlServiceName )
+        self.oDialogModel.insertByName( cCtrlName, oControlModel )
+        # if negative coordinates are given for X or Y position,
+        #  then make that coordinate be relative to the right/bottom
+        #  edge of the dialog box instead of to the left/top.
+        if nPositionX < 0: nPositionX = self.oDialogModel.Width  + nPositionX - nWidth
+        if nPositionY < 0: nPositionY = self.oDialogModel.Height + nPositionY - nHeight
+        oControlModel.PositionX = nPositionX
+        oControlModel.PositionY = nPositionY
+        oControlModel.Width = nWidth
+        oControlModel.Height = nHeight
+        oControlModel.Name = cCtrlName
+
+        if bDropdown != None:
+            oControlModel.Dropdown = bDropdown
+
+        if bMultiSelection!=None:
+            oControlModel.MultiSelection=bMultiSelection
+
+        if cLabel != None:
+            oControlModel.Label = cLabel
+
+        if nTabIndex != None:
+            oControlModel.TabIndex = nTabIndex
+
+        if sImagePath != None:
+            oControlModel.ImageURL = sImagePath
+    #--------------------------------------------------
+    #   Access controls and control models
+    #--------------------------------------------------
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoContorlListBoxModel
+    #--------------------------------------------------
+
+
+    def addComboListBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=True,
+                        bMultiSelection=False,
+                        itemListenerProc=None,
+                        actionListenerProc=None,
+                        ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlListBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,bDropdown,bMultiSelection )
+
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+
+    def addListBoxItems( self, cCtrlName, tcItemTexts, nPosition=0 ):
+        """Add a tupple of items to the ListBox at specified position."""
+        oControl = self.getControl( cCtrlName )
+        oControl.addItems( tcItemTexts, nPosition )
+
+    def selectListBoxItem( self, cCtrlName, cItemText, bSelect=True ):
+        """Selects/Deselects the ispecified item."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.selectItem( cItemText, bSelect )
+
+    def selectListBoxItemPos( self, cCtrlName, nItemPos, bSelect=True ):
+        """Select/Deselect the item at the specified position."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.selectItemPos( nItemPos, bSelect )
+
+    def removeListBoxItems( self, cCtrlName, nPosition, nCount=1 ):
+        """Remove items from a ListBox."""
+        oControl = self.getControl( cCtrlName )
+        oControl.removeItems( nPosition, nCount )
+
+    def getListBoxItemCount( self, cCtrlName ):
+        """Get the number of items in a ListBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getItemCount()
+
+    def getListBoxSelectedItem( self, cCtrlName ):
+        """Returns the currently selected item."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItem()
+
+    def getListBoxItem( self, cCtrlName, nPosition ):
+        """Return the item at specified position within the ListBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getItem( nPosition )
+
+    def getListBoxSelectedItemPos(self,cCtrlName):
+
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItemPos()
+
+    def getListBoxSelectedItems(self,cCtrlName):
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItems()
+
+    def getListBoxSelectedItemsPos(self,cCtrlName):
+
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedItemsPos()
+
+    #--------------------------------------------------
+    #   com.sun.star.awt.UnoControlComboBoxModel
+    #--------------------------------------------------
+    def addComboBox( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        bDropdown=True,
+                        itemListenerProc=None,
+                        actionListenerProc=None ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlComboBoxModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight,bDropdown)
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+
+    def setComboBoxText( self, cCtrlName, cText ):
+        """Set the text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        oControl.setText( cText )
+
+    def getComboBoxText( self, cCtrlName):
+        """Set the text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getText()
+
+    def getComboBoxSelectedText( self, cCtrlName ):
+        """Get the selected text of the ComboBox."""
+        oControl = self.getControl( cCtrlName )
+        return oControl.getSelectedText();
+
+    def getControl( self, cCtrlName ):
+        """Get the control (not its model) for a particular control name.
+        The control returned includes the service com.sun.star.awt.UnoControl,
+         and another control-specific service which inherits from it.
+        """
+        oControl = self.oDialogControl.getControl( cCtrlName )
+        return oControl
+
+    def getControlModel( self, cCtrlName ):
+        """Get the control model (not the control) for a particular control name.
+        The model returned includes the service UnoControlModel,
+         and another control-specific service which inherits from it.
+        """
+        oControl = self.getControl( cCtrlName )
+        oControlModel = oControl.getModel()
+        return oControlModel
+    #---------------------------------------------------
+    #    com.sun.star.awt.UnoControlImageControlModel
+    #---------------------------------------------------
+    def addImageControl( self, cCtrlName, nPositionX, nPositionY, nWidth, nHeight,
+                        sImagePath="",
+                        itemListenerProc=None,
+                        actionListenerProc=None ):
+
+        mod = self.addControl( "com.sun.star.awt.UnoControlImageControlModel",
+                         cCtrlName, nPositionX, nPositionY, nWidth, nHeight, sImagePath=sImagePath)
+
+        if itemListenerProc != None:
+            self.addItemListenerProc( cCtrlName, itemListenerProc )
+        if actionListenerProc != None:
+            self.addActionListenerProc( cCtrlName, actionListenerProc )
+
+
+    #--------------------------------------------------
+    #   Adjust properties of control models
+    #--------------------------------------------------
+
+    def setControlModelProperty( self, cCtrlName, cPropertyName, uValue ):
+        """Set the value of a property of a control's model.
+        This affects the control model, not the control.
+        """
+        oControlModel = self.getControlModel( cCtrlName )
+        oControlModel.setPropertyValue( cPropertyName, uValue )
+
+    def getControlModelProperty( self, cCtrlName, cPropertyName ):
+        """Get the value of a property of a control's model.
+        This affects the control model, not the control.
+        """
+        oControlModel = self.getControlModel( cCtrlName )
+        return oControlModel.getPropertyValue( cPropertyName )
+
+    #--------------------------------------------------
+    #   Sugar coated property adjustments to control models.
+    #--------------------------------------------------
+
+    def setEnabled( self, cCtrlName, bEnabled=True ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "Enabled", bEnabled )
+
+    def getEnabled( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+
+        return self.getControlModelProperty( cCtrlName, "Enabled" )
+
+    def setState( self, cCtrlName, nState ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "State", nState )
+
+    def getState( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "State" )
+
+    def setLabel( self, cCtrlName, cLabel ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "Label", cLabel )
+
+    def getLabel( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "Label" )
+
+    def setHelpText( self, cCtrlName, cHelpText ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        self.setControlModelProperty( cCtrlName, "HelpText", cHelpText )
+
+    def getHelpText( self, cCtrlName ):
+        """Supported controls...
+            UnoControlButtonModel
+            UnoControlCheckBoxModel
+        """
+        return self.getControlModelProperty( cCtrlName, "HelpText" )
+
+
+    #--------------------------------------------------
+    #   Adjust controls (not models)
+    #--------------------------------------------------
+
+    # The following apply to all controls which are a
+    #   com.sun.star.awt.UnoControl
+
+    def setDesignMode( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        oControl.setDesignMode( bDesignMode )
+
+    def isDesignMode( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        return oControl.isDesignMode()
+
+    def isTransparent( self, cCtrlName, bDesignMode=True ):
+        oControl = self.getControl( cCtrlName )
+        return oControl.isTransparent()
+
+
+    # The following apply to all controls which are a
+    #   com.sun.star.awt.UnoControlDialogElement
+
+    def setPosition( self, cCtrlName, nPositionX, nPositionY ):
+        self.setControlModelProperty( cCtrlName, "PositionX", nPositionX )
+        self.setControlModelProperty( cCtrlName, "PositionY", nPositionY )
+    def setPositionX( self, cCtrlName, nPositionX ):
+        self.setControlModelProperty( cCtrlName, "PositionX", nPositionX )
+    def setPositionY( self, cCtrlName, nPositionY ):
+        self.setControlModelProperty( cCtrlName, "PositionY", nPositionY )
+    def getPositionX( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "PositionX" )
+    def getPositionY( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "PositionY" )
+
+    def setSize( self, cCtrlName, nWidth, nHeight ):
+        self.setControlModelProperty( cCtrlName, "Width", nWidth )
+        self.setControlModelProperty( cCtrlName, "Height", nHeight )
+    def setWidth( self, cCtrlName, nWidth ):
+        self.setControlModelProperty( cCtrlName, "Width", nWidth )
+    def setHeight( self, cCtrlName, nHeight ):
+        self.setControlModelProperty( cCtrlName, "Height", nHeight )
+    def getWidth( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Width" )
+    def getHeight( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Height" )
+
+    def setTabIndex( self, cCtrlName, nWidth, nTabIndex ):
+        self.setControlModelProperty( cCtrlName, "TabIndex", nTabIndex )
+    def getTabIndex( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "TabIndex" )
+
+    def setStep( self, cCtrlName, nWidth, nStep ):
+        self.setControlModelProperty( cCtrlName, "Step", nStep )
+    def getStep( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Step" )
+
+    def setTag( self, cCtrlName, nWidth, cTag ):
+        self.setControlModelProperty( cCtrlName, "Tag", cTag )
+    def getTag( self, cCtrlName ):
+        return self.getControlModelProperty( cCtrlName, "Tag" )
+
+    def setEchoChar(self, cCtrlName , cVal):
+        self.setControlModelProperty(cCtrlName, "EchoChar", cVal)
+    def getEchoChar(self, cCtrlName):
+        return self.setControlModelProperty(cCtrlName, "EchoChar")
+
+    #--------------------------------------------------
+    #   Add listeners to controls.
+    #--------------------------------------------------
+
+    # This applies to...
+    #   UnoControlButton
+    def addActionListenerProc( self, cCtrlName, actionListenerProc ):
+        """Create an com.sun.star.awt.XActionListener object and add it to a control.
+        A listener object is created which will call the python procedure actionListenerProc.
+        The actionListenerProc can be either a method or a global procedure.
+        The following controls support XActionListener:
+            UnoControlButton
+        """
+        oControl = self.getControl( cCtrlName )
+        oActionListener = ActionListenerProcAdapter( actionListenerProc )
+        oControl.addActionListener( oActionListener )
+
+    # This applies to...
+    #   UnoControlCheckBox
+    def addItemListenerProc( self, cCtrlName, itemListenerProc ):
+        """Create an com.sun.star.awt.XItemListener object and add it to a control.
+        A listener object is created which will call the python procedure itemListenerProc.
+        The itemListenerProc can be either a method or a global procedure.
+        The following controls support XActionListener:
+            UnoControlCheckBox
+        """
+        oControl = self.getControl( cCtrlName )
+        oActionListener = ItemListenerProcAdapter( itemListenerProc )
+        oControl.addItemListener( oActionListener )
+
+    #--------------------------------------------------
+    #   Display the modal dialog.
+    #--------------------------------------------------
+
+    def doModalDialog( self, sObjName,sValue):
+        """Display the dialog as a modal dialog."""
+        self.oDialogControl.setVisible( True )
+        if not sValue==None:
+            self.selectListBoxItem( sObjName, sValue, True )
+        self.oDialogControl.execute()
+
+    def endExecute( self ):
+        """Call this from within one of the listeners to end the modal dialog.
+        For instance, the listener on your OK or Cancel button would call this to end the dialog.
+        """
+        self.oDialogControl.endExecute()
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
new file mode 100644
index 00000000000..0e47ab627fb
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import logging
+import tempfile
+LOG_DEBUG='debug'
+LOG_INFO='info'
+LOG_WARNING='warn'
+LOG_ERROR='error'
+LOG_CRITICAL='critical'
+
+def log_detail(self):
+    import os
+    logger = logging.getLogger()
+    logfile_name = os.path.join(tempfile.gettempdir(), "openerp_report_designer.log")
+    hdlr = logging.FileHandler(logfile_name)
+    formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
+    hdlr.setFormatter(formatter)
+    logger.addHandler(hdlr)
+    logger.setLevel(logging.INFO)
+
+class Logger(object):
+    def log_write(self,name,level,msg):
+        log = logging.getLogger(name)
+        getattr(log,level)(msg)
+
+    def shutdown(self):
+        logging.shutdown()
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py
new file mode 100644
index 00000000000..446d00094b4
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py
@@ -0,0 +1,204 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+import socket
+import xmlrpclib
+#import tiny_socket
+import re
+
+class RPCGateway(object):
+    def __init__(self, host, port, protocol):
+
+        self.protocol = protocol
+        self.host = host
+        self.port = port
+
+    def get_url(self):
+
+        """Get the url
+        """
+        return "%s://%s:%s/"%(self.protocol, self.host, self.port)
+
+    def listdb(self):
+        """Get the list of databases.
+        """
+        pass
+
+    def login(self, db, user, password):
+        pass
+
+    def execute(self, obj, method, *args):
+        pass
+
+
+
+class RPCSession(object):
+    def __init__(self,url):
+
+        m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$', url or '')
+
+        host = m.group(2)
+        port = m.group(3)
+        protocol = m.group(1)
+        if not m:
+            return -1
+        if protocol == 'http://' or protocol == 'http://':
+            self.gateway = XMLRPCGateway(host, port, 'http')
+        elif protocol == 'socket://':
+
+            self.gateway = NETRPCGateway(host, port)
+
+    def listdb(self):
+        return self.gateway.listdb()
+
+    def login(self, db, user, password):
+
+        if password is None:
+            return -1
+
+        uid = self.gateway.login(db, user or '', password or '')
+
+        if uid <= 0:
+            return -1
+
+        self.uid = uid
+        self.db = db
+        self.password = password
+        self.open = True
+        return uid
+
+
+    def execute(self, obj, method, *args):
+        try:
+            result = self.gateway.execute(obj, method, *args)
+            return self.__convert(result)
+        except Exception,e:
+          import traceback,sys
+          info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+
+    def __convert(self, result):
+
+        if isinstance(result, basestring):
+            # try to convert into unicode string
+            try:
+                return ustr(result)
+            except Exception, e:
+                return result
+
+        elif isinstance(result, list):
+            return [self.__convert(val) for val in result]
+
+        elif isinstance(result, tuple):
+            return tuple([self.__convert(val) for val in result])
+
+        elif isinstance(result, dict):
+            newres = {}
+            for key, val in result.items():
+                newres[key] = self.__convert(val)
+
+            return newres
+
+        else:
+            return result
+
+class XMLRPCGateway(RPCGateway):
+    """XML-RPC implementation.
+    """
+    def __init__(self, host, port, protocol='http'):
+
+        super(XMLRPCGateway, self).__init__(host, port, protocol)
+        global rpc_url
+        rpc_url =  self.get_url() + 'xmlrpc/'
+
+    def listdb(self):
+        global rpc_url
+        sock = xmlrpclib.ServerProxy(rpc_url + 'db')
+        try:
+            return sock.list()
+        except Exception, e:
+            return -1
+
+    def login(self, db, user, password):
+
+        global rpc_url
+
+        sock = xmlrpclib.ServerProxy(rpc_url + 'common')
+
+        try:
+            res = sock.login(db, user, password)
+        except Exception, e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+            return -1
+
+        return res
+
+    def execute(self, sDatabase,UID,sPassword,obj, method, *args):
+        global rpc_url
+
+        sock = xmlrpclib.ServerProxy(rpc_url + 'object')
+
+        return sock.execute(sDatabase,UID,sPassword, obj ,method,*args)
+
+
+
+class NETRPCGateway(RPCGateway):
+    def __init__(self, host, port):
+
+        super(NETRPCGateway, self).__init__(host, port, 'socket')
+
+    def listdb(self):
+        sock = mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            sock.mysend(('db', 'list'))
+            res = sock.myreceive()
+            sock.disconnect()
+            return res
+        except Exception, e:
+            return -1
+
+    def login(self, db, user, password):
+        sock =  mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            sock.mysend(('common', 'login', db, user, password))
+            res = sock.myreceive()
+            sock.disconnect()
+        except Exception, e:
+            return -1
+        return res
+    def execute(self,obj, method, *args):
+        sock = mysocket()
+        try:
+            sock.connect(self.host, self.port)
+            data=(('object', 'execute',obj,method,)+args)
+            sock.mysend(data)
+            res=sock.myreceive()
+            sock.disconnect()
+            return res
+
+        except Exception,e:
+            import traceback,sys
+            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py
new file mode 100644
index 00000000000..38ed0073d68
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py
@@ -0,0 +1,93 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import socket
+import cPickle
+import cStringIO
+import marshal
+
+class Myexception(Exception):
+    def __init__(self, faultCode, faultString):
+        self.faultCode = faultCode
+        self.faultString = faultString
+        self.args = (faultCode, faultString)
+
+class mysocket:
+    def __init__(self, sock=None):
+        if sock is None:
+            self.sock = socket.socket(
+            socket.AF_INET, socket.SOCK_STREAM)
+        else:
+            self.sock = sock
+        self.sock.settimeout(120)
+    def connect(self, host, port=False):
+        if not port:
+            protocol, buf = host.split('//')
+            host, port = buf.split(':')
+        self.sock.connect((host, int(port)))
+    def disconnect(self):
+        self.sock.shutdown(socket.SHUT_RDWR)
+        self.sock.close()
+    def mysend(self, msg, exception=False, traceback=None):
+
+        msg = cPickle.dumps([msg,traceback])
+        size = len(msg)
+        self.sock.send('%8d' % size)
+        self.sock.send(exception and "1" or "0")
+        totalsent = 0
+        while totalsent < size:
+            sent = self.sock.send(msg[totalsent:])
+            if sent == 0:
+                raise RuntimeError, "socket connection broken"
+            totalsent = totalsent + sent
+    def myreceive(self):
+        buf=''
+        while len(buf) < 8:
+            chunk = self.sock.recv(8 - len(buf))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            buf += chunk
+        size = int(buf)
+        buf = self.sock.recv(1)
+        if buf != "0":
+            exception = buf
+        else:
+            exception = False
+        msg = ''
+        while len(msg) < size:
+            chunk = self.sock.recv(size-len(msg))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            msg = msg + chunk
+        msgio = cStringIO.StringIO(msg)
+        unpickler = cPickle.Unpickler(msgio)
+        unpickler.find_global = None
+        res = unpickler.load()
+
+        if isinstance(res[0],Exception):
+            if exception:
+                raise Myexception(str(res[0]), str(res[1]))
+            raise res[0]
+        else:
+            return res[0]
+
+
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py
new file mode 100644
index 00000000000..e5fa0d9f9e7
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import urllib
+
+def get_absolute_file_path( url ):
+	url_unquoted = urllib.unquote(url)
+	return os.name == 'nt' and url_unquoted[1:] or url_unquoted 
+
+# This function reads the content of a file and return it to the caller
+def read_data_from_file( filename ):
+	fp = file( filename, "rb" )
+	data = fp.read()
+	fp.close()
+	return data
+
+# This function writes the content to a file
+def write_data_to_file( filename, data ):
+	fp = file( filename, 'wb' )
+	fp.write( data )
+	fp.close()
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
new file mode 100644
index 00000000000..730d5b3d33b
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
@@ -0,0 +1,138 @@
+##########################################################################
+#
+# Portions of this file are under the following copyright and license:
+#
+#
+#   Copyright (c) 2003-2004 Danny Brewer 
+#   d29583@groovegarden.com 
+# 
+#   This library is free software; you can redistribute it and/or 
+#   modify it under the terms of the GNU Lesser General Public 
+#   License as published by the Free Software Foundation; either 
+#   version 2.1 of the License, or (at your option) any later version. 
+# 
+#   This library is distributed in the hope that it will be useful, 
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#   Lesser General Public License for more details. 
+# 
+#   You should have received a copy of the GNU Lesser General Public 
+#   License along with this library; if not, write to the Free Software 
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+#   See:  http://www.gnu.org/licenses/lgpl.html 
+#
+# 
+# and other portions are under the following copyright and license:
+#
+#
+#    OpenERP, Open Source Management Solution>..
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+##############################################################################
+
+import re
+import uno
+import string
+import unohelper
+import xmlrpclib
+from com.sun.star.task import XJobExecutor
+if __name__<>"package":
+    from lib.gui import *
+    from Expression import Expression
+    from Fields import Fields
+    from Repeatln import RepeatIn
+    from lib.error import *
+    database="test"
+    uid = 3
+
+class modify(unohelper.Base, XJobExecutor ):
+    def __init__( self, ctx ):
+        self.ctx     = ctx
+        self.module  = "openerp_report"
+        self.version = "0.1"
+
+        # Variable Declaration
+        desktop = getDesktop()
+        doc = desktop.getCurrentComponent()
+        docinfo = doc.getDocumentInfo()
+        self.oVC = doc.CurrentController.getViewCursor()
+        if not docinfo.getUserFieldValue(0)=="":
+            self.sMyHost= docinfo.getUserFieldValue(0)
+        else:
+            ErrorDialog(
+		"Please insert user define field Field-1",
+		"Just go to File->Properties->User Define \n"
+		"Field-1 Eg. http://localhost:8069"
+	    )
+            exit(1)
+
+        # Check weather Field-4 is available or not otherwise exit from application
+        if not docinfo.getUserFieldValue(3) == "" and not docinfo.getUserFieldValue(0)=="":
+            if self.oVC.TextField:
+                self.oCurObj=self.oVC.TextField
+		item = self.oCurObj.Items[0]
+
+		kind, group1, group2 = self.getOperation(self.oCurObj.Items[1] )
+
+		start_group1 = group1[:group1.find(".")]
+		stop_group1 = group1[group1.find("."):].replace(".", "/")
+
+                if kind == "field":
+		    Fields( start_group1, stop_group1, item, True )
+                elif kind == "expression":
+                    Expression( group1, item, True )
+                elif kind == "repeatIn":
+		    RepeatIn( start_group1, group2, stop_group1, item, True )
+            else:
+                ErrorDialog(
+		    "Please place your cursor at begaining of field \n"
+		    "which you want to modify",""
+		)
+
+        else:
+            ErrorDialog(
+		"Please insert user define field Field-1 or Field-4",
+		"Just go to File->Properties->User Define \n"
+		"Field-1 Eg. http://localhost:8069 \n"
+		"OR \n"
+		"Field-4 Eg. account.invoice"
+	    )
+            exit(1)
+
+    def getOperation(self, str):
+        #str = "[[ RepeatIn(objects, 'variable') ]]" #repeatIn
+        #str = "[[ saleorder.partner_id.name ]]" # field
+        #str = "[[ some thing complex ]]" # expression
+        method1 = lambda x: (u'repeatIn', x.group(1), x.group(2))
+        method2 = lambda x: (u'field', x.group(1), None)
+        method3 = lambda x: (u'expression', x.group(1), None)
+        regexes = [
+	    ('\\[\\[ *repeatIn\\( *(.+)*, *\'([a-zA-Z0-9_]+)\' *\\) *\\]\\]', method1),
+	    ('\\[\\[ *([a-zA-Z0-9_\.]+) *\\]\\]', method2),
+	    ('\\[\\[ *(.+) *\\]\\]', method3)
+        ]
+        for (rule,method) in regexes:
+	    res = re.match(rule, str)
+	    if res:
+		return method(res)
+
+if __name__<>"package":
+    modify(None)
+else:
+    g_ImplementationHelper.addImplementation( modify, "org.openoffice.openerp.report.modify", ("com.sun.star.task.Job",),)
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/test/test.txt b/addons/base_report_designer/plugin/openerp_report_designer/test/test.txt
new file mode 100644
index 00000000000..2d054ca35dc
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/test/test.txt
@@ -0,0 +1,57 @@
+Test Case of OpenERP Report Desinger Plugin into OpenOffice Writer
+====================================================================
+1. Connecting to the OpenERP Server
+-> OpenERP server ok
+-> OpenERP server not running
+-> Warning if base_report_designer not installed.
+
+2. Creating Report
+-> List of objects in sorted order by name
+
+3. Existing Report
+-> Exception if open non modifiable report (no sxw)
+-> List of exisiting report in sorted order
+
+4. Fields to Brackets
+-> Find the data correctly.
+-> Data for things like [[ '%.2f' % o.amount ]] is completed.
+-> Test on normal Sale Order
+-> Test on normal Purchase Order
+
+5. Modifying report
+-> Adding field if no initial repeatIn
+-> Adding fields (demo data correct)
+-> Adding loop
+-> Adding field within a loop
+-> Adding loop in a section
+-> Adding loop in a table
+-> Adding a loop in a table within a loop in a section
+-> Adding fields within a loop within a loop
+-> check context correct or not
+
+6. Modifying a field
+-> modify a field.
+-> modify a loop.
+-> modify an expression corretly
+-> Display correct data in all these cases
+
+7. Sending Report
+-> send in .SXW if user forgot to save as sxw
+-> Select with/without header
+-> Select between sxw/pdf
+-> Save as .odt and send to the server (check it is converted to sxw or warning)
+
+8. Printing Report into OpenERP clients
+-> Print report 
+-> check images appears in report correctly or not.
+-> check report With or Without Header.
+-> check SXW working or not.
+-> check PDF working or not
+
+9. Print as SXW
+-> Check Send as attachment working or not and also check it is Attached to the right document.
+
+10. Miscelleanous
+-> check the translation tag working.
+-> Save to RML. 
+
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py b/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py
new file mode 100644
index 00000000000..8afd773b3fb
--- /dev/null
+++ b/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py
@@ -0,0 +1,32 @@
+#
+# Use this module to retrive the fields you need according to the type
+# of the OpenOffice operation:
+#  * Insert a Field
+#  * Insert a RepeatIn
+#
+
+import xmlrpclib
+import time
+
+sock = xmlrpclib.ServerProxy('http://localhost:8069/xmlrpc/object')
+
+def get(object, level=3, ending=[], ending_excl=[], recur=[], root=''):
+	res = sock.execute('terp', 3, 'admin', 'account.invoice', 'fields_get')
+	key = res.keys()
+	key.sort()
+	for k in key:
+		if (not ending or res[k]['type'] in ending) and ((not ending_excl) or not (res[k]['type'] in ending_excl)):
+			print root+'/'+k
+
+		if res[k]['type'] in recur:
+			print root+'/'+k
+		if (res[k]['type'] in recur) and (level>0):
+			get(res[k]['relation'], level-1, ending, ending_excl, recur, root+'/'+k)
+
+print 'Field selection for a rields', '='*40
+get('account.invoice', level=0, ending_excl=['one2many','many2one','many2many','reference'], recur=['many2one'])
+
+print
+print 'Field selection for a repeatIn', '='*40
+get('account.invoice', level=0, ending=['one2many','many2many'], recur=['many2one'])
+
diff --git a/addons/base_report_designer/base_report_data.xml b/addons/base_report_designer/security/base_report_security.xml
similarity index 100%
rename from addons/base_report_designer/base_report_data.xml
rename to addons/base_report_designer/security/base_report_security.xml
diff --git a/addons/base_report_designer/wizard/__init__.py b/addons/base_report_designer/wizard/__init__.py
index f80f87da1d5..d2b008e8c3a 100644
--- a/addons/base_report_designer/wizard/__init__.py
+++ b/addons/base_report_designer/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
new file mode 100644
index 00000000000..504f0ab2ba1
--- /dev/null
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+     
+        <record id="view_base_report_sxw" model="ir.ui.view">
+            <field name="name">Base Report sxw</field>
+            <field name="model">base.report.sxw</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Get a report">
+	            <separator string="Select your report" colspan="4"/>
+	            <field name="report_id"/>
+	             <separator string="" colspan="4"/>
+	               <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	               <button name="get_report" string="Continue" type="object" icon="gtk-ok"/>
+            </form>
+            </field>
+       </record>
+
+        <record id="action_view_base_report_sxw" model="ir.actions.act_window">
+            <field name="name">Base Report sxw</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.report.sxw</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <record id="view_base_report_file_sxw" model="ir.ui.view">
+            <field name="name">Base Report File sxw</field>
+            <field name="model">base.report.file.sxw</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Get a report">
+            <separator string="The .SXW report" colspan="4"/>
+            <field name="report_id"/>
+            <newline/>
+            <field name="file_sxw"/>
+            <newline/>
+            <field name="file_sxw_upload"/>
+            <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 OpenERP SA OpenOffice package to modify it.\nOnce it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
+              <separator string="" colspan="4"/>
+              <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+              <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward"/>
+
+            </form>
+            </field>
+       </record>
+        <record id="view_base_report_file_rml" model="ir.ui.view">
+            <field name="name">Base Report File sxw</field>
+            <field name="model">base.report.rml.save</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Save RML FIle">
+	            <separator string="The RML report" colspan="4"/>
+	            <field name="file_rml"/>
+	            <newline/>
+	             <separator string="" colspan="4"/>
+               <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+            </form>
+            </field>
+       </record>
+
+
+    </data>
+</openerp>
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index 1af72086a24..e65a386a3f8 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -2,23 +2,23 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 import time
 import wizard
 import osv
@@ -27,246 +27,125 @@ import urllib
 import base64
 import tools
 from tools.translate import _
+from osv import osv, fields
 
-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>'''
+class base_report_sxw(osv.osv_memory):
+    """Base Report sxw """
+    _name = 'base.report.sxw'
 
-intro_fields = {
-    'text': {
-        'string': 'Introduction',
-        'type': 'text',
-        'readonly': True,
-        'default': lambda *args: """This system must be used with the OpenERP SA OpenOffice plugin. If you
-did not installed yet, you can find this package on:
-    http://www.openerp.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 OpenERP 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 OpenERP SA OpenOffice package to modify it.\nOnce it is modified, re-upload it in OpenERP 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,
+    _columns = {
+        'report_id': fields.many2one('ir.actions.report.xml', "Report", required=True,domain=[('report_sxw_content','<>',False)],),
     }
-}
 
 
-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>'''
+    def get_report(self, cr, uid, ids, context):
+        data=self.read(cr,uid,ids)[0]
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'base_report_designer', 'view_base_report_file_sxw')
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'base.report.file.sxw',
+            'views': [(id2, 'form')],
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
 
-send_form_result_fields = {
-}
+base_report_sxw()
 
+class base_report_file_sxw(osv.osv_memory):
+    """Base Report File sxw """
+    _name = 'base.report.file.sxw'
 
-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>'''
+    def default_get(self, cr, uid, fields, context=None):
+        """
+             To get default values for the object.
 
-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
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values
+             @param context: A standard dictionary
+
+             @return: A dictionary which of fields with values.
+
+        """
+
+        res = super(base_report_file_sxw, self).default_get(cr, uid, fields, context=context)
+        report_id1 = self.pool.get('base.report.sxw').search(cr,uid,[])
+        data=self.pool.get('base.report.sxw').read(cr,uid,report_id1)[0]
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
+        if not context:
+            context={}
+        if 'report_id' in fields:
+            res['report_id'] = data['report_id']
+            res['file_sxw'] = base64.encodestring(report.report_sxw_content)
+        return res
+
+    _columns = {
+        'report_id': fields.many2one('ir.actions.report.xml', "Report", readonly=True),
+        'file_sxw':fields.binary('Your .SXW file',readonly=True),
+        'file_sxw_upload':fields.binary('Your .SXW file',required=True)
     }
-}
 
-rml_form_arch = '''<?xml version="1.0"?>
-<form string="Save As" colspan="4">
-    <field name="file_rml"/>
-</form>
-'''
-
-rml_form_fields = {
-       'file_rml': {
-        'string': 'Save As',
-        'type': 'binary',
-    }
-}
-
-save_rml_arch = '''<?xml version="1.0"?>
-<form string="File saved">
-    <separator string="File saved" colspan="4"/>
-    <label string="Your .rml file is saved and report has been modified."/>
-</form>'''
-
-def _get_default(obj, cursor, user, data, context):
-    return {}
-
-
-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
+    def upload_report(self, cr, uid, ids, context):
+        from base_report_designer import  openerp_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')
-        newrmlcontent = str(tiny_sxw2rml.sxw2rml(sxwval, xsl=fp.read()))
-        report = pool.get('ir.actions.report.xml').write(cr, uid, [data['form']['report_id']], {
-            'report_sxw_content': base64.decodestring(data['form']['file_sxw']),
+        data=self.read(cr,uid,ids)[0]
+        sxwval = StringIO.StringIO(base64.decodestring(data['file_sxw_upload']))
+        fp = tools.file_open('normalized_oo2rml.xsl',subdir='addons/base_report_designer/openerp_sxw2rml')
+        newrmlcontent = str(openerp_sxw2rml.sxw2rml(sxwval, xsl=fp.read()))
+        report = self.pool.get('ir.actions.report.xml').write(cr, uid, [data['report_id']], {
+            'report_sxw_content': base64.decodestring(data['file_sxw_upload']),
             'report_rml_content': newrmlcontent
         })
-        return {'file_rml': base64.encodestring(newrmlcontent)}
+        cr.commit()
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'base_report_designer', 'view_base_report_file_rml')
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'base.report.rml.save',
+            'views': [(id2, 'form')],
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+base_report_file_sxw()
 
-    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)
-        try:
-            return {'file_sxw': base64.encodestring(report.report_sxw_content)}
-        except:
-            raise wizard.except_wizard(_('Error'), _('Report does not contain the sxw content!'))
+class base_report_rml_save(osv.osv_memory):
+    """Base Report file Save"""
+    _name = 'base.report.rml.save'
+    def default_get(self, cr, uid, fields, context=None):
+        """
+             To get default values for the object.
 
-    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'),
-                    ('save_rml_to', 'Update the report'),
-                ]
-            }
-        },
-        'save_rml_to': {
-            'actions': [_upload_report],
-            'result': {
-                    'type': 'form',
-                    'arch': rml_form_arch,
-                    'fields': rml_form_fields,
-                    'state': [
-                            ('save_rml', 'Save rml'),
-                            ('send_form_result','Skip'),
-                        ]
-            }
-        },
-        'send_form_result': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': send_form_result_arch,
-                'fields': send_form_result_fields,
-                'state': [
-                    ('end','Close'),
-                ]
-            }
-        },
-        'save_rml': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': save_rml_arch, 'fields': {},
-                'state': [
-                    ('end','Close'),
-                ]
-            }
-        },
-    }
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values
+             @param context: A standard dictionary
+             @return: A dictionary which of fields with values.
 
-base_report_designer_modify('base_report_designer.modify')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+        """
+        res = super(base_report_rml_save, self).default_get(cr, uid, fields, context=context)
+        report_id = self.pool.get('base.report.sxw').search(cr,uid,[])
+        data=self.pool.get('base.report.file.sxw').read(cr,uid,report_id)[0]
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
+        if not context:
+            context={}
+        if 'file_rml' in fields:
+            res['file_rml'] =  base64.encodestring(report.report_rml_content)
+        return res
+    _columns = {
+         'file_rml':fields.binary('Save As'),
+         }
 
+base_report_rml_save()
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index db890c2dfdf..4245f3da206 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -8,38 +8,41 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Install OpenERP Modules</attribute>
+            <attribute name="string">Install Applications</attribute>
           </form>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Select applications you want to install. If you don't think you need any of these right now, you can easily install them later.</attribute>
+          <xpath expr="//label[@string='description']" position="attributes">
+                <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
                     <attribute name='rowspan'>15</attribute>
           </xpath>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+                    <attribute name="string">Install</attribute>
+          </xpath>
           <separator string="title" position="attributes">
-            <attribute name="string">Install Generic Modules</attribute>
+            <attribute name="string">Install Applications</attribute>
           </separator>
+            
           <group colspan="8">
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <separator string="Install Specific Business Modules" colspan="4"/>
-            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
+            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <separator string="Install Specific Industry Sector Applications" colspan="4"/>
+            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
           </group>
         </data>
       </field>
     </record>
 
     <record id="action_base_setup_installer" model="ir.actions.act_window">
-      <field name="name">Base Setup Modules Installation</field>
+      <field name="name">Install Applications</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">base.setup.installer</field>
       <field name="view_id" ref="view_base_setup_installer"/>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 59543200076..8151442855b 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -1,20 +1,20 @@
 <openerp>
   <data>
     <record id="view_base_setup_company" model="ir.ui.view">
-      <field name="name">Setup company information</field>
+      <field name="name">Company Configuration</field>
       <field name="model">base.setup.company</field>
       <field name="type">form</field>
       <field name="inherit_id" ref="base.res_config_view_base"/>
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Main Company Setup</attribute>
+            <attribute name="string">Company Configuration</attribute>
           </form>
           <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Information of your company will be used to customize your documents like Invoices, Sale Orders and many more.</attribute>
+                <attribute name="string">Your company information will be used to personalize documents issued with OpenERP such as invoices, sales orders and much more.</attribute>
           </xpath>
           <xpath expr='//separator[@string="title"]' position='attributes'>
-                    <attribute name='string'>Configure Your Company</attribute>
+                    <attribute name='string'>Configure Your Company Information</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='rowspan'>25</attribute>
@@ -55,7 +55,7 @@
     </record>
 
     <record id="action_base_setup_company" model="ir.actions.act_window">
-      <field name="name">Setup company information</field>
+      <field name="name">Company Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">base.setup.company</field>
       <field name="view_id" ref="view_base_setup_company"/>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index eb111ecb943..0c8478ba57d 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -65,13 +65,12 @@ class base_setup_installer(osv.osv_memory):
                  "automatic picking lists generation and more."),
         'marketing':fields.boolean('Marketing',
             help="Helps you manage your marketing campaigns step by step."),
-        'profile_tools':fields.boolean('Miscellaneous Tools',
+        'profile_tools':fields.boolean('Extra Tools',
             help="Lets you install various interesting but non-essential tools "
                 "like Survey, Lunch and Ideas box."),
         'report_designer':fields.boolean('Advanced Reporting',
             help="Lets you install various tools to simplify and enhance "
                  "OpenERP's report creation."),
-        'thunderbird' :fields.boolean('Thunderbird'),
         # Vertical modules
         'product_expiry':fields.boolean('Food Industry',
             help="Installs a preselected set of OpenERP applications "
@@ -107,11 +106,13 @@ class base_setup_installer(osv.osv_memory):
             return ['account_voucher']
         return None
 
-    def onchange_moduleselection(self, cr, uid, ids, *args):
+    def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
+        value = {}
+        # Calculate progress
         closed, total = self.get_current_progress(cr, uid)
-
         progress = round(100. * closed / (total + len(filter(None, args))))
+        value.update({'progress':progress})
         if progress < 10.:
             progress = 10.
-        return {'value':{'progress':progress}}
+        return {'value':value}
 base_setup_installer()
diff --git a/addons/base_synchro/__init__.py b/addons/base_synchro/__init__.py
new file mode 100644
index 00000000000..c23ec3f2246
--- /dev/null
+++ b/addons/base_synchro/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import wizard
+import base_synchro_obj
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py
new file mode 100644
index 00000000000..69fcb839715
--- /dev/null
+++ b/addons/base_synchro/__openerp__.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+        "name":"Base Synchro",
+        "version":"0.1",
+        "author":"Tiny",
+        "category":"Generic Modules/Base",
+        "depends":["base"],
+        "demo_xml":[],
+        "update_xml":["base_synchro_wizard.xml","base_synchro_view.xml"],
+        "active":False,
+        "installable":True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_synchro/base_synchro_obj.py b/addons/base_synchro/base_synchro_obj.py
new file mode 100755
index 00000000000..5093c8f787e
--- /dev/null
+++ b/addons/base_synchro/base_synchro_obj.py
@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields,osv
+import tools
+import re
+import time
+
+class base_synchro_server(osv.osv):
+    '''Class to store the information regarding server'''
+    _name = "base.synchro.server"
+    _description = "Synchronized server"
+    _columns = {
+        'name': fields.char('Server name', size=64,required=True),
+        'server_url': fields.char('Server URL', size=64,required=True),
+        'server_port': fields.integer('Server Port', size=64,required=True),
+        'server_db': fields.char('Server Database', size=64,required=True),
+        'login': fields.char('User Name',size=50,required=True),
+        'password': fields.char('Password',size=64,invisible=True,required=True),
+        'obj_ids' : fields.one2many('base.synchro.obj','server_id','Models',ondelete='cascade')
+    }
+    _defaults = {
+        'server_port': lambda *args: 8069
+    }
+base_synchro_server()
+
+class base_synchro_obj(osv.osv):
+    '''Class to store the operations done by wizart'''
+    _name = "base.synchro.obj"
+    _description = "Register Class"
+    _columns = {
+        'name':fields.char('Name', size=64, select=1, required=1),
+        'domain':fields.char('Domain', size=64, select=1, required=1),
+        'server_id':fields.many2one('base.synchro.server','Server', ondelete='cascade', select=1, required=1),
+        'model_id': fields.many2one('ir.model', 'Object to synchronize',required=True),
+        'action':fields.selection([('d','Download'),('u','Upload'),('b','Both')],'Synchronisation direction', required=True),
+        'sequence': fields.integer('Sequence'),
+        'active': fields.boolean('Active'),
+        'synchronize_date':fields.datetime('Latest Synchronization', readonly=True),
+        'line_id':fields.one2many('base.synchro.obj.line','obj_id','Ids Affected',ondelete='cascade'),
+        'avoid_ids':fields.one2many('base.synchro.obj.avoid','obj_id','Fields Not Sync.'),
+    }
+    _defaults = {
+        'active': lambda *args: True,
+        'action': lambda *args: 'd',
+        'domain': lambda *args: '[]'
+    }
+    _order = 'sequence'
+    #
+    # Return a list of changes: [ (date, id) ]
+    #
+    def _get_ids(self, cr, uid, object, dt, domain=[], context={}):
+        result = []
+        if dt:
+            domain2 = domain+[('write_date','>=',dt)]
+            domain3 = domain+[('create_date','>=',dt)]
+        else:
+            domain2 = domain3 = domain
+        ids = self.pool.get(object).search(cr, uid, domain2, context=context)
+        ids += self.pool.get(object).search(cr, uid, domain3, context=context)
+        for r in self.pool.get(object).perm_read(cr, uid, ids, context, details=False):
+            result.append( (r['write_date'] or r['create_date'], r['id'], context.get('action', 'd')))
+        return result
+base_synchro_obj()
+
+class base_synchro_obj_avoid(osv.osv):
+    _name = "base.synchro.obj.avoid"
+    _description = "Fields to not synchronize"
+    _columns = {
+        'name':fields.char('Field Name', size=64, select=1, required=1),
+        'obj_id':fields.many2one('base.synchro.obj', 'Object', required=1,ondelete='cascade'),
+    }
+base_synchro_obj_avoid()
+
+
+class base_synchro_obj_line(osv.osv):
+    '''Class to store the operations done by wizard'''
+    _name = "base.synchro.obj.line"
+    _description = "Synchronized instances"
+    _columns = {
+        'name': fields.datetime('Date', required=True),
+        'obj_id': fields.many2one('base.synchro.obj', 'Object', ondelete='cascade', select=True),
+        'local_id': fields.integer('Local Id',readonly=True),
+        'remote_id':fields.integer('Remote Id',readonly=True),
+    }
+    _defaults = {
+        'name': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S')
+    }
+base_synchro_obj_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml
new file mode 100755
index 00000000000..97995106070
--- /dev/null
+++ b/addons/base_synchro/base_synchro_view.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_transfer_line_tree" model="ir.ui.view">
+            <field name="name">base.synchro.obj.line.tree</field>
+            <field name="model">base.synchro.obj.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Transfered Ids Details">
+                    <field name="name" select="1"/>
+                    <field name="obj_id" select="1"/>
+                    <field name="local_id" select="2"/>
+                    <field name="remote_id" select="2"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_transfer_line_form" model="ir.ui.view">
+            <field name="name">base.synchro.obj.line.form</field>
+            <field name="model">base.synchro.obj.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Transfered Ids Details">
+                    <field name="name" select="1"/>
+                    <field name="obj_id" select="1"/>
+                    <field name="local_id" readonly="1" select="2"/>
+                    <field name="remote_id" readonly="1" select="2"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_base_synchro_obj_line_tree" model="ir.actions.act_window">
+            <field name="name">Synchronized instances</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.synchro.obj.line</field>
+            <field name="view_type">form</field>
+        </record>
+        <menuitem id="next_id_63" name="History"  groups="base.group_extended" parent="base_synchro.next_id_62"/><menuitem action="action_base_synchro_obj_line_tree" id="menu_action_base_synchro_obj_line_tree" parent="base_synchro.next_id_63"/>
+
+<!--view_base_synchro_obj starts-->
+
+        <record id="view_transfer_form" model="ir.ui.view">
+            <field name="name">base.synchro.obj.form</field>
+            <field name="model">base.synchro.obj</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Transfer Details">
+                    <field name="name" select="1"/>
+                    <field name="active" select="2"/>
+                    <field name="server_id" select="2"/>
+                    <field name="model_id" select="1"/>
+                    <field name="action"/>
+                    <field name="sequence"/>
+                    <field colspan="4" name="domain"/>
+                    <field name="synchronize_date"/>
+                    <newline/>
+                    <field name="avoid_ids" colspan="4">
+                        <tree string="Fields" editable="bottom">
+                            <field name="name"/>
+                        </tree>
+                    </field>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_regclass_tree" model="ir.ui.view">
+            <field name="name">base.synchro.obj.tree</field>
+            <field name="model">base.synchro.obj</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Synchronized objects">
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="model_id"/>
+                    <field name="server_id"/>
+                    <field name="action"/>
+                    <field name="synchronize_date"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_transfer_tree" model="ir.actions.act_window">
+            <field name="name">Synchronized objects</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.synchro.obj</field>
+            <field name="view_type">form</field>
+        </record>
+
+        <menuitem action="action_transfer_tree" id="transfer_menu_id" parent="base_synchro.next_id_63"/>
+
+
+<!--view_base_synchro_obj starts-->
+
+<!--view_base_synchro_server starts -->
+
+        <record id="view_base_synchro_server_tree" model="ir.ui.view">
+            <field name="name">base.synchro.server.tree</field>
+            <field name="model">base.synchro.server</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Synchronized server">
+                    <field name="name"/>
+                    <field name="server_url"/>
+                    <field name="server_port"/>
+                    <field name="server_db"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_base_synchro_server_form" model="ir.ui.view">
+            <field name="name">base.synchro.server.form</field>
+            <field name="model">base.synchro.server</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Synchronized server">
+                    <field name="name" select="1"/>
+                    <newline/>
+                    <field name="server_url" select="2"/>
+                    <newline/>
+                    <field name="server_port"/>
+                    <field name="server_db"/>
+                    <newline/>
+                    <field name="login" select="1"/>
+                    <field name="password"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_base_synchro_server_tree" model="ir.actions.act_window">
+            <field name="name">Synchronized Servers</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.synchro.server</field>
+            <field name="view_type">form</field>
+        </record>
+
+        <menuitem action="action_base_synchro_server_tree" id="synchro_server_tree_menu_id" parent="base_synchro.next_id_63"/>
+
+
+
+<!--view_base_synchro_server end -->
+
+
+    </data>
+</openerp>
diff --git a/addons/base_synchro/base_synchro_wizard.xml b/addons/base_synchro/base_synchro_wizard.xml
new file mode 100644
index 00000000000..b26b3bbae2b
--- /dev/null
+++ b/addons/base_synchro/base_synchro_wizard.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<wizard id="wizard_cost_account_synchro" model="account.analytic.account" name="account.analytic.account.transfer" string="Synchronize objects"/>
+		<menuitem id="next_id_62" name="Synchronization" parent="base.menu_administration"/><menuitem action="wizard_cost_account_synchro" id="menu_wizard_cost_account_synchro" parent="base_synchro.next_id_62" type="wizard"/>
+
+	</data>
+</openerp>
diff --git a/addons/base_synchro/wizard/__init__.py b/addons/base_synchro/wizard/__init__.py
new file mode 100644
index 00000000000..7ff450acd76
--- /dev/null
+++ b/addons/base_synchro/wizard/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import base_synchro
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py
new file mode 100644
index 00000000000..3a394d4ba3b
--- /dev/null
+++ b/addons/base_synchro/wizard/base_synchro.py
@@ -0,0 +1,279 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import wizard
+import osv
+from datetime import date
+import time
+import pooler
+import xmlrpclib
+import re
+import tools
+import threading
+
+acc_synchro_form = '''<?xml version="1.0"?>
+<form string="Transfer Data To Server">
+    <field name="server_url" colspan="4"/>
+    <newline/>
+    <separator string="Control" colspan="4"/>
+    <field name="user_id"/>
+    <newline/>
+</form>'''
+
+acc_synchro_fields = {
+    'server_url': {'string':'Server URL', 'type':'many2one', 'relation':'base.synchro.server','required':True},
+    'user_id': {'string':'Send Result To', 'type':'many2one', 'relation':'res.users', 'default': lambda uid,data,state: uid},
+}
+
+finish_form ='''<?xml version="1.0"?>
+<form string="Synchronization Complited!">
+    <label string="The synchronisation has been started.\nYou will receive a request when it's done." colspan="4"/>
+</form>
+'''
+
+class RPCProxyOne(object):
+    def __init__(self, server, ressource):
+        self.server = server
+        local_url = 'http://%s:%d/xmlrpc/common'%(server.server_url,server.server_port)
+        rpc = xmlrpclib.ServerProxy(local_url)
+        self.uid = rpc.login(server.server_db, server.login, server.password)
+        local_url = 'http://%s:%d/xmlrpc/object'%(server.server_url,server.server_port)
+        self.rpc = xmlrpclib.ServerProxy(local_url)
+        self.ressource = ressource
+    def __getattr__(self, name):
+        return lambda cr, uid, *args, **kwargs: self.rpc.execute(self.server.server_db, self.uid, self.server.password, self.ressource, name, *args, **kwargs)
+
+class RPCProxy(object):
+    def __init__(self, server):
+        self.server = server
+    def get(self, ressource):
+        return RPCProxyOne(self.server, ressource)
+
+class wizard_cost_account_synchro(wizard.interface):
+    start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
+    report = []
+    report_total = 0
+    report_create = 0
+    report_write = 0
+    def _synchronize(self, cr, uid, server, object, context):
+        pool = pooler.get_pool(cr.dbname)
+        self.meta = {}
+        ids = []
+        pool1 = RPCProxy(server)
+        pool2 = pool
+        #try:
+        if object.action in ('d','b'):
+            ids = pool1.get('base.synchro.obj')._get_ids(cr, uid,
+                object.model_id.model,
+                object.synchronize_date,
+                eval(object.domain),
+                {'action':'d'}
+            )
+        if object.action in ('u','b'):
+            ids += pool2.get('base.synchro.obj')._get_ids(cr, uid,
+                object.model_id.model,
+                object.synchronize_date,
+                eval(object.domain),
+                {'action':'u'}
+            )
+        ids.sort()
+        iii = 0
+        for dt, id, action in ids:
+            print 'Process', dt, id, action
+            iii +=1
+            if action=='u':
+                pool_src = pool2
+                pool_dest = pool1
+            else:
+                pool_src = pool1
+                pool_dest = pool2
+            print 'Read', object.model_id.model, id
+            fields = False
+            if object.model_id.model=='crm.case.history':
+                fields = ['email','description','log_id']
+            value = pool_src.get(object.model_id.model).read(cr, uid, [id], fields)[0]
+            value = self._data_transform(cr, uid, pool_src, pool_dest, object.model_id.model, value, action)
+            id2 = self.get_id(cr, uid, object.id, id, action, context)
+            #
+            # Transform value
+            #
+            #tid=pool_dest.get(object.model_id.model).name_search(cr, uid, value['name'],[],'=',)
+            if not (iii%50):
+                print 'Record', iii
+
+            # Filter fields to not sync
+            for field in object.avoid_ids:
+                if field.name in value:
+                    del value[field.name]
+
+            if id2:
+                #try:
+                pool_dest.get(object.model_id.model).write(cr, uid, [id2], value)
+                #except Exception, e:
+                #self.report.append('ERROR: Unable to update record ['+str(id2)+']:'+str(value.get('name', '?')))
+                self.report_total+=1
+                self.report_write+=1
+            else:
+                print value
+                idnew = pool_dest.get(object.model_id.model).create(cr, uid, value)
+                synid = pool.get('base.synchro.obj.line').create(cr, uid, {
+                    'obj_id': object.id,
+                    'local_id': (action=='u') and id or idnew,
+                    'remote_id': (action=='d') and id or idnew
+                })
+                self.report_total+=1
+                self.report_create+=1
+        self.meta = {}
+        return 'finish'
+
+    #
+    # IN: object and ID
+    # OUT: ID of the remote object computed:
+    #        If object is synchronised, read the sync database
+    #        Otherwise, use the name_search method
+    #
+    def get_id(self, cr, uid, object_id, id, action, context={}):
+        pool = pooler.get_pool(cr.dbname)
+        field_src = (action=='u') and 'local_id' or 'remote_id'
+        field_dest = (action=='d') and 'local_id' or 'remote_id'
+        rid = pool.get('base.synchro.obj.line').search(cr, uid, [('obj_id','=',object_id), (field_src,'=',id)], context=context)
+        result = False
+        if rid:
+            result  = pool.get('base.synchro.obj.line').read(cr, uid, rid, [field_dest], context=context)[0][field_dest]
+        return result
+
+    def _relation_transform(self, cr, uid, pool_src, pool_dest, object, id, action, context={}):
+        if not id:
+            return False
+        pool = pooler.get_pool(cr.dbname)
+        cr.execute('''select o.id from base_synchro_obj o left join ir_model m on (o.model_id =m.id) where
+                m.model=%s and
+                o.active''', (object,))
+        obj = cr.fetchone()
+        result = False
+        if obj:
+            #
+            # If the object is synchronised and found, set it
+            #
+            result = self.get_id(cr, uid, obj[0], id, action, context)
+        else:
+            #
+            # If not synchronized, try to find it with name_get/name_search
+            #
+            names = pool_src.get(object).name_get(cr, uid, [id], context)[0][1]
+            res = pool_dest.get(object).name_search(cr, uid, names, [], 'like')
+            if res:
+                result = res[0][0]
+            else:
+                # LOG this in the report, better message.
+                print self.report.append('WARNING: Record "%s" on relation %s not found, set to null.' % (names,object))
+        return result
+
+    def _data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context={}):
+        self.meta.setdefault(pool_src, {})
+        if not object in self.meta[pool_src]:
+            self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid, context)
+        fields = self.meta[pool_src][object]
+
+        for f in fields:
+            if f not in data:
+                continue
+            ftype = fields[f]['type']
+
+            if ftype in ('function', 'one2many', 'one2one'):
+                del data[f]
+            elif ftype == 'many2one':
+                if data[f]:
+                    df = self._relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], data[f][0], action, context)
+                    data[f] = df
+                    if not data[f]:
+                        del data[f]
+            elif ftype == 'many2many':
+                res = map(lambda x: self._relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], x, action, context), data[f])
+                data[f] = [(6, 0, res)]
+        del data['id']
+        return data
+
+    #
+    # Find all objects that are created or modified after the synchronize_date
+    # Synchronize these obejcts
+    #
+    def _upload_download(self, db_name, uid, data, context):
+        cr = pooler.get_db(db_name).cursor()
+        start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
+        pool = pooler.get_pool(cr.dbname)
+        server = pool.get('base.synchro.server').browse(cr, uid, data['form']['server_url'], context)
+        for object in server.obj_ids:
+            dt = time.strftime('%Y-%m-%d %H:%M:%S')
+            self._synchronize(cr, uid, server, object, context)
+            if object.action=='b':
+                time.sleep(1)
+                dt = time.strftime('%Y-%m-%d %H:%M:%S')
+            pool.get('base.synchro.obj').write(cr, uid, [object.id], {'synchronize_date': dt})
+            cr.commit()
+        end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
+        if 'user_id' in data['form'] and data['form']['user_id']:
+            request = pooler.get_pool(cr.dbname).get('res.request')
+            if not self.report:
+                self.report.append('No exception.')
+            summary = '''Here is the synchronization report:
+
+Synchronization started: %s
+Synchronization finnished: %s
+
+Synchronized records: %d
+Records updated: %d
+Records created: %d
+
+Exceptions:
+            '''% (start_date,end_date,self.report_total, self.report_write,self.report_create)
+            summary += '\n'.join(self.report)
+            request.create(cr, uid, {
+                'name' : "Synchronization report",
+                'act_from' : uid,
+                'act_to' : data['form']['user_id'],
+                'body': summary,
+            })
+        cr.commit()
+        cr.close()
+        return 'finish'
+
+    def _upload_download_multi_thread(self, cr, uid, data, context):
+        threaded_synchronization = threading.Thread(target=self._upload_download, args=(cr.dbname, uid, data, context))
+        threaded_synchronization.start()
+        return 'finish'
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'form', 'arch':acc_synchro_form, 'fields':acc_synchro_fields, 'state':[('end','Cancel'),('upload_download','Synchronize')]}
+        },
+        'upload_download': {
+            'actions': [],
+            'result':{'type':'choice', 'next_state': _upload_download_multi_thread}
+        },
+        'finish': {
+            'actions': [],
+            'result':{'type':'form', 'arch':finish_form,'fields':{},'state':[('end','Ok')]}
+        },
+    }
+wizard_cost_account_synchro('account.analytic.account.transfer')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 94f3d977842..dc7fef3ca70 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -84,6 +84,7 @@ Create dashboard for CRM that includes:
         'wizard/crm_partner_to_opportunity_view.xml',
 
         'wizard/crm_send_email_view.xml',
+        'wizard/crm_add_note_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
         'wizard/crm_merge_opportunities_view.xml',
 
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 1ee2f295778..a16f749323d 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -499,10 +499,14 @@ class crm_case_section(osv.osv):
 
     _name = "crm.case.section"
     _description = "Sales Teams"
-    _order = "parent_id, name"
+    _order = "complete_name"
+
+    def get_full_name(self, cr, uid, ids, field_name, arg, context={}):
+        return  dict(self.name_get(cr, uid, ids, context))
 
     _columns = {
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
+        'complete_name': fields.function(get_full_name, method=True, type='char', size=256, readonly=True, store=True),
         'code': fields.char('Code', size=8),
         'active': fields.boolean('Active', help="If the active field is set to "\
                         "true, it will allow you to hide the sales team without removing it."),
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 6805131155a..f7df076e24d 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -96,7 +96,8 @@ this if you want the rule to send an email to the partner."),
         res_count = True
         if action.trg_max_history:
             res_count = False
-            if len(obj.message_ids) <= action.trg_max_history:
+            history_ids = filter(lambda x: x.history, obj.message_ids)
+            if len(history_ids) <= action.trg_max_history:
                 res_count = True
         ok = ok and res_count
         return ok
@@ -120,7 +121,11 @@ this if you want the rule to send an email to the partner."),
                     write['email_cc'] = obj.email_cc+','+obj.act_email_cc
             else:
                 write['email_cc'] = obj.act_email_cc
-        
+
+        # Put state change by rule in communication history
+        if hasattr(obj, 'state') and action.act_state:
+            model_obj._history(cr, uid, [obj], _(action.act_state))
+
         model_obj.write(cr, uid, [obj.id], write, context)
         emails = []
 
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 5599eeff5d9..5fad3f41a3d 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -8,15 +8,15 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">CRM Modules Configuration</attribute>
+            <attribute name="string">CRM Application Configuration</attribute>
           </form>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Configure Your CRM System</attribute>
+            <attribute name="string">Configure Your CRM Application</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP applications</attribute>
+            <attribute name="string">Enhance your CRM basic Application with additional Addons.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
               <attribute name='rowspan'>13</attribute>
@@ -49,7 +49,7 @@
     </record>
 
     <record id="action_crm_installer" model="ir.actions.act_window">
-      <field name="name">CRM Modules Installation</field>
+      <field name="name">CRM Application Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">crm.installer</field>
       <field name="view_id" ref="view_crm_installer"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6e1b851f52a..95f81e0d813 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -174,6 +174,7 @@
                     <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                         <tree string="Communication history">
                             <field name="display_text" string="History Information"/>
+                            <field name="history" invisible="1"/>
                             <button
                                 string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
                                 name="%(crm.action_crm_send_mail)d"
@@ -209,11 +210,15 @@
                             </notebook>
                         </form>
                     </field>
-                    <button colspan="2" string="Send New Email"
+                    <button string="Add New Note"
+                        name="%(crm.action_crm_add_note)d"
+                        context="{'model': 'crm.lead' }"
+                        icon="terp-document-new" type="action" />
+                    <button string="Send New Email"
                         name="%(crm.action_crm_send_mail)d"
                         context="{'mail':'new', 'model': 'crm.lead'}"
                         icon="terp-mail-message-new" type="action" />
-                    <button colspan="2" string="Forward"
+                    <button string="Forward"
                         name="%(crm_lead_forward_to_partner_act)d"
                         icon="terp-mail-forward" type="action" />
                  </page>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 0be6e34e1a6..d5a4963ed66 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -130,6 +130,7 @@
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                 <tree string="Communication history">
                                     <field name="display_text" string="History Information"/>
+                                    <field name="history" invisible="1"/>
                                     <button
                                         string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
                                         name="%(crm.action_crm_send_mail)d"
@@ -165,11 +166,15 @@
                                     </notebook>
                                 </form>
                             </field>
-                            <button colspan="2" string="Send New Email"
+                            <button string="Add New Note"
+                                name="%(crm.action_crm_add_note)d"
+                                context="{'model': 'crm.lead' }"
+                                icon="terp-document-new" type="action" />
+                            <button string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.lead'}"
                                 icon="terp-mail-message-new" type="action" />
-                            <button colspan="2" string="Forward"
+                            <button string="Forward"
                                 name="%(crm_lead_forward_to_partner_act)d"
                                 icon="terp-mail-forward" type="action" />
                         </page>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 702fd2a0c5c..1235bcc095a 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -532,6 +532,7 @@
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
 		                        <tree string="Communication history">
 		                            <field name="display_text" string="History Information"/>
+		                            <field name="history" invisible="1"/>
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
 		                                name="%(crm.action_crm_send_mail)d"
@@ -567,11 +568,15 @@
 		                            </notebook>
 		                        </form>
 		                    </field>
-                            <button colspan="2" string="Send New Email"
+		                    <button string="Add New Note"
+                                name="%(crm.action_crm_add_note)d"
+                                context="{'model': 'crm.lead' }"
+                                icon="terp-document-new" type="action" />
+                            <button string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.case.custom'}"
                                 icon="terp-mail-message-new" type="action" />
-                            <button colspan="2" string="Forward to Partner"
+                            <button string="Forward to Partner"
                                 name="%(crm_lead_forward_to_partner_act)d"
                                 icon="terp-mail-forward" type="action" />
                          </page>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 03ddbc43622..7b23d0eac3d 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -21,6 +21,7 @@
 
 import crm_send_email
 import crm_forward_to_partner
+import crm_add_note
 
 import crm_lead_to_partner
 import crm_lead_to_opportunity
diff --git a/addons/crm/wizard/crm_add_note.py b/addons/crm/wizard/crm_add_note.py
new file mode 100644
index 00000000000..9a8d4f2d4f3
--- /dev/null
+++ b/addons/crm/wizard/crm_add_note.py
@@ -0,0 +1,62 @@
+from crm import crm
+from osv import fields, osv
+from tools.translate import _
+import base64
+
+AVAILABLE_STATES = crm.AVAILABLE_STATES + [('unchanged', 'Unchanged')]
+
+
+class crm_add_note(osv.osv_memory):
+    """Adds a new note to the case."""
+    _name = 'crm.add.note'
+    _description = "Add New Note"
+
+    _columns = {
+        'body': fields.text('Note Body', required=True),
+        'state': fields.selection(AVAILABLE_STATES, string='Set New State To',
+                                  required=True), 
+        'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id'),
+    }
+
+    def action_add(self, cr, uid, ids, context=None):
+        if not context:
+            context = {}
+
+        if not context.get('active_model'):
+            raise osv.except_osv(_('Error'), _('Can not add note!'))
+
+        model = context.get('active_model')
+        case_pool = self.pool.get(model)
+
+        for obj in self.browse(cr, uid, ids, context=context):
+            case_list = case_pool.browse(cr, uid, context['active_ids'],
+                                         context=context)
+            case = case_list[0]
+            user_obj = self.pool.get('res.users')
+            user_name = user_obj.browse(cr, uid, [uid], context=context)[0].name
+            attach = [
+                (x.name, base64.decodestring(x.binary)) for x in obj.attachment_ids
+            ]
+            case_pool.history(cr, uid, [case], _("Note"), history=False,
+                              details=obj.body, email_from=user_name, attach=attach)
+
+            if obj.state == 'unchanged':
+                pass
+            elif obj.state == 'done':
+                case_pool.case_close(cr, uid, [case.id])
+            elif obj.state == 'draft':
+                case_pool.case_reset(cr, uid, [case.id])
+            elif obj.state in ['cancel', 'open', 'pending']:
+                act = 'case_' + obj.state
+                getattr(case_pool, act)(cr, uid, [case.id])
+
+        return {}
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        """
+        return {'state': u'unchanged'}
+
+
+crm_add_note()
diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
new file mode 100644
index 00000000000..f218a4252c1
--- /dev/null
+++ b/addons/crm/wizard/crm_add_note_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+<!-- Add New Note view -->
+
+        <record model="ir.ui.view" id="crm_add_new_note_view">
+            <field name="name">crm.new.add.note.form</field>
+            <field name="model">crm.add.note</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Add Note" col="4">
+                    <separator string="Add Note" colspan="6"/>
+                    <notebook colspan="6">
+                        <page string="Note">
+                            <field name="body" nolabel="1" colspan="4" default_focus="1"/>
+                        </page>
+                        <page string="Attachments">
+                            <field name="attachment_ids" colspan="4" nolabel="1">
+                                <form string="Attachment">
+                                    <field name="binary" filename="name" />
+                                    <field name="name" />
+                                </form>
+                                <tree string="Attachments">
+                                    <field name="name" />
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                    <separator string="" colspan="6"/>
+                    <group colspan="6" col="4" >
+                        <field name="state" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_add" type="object" string="_Add" icon="gtk-ok" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+<!-- Add New Note action -->
+
+        <record model="ir.actions.act_window" id="action_crm_add_note">
+            <field name="name">Add Note</field>
+            <field name="res_model">crm.add.note</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_add_new_note_view"/>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
+
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index ae4e87f30ad..aadd607c154 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -28,6 +28,10 @@ import itertools
 import tools
 import re
 
+
+AVAILABLE_STATES = crm.AVAILABLE_STATES + [('unchanged', 'Unchanged')]
+
+
 class crm_send_new_email_attachment(osv.osv_memory):
     _name = 'crm.send.mail.attachment'
 
@@ -51,7 +55,7 @@ class crm_send_new_email(osv.osv_memory):
         'email_cc' : fields.char('CC', size=512, help="These addresses will receive a copy of this email. To modify the permanent CC list, edit the global CC field of this case"),
         'subject': fields.char('Subject', size=512, required=True),
         'body': fields.text('Message Body', required=True),
-        'state': fields.selection(crm.AVAILABLE_STATES, string='Set New State To', required=True),
+        'state': fields.selection(AVAILABLE_STATES, string='Set New State To', required=True),
         'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id'),
     }
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 1938b6bf056..44b1eb34fd8 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -205,10 +205,14 @@
                                         </notebook>
                                     </form>
                                 </field>
-                                <button colspan="4" string="Send New Email"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'new', 'model': 'crm.claim'}"
-                                icon="terp-mail-message-new" type="action" />
+                                <button string="Add New Note"
+                                    name="%(crm.action_crm_add_note)d"
+                                    context="{'model': 'crm.lead' }"
+                                    icon="terp-document-new" type="action" />
+                                <button string="Send New Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'new', 'model': 'crm.claim'}"
+                                    icon="terp-mail-message-new" type="action" />
                             </page>
                             <page string="Extra Info" groups="base.group_extended">
                                 <field name="id" select="1"/>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 1e8b4072bab..84af1b141c9 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -161,6 +161,7 @@
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                 <tree string="Communication history">
                                     <field name="display_text" string="History Information"/>
+                                    <field name="history" invisible="1"/>
                                     <button
                                         string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
                                         name="%(crm.action_crm_send_mail)d"
@@ -196,7 +197,11 @@
                                     </notebook>
                                 </form>
                             </field>
-                            <button colspan="4" string="Send New Email"
+                             <button string="Add New Note"
+                                name="%(crm.action_crm_add_note)d"
+                                context="{'model': 'crm.lead' }"
+                                icon="terp-document-new" type="action" />
+                            <button string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.fundraising'}"
                                 icon="terp-mail-message-new" type="action" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 31ba54f426f..375b758f9c7 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -98,6 +98,7 @@
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                 <tree string="Communication history">
                                     <field name="display_text" string="History Information"/>
+                                    <field name="history" invisible="1"/>
                                     <button
                                         string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
                                         name="%(crm.action_crm_send_mail)d"
@@ -133,7 +134,11 @@
                                     </notebook>
                                 </form>
                             </field>
-                            <button colspan="4" string="Send New Email"
+                             <button string="Add New Note"
+                                name="%(crm.action_crm_add_note)d"
+                                context="{'model': 'crm.lead' }"
+                                icon="terp-document-new" type="action" />
+                            <button string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.helpdesk'}"
                                 icon="terp-mail-message-new" type="action" />
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index c6f40deb429..d922a4bcc1c 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -8,10 +8,10 @@
         <field name="arch" type="xml">
           <data>
             <form position="attributes">
-              <attribute name="string">Auto Configure</attribute>
+              <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
              <separator string="title" position="attributes">
-            	<attribute name="string">Resource Directory Configuration </attribute>
+            	<attribute name="string">Configure Resource Directory</attribute>
           	</separator>
           	<xpath expr="//label[@string='description']" position="attributes">
             <attribute name="string">Choose the following Resouces to auto directory configuration.</attribute>
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index df3aee360af..27df92ff515 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -15,10 +15,10 @@
         <field name="arch" type="xml">
           <data>
             <form position="attributes">
-              <attribute name="string">FTP Server Configuration</attribute>
+              <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
              <separator string="title" position="attributes">
-            	<attribute name="string">FTP Server Configuration</attribute>
+            	<attribute name="string">Configure FTP Server</attribute>
           	</separator>
           	<xpath expr="//label[@string='description']" position="attributes">
             <attribute name="string">Choose the address for the Document Management System's FTP server.</attribute>
@@ -30,7 +30,7 @@
             <group string="res_config_contents" position="replace">
                 <field name="host"/>
             </group>
-            <xpath expr="//button[@name='action_skip']" position="replace"/>
+           <xpath expr="//button[@name='action_skip']" position="replace"/>
           </data>
         </field>
     </record>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e82da17e0f0..deb11c14575 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -373,6 +373,7 @@
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                 <tree string="Communication history">
                                     <field name="display_text" string="History Information"/>
+                                    <field name="history" invisible="1"/>
                                     <button
                                         string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
                                         name="%(crm.action_crm_send_mail)d"
@@ -408,7 +409,11 @@
                                     </notebook>
                                 </form>
                             </field>
-                              <button colspan="4" string="Send New Email"
+                             <button string="Add New Note"
+                                name="%(crm.action_crm_add_note)d"
+                                context="{'model': 'crm.lead' }"
+                                icon="terp-document-new" type="action" />
+                              <button string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'event.registration'}"
                                 icon="terp-mail-message-new" type="action" />
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 6ae8890a11f..ef7e3e4aad7 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -10,16 +10,16 @@
       <field name="arch" type="xml">
         <data>
             <form position="attributes">
-                <attribute name="string">Human Resources Modules Configuration</attribute>
+                <attribute name="string">Human Resources Application Configuration</attribute>
             </form>
             <separator string="title" position="attributes">
-                <attribute name="string">Select Human Resources Modules To Install</attribute>
+                <attribute name="string">Configure Your Human Resources Application</attribute>
             </separator>
             <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">You can enhance the base HR addon by installing few HR-related applications.</attribute>
+                <attribute name="string">You can enhance the base HR Application by installing few HR-related modules.</attribute>
             </xpath>
           <group colspan="8">
             <field name="hr_holidays"/>
@@ -40,7 +40,7 @@
     </record>
 
     <record id="action_hr_installer" model="ir.actions.act_window">
-      <field name="name">Human Resources Modules Installation</field>
+      <field name="name">Human Resources Application Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">hr.installer</field>
       <field name="view_id" ref="view_hr_installer"/>
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index a551e3a0a5d..a14970b31e5 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -87,7 +87,8 @@ class report_custom(report_rml):
         depts=[]
         emp_id={}
 #        done={}
-
+        rpt_obj = pooler.get_pool(cr.dbname).get('hr.holidays')
+        rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
         cr.execute("SELECT name FROM res_company")
         res=cr.fetchone()[0]
         date_xml=[]
@@ -113,8 +114,8 @@ class report_custom(report_rml):
         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('<from>%s</from>\n'% (str(rml_obj.formatLang(som.strftime("%Y-%m-%d"),date=True))))
+        date_xml.append('<to>%s</to>\n' %(str(rml_obj.formatLang(eom.strftime("%Y-%m-%d"),date=True))))
         date_xml.append('<type>%s</type>'%(type))
 
 #        date_xml=[]
@@ -229,8 +230,6 @@ class report_custom(report_rml):
                     emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, item['id'], item['name'], som, eom)
                     row_id = row_id +1
 
-        rpt_obj = pooler.get_pool(cr.dbname).get('hr.holidays')
-        rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
         header_xml = '''
         <header>
         <date>%s</date>
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 9c2ce90cd7a..0d5b593279e 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -72,6 +72,7 @@
             <field name="wage_type_id" ref="hr_contract.hr_contract_monthly_gross"/>
             <field name="name">First Contract</field>
             <field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
+            <field name="date_end" eval="time.strftime('%Y')+'-12-31'"/>
             <field name="struct_id" ref="hr_payroll.structure_001"/>
             <field name="employee_id" ref="hr_employee_bonamy0"/>
             <field name="notes">This is a First Contract</field>
diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
index 178695d2d9c..d7df0ada7cc 100644
--- a/addons/hr_payroll/report/payroll_register.rml
+++ b/addons/hr_payroll/report/payroll_register.rml
@@ -22,7 +22,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -34,7 +34,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -65,6 +65,7 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
+    <paraStyle name="space" fontName="Helvetica" fontSize="6.0" leading="8"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -131,11 +132,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <section>
-      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table1">
+      <para style="terp_default_8">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table6">
         <tr>
           <td>
             <para style="terp_tblheader_details_center">#</para>
@@ -163,14 +164,18 @@
           </td>
         </tr>
       </blockTable>
-      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table2">
+      <para style="space">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <section>
+      <para style="terp_default_9">[[repeatIn(o.line_ids, 'l')]]</para>
+      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table1">
         <tr>
           <td>
             <para style="terp_default_8">[[ get_no() ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ repeatIn(o.line_ids, 'l') ]]</para>
-            <para style="terp_default_8">[[add_line(l)]]</para>
             <para style="terp_default_8">[[ l.employee_id.name ]]</para>
           </td>
           <td>
@@ -193,40 +198,46 @@
           </td>
         </tr>
       </blockTable>
-      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table4">
-        <tr>
-          <td>
-            <para style="terp_default_8">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_details">Total SAL<font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_basic())]][[ company.currency_id.symbol]] </para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_other())]] [[ company.currency_id.symbol]]</para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_allow())]] [[ company.currency_id.symbol]]</para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_grows())]] [[ company.currency_id.symbol]]</para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_deduct())]] [[ company.currency_id.symbol]]</para>
-          </td>
-          <td>
-            <para style="terp_tbleheader_details_right">[[formatLang(get_net())]] [[ company.currency_id.symbol]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_8">
+      <para style="space">
         <font color="white"> </font>
       </para>
     </section>
+    <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_details">Total SAL<font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_basic())]][[ company.currency_id.symbol]] </para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_other())]] [[ company.currency_id.symbol]]</para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_allow())]] [[ company.currency_id.symbol]]</para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_grows())]] [[ company.currency_id.symbol]]</para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_deduct())]] [[ company.currency_id.symbol]]</para>
+        </td>
+        <td>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_net())]] [[ company.currency_id.symbol]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="241.0,241.0" style="Table5">
       <tr>
         <td>
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.py b/addons/hr_payroll/report/report_emp_salary_structure.py
index 0c63f446c38..d4365a8423b 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.py
+++ b/addons/hr_payroll/report/report_emp_salary_structure.py
@@ -36,7 +36,8 @@ class salary_structure_report(report_sxw.rml_parse):
             'get_type':self.get_type,
             'get_contract':self.get_contract,
             'get_line_amount_type':self.get_line_amount_type,
-            'get_line_type':self.get_line_type
+            'get_line_type':self.get_line_type,
+            'get_line_amount_symbol':self.get_line_amount_symbol
           })
 
     def get_contract(self,emp):
@@ -69,6 +70,10 @@ class salary_structure_report(report_sxw.rml_parse):
         else:
             return 'Fixed'
 
+    def get_line_amount_symbol(self,amount_type):
+        if amount_type != 'per':
+            return self.pool.get('res.users').browse(self.cr, self.uid,self.uid).company_id.currency_id.symbol
+
     def get_line_type(self,type):
         if type == 'allounce':
             return 'Allowance'
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 11bfee609f0..ee564052af3 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -441,7 +441,7 @@
                 <para style="terp_default_9">[[ get_line_amount_type(line.amount_type) ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(line.amount) or '']][[ employee.company_id.currency_id.symbol]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(line.amount) or '']][[ get_line_amount_symbol(line.amount_type) ]]</para>
               </td>
               <td>
                 <para style="terp_default_9">[[ get_line_type(line.type) ]]</para>
diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 8a9689b45c6..3b032af3409 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -172,19 +172,19 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Header" fontName="Times-Roman"/>
-    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
-    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
-    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -194,13 +194,13 @@
     <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Salutation" fontName="Times-Roman"/>
-    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -210,8 +210,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -225,10 +225,10 @@
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]]</para>
+    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]] [[ get_employee_detail(o) ]]</para>
     <para style="terp_header_Centre">Employees Salary Details </para>
     <para style="terp_default_Centre_9">For [[ get_fiscalyear(data['form']['fiscalyear_id']) ]]</para>
     <para style="terp_default_space">
@@ -284,7 +284,7 @@
           <para style="terp_tblheader_Details">Designation</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.contract_ids and o.contract_ids[0].function.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.contract_ids and o.contract_ids[0].job_id.name or '' ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Phone No.</para>
@@ -355,7 +355,9 @@
         <font color="white"> </font>
       </para>
       <section>
-        <para style="terp_default_9">[[ get_employee_detail(o) ]]</para>
+        <para style="terp_default_9">
+          <font color="white"> </font>
+        </para>
         <para style="terp_tblheader_Details">Allowances with Basic:</para>
         <section>
           <para style="terp_default_9">[[ repeatIn(get_allow(),'e1') ]]</para>
@@ -528,43 +530,43 @@
             <para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_total()) ]]</u></para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]][[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -579,4 +581,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/hr_payroll/test/hr_payroll_report.yml b/addons/hr_payroll/test/hr_payroll_report.yml
index e2268db7697..35020d30ceb 100644
--- a/addons/hr_payroll/test/hr_payroll_report.yml
+++ b/addons/hr_payroll/test/hr_payroll_report.yml
@@ -1,14 +1,14 @@
 -
-  In order to test the PDF reports defined on HR Employee Salary, we will print HR Employee Salary
+  In order to test the PDF reports defined on HR Payroll, we will print Employees' Salary Structure
 - 
   !python {model: hr.employee}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.salary.structure').create(cr, uid, [ref('hr_payroll.hr_employee_bonamy0')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-salary_report.'+format), 'wb+').write(data)
-          
+        file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-salary_structure.'+format), 'wb+').write(data)
+
 -
-  In order to test the PDF reports defined on HR Payslip, we will print a HR Payslip
+  Print HR Payslip
 - 
   !python {model: hr.payslip}: |
     import netsvc, tools, os
@@ -17,20 +17,23 @@
         file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-payslip_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on HR Employee Salary Details, we will print HR Employee Salary Details
+  Print HR Employee Salary Details
 -
   !python {model: hr.payslip}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'employee_ids': [ref('hr.employee2')]}}
-    (data, format) = netsvc.LocalService('report.employees.salary').create(cr, uid, [], data_dict, {'periods': []})
+    emp_ids = [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3'),ref('hr_payroll.hr_employee_bonamy0')]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'employee_ids': emp_ids, 'ids':emp_ids }}
+    (data, format) = netsvc.LocalService('report.employees.salary').create(cr, uid, [], data_dict, {'active_ids': emp_ids})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_salary_detai_report.'+format), 'wb+').write(data)
+       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_salary_detail_report.'+format), 'wb+').write(data)
 -
- In order to test the PDF reports defined on HR Employee Salary Details, we will print HR Employee Salary Details
+  Print HR Employee Salary Details Annual basis
 -
   !python {model: hr.payslip}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'salary_on': 'current_month', 'employee_ids': [ref('hr.employee2')]}}
-    (data, format) = netsvc.LocalService('report.year.salary').create(cr, uid, [], data_dict, {'periods': []})
+    emp_ids = [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3'),ref('hr_payroll.hr_employee_bonamy0')]
+    data_dict = {'model': 'hr.payslip', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'salary_on': 'current_month', 'employee_ids': emp_ids, 'ids':emp_ids}}
+    (data, format) = netsvc.LocalService('report.year.salary').create(cr, uid, [], data_dict,{'active_ids': emp_ids} )
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_yearly_salary_detai_report.'+format), 'wb+').write(data)
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_yearly_salary_detail_report.'+format), 'wb+').write(data)
+
diff --git a/addons/hr_payroll/test/payment_advice.yml b/addons/hr_payroll/test/payment_advice.yml
index a2a9c3d5dbe..934485109b6 100644
--- a/addons/hr_payroll/test/payment_advice.yml
+++ b/addons/hr_payroll/test/payment_advice.yml
@@ -52,3 +52,12 @@
     from tools.translate import _
     advice_id=self.browse(cr, uid, ref("hr_payroll_advice_advice0"))
     assert(advice_id.state == 'confirm'), _('State not changed!')
+
+-
+  Print Payroll Advice
+- 
+  !python {model: hr.payroll.advice}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.payroll.advice').create(cr, uid, [ref('hr_payroll_advice_advice0')], {}, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-payroll-advice.'+format), 'wb+').write(data)
diff --git a/addons/hr_payroll/test/payroll_register.yml b/addons/hr_payroll/test/payroll_register.yml
index f5772602db4..6ce953c1d94 100644
--- a/addons/hr_payroll/test/payroll_register.yml
+++ b/addons/hr_payroll/test/payroll_register.yml
@@ -1,6 +1,5 @@
 -
   I test the 'Payroll Register' in order to check the hr_payroll in OpenERP
--
   I create a new employee “Keith”
 -
   !record {model: hr.employee, id: hr_employee_keith0}:
@@ -61,3 +60,12 @@
     from tools.translate import _
     reg_brw=self.browse(cr, uid, ref("hr_payroll_register_payroll0"))
     assert(reg_brw.state == 'hr_check'), _('State not changed!')
+
+-
+  Print HR Payroll Register
+-
+  !python {model: hr.payroll.register}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.hr.payroll.register.sheet').create(cr, uid, [ref('hr_payroll_register_payroll0')], {}, {})
+    if tools.config['test_report_directory']:
+       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-register_report.'+format), 'wb+').write(data)
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ad7e293456a..ee2221b58c2 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -150,6 +150,7 @@
                        <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                             <tree string="Communication history">
                                 <field name="display_text" string="History Information"/>
+                                <field name="history" invisible="1"/>
                                 <button
                                     string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
                                     name="%(crm.action_crm_send_mail)d"
@@ -185,13 +186,14 @@
                                 </notebook>
                             </form>
                         </field>
-                       <button colspan="2" string="Send New Email"
+                         <button string="Add New Note"
+                                name="%(crm.action_crm_add_note)d"
+                                context="{'model': 'crm.lead' }"
+                                icon="terp-document-new" type="action" />
+                        <button string="Send New Email"
                            name="%(crm.action_crm_send_mail)d"
                            context="{'mail':'new', 'model': 'hr.applicant'}"
                            icon="terp-mail-message-new" type="action" />
-                       <button colspan="2" string="Forward"
-                           name="%(crm.crm_lead_forward_to_partner_act)d"
-                           icon="terp-mail-forward" type="action" />
                  </page>
                  <page string="Notes">
                      <field name="description" nolabel="1" colspan="4"/>
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 5a2e37353cd..90ddc25fff6 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -51,7 +51,7 @@ to set up a management by affair.
     ],
     'demo_xml': ['hr_timesheet_demo.xml'],
     'test': ['test/test_hr_timesheet.yml',
-             'test/hr_timesheet_invoice_report.yml',
+             'test/hr_timesheet_report.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index cbd0675208f..6029336542d 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -31,17 +31,31 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet Lines">
-                    <field colspan="4" name="name"/>
+                    <group colspan="4" col="6">
+                    <field name="name"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" select="1"/>
                     <field name="date" select="1" on_change="on_change_date(date)"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
-                    <newline/>
-                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
-                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1" groups="base.group_extended"/>
-                    <field name="amount"/>
-                    <field name="general_account_id"/>
-                    <field name="journal_id"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Information">
+                            <group colspan="2" col="2">
+                                <separator string="Product" colspan="2"/>
+                                <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
+                                <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Accounting" colspan="2"/>
+                                <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1" groups="base.group_extended"/>
+                                <field name="amount"/>
+                                <field name="general_account_id"/>
+                                <field name="journal_id"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Invoicing" colspan="2"/>
+                            </group>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
index 04c07d77403..811858eb7f2 100644
--- a/addons/hr_timesheet/test/hr_timesheet_report.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -1,31 +1,23 @@
 -
- In order to test the PDF reports defined on a HR Timesheet User Report, we will print a  HR Timesheet User Report
+ In order to test the PDF reports defined on HR Timesheet User Report, we will print a  HR Timesheet User Report
 -
   !python {model: hr.employee}: |
     import netsvc, tools, os, time
-    import datetime
-    from mx.DateTime import *
-    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    start = DateTime(int(start.year), int(start.month), int(start.day))
-    month=start.month
-    year=start.year
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_id' : ref('base.user_root') }}
-    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet').create(cr, uid, [], data_dict, {'periods': []})
+    month = time.gmtime()[1]
+    year = time.gmtime()[0]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_id' : uid }}
+    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-user_report.'+format), 'wb+').write(data)
 
 -
- In order to test the PDF reports defined on a HR Timesheet Users Report, we will print a  HR Timesheet Users Report
+ In order to test the PDF reports defined on HR Timesheet Users Report, we will print a  HR Timesheet Users Report
 -
   !python {model: hr.employee}: |
     import netsvc, tools, os, time
-    import datetime
-    from mx.DateTime import *
-    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    start = DateTime(int(start.year), int(start.month), int(start.day))
-    month=start.month
-    year=start.year
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_ids' : [ref('base.user_root')] }}
-    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet_users').create(cr, uid, [], data_dict, {'periods': []})
+    month = time.gmtime()[1]
+    year = time.gmtime()[0]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_ids' : [uid] }}
+    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet_users').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-users_report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index df44302ec56..f45490867c2 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -47,7 +47,7 @@ reports, eso.""",
     ],
     'demo_xml': ['hr_timesheet_invoice_demo.xml',
                  ],
-    'test': ['test/test_hr_timesheet_invoice.yml'
+    'test': ['test/test_hr_timesheet_invoice.yml',
              'test/hr_timesheet_invoice_report.yml',
              ],             
     'installable': True,
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 21ddd3ddda5..1befaebf168 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -21,18 +21,16 @@
             </field>
         </record>
 
-        
-
         <record id="hr_timesheet_line_form" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
-                <field name="journal_id" position="after">
+                <xpath expr='//separator[@string="Invoicing"]' position='after'>
                     <field name="to_invoice"/>
                     <field name="invoice_id"/>
-                </field>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
index 0e6a12030f2..3cb4b150395 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
@@ -157,10 +157,12 @@
     <blockTable colWidths="175.0,175.0,175.0" style="Table_Content_Date">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ data['form']['date_from'] ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang (data['form']['date_from'],date=True)
+]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ data['form']['date_to'] ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang (data['form']['date_to'],date=True)
+ ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para>
diff --git a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
index 118699c4aa3..ecdd486a65e 100644
--- a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
+++ b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
@@ -1,23 +1,20 @@
 -
-  In order to test the PDF reports defined on a HR Timesheet Account Analytic Profit, we will print a  HR Timesheet Account Analytic Profit
+  In order to test the PDF reports defined on HR Timesheet Account Analytic Profit, we will print report of  HR Timesheet Account Analytic Profit
 -
   !python {model: account.analytic.line}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': '2010-09-01', 'employee_ids': [[6, 0, [1, ref('hr.employee2')]]], 'journal_ids': [[6, 0, [1, 2, 3, 4]]], 'date_to': '2010-09-16'}}
-    (data, format) = netsvc.LocalService('report.account.analytic.profit').create(cr, uid, [], data_dict, {'periods': []})
+    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': time.strftime('%Y-%m-01'), 'employee_ids': [[6,0,[ref('hr.employee1'), ref('hr.employee2'),ref('hr.employee3')]]], 'journal_ids': [[6,0,[ref('account.cose_journal_sale'),ref('account.exp'),ref('account.sit')]]], 'date_to': time.strftime('%Y-%m-%d')}}
+    (data, format) = netsvc.LocalService('report.account.analytic.profit').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-account_analytic_profit_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a HR Cost Ledger, we will print a HR Cost Ledger
+  In order to test the PDF reports defined on HR Cost Ledger, we will print report of HR Cost Ledger
 -
   !python {model: account.analytic.account}: |
     import netsvc, tools, os, time
-    import datetime
-    from mx.DateTime import *
-    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    start = DateTime(int(start.year), int(start.month), int(start.day))
-    data_dict = {'model': 'ir.ui.menu', 'form': {'date1': start.strftime('%Y-%m-%d'), 'date2': start.strftime('%Y-%m-%d')}}
-    (data, format) = netsvc.LocalService('report.hr.timesheet.invoice.account.analytic.account.cost_ledger').create(cr, uid, [], data_dict, {'periods': []})
+    acc_ids = [ref('account.analytic_absences'),ref('account.analytic_internal'),ref('account.analytic_sednacom'),ref('account.analytic_thymbra'),ref('account.analytic_partners_camp_to_camp')]
+    data_dict = {'model': 'ir.ui.menu', 'form': {'date1': time.strftime('%Y-01-01'), 'date2': time.strftime('%Y-%m-%d')}}
+    (data, format) = netsvc.LocalService('report.hr.timesheet.invoice.account.analytic.account.cost_ledger').create(cr, uid, acc_ids, data_dict, {'active_ids': acc_ids})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-cost_ledger_report.'+format), 'wb+').write(data)    
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-cost_ledger_report.'+format), 'wb+').write(data)
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 7f99329688d..681bf2253d5 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -8,19 +8,19 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Knowledge Modules Configuration</attribute>
+            <attribute name="string">Knowledge Application Configuration</attribute>
           </form>
 
           <separator string="title" position="attributes">
             <attribute name="string"
-                       >Knowledge Management</attribute>
+                       >Configure Your Knowledge Application</attribute>
           </separator>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                       <attribute name='string'></attribute>
                   </xpath>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">You can select various OpenERP applications which will help you and your employees to store and share information.</attribute>
+            <attribute name="string">Share information within the company with these specific Addons.</attribute>
           </xpath>
           <group colspan="8" position="replace">
           <group colspan="4">
@@ -40,7 +40,7 @@
     </record>
 
     <record id="action_knowledge_installer" model="ir.actions.act_window">
-      <field name="name">Knowledge Modules Installation</field>
+      <field name="name">Knowledge Application Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">knowledge.installer</field>
       <field name="view_id" ref="view_knowledge_installer"/>
diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml
index 0379e6bc83b..49c058a4bc8 100644
--- a/addons/l10n_ch/test/l10n_ch_report.yml
+++ b/addons/l10n_ch/test/l10n_ch_report.yml
@@ -1,17 +1,17 @@
 -
-  In order to test the PDF reports defined on a l10n_ch, we will print a bvr_report
+  In order to test the PDF reports defined on a l10n_ch, we will print BVR Report
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.l10n_ch.bvr').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a l10n_ch, we will print a bvr_invoice_report
+  In order to test the PDF reports defined on a l10n_ch, we will print a BVR Invoice Report
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.l10n_ch.invoice.bvr').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_invoice.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_invoice_report.'+format), 'wb+').write(data)
diff --git a/addons/l10n_fr/test/l10n_fr_report.yml b/addons/l10n_fr/test/l10n_fr_report.yml
index cfc4f659925..ddc95595175 100644
--- a/addons/l10n_fr/test/l10n_fr_report.yml
+++ b/addons/l10n_fr/test/l10n_fr_report.yml
@@ -1,26 +1,26 @@
 -
   In order to test Generate Fiscalyear Opening Entries wizard of OpenERP I first create a fiscalyear "Fiscal Year 2011" to which the entries will move
 -
-  !record {model: account.fiscalyear, id: account_fiscalyear_0}:
+  !record {model: account.fiscalyear, id: account_fiscalyear_01}:
     code: FY2011
     company_id: base.main_company
-    date_start: '2011-01-01'
-    date_stop: '2011-12-31'
-    name: Fiscal Year 2011
+    date_start: '2012-01-01'
+    date_stop: '2012-12-31'
+    name: Fiscal Year 2012
 -
-  In order to test the PDF reports defined on a l10n_fr, we will print a account move line for l10n_fr
+  In order to test the PDF reports defined on a l10n_fr, we will print an Account Move Line Report for l10n_fr
 -
   !python {model: account.move.line}: |
     import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account_fiscalyear_0')}}, {})
+    (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account_fiscalyear_01')}}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-bilan.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-bilan_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a l10n_fr, we will print a compute result for l10n_fr
+  In order to test the PDF reports defined on a l10n_fr, we will print a Compute Resultant Report for l10n_fr
 -
   !python {model: account.move.line}: |
     import netsvc, tools, os,time
     (data, format) = netsvc.LocalService('report.l10n.fr.compute_resultant').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account.data_fiscalyear')}}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-compute_resultant.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-compute_resultant_report.'+format), 'wb+').write(data)
diff --git a/addons/l10n_lu/test/l10n_lu_report.yml b/addons/l10n_lu/test/l10n_lu_report.yml
index 0ea9850df9a..43b1ce35df1 100644
--- a/addons/l10n_lu/test/l10n_lu_report.yml
+++ b/addons/l10n_lu/test/l10n_lu_report.yml
@@ -5,10 +5,10 @@
     name: a
 
 -
-  In order to test the PDF reports defined on a l10u_lu, we will print a vat
+  In order to test the PDF reports defined on a l10u_lu, we will print a VAT Report
 -
   !python {model: res.partner}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.l10n_lu.tax.report.print').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'tax_code_id': ref('account_tax_code_id_r1'), 'period_id': ref('account.period_1')}}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'l10n_lu-vat.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_lu-vat_report.'+format), 'wb+').write(data)
diff --git a/addons/lunch/test/lunch_report.yml b/addons/lunch/test/lunch_report.yml
index 76214dfb599..2043afe7796 100644
--- a/addons/lunch/test/lunch_report.yml
+++ b/addons/lunch/test/lunch_report.yml
@@ -1,8 +1,8 @@
 -
-  In order to test the PDF reports defined on a lunch, we will print a lunch order
+  In order to test the PDF reports defined on a Lunch, we will print a Lunch Order Report
 -
   !python {model: lunch.order}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.lunch.order').create(cr, uid, [ref('lunch.lunch_order_0'),ref('lunch.lunch_order_1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'lunch-lunch_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'lunch-lunch_order_report.'+format), 'wb+').write(data)
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 3a40aac2649..c8d75a3a873 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -122,6 +122,10 @@ class mailgate_thread(osv.osv):
         obj = self.pool.get('mailgate.message')
 
         for case in cases:
+            attachments = []
+            for att in attach:
+                    attachments.append(att_obj.create(cr, uid, {'name': att[0], 'datas': base64.encodestring(att[1])}))
+
             partner_id = hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False
             if not partner_id and case._name == 'res.partner':
                 partner_id = case.id
@@ -132,13 +136,12 @@ class mailgate_thread(osv.osv):
                 'partner_id': partner_id,
                 'res_id': case.id,
                 'date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'message_id': message_id,
+                'message_id': message_id, 
+                'description': details or (hasattr(case, 'description') and case.description or False), 
+                'attachment_ids': [(6, 0, attachments)]
             }
-            attachments = []
-            if history:
-                for att in attach:
-                    attachments.append(att_obj.create(cr, uid, {'name': att[0], 'datas': base64.encodestring(att[1])}))
 
+            if history:
                 for param in (email, email_cc, email_bcc):
                     if isinstance(param, list):
                         param = ", ".join(param)
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 7f679e7e1fd..b96ba8fb7e3 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -12,14 +12,14 @@
             <field name="arch" type="xml">
                 <data>
                   <form position="attributes">
-                    <attribute name="string">Marketing Modules Configuration</attribute>
+                    <attribute name="string">Marketing Application Configuration</attribute>
                   </form>
                   <separator string="title" position="attributes">
-                    <attribute name="string">Select Marketing Modules to Install</attribute>
+                    <attribute name="string">Configure Your Marketing Application</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']"
                          position="attributes">
-                    <attribute name="string">OpenERP provides tools to automate your leads process, design marketing campaigns and profile efficiently your customers.</attribute>
+                    <attribute name="string">OpenERP provides Addons to better manage your sales and marketing processes. Select the ones you would be interested in.</attribute>
                   </xpath>
                  <xpath expr='//separator[@string="vsep"]' position='attributes'>
                        <attribute name='rowspan'>13</attribute>
@@ -39,7 +39,7 @@
         </record>
 
         <record id="action_marketing_installer" model="ir.actions.act_window">
-            <field name="name">Marketing Modules Installation</field>
+            <field name="name">Marketing Applications Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">marketing.installer</field>
             <field name="view_id" ref="view_marketing_installer"/>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 2ca500afd93..f474048bd3f 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -12,11 +12,11 @@
           </form>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Manufacturing Resource Planning</attribute>
+            <attribute name="string">Configure Your Manufacturing Resource Planning Application</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">After having installed the core manufacturing application, you can extend it depending on the needs of your MRP's organization</attribute>
+            <attribute name="string">Add more functionalities to the core Manufacturing Application with the following addons.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                   <attribute name='string'></attribute>
@@ -36,7 +36,7 @@
     </record>
 
     <record id="action_mrp_installer" model="ir.actions.act_window">
-      <field name="name">MRP Modules Installation</field>
+      <field name="name">MRP Applications Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">mrp.installer</field>
       <field name="view_id" ref="view_mrp_installer"/>
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 762d1e4b2a6..3a6ab81a308 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -23,7 +23,9 @@ import ir
 import pooler
 from report.interface import report_rml
 from report.interface import toxml
-
+from tools import to_xml
+from report import report_sxw
+from datetime import datetime
 from tools.translate import _
 
 
@@ -38,6 +40,9 @@ class report_custom(report_rml):
         workcenter_pool = pool.get('mrp.workcenter')
         user_pool = pool.get('res.users')
         bom_pool = pool.get('mrp.bom')
+        rml_obj=report_sxw.rml_parse(cr, uid, product_pool._name,context)
+        rml_obj.localcontext.update({'lang':context.get('lang',False)})
+        company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id
         def process_bom(bom, currency_id, factor=1):
             xml = '<row>'
             sum = 0
@@ -55,7 +60,7 @@ class report_custom(report_rml):
                 main_sp_name = "<b>%s</b>\r\n" %(prod.seller_id.name)
                 price = supplier_info_pool.price_get(cr, uid, prod.seller_id.id, prod.id, number*prod_qtty)[prod.seller_id.id]
                 price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
-                main_sp_price = '<b>%.2f</b>\r\n' %(price)
+                main_sp_price = """<b>"""+rml_obj.formatLang(price)+' '+ company_currency.symbol+"""</b>\r\n"""
                 sum += prod_qtty*price
             std_price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, prod.standard_price, to_uom_id=product_uom.id)
             main_strd_price = str(std_price) + '\r\n'
@@ -64,13 +69,12 @@ class report_custom(report_rml):
                 sellers +=  '- <i>'+ seller_id.name.name +'</i>\r\n'
                 price = supplier_info_pool.price_get(cr, uid, seller_id.name.id, prod.id, number*prod_qtty)[seller_id.name.id]
                 price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
-                sellers_price += """<i>%.2f</i>\r\n"""%(price)
-            xml += """<col para='yes'> %s </col>
-                    <col para='yes'> %s </col>
-                    <col f='yes'>%.2f</col>
-                    <col f='yes'>%s</col>
-                    <col f='yes'>%.2f</col>
-                    <col f='yes'>%s</col>'"""%(prod_name,main_sp_name +  sellers ,prod_qtty, product_uom.name,float(main_strd_price),main_sp_price + sellers_price)
+                sellers_price += """<i>"""+rml_obj.formatLang(price) +' '+ company_currency.symbol +"""</i>\r\n"""
+            xml += """<col para='yes'> """+ prod_name +""" </col>
+                    <col para='yes'> """+ main_sp_name + sellers + """ </col>
+                    <col f='yes'>"""+ rml_obj.formatLang(prod_qtty) +' '+ product_uom.name +"""</col>
+                    <col f='yes'>"""+ rml_obj.formatLang(float(main_strd_price)) +' '+ company_currency.symbol +"""</col>
+                    <col f='yes'>""" + main_sp_price + sellers_price + """</col>'"""
 
             xml += '</row>'
             return xml, sum, sum_strd
@@ -83,10 +87,9 @@ class report_custom(report_rml):
             xml = '<row>'
             xml += "<col para='yes'>" + workcenter.name + '</col>'
             xml += "<col/>"
-            xml += "<col/>"
-            xml += """<col f='yes'>%.2f</col>"""%(cost_cycle)
-            xml += """<col f='yes'>%.2f</col>"""%(cost_hour)
-            xml += """<col f='yes'>%.2f</col>"""%(cost_hour + cost_cycle)
+            xml += """<col f='yes'>"""+rml_obj.formatLang(cost_cycle)+' '+ company_currency.symbol + """</col>"""
+            xml += """<col f='yes'>"""+rml_obj.formatLang(cost_hour)+' '+ company_currency.symbol + """</col>"""
+            xml += """<col f='yes'>"""+rml_obj.formatLang(cost_hour + cost_cycle)+' '+ company_currency.symbol + """</col>"""
             xml += '</row>'
 
             return xml, total
@@ -95,13 +98,13 @@ class report_custom(report_rml):
         xml = ''
         config_start = """
         <config>
-            <date>%s</date>
+            <date>""" + to_xml(rml_obj.formatLang(datetime.now().strftime('%Y-%m-%d %H:%M:%S'),date_time=True)) + """</date>
             <company>%s</company>
             <PageSize>210.00mm,297.00mm</PageSize>
             <PageWidth>595.27</PageWidth>
             <PageHeight>841.88</PageHeight>
-            <tableSize>55.00mm,55.00mm, 20.00mm, 22.00mm, 22.00mm, 25.00mm</tableSize>
-            """ % (time.strftime('%m/%d/%Y %H:%M'),user_pool.browse(cr, uid, uid).company_id.name)
+            <tableSize>55.00mm,58.00mm,29.00mm,29.00mm,29.00mm</tableSize>
+            """ % (user_pool.browse(cr, uid, uid).company_id.name)
         config_stop = """
             <report-footer>Generated by OpenERP</report-footer>
         </config>
@@ -111,14 +114,13 @@ class report_custom(report_rml):
             <lines style='header'>
                 <row>
                     <col>%s</col>
-                    <col/>
                     <col t='yes'/>
                     <col t='yes'>%s</col>
                     <col t='yes'>%s</col>
                     <col t='yes'>%s</col>
                 </row>
             </lines>
-        """ % (_('Work Center name'), _('Cycles Cost'), _('Hourly Cost'),_('Work Cost'))
+        """ % (_('Work Center name'), _('Cycles Cost')+'('+company_currency.code+')', _('Hourly Cost')+'('+company_currency.code+')',_('Work Cost')+'('+company_currency.code+')')
         prod_header = """
                 <row>
                     <col>%s</col>
@@ -126,11 +128,9 @@ class report_custom(report_rml):
                     <col t='yes'>%s</col>
                     <col t='yes'>%s</col>
                     <col t='yes'>%s</col>
-                    <col t='yes'>%s</col>
                 </row>
-        """ % (_('Component'), _('Component suppliers'), _('Quantity'), _('Uom'), _('Cost Price per Uom'), _('Supplier Price per Uom'))
+        """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom')+'('+company_currency.code+')', _('Supplier Price per Uom')+'('+company_currency.code+')')
 
-        company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id.id
         for product in product_pool.browse(cr, uid, ids, context=context):
             bom_id = bom_pool._bom_find(cr, uid, product.id, product.uom_id.id)
             title = "<title>%s</title>" %(_("Cost Structure"))
@@ -145,16 +145,14 @@ class report_custom(report_rml):
                     <col para='yes'>-</col>
                     <col para='yes'>-</col>
                     <col para='yes'>-</col>
-                    <col para='yes'>-</col>
                     </row></lines>"""
                 xml += """<lines style='total'> <row>
-                    <col>%s %s %s %s : </col>
-                    <col/>
+                    <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
                     <col/>
                     <col f='yes'/>
-                    <col f='yes'>%.2f</col>
-                    <col f='yes'>%.2f</col>
-                    </row></lines>'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, total_strd, total)
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total) +' '+ company_currency.symbol + """</col>
+                    </row></lines>'"""
             else:
                 bom = bom_pool.browse(cr, uid, bom_id, context=context)
                 factor = number * product.uom_id.factor / bom.product_uom.factor
@@ -169,20 +167,19 @@ class report_custom(report_rml):
                 }
                 xml_tmp = ''
                 for sub_bom in (sub_boms and sub_boms[0]) or [parent_bom]:
-                    txt, sum, sum_strd = process_bom(sub_bom, company_currency)
+                    txt, sum, sum_strd = process_bom(sub_bom, company_currency.id)
                     xml_tmp +=  txt
                     total += sum
                     total_strd += sum_strd
 
                 xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                 xml += """<lines style='sub_total'> <row>
-                    <col>%s %s %s %s : </col>
-                    <col/>
+                    <col> """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'(' + company_currency.code +')'+ """: </col>
                     <col/>
                     <col t='yes'/>
-                    <col t='yes'>%.2f</col>
-                    <col t='yes'>%.2f</col>
-                    </row></lines>'"""%(_('Cost'), _('of'), str(number), product.uom_id.name, total_strd, total)
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total) +' '+ company_currency.symbol + """</col>
+                    </row></lines>'"""
 
                 total2 = 0
                 xml_tmp = ''
@@ -194,27 +191,22 @@ class report_custom(report_rml):
                     xml += workcenter_header
                     xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                     xml += """<lines style='sub_total'> <row>
-                    <col>%s %s %s %s : </col>
+                    <col> """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+""": </col>
                     <col/>
                     <col/>
                     <col/>
-                    <col/>
-                    <col t='yes'>%.2f</col>
-                    </row></lines>'"""%(_('Work Cost'), _('of'), str(number), product.uom_id.name, total2)
+                    <col t='yes'>"""+ rml_obj.formatLang(total2) +' '+ company_currency.symbol +"""</col>
+                    </row></lines>'"""
                 xml += """<lines style='total'> <row>
-                    <col>%s %s %s %s : </col>
-                    <col/>
+                    <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
                     <col/>
                     <col t='yes'/>
-                    <col t='yes'>%.2f</col>
-                    <col t='yes'>%.2f</col>
-                    </row></lines>'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, total_strd+total2, total+total2)
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd+total2) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total+total2) +' '+ company_currency.symbol + """</col>
+                    </row></lines>'"""
 
         xml = '<?xml version="1.0" ?><report>' + config_start + config_stop + xml + '</report>'
 
         return xml
 
 report_custom('report.product.price', 'product.product', '', 'addons/mrp/report/price.xsl')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp/test/mrp_report.yml b/addons/mrp/test/mrp_report.yml
index 6a13d489104..db9a83d495b 100644
--- a/addons/mrp/test/mrp_report.yml
+++ b/addons/mrp/test/mrp_report.yml
@@ -1,35 +1,35 @@
 -
-  In order to test the PDF reports defined on a mrp, we will print a bom order
+  In order to test the PDF reports defined on a MRP, we will print a BOM Structure Report
 -
   !python {model: mrp.bom}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.bom.structure').create(cr, uid, [ref('mrp.mrp_bom_0'),ref('mrp.mrp_bom_1'),ref('mrp.mrp_bom_2'),ref('mrp.mrp_bom_23'),ref('mrp.mrp_bom_1901'),ref('mrp.mrp_bom_assemblysection0'),ref('mrp.mrp_bom_sidepanel0'),ref('mrp.mrp_bom_defaultbomforshelfofcm1'),ref('mrp.mrp_bom_sidepanel3')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp-bom_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-bom_structure_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a mrp, we will print an order
+  In order to test the PDF reports defined on a MRP, we will print Production Order Report
 -
   !python {model: mrp.production}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.mrp.production.order').create(cr, uid, [ref('mrp.mrp_production_mo1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp-production_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-production_order_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a mrp product price, we will print a (mrp)Product Price order
+  In order to test the PDF reports defined on a MRP, we will print Product Price Report
 -
   !python {model: product.product}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.product.price').create(cr, uid, [1,2,3,5], {'model':'product.product', 'form':{'number': 1}}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp_product-price_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-product_price_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a mrp workcenter, we will print a (mrp)workcenter
+  In order to test the PDF reports defined on a MRP, we will print Workcenter Load Report
 -
   !python {model: mrp.workcenter}: |
     import netsvc, tools, os, time
     (data, format) = netsvc.LocalService('report.mrp.workcenter.load').create(cr, uid, [ref('mrp_workcenter_0'),ref('mrp_workcenter_1')], {'model':'mrp.workcenter', 'form':{'time_unit': 'day', 'measure_unit': 'hours'}}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp_workcenter.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-workcenter_load_report.'+format), 'wb+').write(data)
diff --git a/addons/mrp_operations/test/mrp_operations_report.yml b/addons/mrp_operations/test/mrp_operations_report.yml
index c83d077acde..f0a646adf4e 100644
--- a/addons/mrp_operations/test/mrp_operations_report.yml
+++ b/addons/mrp_operations/test/mrp_operations_report.yml
@@ -1,17 +1,17 @@
 -
-  In order to test the PDF reports defined on a mrp operations, we  will print a barcode
+  In order to test the PDF reports defined on a MRP Operations, we  will print a Barcode Report
 -
   !python {model: mrp_operations.operation.code}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.mrp.code.barcode').create(cr, uid, [ref('mrp_operations.mrp_op_1'),ref('mrp_operations.mrp_op_2'),ref('mrp_operations.mrp_op_3'),ref('mrp_operations.mrp_op_4'),ref('mrp_operations.mrp_op_5')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp_operations-barcoder.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp_operations-barcode_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a mrp operations, we  will print a workcenters
+  In order to test the PDF reports defined on a MRP Operations, we  will print Workcenter's Barcode Report
 -
   !python {model: mrp.workcenter}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.mrp.wc.barcode').create(cr, uid, [ref('mrp.mrp_workcenter_0'),ref('mrp.mrp_workcenter_1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp_ workcenter.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp_operations-workcenter_barcode_report.'+format), 'wb+').write(data)
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index dae2a25ec0e..c71abb614cf 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -277,7 +277,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price([[ o.pricelist_id.currency_id. name ]])</para>
+          <para style="terp_tblheader_Details_Right">Price<font size="8.0">([[ o.pricelist_id.currency_id. name ]])</font></para>
         </td>
       </tr>
     </blockTable>
@@ -307,9 +307,6 @@
         </tr>
       </blockTable>
     </section>
-	 <para style="P12">
-      <font color="white"> </font>
-    </para>
     <para style="P29">Fees Line(s) [[ (o.fees_lines ==[] and  removeParentNode('para') )  ]]</para>
     <section>
     <para style="P30"><font color="white">[[ repeatIn(o.fees_lines,'fees') ]]</font></para>
@@ -386,7 +383,7 @@
     <blockTable colWidths="534.0" style="Table8">
       <tr>
         <td>
-          <para style="P3">[[ format(o.quotation_notes) or removeParentNode('blockTable') ]]</para>
+          <para style="P3">[[ format(o.quotation_notes or '') or removeParentNode('blockTable') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/mrp_repair/test/mrp_repair_report.yml b/addons/mrp_repair/test/mrp_repair_report.yml
index b6eb782dcfe..cc6600c6704 100644
--- a/addons/mrp_repair/test/mrp_repair_report.yml
+++ b/addons/mrp_repair/test/mrp_repair_report.yml
@@ -1,8 +1,8 @@
 -
-  In order to test the PDF reports defined on a mrp-repair, we will print a order
+  In order to test the PDF reports defined on a MRP Repair, we will print an Order Report
 -
   !python {model: mrp.repair}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.repair.order').create(cr, uid, [ref('mrp_repair.mrp_repair_rma0')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp-repair_order.'+format), 'wb+').write(data)
+        file(os.path.join(tools.config['test_report_directory'], 'mrp_repair-order_report.'+format), 'wb+').write(data)
diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
index aeda5e4e754..f042ce9c94e 100755
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -40,7 +40,7 @@ class outlook_installer(osv.osv_memory):
     _columns = {
         'name':fields.char('File name', size=34),
         'doc_name':fields.char('File name', size=64),
-        'outlook':fields.boolean('Outlook Module ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
+        'outlook':fields.boolean('Outlook Plug-in ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
         'plugin_file':fields.binary('Outlook Plug-in', readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
         'doc_file':fields.binary('Installation Manual', help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
         'description':fields.text('Description', readonly=True)
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index 1b20945d816..99b440bf89a 100755
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -12,13 +12,19 @@
                         <attribute name="string">Outlook Plug-In Configuration</attribute>
                     </form>
                     <separator string="title" position="attributes">
-                        <attribute name="string">Outlook</attribute>
+                        <attribute name="string">Outlook Plug-In</attribute>
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
                         <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
                     </xpath>
-                    <xpath expr="//button[@string='Install Modules']" position="attributes">
-                        <attribute name="string">Configure</attribute>
+                    <xpath expr="//button[@string='Install Modules']" position="replace">
+                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
+                        <button name="action_next" icon="gtk-go-forward"
+                                type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+                    </xpath>
+                    <xpath expr="//button[@string='Skip']" position="replace">
+                        <button name="action_skip" icon="gtk-jump-to" special="cancel"
+                                type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
                     </xpath>
                     <xpath expr='//separator[@string="vsep"]' position='attributes'>
                         <attribute name='string'></attribute>
@@ -43,7 +49,7 @@
         </record>
 
         <record id="action_outlook_installer" model="ir.actions.act_window">
-            <field name="name">Outlook Module Installation</field>
+            <field name="name">Outlook Plug-In Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
             <field name="view_id" ref="view_outlook_installer"/>
@@ -57,53 +63,15 @@
             <field name="sequence">4</field>
         </record>
 
-    <!--	  Configuration wizard.  -->
-
-        <record id="view_outlook_wizard" model="ir.ui.view">
-        <field name="name">outlook.wizard</field>
-        <field name="model">outlook.installer</field>
-        <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string= "Outlook Plug-In Configuration">
-                    <group colspan="4">
-                        <separator string="Configure Outlook Module" colspan="4"/>
-                        <group colspan="4" col="10">
-                            <group colspan="2">
-                                <image name="gtk-dialog-info"/>
-                                    <newline/>
-                                <label align="0.0" string="This Module allows you to select an object that you would like to add to your email and its attachments from MS Outlook. You can select a partner, a task, a project, an analytical account, or any other object and Archived selected mail in mailgate.messages with attachments" width="200"/>
-                            </group>
-                            <group colspan="8">
-                                <field name="outlook" invisible="1"/>
-                                <field name="name" invisible="1"/>
-                                <field name="doc_name" invisible="1"/>
-                                    <newline/>
-                                <field name="plugin_file" filename="name"/>
-                                    <newline/>
-                                <field name="doc_file" filename="doc_name"/>
-                                    <newline/>
-                                <separator string="Outlook plugin installation note." colspan="4"/>
-                                <field name="description" nolabel="1" colspan="8"/>
-                            </group>
-                        </group>
-                    </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4">
-                        <label align="0.0" string="" colspan="3"/>
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
         <record id="action_outlook_wizard" model="ir.actions.act_window">
-            <field name="name">Outlook Module Installation</field>
+            <field name="name">Outlook Plug-In Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
-            <field name="view_id" ref="view_outlook_wizard"/>
+            <field name="view_id" ref="view_outlook_installer"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="context">{'menu':True}</field>
         </record>
 
         <menuitem id="base.menu_base_config_mail" 
@@ -118,7 +86,7 @@
                   
         <menuitem id="menu_base_config_plugins_outlook" 
                   action="action_outlook_wizard" 
-                  name="Outlook" 
+                  name="Outlook Plug-In" 
                   parent="base.menu_base_config_plugins" 
                   sequence="10" />
     </data>
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 6f33f75f65d..ad466b12522 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -75,8 +75,7 @@ Main features :
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml',],
     'test':['test/pos_test.yml',
             'test/pos_report.yml',
-            'test/pos_details.yml',
-            'test/pos_payment_report_date.yml'],
+    ],
     '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
index af0be67af63..769d3a0460e 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -128,10 +128,6 @@ class pos_order(osv.osv):
             cr.execute(" SELECT max(l.date) from account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o where i.move_id=m.id and l.move_id=m.id and l.reconcile_id=r.id and o.id=%d and o.invoice_id=i.id"%(order.id))
             val=cr.fetchone()
             val= val and val[0] or None
-            if not val:
-                cr.execute("select max(date) from account_bank_statement_line l, account_bank_statement_reconcile s where l.pos_statement_id=%d and l.reconcile_id=s.id"%(order.id))
-                val=cr.fetchone()
-                val=val and val[0] or None
             if val:
                 res[order.id]=val
         return res
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index 80ba3d24397..18029826008 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -61,5 +61,14 @@
             <field name="notice">Discount Applied</field>
         </record>
 		
+		<record id="account_bank_statement_st0" model="account.bank.statement">
+			<field name="name">St. 05/19</field>
+            <field name="balance_end_real">0.0</field>
+            <field name="date">2010-05-19</field>
+            <field name="journal_id" ref="account.bank_journal"/>
+            <field name="period_id" ref="account.period_5"/>
+            <field name="state">draft</field>
+        </record>
+		
     </data>
 </openerp>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 0cc1c43520a..28f240c1070 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -186,13 +186,13 @@
             <para style="terp_default_Right_9">[[ formatLang(l.qty) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]][[o.pricelist_id.currency_id. symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l.discount) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]][[o.pricelist_id.currency_id. symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -223,7 +223,7 @@
           <para style="terp_default_9">Net Total </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.code ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -251,7 +251,7 @@
           <para style="terp_default_9">Taxes</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id.code ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -279,7 +279,7 @@
           <para style="terp_default_9">Total</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id.code ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index 48ea148d8d1..dc829859c3e 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -40,13 +40,13 @@ class pos_payment_report_user(report_sxw.rml_parse):
                          "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
                          "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
                          "and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
-                         "and po.user_id IN %s",(tuple(ids), )
-        self.cr.execute (sql)
+                         "and po.user_id IN %s"
+        self.cr.execute (sql, (tuple(ids), ))
         data=self.cr.dictfetchall()
         return data
-    def __pos_payment_user__total__(self,form):
+    def __pos_payment_user__total__(self, form):
         res=[]
-        ids = form['user_id'][0][-1]
+        ids = form['user_id']
         self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
                          "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
                          "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index 3a284f1957f..141445bcafe 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -42,7 +42,7 @@ class pos_user_product(report_sxw.rml_parse):
         a_l=[]
         for r in data:
             a_l.append(r['id'])
-        if len(a):
+        if len(a_l):
             sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name from product_product p, product_template t, pos_order_line l where order_id IN %s and p.product_tmpl_id=t.id and l.product_id=p.id group by t.name, l.price_unit""",(tuple(a_l),)
             self.cr.execute(sql2)
             data = self.cr.dictfetchall()
diff --git a/addons/point_of_sale/test/pos_details_report.yml b/addons/point_of_sale/test/pos_details_report.yml
deleted file mode 100644
index 72f35b87ec5..00000000000
--- a/addons/point_of_sale/test/pos_details_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Details report
-- 
-  !python {model: ir.ui.menu}: |
-    import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.pos.details').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d') }}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos details report'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/point_of_sale/test/pos_payment_report_date.yml b/addons/point_of_sale/test/pos_payment_report_date.yml
deleted file mode 100644
index 15eefcdc6ab..00000000000
--- a/addons/point_of_sale/test/pos_payment_report_date.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Sales Lines report
-- 
-  !python {model: ir.ui.menu}: |
-    import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.pos.payment.report.date').create(cr, uid, [1], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'), 'user_id': [ref('base.user_root')] }}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos sales lines report'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
index bd89ca2015d..1747fb60305 100644
--- a/addons/point_of_sale/test/pos_report.yml
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Detail Summary report
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Detail Summary Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
@@ -8,7 +8,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-details_summary report'+format), 'wb+').write(data)
         
 -
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Invoice report
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Invoice Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
@@ -17,7 +17,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data)
         
 -
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Lines report
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Lines Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
@@ -26,7 +26,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-lines report'+format), 'wb+').write(data)
         
 -
-  In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt report
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
@@ -35,7 +35,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt report'+format), 'wb+').write(data)
         
 -
-  In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt With Reimbursement report
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Receipt With Reimbursement Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
@@ -44,10 +44,93 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt with reimbursement report'+format), 'wb+').write(data)
         
 -
-  In order to test the PDF reports defined on a point of sale, we will print a POS Receipt Without Reimbursement report
+  In order to test the PDF reports defined on a point of sale, we will print a POS Receipt Without Reimbursement Report
 - 
   !python {model: pos.order}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.pos.receipt.without.remboursment').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Payment Report Report
+- 
+  !python {model: ir.ui.menu}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.payment.report.date').create(cr, uid, [1], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'), 'user_id': [ref('base.user_root')] }}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos sales lines report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Details Report
+- 
+  !python {model: ir.ui.menu}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.details').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d') }}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos details report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a Account Statement Report
+- 
+  !python {model: account.bank.statement}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.account.statement').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-account_statement_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS User Product Report
+- 
+  !python {model: account.bank.statement}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.user.product').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-user_product_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS All Close Cashbox Of the Day Report
+- 
+  !python {model: account.bank.statement}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.all.closed.cashbox.of.the.day').create(cr, uid, [ref('point_of_sale.account_bank_statement_st0')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-all_closed_cash_box_of_the_day_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Sales User Report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os, time
+    data_dict = {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'),'user_id':[ref('base.user_root')] }}
+    (data, format) = netsvc.LocalService('report.pos.sales.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], data_dict, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_user_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Sales User Today Report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os, time
+    data_dict = {'model':'ir.ui.menu', 'form':{'user_id':[ref('base.user_root')] }}
+    (data, format) = netsvc.LocalService('report.pos.sales.user.today').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], data_dict, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_user_today_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Payment Report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.payment.report').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-payment_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Payment User Report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os, time
+    data_dict = {'model':'ir.ui.menu', 'form':{'user_id':[ref('base.user_root'),ref('base.user_demo')] }}
+    (data, format) = netsvc.LocalService('report.pos.payment.report.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], data_dict, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-payment_user_report'+format), 'wb+').write(data)
+-
+  In order to test the PDF reports defined on a Point of Sale, we will print a POS Today's Sales of Current User Report
+- 
+  !python {model: pos.order}: |
+    import netsvc, tools, os, time
+    (data, format) = netsvc.LocalService('report.pos.sales.user.today.current.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_today_current_user_report'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 2fcb2a3e0c4..c9b5f744b77 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -8,18 +8,18 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Tools Modules Configuration</attribute>
+            <attribute name="string">Extra Tools Configuration</attribute>
           </form>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>
           </xpath>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Tools</attribute>
+            <attribute name="string">Configure Extra Tools</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">Here are applications which, while they do not directly contribute to your business, can help you to improve your organization.</attribute>
+            <attribute name="string">Here are applications that can help you improve your organization without being key in its management.</attribute>
           </xpath>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
               <attribute name="string">Configure</attribute>
@@ -36,7 +36,7 @@
     </record>
 
     <record id="action_misc_tools_installer" model="ir.actions.act_window">
-      <field name="name">Tools Modules Installation</field>
+      <field name="name">Tools Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">misc_tools.installer</field>
       <field name="view_id" ref="view_misc_tools_installer"/>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index d19c8467de2..e12fa4d3815 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -9,10 +9,10 @@
       <field name="arch" type="xml">
           <data>
           <form position="attributes">
-            <attribute name="string">Project Modules Configuration</attribute>
+            <attribute name="string">Project Application Configuration</attribute>
           </form>
           <separator string="title" position="attributes">
-            <attribute name="string">Project Management</attribute>
+            <attribute name="string">Configure Your Project Management Application</attribute>
           </separator>
            <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>
@@ -40,7 +40,7 @@
     </record>
 
     <record id="action_project_installer" model="ir.actions.act_window">
-      <field name="name">Project Modules Installation</field>
+      <field name="name">Project Application Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">project.installer</field>
       <field name="view_id" ref="view_project_installer"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f1e4d34f54c..f3dcca16edc 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -80,6 +80,7 @@
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                 <tree string="Communication history">
                                     <field name="display_text" string="History Information"/>
+                                    <field name="history" invisible="1"/>
                                     <button
                                         string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
                                         name="%(crm.action_crm_send_mail)d"
@@ -116,7 +117,11 @@
                                 </form>
                             </field>
                            <separator colspan="4"/>
-                           <button colspan="4" string="Send New Email"
+                            <button string="Add New Note"
+                                name="%(crm.action_crm_add_note)d"
+                                context="{'model': 'crm.lead' }"
+                                icon="terp-document-new" type="action" />
+                            <button string="Send New Email"
                                name="%(crm.action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'project.issue'}"
                                icon="terp-mail-message-new" type="action" />
diff --git a/addons/project_planning/report/report_planning.rml b/addons/project_planning/report/report_planning.rml
index 8a6fe372661..43dab8eb5b4 100644
--- a/addons/project_planning/report/report_planning.rml
+++ b/addons/project_planning/report/report_planning.rml
@@ -142,7 +142,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P6">[[ repeatIn(o.planning_user_ids , 'u') ]] [[ formatLang(u.user_id.name ]]</para>
+          <para style="P6">[[ repeatIn(o.planning_user_ids , 'u') ]] [[ u.user_id.name ]]</para>
         </td>
         <td>
           <para style="P6">[[ formatLang(u.plan_tasks) ]]</para>
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index b39dbc6003b..539edb3ec2f 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -2,25 +2,25 @@
 <openerp>
     <data>
         <record id="view_purchase_install_module_form" model="ir.ui.view">
-            <field name="name">Purchase Requisition</field>
+            <field name="name">Purchases Application Configuration</field>
             <field name="model">purchase.installer</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
               <data>
               <form position="attributes">
-                <attribute name="string"> Purchase Modules Configuration</attribute>
+                <attribute name="string">Purchases Application Configuration</attribute>
               </form>
               <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
                   </xpath>
               <separator string="title" position="attributes">
                 <attribute name="string"
-                           >Configure Your Purchase System</attribute>
+                           >Configure Your Purchases Management Application</attribute>
               </separator>
               <xpath expr="//label[@string='description']"
                      position="attributes">
-                <attribute name="string">In this page, you can extend your purchase system with purchase requisition facility and analytic distribution of purchase orders.</attribute>
+                <attribute name="string">Extend your Purchases Management Application with purchase requisition facility and analytic distribution of purchase orders.</attribute>
               </xpath>
               <xpath expr="//button[@string='Install Modules']" position="attributes">
                    <attribute name="string">Configure</attribute>
@@ -34,7 +34,7 @@
         </record>
 
         <record id="action_purchase_install_module" model="ir.actions.act_window">
-            <field name="name">Purchase  Profile : Install Extra Modules</field>
+            <field name="name">Purchases Application Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.installer</field>
             <field name="view_id" ref="view_purchase_install_module_form"/>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 79381691d32..907cdaad06d 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -8,14 +8,14 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Report Modules Configuration</attribute>
+            <attribute name="string">Reporting Tools Configuration</attribute>
           </form>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                   <attribute name='string'></attribute>
           </xpath>
           <separator string="title" position="attributes">
             <attribute name="string"
-                       >Reporting Tools</attribute>
+                       >Configure Reporting Tools</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
@@ -35,7 +35,7 @@
     </record>
 
     <record id="action_report_designer_installer" model="ir.actions.act_window">
-      <field name="name">Report Modules Installation</field>
+      <field name="name">Reporting Tools Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">report_designer.installer</field>
       <field name="view_id" ref="view_report_designer_installer"/>
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
index a68af46bd73..9aab465573d 100644
--- a/addons/sale/sale_installer.xml
+++ b/addons/sale/sale_installer.xml
@@ -8,15 +8,15 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Sale Modules Configuration</attribute>
+            <attribute name="string">Sales Application Configuration</attribute>
           </form>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Sales Management</attribute>
+            <attribute name="string">Configure Your Sales Management Application</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">After having installed the core sales application, you can extend it depending on the needs of your sale's organization.</attribute>
+            <attribute name="string">Add more functionalities to the core Sales Application with the following addons.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>
@@ -36,7 +36,7 @@
     </record>
 
     <record id="action_sale_installer" model="ir.actions.act_window">
-      <field name="name">Sale Management Modules Installation</field>
+      <field name="name">Sales Application Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">sale.installer</field>
       <field name="view_id" ref="view_sale_installer"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 56fcfc64d7f..327a10aa6d8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -524,7 +524,7 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Sales Configuration</attribute>
+                  <attribute name="string">Sales Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
                 <attribute name="string"
@@ -545,6 +545,7 @@ to your configuration: from the sales order, from the pickings, etc.
                   <field name="step"/>
                 </group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
+               
               </data>
             </field>
         </record>
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 0cf3111781a..317180c7209 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Picking List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Packing List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
     </pageTemplate>
@@ -124,6 +124,7 @@
     <blockTable colWidths="269.0,269.0" style="Table_Address_detail">
       <tr>
         <td>
+          <para style="terp_default_Bold_9">Shipping Address :</para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
@@ -132,6 +133,7 @@
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
         </td>
         <td>
+          <para style="terp_default_Bold_9">Contact Address :</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.title or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
@@ -147,9 +149,6 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_5cm_Above_Space">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="538.0" style="Table_Title_String">
       <tr>
         <td>
@@ -160,9 +159,6 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_5cm_Above_Space">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="123.0,134.0,133.0,134.0" style="Header_Order_Reference_Tbl">
       <tr>
         <td>
diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py
index 0fb9a9dd08a..cb963831218 100644
--- a/addons/thunderbird/installer.py
+++ b/addons/thunderbird/installer.py
@@ -41,7 +41,7 @@ class thunderbird_installer(osv.osv_memory):
     _columns = {
         'name':fields.char('File name', size=34),
         'pdf_name':fields.char('File name', size=64),
-        'thunderbird':fields.boolean('Thunderbird Module ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
+        'thunderbird':fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you’d like to add to your email and its attachments."),
         'plugin_file':fields.binary('Thunderbird Plug-in', readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."),
         'pdf_file':fields.binary('Installation Manual', help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
         'description':fields.text('Description', readonly=True)
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index b7a66d4e122..622ca3ed127 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -12,14 +12,20 @@
                   <attribute name="string">Thunderbird Plug-In Configuration</attribute>
               </form>
               <separator string="title" position="attributes">
-                   <attribute name="string">Thunderbird</attribute>
+                   <attribute name="string">Thunderbird Plug-In</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
                   <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
               </xpath>
-	      <xpath expr="//button[@string='Install Modules']" position="attributes">
-	        <attribute name="string">Configure</attribute>
-	      </xpath>
+	          <xpath expr="//button[@string='Install Modules']" position="replace">
+                <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
+                <button name="action_next" icon="gtk-go-forward"
+                        type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+              </xpath>
+              <xpath expr="//button[@string='Skip']" position="replace">
+                <button name="action_skip" icon="gtk-jump-to" special="cancel"
+                        type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+              </xpath>
               <xpath expr='//separator[@string="vsep"]' position='attributes'>
 		  		<attribute name='string'></attribute>
 		  		<attribute name='rowspan'>15</attribute>
@@ -44,7 +50,7 @@
     </record>
 
     <record id="action_thunderbird_installer" model="ir.actions.act_window">
-      <field name="name">Thunderbird Module Installation</field>
+      <field name="name">Thunderbird Plug-In Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
@@ -58,59 +64,21 @@
       <field name="sequence">3</field>
     </record>
 
-	<!--  Configuration wizard.  -->
-
-    <record id="view_thunderbird_wizard" model="ir.ui.view">
-      <field name="name">thunderbird.wizard</field>
-      <field name="model">thunderbird.installer</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-          <form string= "Thunderbird Installation">
-              <group colspan="4">
-                  <separator string="Configure Thunderbird Module" colspan="4"/>
-                  <group colspan="4" col="10">
-                      <group colspan="2">
-                          <image name="gtk-dialog-info"/>
-                          <newline/>
-                          <label align="0.0" string="This module allows you to archive an e-mail on one or more objects of OpenERP. You can attach an email to a partner, a task, an analytic account or any other object. You can also create a new object like a lead, a phone call, claim and many more." width="200"/>
-                       </group>
-                       <group colspan="8">
-		                  <field name="thunderbird" invisible="1"/>
-		                  <field name="name" invisible="1"/>
-		                  <field name="pdf_name" invisible="1"/>
-		                  <newline/>
-
-		                  <field name="plugin_file" filename="name"/>
-		                  <newline/>
-		                  <field name="pdf_file" filename="pdf_name"/>
-		                  <newline/>
-		                  <separator string="Installation and Configuration Steps" colspan="4"/>
-		                  <field name="description" nolabel="1" colspan="8"/>
-		               </group>
-                   </group>
-             </group>
-             <separator string="" colspan="4"/>
-             <group colspan="4">
-                 <label align="0.0" string="" colspan="3"/>
-                 <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-             </group>
-         </form>
-      </field>
-    </record>
 
     <record id="action_thunderbird_wizard" model="ir.actions.act_window">
-      <field name="name">Thunderbird Module Installation</field>
+      <field name="name">Thunderbird Plug-In Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
-      <field name="view_id" ref="view_thunderbird_wizard"/>
+      <field name="view_id" ref="view_thunderbird_installer"/>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
       <field name="target">new</field>
+      <field name="context">{'menu':True}</field>
     </record>
 
     <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
 	<menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config_mail" sequence="10" />
-	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird" parent="base.menu_base_config_plugins" sequence="10" />
+	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10" />
 
   </data>
 </openerp>
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index ab19dc8f4eb..4f78b2f7c85 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -24,13 +24,13 @@ from osv import fields, osv
 from tools.translate import _
 import difflib
 
-class Wiki(osv.osv):
+class wiki_wiki(osv.osv):
     """ wiki """
     _name = "wiki.wiki"
 
-Wiki()
+wiki_wiki()
 
-class WikiGroup(osv.osv):
+class wiki_group(osv.osv):
     """ Wiki Groups """
 
     _name = "wiki.groups"
@@ -45,8 +45,8 @@ class WikiGroup(osv.osv):
        'template': fields.text('Wiki Template'),
        'section': fields.boolean("Make Section ?"),
        'method':fields.selection([('list', 'List'), ('page', 'Home Page'), \
-                                   ('tree', 'Tree')], 'Display Method'),
-       'home':fields.many2one('wiki.wiki', 'Home Page'),
+                                   ('tree', 'Tree')], 'Display Method', help="Define the default behaviour of the menu created on this group"),
+       'home':fields.many2one('wiki.wiki', 'Home Page', help="Required to select home page if display method is Home Page"),
        'menu_id': fields.many2one('ir.ui.menu', "Menu", readonly=True),
     }
 
@@ -71,7 +71,7 @@ class WikiGroup(osv.osv):
             group_id = ids[0]
         if not group_id:
             return {}
-        value = {            
+        value = {
             'name': 'Wiki Page',
             'view_type': 'form',
             'view_mode': 'form,tree',
@@ -94,10 +94,10 @@ class WikiGroup(osv.osv):
             value['view_type'] = 'tree'
 
         return value
-WikiGroup()
+wiki_group()
 
 
-class Wiki2(osv.osv):
+class wiki_wiki2(osv.osv):
     """ Wiki Page """
 
     _inherit = "wiki.wiki"
@@ -111,7 +111,7 @@ class Wiki2(osv.osv):
         'create_uid': fields.many2one('res.users', 'Author', select=True),
         'create_date': fields.datetime("Created on", select=True),
         'write_date': fields.datetime("Modification Date", select=True),
-        'tags': fields.char('Tags', size=1024, select=True),
+        'tags': fields.char('Keywords', size=1024, select=True),
         'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'),
         'minor_edit': fields.boolean('Minor edit', select=True),
         'summary': fields.char('Summary', size=256),
@@ -119,12 +119,17 @@ class Wiki2(osv.osv):
         'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null',
             help="Topic, also called Wiki Group"),
         'toc': fields.boolean('Table of Contents',
-            help="Indicates that this pages is a table of contents (linking to other pages)"),
+            help="Indicates that this pages have a table of contents or not"),
         'review': fields.boolean('Needs Review', select=True,
             help="Indicates that this page should be reviewed, raising the attention of other contributors"),
-        'parent_id': fields.many2one('wiki.wiki', 'Parent Page'),
+        'parent_id': fields.many2one('wiki.wiki', 'Parent Page', help="Allows you to link with the other page with in the current topic"),
         'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
     }
+    _defaults = {
+        'toc': lambda *a: True,
+        'review': lambda *a: True,
+        'minor_edit': lambda *a: True,
+    }
 
     def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
 
@@ -161,22 +166,27 @@ class Wiki2(osv.osv):
 
         return super(Wiki, self).copy_data(cr, uid, id, {'wiki_id': False}, context)
 
-    def create(self, cr, uid, vals, context=None):
-
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks, """
-
-        id = super(Wiki, self).create(cr, uid, vals, context)
+    def create_history(self, cr, uid, ids, vals, context=None):
+        history_id = False
         history = self.pool.get('wiki.wiki.history')
         if vals.get('text_area'):
             res = {
                 'minor_edit': vals.get('minor_edit', True),
                 'text_area': vals.get('text_area', ''),
                 'write_uid': uid,
-                'wiki_id': id,
+                'wiki_id': ids[0],
                 'summary':vals.get('summary', '')
             }
-            history.create(cr, uid, res)
+            history_id = history.create(cr, uid, res)
+        return history_id
+
+    def create(self, cr, uid, vals, context=None):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks, """
+
+        id = super(wiki_wiki2, self).create(cr, uid, vals, context)
+        self.create_history(cr, uid, [id], vals, context)
         return id
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -184,24 +194,14 @@ class Wiki2(osv.osv):
         """ @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks, """
 
-        result = super(Wiki, self).write(cr, uid, ids, vals, context)
-        history = self.pool.get('wiki.wiki.history')
-        if vals.get('text_area'):
-            for id in ids:
-                res = {
-                    'minor_edit': vals.get('minor_edit', True),
-                    'text_area': vals.get('text_area', ''),
-                    'write_uid': uid,
-                    'wiki_id': id,
-                    'summary': vals.get('summary', '')
-                }
-                history.create(cr, uid, res)
+        result = super(wiki_wiki2, self).write(cr, uid, ids, vals, context)
+        self.create_history(cr, uid, ids, vals, context)
         return result
 
-Wiki2()
+wiki_wiki2()
 
 
-class History(osv.osv):
+class wiki_history(osv.osv):
     """ Wiki History """
 
     _name = "wiki.wiki.history"
@@ -240,6 +240,6 @@ class History(osv.osv):
         diff = difflib.HtmlDiff()
         return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False)
 
-History()
+wiki_history()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 5c9aa842e98..04f33be35cb 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -12,8 +12,7 @@
            parent="knowledge.menu_document_configuration" sequence="2" />
 
 
-<!--  Wiki Groups Tree view -->
-
+        <!--  Wiki Groups Tree view -->
        <record model="ir.ui.view" id="wiki_group_tree">
             <field name="name">wiki.groups.tree</field>
             <field name="model">wiki.groups</field>
@@ -25,23 +24,25 @@
             </field>
         </record>
 
-<!--  Wiki Groups Form view -->
-
+        <!--  Wiki Groups Form view -->
         <record model="ir.ui.view" id="wiki_group_form">
             <field name="name">wiki.groups.form</field>
             <field name="model">wiki.groups</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Wiki Groups">
-                    <group colspan="4" col="4">
+                    <group col="4" colspan="3" >
                         <field name="name" select="1"/>
                         <field name="create_date" readonly="2"/>
+                    </group>
+                    <group col="2" colspan="1">
                         <field name="method" select="1"/>
-                        <field name="home" select="1"
+                        <field name="home" select="1" domain="[('group_id','=',active_id)]"
                             attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
                     </group>
                     <notebook colspan="4">
                     <page string="Notes">
+                        <separator string="Group Description" colspan="4"/>
                         <field name="notes" colspan="4" nolabel="1"/>
                     </page><page string="Configuration">
                         <separator string="Page Template" colspan="4"/>
@@ -64,8 +65,7 @@
             </field>
         </record>
 
-<!--  Wiki Groups Action  -->
-
+        <!--  Wiki Groups Action  -->
         <record model="ir.actions.act_window" id="action_wiki_groups">
             <field name="name">Wiki Groups</field>
             <field name="res_model">wiki.groups</field>
@@ -84,8 +84,7 @@
             <field name="view_type">tree</field>
         </record>
 
-<!-- wiki Tree view For child -->
-
+        <!-- wiki Tree view For child -->
         <record id="view_wiki_tree_childs" model="ir.ui.view">
             <field name="name">wiki.wiki.tree.childs</field>
             <field name="model">wiki.wiki</field>
@@ -103,8 +102,7 @@
             </field>
         </record>
 
-<!-- wiki Tree view  -->
-
+        <!-- wiki Tree view  -->
         <record model="ir.ui.view" id="view_wiki_tree">
             <field name="name">wiki.wiki.tree</field>
             <field name="model">wiki.wiki</field>
@@ -112,27 +110,28 @@
             <field name="arch" type="xml">
                 <tree string="Wiki">
                     <field name="name"/>
+                    <field name="group_id"/>
                     <field name="section" invisible="not context.get('section',False)"/>
-                    <field name="group_id" invisible="context.get('group_id',False)"/>
                     <field name="review"/>
+                    <field name="create_uid" invisible="context.get('create_uid',False)"/>
                     <field name="write_uid"/>
                     <field name="write_date"/>
                 </tree>
             </field>
         </record>
 
-<!-- wiki Form view  -->
-
+        <!-- wiki Form view  -->
         <record model="ir.ui.view" id="view_wiki_form">
             <field name="name">wiki.wiki.form</field>
             <field name="model">wiki.wiki</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Wiki">
-                    <group col="8" colspan="4">
-                        <field name="name" select="1" colspan="8"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" colspan="6"/>
                         <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
-                        <field name="section"/>
+                        <field name="parent_id" groups="base.group_extended" domain="[('group_id','=',group_id)]"/>
+                        <field name="section"/>                        
                     </group>
                     <notebook colspan="4">
                         <page string="Content">
@@ -140,44 +139,47 @@
                         <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                         </page>
                     </notebook>
-                    <separator colspan="4" string="Modifications"/>
-                    <group col="4" colspan="4">
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Modification Information"/>
                         <field name="write_date" readonly="1"/>
-                        <field name="review" select="1"/>
-                        <field name="tags" select="1" groups="base.group_extended"/>
-                        <field name="toc"/>
+                        <field name="minor_edit" groups="base.group_extended"/>
+                        <field name="review" select="1" groups="base.group_extended"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Meta Information"/>
+                        <field name="tags" select="1"/>
+                        <field name="toc" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
         </record>
 
-    <!-- wiki Search view  -->
-
+        <!-- wiki Search view  -->
         <record id="view_wiki_filter" model="ir.ui.view">
             <field name="name">wiki.wiki.search</field>
             <field name="model">wiki.wiki</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Wiki">
-                    <filter icon="terp-check" string="Need Review" domain="[('review','=',True)]"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <separator orientation="vertical"/>
-                    <field name="section" select="1"/>
                     <field name="name" select="1"/>
                     <field name="group_id" select="1"/>
+                    <field name="tags" select="1"/>
+                    <field name="section" select="1" groups="base.group_extended"/>
                     <field name="write_uid" select="1"/>
                     <field name="write_date" select="1"/>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="8" col="6">
-                        <filter icon="terp-check" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
+                        <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
-                        <filter icon="terp-personal-" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
+                        <filter icon="terp-personal+" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
                     </group>
                 </search>
             </field>
         </record>
 
-<!-- search page for wiki -->
-
+        <!-- search page for wiki -->
         <record model="ir.actions.act_window" id="action_wiki">
             <field name="name">Wiki Pages</field>
             <field name="res_model">wiki.wiki</field>
@@ -192,8 +194,7 @@
             id="menu_action_wiki_wiki" name="Wiki Pages"
             action="action_wiki" />
 
-<!--  Pages Waiting Review -->
-
+        <!--  Pages Waiting Review -->
         <record model="ir.actions.act_window" id="action_wiki_review">
             <field name="name">Pages Waiting Review</field>
             <field name="res_model">wiki.wiki</field>
@@ -205,8 +206,7 @@
             <field name="filter" eval="True"/>
         </record>
 
-<!-- History Tree view -->
-
+        <!-- History Tree view -->
         <record model="ir.ui.view" id="view_wiki_history_tree">
             <field name="name">wiki.wiki.history.tree</field>
             <field name="model">wiki.wiki.history</field>
@@ -221,8 +221,7 @@
             </field>
         </record>
 
-<!-- History Form view  -->
-
+        <!-- History Form view  -->
         <record model="ir.ui.view" id="wiki_history_form">
             <field name="name">wiki.wiki.history.form</field>
             <field name="model">wiki.wiki.history</field>
@@ -238,8 +237,7 @@
             </field>
         </record>
 
-<!-- History Action  -->
-
+        <!-- History Action  -->
         <record model="ir.actions.act_window" id="action_history">
             <field name="name">All Page Histories</field>
             <field name="res_model">wiki.wiki.history</field>