diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 08122f5af30..e01dbc70f07 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -104,6 +104,8 @@ module named account_voucher.
         'account_invoice_view.xml',
         'partner_view.xml',
         'data/account_data.xml',
+        'data/data_financial_report.xml',
+        'data/data_account_type.xml',
         'account_invoice_workflow.xml',
         'project/project_view.xml',
         'project/project_report.xml',
@@ -121,8 +123,6 @@ module named account_voucher.
         'ir_sequence_view.xml',
         'company_view.xml',
         'board_account_view.xml',
-        "wizard/account_report_profit_loss_view.xml",
-        "wizard/account_report_balance_sheet_view.xml",
         "edi/invoice_action_data.xml",
         "account_bank_view.xml",
         "account_pre_install.yml"
diff --git a/addons/account/account.py b/addons/account/account.py
index a15a04dcffe..83838f5f545 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -130,8 +130,45 @@ account_payment_term_line()
 class account_account_type(osv.osv):
     _name = "account.account.type"
     _description = "Account Type"
+
+    def _get_current_report_type(self, cr, uid, ids, name, arg, context=None):
+        obj_data = self.pool.get('ir.model.data')
+        obj_financial_report = self.pool.get('account.financial.report') 
+        res = {}
+        financial_report_ref = {
+            'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
+            'liability': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_liability0')[1], context=context),
+            'income': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_income0')[1], context=context),
+            'expense': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_expense0')[1], context=context),
+        }
+        for record in self.browse(cr, uid, ids, context=context):
+            res[record.id] = 'none'
+            for key, financial_report in financial_report_ref.items():
+                list_ids = [x.id for x in financial_report.account_type_ids]
+                if record.id in list_ids:
+                    res[record.id] = key
+        return res
+
+    def _save_report_type(self, cr, uid, account_type_id, field_name, field_value, arg, context=None):
+        obj_data = self.pool.get('ir.model.data')
+        obj_financial_report = self.pool.get('account.financial.report') 
+        #unlink if it exists somewhere in the financial reports related to BS or PL
+        financial_report_ref = {
+            'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
+            'liability': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_liability0')[1], context=context),
+            'income': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_income0')[1], context=context),
+            'expense': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_expense0')[1], context=context),
+        }
+        for key, financial_report in financial_report_ref.items():
+            list_ids = [x.id for x in financial_report.account_type_ids]
+            if account_type_id in list_ids:
+                obj_financial_report.write(cr, uid, [financial_report.id], {'account_type_ids': [(3, account_type_id)]})
+        #write it in the good place
+        if field_value != 'none':
+            return obj_financial_report.write(cr, uid, [financial_report_ref[field_value].id], {'account_type_ids': [(4, account_type_id)]})
+
     _columns = {
-        'name': fields.char('Account Type', size=64, required=True),
+        'name': fields.char('Account Type', size=64, required=True, translate=True),
         'code': fields.char('Code', size=32, required=True),
         'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True, help="""Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.
 
@@ -139,19 +176,16 @@ class account_account_type(osv.osv):
  'Balance' will generally be used for cash accounts.
  'Detail' will copy each existing journal item of the previous year, even the reconciled ones.
  'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."""),
-        'sign': fields.selection([(-1, 'Reverse balance sign'), (1, 'Preserve balance sign')], 'Sign on Reports', required=True, help='For accounts that are typically more debited than credited and that you would like to print as negative amounts in your reports, you should reverse the sign of the balance; e.g.: Expense account. The same applies for  accounts that are typically more credited than debited and that you would like to print as positive amounts in your reports; e.g.: Income account.'),
-        'report_type':fields.selection([
-            ('none','/'),
-            ('income','Profit & Loss (Income Accounts)'),
-            ('expense','Profit & Loss (Expense Accounts)'),
-            ('asset','Balance Sheet (Asset Accounts)'),
-            ('liability','Balance Sheet (Liability Accounts)')
-        ],'P&L / BS Category', select=True, readonly=False, help="This field is used to generate legal reports: profit and loss, balance sheet.", required=True),
+        'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category', 
+            selection= [('none','/'),
+                        ('income', _('Profit & Loss (Income account)')),
+                        ('expense', _('Profit & Loss (Expense account)')),
+                        ('asset', _('Balance Sheet (Asset account)')),
+                        ('liability', _('Balance Sheet (Liability account)'))], help="This field is used to generate legal reports: profit and loss, balance sheet.", required=True),
         'note': fields.text('Description'),
     }
     _defaults = {
         'close_method': 'none',
-        'sign': 1,
         'report_type': 'none',
     }
     _order = "code"
@@ -422,6 +456,7 @@ class account_account(osv.osv):
         'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
             help="Account Type is used for information purpose, to generate "
               "country-specific legal reports, and set the rules to close a fiscal year and generate opening entries."),
+        'financial_report_ids': fields.many2many('account.financial.report', 'account_account_financial_report', 'account_id', 'report_line_id', 'Financial Reports'),
         'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]),
         'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
         'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
@@ -771,7 +806,9 @@ class account_journal(osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         if not 'sequence_id' in vals or not vals['sequence_id']:
-            vals.update({'sequence_id': self.create_sequence(cr, uid, vals, context)})
+            # if we have the right to create a journal, we should be able to
+            # create it's sequence.
+            vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
         return super(account_journal, self).create(cr, uid, vals, context)
 
     def name_get(self, cr, user, ids, context=None):
@@ -2422,6 +2459,7 @@ class account_account_template(osv.osv):
         'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
             help="These types are defined according to your country. The type contains more information "\
             "about the account and its specificities."),
+        'financial_report_ids': fields.many2many('account.financial.report', 'account_template_financial_report', 'account_template_id', 'report_line_id', 'Financial Reports'),
         'reconcile': fields.boolean('Allow Reconciliation', help="Check this option if you want the user to reconcile entries in this account."),
         'shortcut': fields.char('Shortcut', size=12),
         'note': fields.text('Note'),
@@ -2429,6 +2467,7 @@ class account_account_template(osv.osv):
         'child_parent_ids':fields.one2many('account.account.template', 'parent_id', 'Children'),
         'tax_ids': fields.many2many('account.tax.template', 'account_account_template_tax_rel', 'account_id', 'tax_id', 'Default Taxes'),
         'nocreate': fields.boolean('Optional create', help="If checked, the new chart of accounts will not contain this by default."),
+        'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', help="This optional field allow you to link an account template to a specific chart template that may differ from the one its root parent belongs to. This allow you to define chart templates that extend another and complete it with few new accounts (You don't need to define the whole structure that is common to both several times)."),
     }
 
     _defaults = {
@@ -2465,6 +2504,60 @@ class account_account_template(osv.osv):
             res.append((record['id'],name ))
         return res
 
+    def generate_account(self, cr, uid, chart_template_id, tax_template_ref, acc_template_ref, code_digits, company_id, context=None):
+        """
+        This method for generating accounts from templates.
+
+        :param chart_template_id: id of the chart template chosen in the wizard
+        :param tax_template_ref: Taxes templates reference for write taxes_id in account_account.
+        :paramacc_template_ref: dictionary with the mappping between the account templates and the real accounts.
+        :param code_digits: number of digits got from wizard.multi.charts.accounts, this is use for account code.
+        :param company_id: company_id selected from wizard.multi.charts.accounts.
+        :returns: return acc_template_ref for reference purpose.
+        :rtype: dict
+        """
+        if context is None:
+            context = {}
+        obj_acc = self.pool.get('account.account')
+        company_name = self.pool.get('res.company').browse(cr, uid, company_id, context=context).name
+        template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
+        #deactivate the parent_store functionnality on account_account for rapidity purpose
+        ctx = context.copy()
+        ctx.update({'defer_parent_store_computation': True})
+        children_acc_template = self.search(cr, uid, ['|', ('chart_template_id','=', [chart_template_id]),'&',('parent_id','child_of', [template.account_root_id.id]),('chart_template_id','=', False), ('nocreate','!=',True)], order='id')
+        for account_template in self.browse(cr, uid, children_acc_template, context=context):
+            # skip the root of COA if it's not the main one
+            if (template.account_root_id.id == account_template.id) and template.parent_id:
+                continue
+            tax_ids = []
+            for tax in account_template.tax_ids:
+                tax_ids.append(tax_template_ref[tax.id])
+
+            code_main = account_template.code and len(account_template.code) or 0
+            code_acc = account_template.code or ''
+            if code_main > 0 and code_main <= code_digits and account_template.type != 'view':
+                code_acc = str(code_acc) + (str('0'*(code_digits-code_main)))
+            vals={
+                'name': (template.account_root_id.id == account_template.id) and company_name or account_template.name,
+                '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,
+                'reconcile': account_template.reconcile,
+                'shortcut': account_template.shortcut,
+                'note': account_template.note,
+                'financial_report_ids': account_template.financial_report_ids and [(6,0,[x.id for x in account_template.financial_report_ids])] or False,
+                '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,
+            }
+            new_account = obj_acc.create(cr, uid, vals, context=ctx)
+            acc_template_ref[account_template.id] = new_account
+
+        #reactivate the parent_store functionnality on account_account
+        obj_acc._parent_store_compute(cr)
+        return acc_template_ref
+
 account_account_template()
 
 class account_add_tmpl_wizard(osv.osv_memory):
@@ -2542,6 +2635,41 @@ class account_tax_code_template(osv.osv):
         'notprintable': False,
     }
 
+    def generate_tax_code(self, cr, uid, tax_code_root_id, company_id, context=None):
+        '''
+        This function generates the tax codes from the templates of tax code that are children of the given one passed
+        in argument. Then it returns a dictionary with the mappping between the templates and the real objects.
+
+        :param tax_code_root_id: id of the root of all the tax code templates to process
+        :param company_id: id of the company the wizard is running for
+        :returns: dictionary with the mappping between the templates and the real objects.
+        :rtype: dict
+        '''
+        obj_tax_code_template = self.pool.get('account.tax.code.template')
+        obj_tax_code = self.pool.get('account.tax.code')
+        tax_code_template_ref = {}
+        company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+
+        #find all the children of the tax_code_root_id
+        children_tax_code_template = obj_tax_code_template.search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
+        for tax_code_template in obj_tax_code_template.browse(cr, uid, children_tax_code_template, context=context):
+            vals = {
+                'name': (tax_code_root_id == tax_code_template.id) and company.name or tax_code_template.name,
+                'code': tax_code_template.code,
+                'info': tax_code_template.info,
+                'parent_id': tax_code_template.parent_id and ((tax_code_template.parent_id.id in tax_code_template_ref) and tax_code_template_ref[tax_code_template.parent_id.id]) or False,
+                'company_id': company_id,
+                'sign': tax_code_template.sign,
+            }
+            #check if this tax code already exists
+            rec_list = obj_tax_code.search(cr, uid, [('name', '=', vals['name']),('code', '=', vals['code']),('company_id', '=', vals['company_id'])], context=context)
+            if not rec_list:
+                #if not yet, create it
+                new_tax_code = obj_tax_code.create(cr, uid, vals)
+                #recording the new tax code to do the mapping
+                tax_code_template_ref[tax_code_template.id] = new_tax_code
+        return tax_code_template_ref
+
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
@@ -2565,19 +2693,29 @@ class account_chart_template(osv.osv):
 
     _columns={
         'name': fields.char('Name', size=64, required=True),
-        'account_root_id': fields.many2one('account.account.template','Root Account',required=True,domain=[('parent_id','=',False)]),
-        'tax_code_root_id': fields.many2one('account.tax.code.template','Root Tax Code',required=True,domain=[('parent_id','=',False)]),
+        'parent_id': fields.many2one('account.chart.template', 'Parent Chart Template'),
+        'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"), 
+        'visible': fields.boolean('Can be Visible?', help="Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."),
+        'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sale and purchase rates or choose from list of taxes. This last choice assumes that the set of tax defined on this template is complete'),
+        'account_root_id': fields.many2one('account.account.template', 'Root Account', domain=[('parent_id','=',False)]),
+        'tax_code_root_id': fields.many2one('account.tax.code.template', 'Root Tax Code', domain=[('parent_id','=',False)]),
         'tax_template_ids': fields.one2many('account.tax.template', 'chart_template_id', 'Tax Template List', help='List of all the taxes that have to be installed by the wizard'),
-        'bank_account_view_id': fields.many2one('account.account.template','Bank Account',required=True),
-        'property_account_receivable': fields.many2one('account.account.template','Receivable Account'),
-        'property_account_payable': fields.many2one('account.account.template','Payable Account'),
-        'property_account_expense_categ': fields.many2one('account.account.template','Expense Category Account'),
-        'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
-        'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
-        'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
+        'bank_account_view_id': fields.many2one('account.account.template', 'Bank Account'),
+        'property_account_receivable': fields.many2one('account.account.template', 'Receivable Account'),
+        'property_account_payable': fields.many2one('account.account.template', 'Payable Account'),
+        'property_account_expense_categ': fields.many2one('account.account.template', 'Expense Category Account'),
+        'property_account_income_categ': fields.many2one('account.account.template', 'Income Category Account'),
+        'property_account_expense': fields.many2one('account.account.template', 'Expense Account on Product Template'),
+        'property_account_income': fields.many2one('account.account.template', 'Income Account on Product Template'),
         'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
-        'property_account_income_opening': fields.many2one('account.account.template','Opening Entries Income Account'),
-        'property_account_expense_opening': fields.many2one('account.account.template','Opening Entries Expense Account'),
+        'property_account_income_opening': fields.many2one('account.account.template', 'Opening Entries Income Account'),
+        'property_account_expense_opening': fields.many2one('account.account.template', 'Opening Entries Expense Account'),
+    }
+
+    _defaults = {
+        'visible': True,
+        'code_digits': 6,
+        'complete_tax_set': True,
     }
 
 account_chart_template()
@@ -2655,6 +2793,61 @@ class account_tax_template(osv.osv):
     }
     _order = 'sequence'
 
+    def _generate_tax(self, cr, uid, tax_templates, tax_code_template_ref, company_id, context=None):
+        """
+        This method generate taxes from templates.
+
+        :param tax_templates: list of browse record of the tax templates to process
+        :param tax_code_template_ref: Taxcode templates reference.
+        :param company_id: id of the company the wizard is running for
+        :returns:
+            {
+            'tax_template_to_tax': mapping between tax template and the newly generated taxes corresponding,
+            'account_dict': dictionary containing a to-do list with all the accounts to assign on new taxes
+            }
+        """
+        if context is None:
+            context = {}
+        res = {}
+        todo_dict = {}
+        tax_template_to_tax = {}
+        for tax in tax_templates:
+            vals_tax = {
+                'name':tax.name,
+                'sequence': tax.sequence,
+                'amount': tax.amount,
+                'type': tax.type,
+                'applicable_type': tax.applicable_type,
+                'domain': tax.domain,
+                'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_to_tax) and tax_template_to_tax[tax.parent_id.id]) or False,
+                'child_depend': tax.child_depend,
+                'python_compute': tax.python_compute,
+                'python_compute_inv': tax.python_compute_inv,
+                'python_applicable': tax.python_applicable,
+                'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False,
+                'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False,
+                'base_sign': tax.base_sign,
+                'tax_sign': tax.tax_sign,
+                'ref_base_code_id': tax.ref_base_code_id and ((tax.ref_base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_base_code_id.id]) or False,
+                'ref_tax_code_id': tax.ref_tax_code_id and ((tax.ref_tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_tax_code_id.id]) or False,
+                'ref_base_sign': tax.ref_base_sign,
+                'ref_tax_sign': tax.ref_tax_sign,
+                'include_base_amount': tax.include_base_amount,
+                'description': tax.description,
+                'company_id': company_id,
+                'type_tax_use': tax.type_tax_use,
+                'price_include': tax.price_include
+            }
+            new_tax = self.pool.get('account.tax').create(cr, uid, vals_tax)
+            tax_template_to_tax[tax.id] = new_tax
+            #as the accounts have not been created yet, we have to wait before filling these fields
+            todo_dict[new_tax] = {
+                'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False,
+                'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
+            }
+        res.update({'tax_template_to_tax': tax_template_to_tax, 'account_dict': todo_dict})
+        return res
+
 account_tax_template()
 
 # Fiscal Position Templates
@@ -2671,6 +2864,38 @@ class account_fiscal_position_template(osv.osv):
         'note': fields.text('Notes', translate=True),
     }
 
+    def generate_fiscal_position(self, cr, uid, chart_temp_id, tax_template_ref, acc_template_ref, company_id, context=None):
+        """
+        This method generate Fiscal Position, Fiscal Position Accounts and Fiscal Position Taxes from templates.
+
+        :param chart_temp_id: Chart Template Id.
+        :param taxes_ids: Taxes templates reference for generating account.fiscal.position.tax.
+        :param acc_template_ref: Account templates reference for generating account.fiscal.position.account.
+        :param company_id: company_id selected from wizard.multi.charts.accounts.
+        :returns: True
+        """
+        if context is None:
+            context = {}
+        obj_tax_fp = self.pool.get('account.fiscal.position.tax')
+        obj_ac_fp = self.pool.get('account.fiscal.position.account')
+        obj_fiscal_position = self.pool.get('account.fiscal.position')
+        fp_ids = self.search(cr, uid, [('chart_template_id', '=', chart_temp_id)])
+        for position in self.browse(cr, uid, fp_ids, context=context):
+            new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name})
+            for tax in position.tax_ids:
+                obj_tax_fp.create(cr, uid, {
+                    'tax_src_id': tax_template_ref[tax.tax_src_id.id],
+                    'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
+                    'position_id': new_fp
+                })
+            for acc in position.account_ids:
+                obj_ac_fp.create(cr, uid, {
+                    'account_src_id': acc_template_ref[acc.account_src_id.id],
+                    'account_dest_id': acc_template_ref[acc.account_dest_id.id],
+                    'position_id': new_fp
+                })
+        return True
+
 account_fiscal_position_template()
 
 class account_fiscal_position_tax_template(osv.osv):
@@ -2724,6 +2949,7 @@ class account_financial_report(osv.osv):
         return res
 
     def _get_balance(self, cr, uid, ids, name, args, context=None):
+        account_obj = self.pool.get('account.account')
         res = {}
         res_all = {}
         for report in self.browse(cr, uid, ids, context=context):
@@ -2734,6 +2960,12 @@ class account_financial_report(osv.osv):
                 # it's the sum of balance of the linked accounts
                 for a in report.account_ids:
                     balance += a.balance
+            elif report.type == 'account_type':
+                # it's the sum of balance of the leaf accounts with such an account type
+                report_types = [x.id for x in report.account_type_ids]
+                account_ids = account_obj.search(cr, uid, [('user_type','in', report_types), ('type','!=','view')], context=context)
+                for a in account_obj.browse(cr, uid, account_ids, context=context):
+                    balance += a.balance
             elif report.type == 'account_report' and report.account_report_id:
                 # it's the amount of the linked report
                 res2 = self._get_balance(cr, uid, [report.account_report_id.id], 'balance', False, context=context)
@@ -2756,7 +2988,6 @@ class account_financial_report(osv.osv):
         'parent_id': fields.many2one('account.financial.report', 'Parent'),
         'children_ids':  fields.one2many('account.financial.report', 'parent_id', 'Account Report'),
         'sequence': fields.integer('Sequence'),
-        'note': fields.text('Notes'),
         'balance': fields.function(_get_balance, 'Balance'),
         'level': fields.function(_get_level, string='Level', store=True, type='integer'),
         'type': fields.selection([
@@ -2766,13 +2997,20 @@ class account_financial_report(osv.osv):
             ('account_report','Report Value'),
             ],'Type'),
         'account_ids': fields.many2many('account.account', 'account_account_financial_report', 'report_line_id', 'account_id', 'Accounts'),
-        'display_detail': fields.boolean('Display details', help='Display every account with its balance instead of the sum.'),
+        'display_detail': fields.selection([
+            ('no_detail','No detail'),
+            ('detail_flat','Display children flat'),
+            ('detail_with_hierarchy','Display children with hierarchy')
+            ], 'Display details'),
         'account_report_id':  fields.many2one('account.financial.report', 'Report Value'),
         'account_type_ids': fields.many2many('account.account.type', 'account_account_financial_report_type', 'report_id', 'account_type_id', 'Account Types'),
+        'sign': fields.selection([(-1, 'Reverse balance sign'), (1, 'Preserve balance sign')], 'Sign on Reports', required=True, help='For accounts that are typically more debited than credited and that you would like to print as negative amounts in your reports, you should reverse the sign of the balance; e.g.: Expense account. The same applies for accounts that are typically more credited than debited and that you would like to print as positive amounts in your reports; e.g.: Income account.'),
     }
 
     _defaults = {
         'type': 'sum',
+        'display_detail': 'detail_flat',
+        'sign': 1,
     }
 
 account_financial_report()
@@ -2805,66 +3043,64 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
         "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"),
         "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"),
+        'sale_tax_rate': fields.float('Sales Tax(%)'),
+        'purchase_tax_rate': fields.float('Purchase Tax(%)'),
+        'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
     }
     def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None):
         res = {}
-        res['value'] = {}
-        res['value']["sale_tax"] = False
-        res['value']["purchase_tax"] = False
+        tax_templ_obj = self.pool.get('account.tax.template')
+        res['value'] = {'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False}
         if chart_template_id:
-            # default tax is given by the lowest sequence. For same sequence we will take the latest created as it will be the case for tax created while installing the generic chart of accounts
-            sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc")
-            purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc")
+            data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
+            res['value'].update({'complete_tax_set': data.complete_tax_set})
+            if data.complete_tax_set:
+            # default tax is given by the lowest sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
+                sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
+                                              , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc")
+                purchase_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
+                                              , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc")
+                res['value'].update({'sale_tax': sale_tax_ids and sale_tax_ids[0] or False, 'purchase_tax': purchase_tax_ids and purchase_tax_ids[0] or False})
 
-            res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False
-            res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False
+            if data.code_digits:
+               res['value'].update({'code_digits': data.code_digits})
         return res
 
-    def _get_purchase_tax(self, cr, uid, context=None):
-        ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(wizard_multi_charts_accounts, self).default_get(cr, uid, fields, context=context) 
+        tax_templ_obj = self.pool.get('account.tax.template')
+
+        if 'bank_accounts_id' in fields:
+            res.update({'bank_accounts_id': [{'acc_name': _('Current'), 'account_type': 'bank'},
+                    {'acc_name': _('Deposit'), 'account_type': 'bank'},
+                    {'acc_name': _('Cash'), 'account_type': 'cash'}]})
+        if 'company_id' in fields:
+            res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id})
+        if 'seq_journal' in fields:
+            res.update({'seq_journal': True})
+
+        ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
         if ids:
-            chart_template_id = ids[0]
-            purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
-            return purchase_tax_ids and purchase_tax_ids[0] or False
-        return False
-
-    def _get_sale_tax(self, cr, uid, context=None):
-        ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
-        if ids:
-            chart_template_id = ids[0]
-            sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
-            return sale_tax_ids and sale_tax_ids[0] or False
-        return False
-
-    def _get_chart(self, cr, uid, context=None):
-        ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
-        if ids:
-            return ids[0]
-        return False
-
-    def _get_default_accounts(self, cr, uid, context=None):
-        return [
-            {'acc_name': _('Cash'),'account_type':'cash'}
-        ]
-
-    _defaults = {
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
-        'chart_template_id': _get_chart,
-        'bank_accounts_id': _get_default_accounts,
-        'sale_tax': _get_sale_tax,
-        'purchase_tax': _get_purchase_tax,
-        'code_digits': 6,
-        'seq_journal': True
-    }
+            if 'chart_template_id' in fields:
+                res.update({'chart_template_id': ids[0]})
+            if 'sale_tax' in fields:
+                sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
+                                              , "=", ids[0]), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
+                res.update({'sale_tax': sale_tax_ids and sale_tax_ids[0] or False})
+            if 'purchase_tax' in fields:
+                purchase_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
+                                          , "=", ids[0]), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
+                res.update({'purchase_tax': purchase_tax_ids and purchase_tax_ids[0] or False})
+        return res
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(wizard_multi_charts_accounts, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         cmp_select = []
-        company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
+        acc_template_obj = self.pool.get('account.chart.template')
+        company_obj = self.pool.get('res.company')
+
+        company_ids = company_obj.search(cr, uid, [], context=context)
         #display in the widget selection of companies, only the companies that haven't been configured yet (but don't care about the demo chart of accounts)
         cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
         configured_cmp = [r[0] for r in cr.fetchall()]
@@ -2874,305 +3110,118 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
                 res['fields'][field]['selection'] = [('', '')]
                 if unconfigured_cmp:
-                    cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
+                    cmp_select = [(line.id, line.name) for line in company_obj.browse(cr, uid, unconfigured_cmp)]
                     res['fields'][field]['selection'] = cmp_select
         return res
 
-    def execute(self, cr, uid, ids, context=None):
-        obj_multi = self.browse(cr, uid, ids[0])
-        obj_acc = self.pool.get('account.account')
-        obj_acc_tax = self.pool.get('account.tax')
+    def check_created_journals(self, cr, uid, vals_journal, company_id, context=None):
+        """
+        This method used for checking journals already created or not. If not then create new journal.
+        """
         obj_journal = self.pool.get('account.journal')
-        obj_acc_template = self.pool.get('account.account.template')
-        obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
-        obj_fiscal_position = self.pool.get('account.fiscal.position')
+        rec_list = obj_journal.search(cr, uid, [('name','=', vals_journal['name']),('company_id', '=', company_id)], context=context)
+        if not rec_list:
+            obj_journal.create(cr, uid, vals_journal, context=context)
+        return True
+
+    def generate_journals(self, cr, uid, chart_template_id, acc_template_ref, company_id, context=None):
+        """
+        This method is used for creating journals.
+
+        :param chart_temp_id: Chart Template Id.
+        :param acc_template_ref: Account templates reference.
+        :param company_id: company_id selected from wizard.multi.charts.accounts.
+        :returns: True
+        """
+        journal_data = self._prepare_all_journals(cr, uid, chart_template_id, acc_template_ref, company_id, context=context)
+        for vals_journal in journal_data:
+            self.check_created_journals(cr, uid, vals_journal, company_id, context=context)
+        return True
+
+    def _prepare_all_journals(self, cr, uid, chart_template_id, acc_template_ref, company_id, context=None):
+        def _get_analytic_journal(journal_type):
+            # Get the analytic journal
+            analytic_journal_ids = []
+            if journal_type in ('sale', 'sale_refund'):
+                analytical_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','sale')], context=context)
+            elif journal_type in ('purchase', 'purchase_refund'):
+                analytical_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')], context=context)
+            elif journal_type == 'general':
+                analytical_journal_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
+            return analytic_journal_ids and analytic_journal_ids[0] or False
+
+        def _get_default_account(journal_type, type='debit'):
+            # Get the default accounts
+            default_account = False
+            if journal_type in ('sale', 'sale_refund'):
+                default_account = acc_template_ref.get(template.property_account_income_categ.id)
+            elif journal_type in ('purchase', 'purchase_refund'):
+                default_account = acc_template_ref.get(template.property_account_expense_categ.id)
+            elif journal_type == 'situation':
+                if type == 'debit':
+                    default_account = acc_template_ref.get(template.property_account_expense_opening.id)
+                else:
+                    default_account = acc_template_ref.get(template.property_account_income_opening.id)
+            return default_account
+
+        def _get_view_id(journal_type):
+            # Get the journal views
+            if journal_type in ('general', 'situation'):
+                data = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_view')
+            elif journal_type in ('sale_refund', 'purchase_refund'):
+                data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_refund_journal_view') 
+            else:
+                data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_journal_view')
+            return data and data[1] or False
+
+        journal_names = {
+            'sale': _('Sales Journal'),
+            'purchase': _('Purchase Journal'),
+            'sale_refund': _('Sales Refund Journal'),
+            'purchase_refund': _('Purchase Refund Journal'),
+            'general': _('Miscellaneous Journal'),
+            'situation': _('Opening Entries Journal'),
+        }
+        journal_codes = {
+            'sale': _('SAJ'),
+            'purchase': _('EXJ'),
+            'sale_refund': _('SCNJ'),
+            'purchase_refund': _('ECNJ'),
+            'general': _('MISC'),
+            'situation': _('OPEJ'),
+        }
+
         obj_data = self.pool.get('ir.model.data')
         analytic_journal_obj = self.pool.get('account.analytic.journal')
-        obj_tax_code = self.pool.get('account.tax.code')
-        obj_tax_code_template = self.pool.get('account.tax.code.template')
-        ir_values_obj = self.pool.get('ir.values')
-        # Creating Account
-        obj_acc_root = obj_multi.chart_template_id.account_root_id
-        tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
-        company_id = obj_multi.company_id.id
+        template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
 
-        #new code
-        acc_template_ref = {}
-        tax_template_ref = {}
-        tax_code_template_ref = {}
-        todo_dict = {}
-
-        #create all the tax code
-        children_tax_code_template = obj_tax_code_template.search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
-        children_tax_code_template.sort()
-        for tax_code_template in obj_tax_code_template.browse(cr, uid, children_tax_code_template, context=context):
+        journal_data = []
+        for journal_type in ['sale', 'purchase', 'sale_refund', 'purchase_refund', 'general', 'situation']:
             vals = {
-                'name': (tax_code_root_id == tax_code_template.id) and obj_multi.company_id.name or tax_code_template.name,
-                'code': tax_code_template.code,
-                'info': tax_code_template.info,
-                'parent_id': tax_code_template.parent_id and ((tax_code_template.parent_id.id in tax_code_template_ref) and tax_code_template_ref[tax_code_template.parent_id.id]) or False,
+                'type': journal_type,
+                'name': journal_names[journal_type],
+                'code': journal_codes[journal_type],
                 'company_id': company_id,
-                'sign': tax_code_template.sign,
+                'centralisation': journal_type == 'situation',
+                'view_id': _get_view_id(journal_type),
+                'analytic_journal_id': _get_analytic_journal(journal_type),
+                'default_credit_account_id': _get_default_account(journal_type, 'credit'),
+                'default_debit_account_id': _get_default_account(journal_type, 'debit'),
             }
-            new_tax_code = obj_tax_code.create(cr, uid, vals)
-            #recording the new tax code to do the mapping
-            tax_code_template_ref[tax_code_template.id] = new_tax_code
+            journal_data.append(vals)
+        return journal_data
 
-        #create all the tax
-        tax_template_to_tax = {}
-        for tax in obj_multi.chart_template_id.tax_template_ids:
-            #create it
-            vals_tax = {
-                'name':tax.name,
-                'sequence': tax.sequence,
-                'amount':tax.amount,
-                'type':tax.type,
-                'applicable_type': tax.applicable_type,
-                'domain':tax.domain,
-                'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_ref) and tax_template_ref[tax.parent_id.id]) or False,
-                'child_depend': tax.child_depend,
-                'python_compute': tax.python_compute,
-                'python_compute_inv': tax.python_compute_inv,
-                'python_applicable': tax.python_applicable,
-                'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False,
-                'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False,
-                'base_sign': tax.base_sign,
-                'tax_sign': tax.tax_sign,
-                'ref_base_code_id': tax.ref_base_code_id and ((tax.ref_base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_base_code_id.id]) or False,
-                'ref_tax_code_id': tax.ref_tax_code_id and ((tax.ref_tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_tax_code_id.id]) or False,
-                'ref_base_sign': tax.ref_base_sign,
-                'ref_tax_sign': tax.ref_tax_sign,
-                'include_base_amount': tax.include_base_amount,
-                'description':tax.description,
-                'company_id': company_id,
-                'type_tax_use': tax.type_tax_use,
-                'price_include': tax.price_include
-            }
-            new_tax = obj_acc_tax.create(cr, uid, vals_tax)
-            tax_template_to_tax[tax.id] = new_tax
-            #as the accounts have not been created yet, we have to wait before filling these fields
-            todo_dict[new_tax] = {
-                'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False,
-                'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
-            }
-            tax_template_ref[tax.id] = new_tax
-        #deactivate the parent_store functionnality on account_account for rapidity purpose
-        ctx = context and context.copy() or {}
-        ctx['defer_parent_store_computation'] = True
+    def generate_properties(self, cr, uid, chart_template_id, acc_template_ref, company_id, context=None):
+        """
+        This method used for creating properties.
 
-        children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
-        children_acc_template.sort()
-        for account_template in obj_acc_template.browse(cr, uid, children_acc_template, context=context):
-            tax_ids = []
-            for tax in account_template.tax_ids:
-                tax_ids.append(tax_template_ref[tax.id])
-            #create the account_account
-
-            dig = obj_multi.code_digits
-            code_main = account_template.code and len(account_template.code) or 0
-            code_acc = account_template.code or ''
-            if code_main>0 and code_main<=dig and account_template.type != 'view':
-                code_acc=str(code_acc) + (str('0'*(dig-code_main)))
-            vals={
-                'name': (obj_acc_root.id == account_template.id) and obj_multi.company_id.name or account_template.name,
-                '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,
-                'reconcile': account_template.reconcile,
-                '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,
-            }
-            new_account = obj_acc.create(cr, uid, vals, context=ctx)
-            acc_template_ref[account_template.id] = new_account
-
-
-        #reactivate the parent_store functionnality on account_account
-        obj_acc._parent_store_compute(cr)
-
-        for key,value in todo_dict.items():
-            if value['account_collected_id'] or value['account_paid_id']:
-                obj_acc_tax.write(cr, uid, [key], {
-                    'account_collected_id': acc_template_ref.get(value['account_collected_id'], False),
-                    'account_paid_id': acc_template_ref.get(value['account_paid_id'], False),
-                })
-
-        # Creating Journals
-        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
-        data = obj_data.browse(cr, uid, data_id[0], context=context)
-        view_id = data.res_id
-
-        #Sales Journal
-        analytical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')])
-        analytical_journal_sale = analytical_sale_ids and analytical_sale_ids[0] or False
-
-        vals_journal = {
-            'name': _('Sales Journal'),
-            'type': 'sale',
-            'code': _('SAJ'),
-            'view_id': view_id,
-            'company_id': company_id,
-            'analytic_journal_id': analytical_journal_sale,
-        }
-
-        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]
-            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
-
-        obj_journal.create(cr,uid,vals_journal)
-
-        # Purchase Journal
-        analytical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')])
-        analytical_journal_purchase = analytical_purchase_ids and analytical_purchase_ids[0] or False
-
-        vals_journal = {
-            'name': _('Purchase Journal'),
-            'type': 'purchase',
-            'code': _('EXJ'),
-            'view_id': view_id,
-            'company_id':  company_id,
-            'analytic_journal_id': analytical_journal_purchase,
-        }
-
-        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]
-            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
-        obj_journal.create(cr,uid,vals_journal)
-
-        # Creating Journals Sales Refund and Purchase Refund
-        data_id = obj_data.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_refund_journal_view')], context=context)
-        data = obj_data.browse(cr, uid, data_id[0], context=context)
-        view_id = data.res_id
-
-        #Sales Refund Journal
-        vals_journal = {
-            'name': _('Sales Refund Journal'),
-            'type': 'sale_refund',
-            'code': _('SCNJ'),
-            'view_id': view_id,
-            'analytic_journal_id': analytical_journal_sale,
-            '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]
-            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
-
-        obj_journal.create(cr, uid, vals_journal, context=context)
-
-        # Purchase Refund Journal
-        vals_journal = {
-            'name': _('Purchase Refund Journal'),
-            'type': 'purchase_refund',
-            'code': _('ECNJ'),
-            'view_id': view_id,
-            'analytic_journal_id': analytical_journal_purchase,
-            '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]
-            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
-
-        obj_journal.create(cr, uid, vals_journal, context=context)
-
-        # Miscellaneous Journal
-        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')])
-        data = obj_data.browse(cr, uid, data_id[0], context=context)
-        view_id = data.res_id
-
-        analytical_miscellaneous_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
-        analytical_journal_miscellaneous = analytical_miscellaneous_ids and analytical_miscellaneous_ids[0] or False
-
-        vals_journal = {
-            'name': _('Miscellaneous Journal'),
-            'type': 'general',
-            'code': _('MISC'),
-            'view_id': view_id,
-            'analytic_journal_id': analytical_journal_miscellaneous,
-            'company_id': company_id
-        }
-
-        obj_journal.create(cr, uid, vals_journal, context=context)
-
-        # Opening Entries Journal
-        if obj_multi.chart_template_id.property_account_income_opening and obj_multi.chart_template_id.property_account_expense_opening:
-            vals_journal = {
-                'name': _('Opening Entries Journal'),
-                'type': 'situation',
-                'code': _('OPEJ'),
-                'view_id': view_id,
-                'company_id': company_id,
-                'centralisation': True,
-                'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_opening.id],
-                'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_expense_opening.id]
-                }
-            obj_journal.create(cr, uid, vals_journal, context=context)
-
-        # Bank Journals
-        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
-        data = obj_data.browse(cr, uid, data_id[0], context=context)
-        view_id_cash = data.res_id
-
-        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
-        data = obj_data.browse(cr, uid, data_id[0], context=context)
-        view_id_cur = data.res_id
-        ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
-
-        current_num = 1
-        valid = True
-        for line in obj_multi.bank_accounts_id:
-            #create the account_account for this bank journal
-            tmp = line.acc_name
-            dig = obj_multi.code_digits
-            if not ref_acc_bank.code:
-                raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of accounts hasn\'t a code.'))
-            while True:
-                new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)), '0')) + str(current_num)
-                ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', company_id)])
-                if not ids:
-                    break
-                else:
-                    current_num += 1
-            vals = {
-                'name': tmp,
-                'currency_id': line.currency_id and line.currency_id.id or False,
-                'code': new_code,
-                'type': 'liquidity',
-                'user_type': account_template.user_type and account_template.user_type.id or False,
-                'reconcile': True,
-                'parent_id': acc_template_ref[ref_acc_bank.id] or False,
-                'company_id': company_id,
-            }
-            acc_cash_id  = obj_acc.create(cr,uid,vals)
-
-            #create the bank journal
-            vals_journal = {
-                'name': vals['name'],
-                'code': _('BNK') + str(current_num),
-                'type': line.account_type == 'cash' and 'cash' or 'bank',
-                'company_id': company_id,
-                'analytic_journal_id': False,
-                'currency': False,
-            }
-            if line.currency_id:
-                vals_journal['view_id'] = view_id_cur
-                vals_journal['currency'] = line.currency_id.id
-            else:
-                vals_journal['view_id'] = view_id_cash
-            vals_journal['default_credit_account_id'] = acc_cash_id
-            vals_journal['default_debit_account_id'] = acc_cash_id
-            obj_journal.create(cr, uid, vals_journal)
-            current_num += 1
-            valid = True
-
-        #create the properties
+        :param chart_template_id: id of the current chart template for which we need to create properties
+        :param acc_template_ref: Mapping between ids of account templates and real accounts created from them
+        :param company_id: company_id selected from wizard.multi.charts.accounts.
+        :returns: True
+        """
         property_obj = self.pool.get('ir.property')
-        fields_obj = self.pool.get('ir.model.fields')
-
+        field_obj = self.pool.get('ir.model.fields')
         todo_list = [
             ('property_account_receivable','res.partner','account.account'),
             ('property_account_payable','res.partner','account.account'),
@@ -3182,61 +3231,314 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             ('property_account_income','product.template','account.account'),
             ('property_reserve_and_surplus_account','res.company','account.account')
         ]
+        template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
         for record in todo_list:
-            r = []
-            r = property_obj.search(cr, uid, [('name','=', record[0] ),('company_id','=',company_id)])
-            account = getattr(obj_multi.chart_template_id, record[0])
-            field = fields_obj.search(cr, uid, [('name','=',record[0]),('model','=',record[1]),('relation','=',record[2])])
-            vals = {
-                'name': record[0],
-                'company_id': company_id,
-                'fields_id': field[0],
-                'value': account and 'account.account,' + str(acc_template_ref[account.id]) or False,
+            account = getattr(template, record[0])
+            value = account and 'account.account,' + str(acc_template_ref[account.id]) or False
+            if value:
+                field = field_obj.search(cr, uid, [('name', '=', record[0]),('model', '=', record[1]),('relation', '=', record[2])], context=context)
+                vals = {
+                    'name': record[0],
+                    'company_id': company_id,
+                    'fields_id': field[0],
+                    'value': value,
+                }
+                property_ids = property_obj.search(cr, uid, [('name','=', record[0]),('company_id', '=', company_id)], context=context)
+                if property_ids:
+                    #the property exist: modify it
+                    property_obj.write(cr, uid, property_ids, vals, context=context)
+                else:
+                    #create the property
+                    property_obj.create(cr, uid, vals, context=context)
+        return True
+
+    def _install_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, acc_ref={}, taxes_ref={}, tax_code_ref={}, context=None):
+        '''
+        This function recursively loads the template objects and create the real objects from them.
+
+        :param template_id: id of the chart template to load
+        :param company_id: id of the company the wizard is running for
+        :param code_digits: integer that depicts the number of digits the accounts code should have in the COA
+        :param obj_wizard: the current wizard for generating the COA from the templates
+        :param acc_ref: Mapping between ids of account templates and real accounts created from them
+        :param taxes_ref: Mapping between ids of tax templates and real taxes created from them
+        :param tax_code_ref: Mapping between ids of tax code templates and real tax codes created from them
+        :returns: return a tuple with a dictionary containing
+            * the mapping between the account template ids and the ids of the real accounts that have been generated
+              from them, as first item,
+            * a similar dictionary for mapping the tax templates and taxes, as second item,
+            * a last identical containing the mapping of tax code templates and tax codes
+        :rtype: tuple(dict, dict, dict)
+        '''
+        template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context)
+        if template.parent_id:
+            tmp1, tmp2, tmp3 = self._install_template(cr, uid, template.parent_id.id, company_id, code_digits=code_digits, acc_ref=acc_ref, taxes_ref=taxes_ref, tax_code_ref=tax_code_ref, context=context)
+            acc_ref.update(tmp1)
+            taxes_ref.update(tmp2)
+            tax_code_ref.update(tmp3)
+        tmp1, tmp2, tmp3 = self._load_template(cr, uid, template_id, company_id, code_digits=code_digits, obj_wizard=obj_wizard, account_ref=acc_ref, taxes_ref=taxes_ref, tax_code_ref=tax_code_ref, context=context)
+        acc_ref.update(tmp1)
+        taxes_ref.update(tmp2)
+        tax_code_ref.update(tmp3)
+        return acc_ref, taxes_ref, tax_code_ref
+
+    def _load_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, account_ref={}, taxes_ref={}, tax_code_ref={}, context=None):
+        '''
+        This function generates all the objects from the templates
+
+        :param template_id: id of the chart template to load
+        :param company_id: id of the company the wizard is running for
+        :param code_digits: integer that depicts the number of digits the accounts code should have in the COA
+        :param obj_wizard: the current wizard for generating the COA from the templates
+        :param acc_ref: Mapping between ids of account templates and real accounts created from them
+        :param taxes_ref: Mapping between ids of tax templates and real taxes created from them
+        :param tax_code_ref: Mapping between ids of tax code templates and real tax codes created from them
+        :returns: return a tuple with a dictionary containing
+            * the mapping between the account template ids and the ids of the real accounts that have been generated
+              from them, as first item,
+            * a similar dictionary for mapping the tax templates and taxes, as second item,
+            * a last identical containing the mapping of tax code templates and tax codes
+        :rtype: tuple(dict, dict, dict)
+        '''
+        template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context)
+        obj_tax_code_template = self.pool.get('account.tax.code.template')
+        obj_acc_tax = self.pool.get('account.tax')
+        obj_tax_temp = self.pool.get('account.tax.template')
+        obj_acc_template = self.pool.get('account.account.template')
+        obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
+
+        # create all the tax code.
+        tax_code_ref.update(obj_tax_code_template.generate_tax_code(cr, uid, template.tax_code_root_id.id, company_id, context=context))
+
+        # Generate taxes from templates.
+        tax_templates = [x for x in template.tax_template_ids]
+        generated_tax_res = obj_tax_temp._generate_tax(cr, uid, tax_templates, tax_code_ref, company_id, context=context)
+        taxes_ref.update(generated_tax_res['tax_template_to_tax'])
+
+        # Generating Accounts from templates.
+        account_template_ref = obj_acc_template.generate_account(cr, uid, template_id, taxes_ref, account_ref, code_digits, company_id, context=context)
+        account_ref.update(account_template_ref)
+
+        # writing account values on tax after creation of accounts
+        for key,value in generated_tax_res['account_dict'].items():
+            if value['account_collected_id'] or value['account_paid_id']:
+                obj_acc_tax.write(cr, uid, [key], {
+                    'account_collected_id': account_ref.get(value['account_collected_id'], False),
+                    'account_paid_id': account_ref.get(value['account_paid_id'], False),
+                })
+
+        # Create Journals
+        self.generate_journals(cr, uid, template_id, account_ref, company_id, context=context)
+
+        # generate properties function
+        self.generate_properties(cr, uid, template_id, account_ref, company_id, context=context)
+
+        # Generate Fiscal Position , Fiscal Position Accounts and Fiscal Position Taxes from templates
+        obj_fiscal_position_template.generate_fiscal_position(cr, uid, template_id, taxes_ref, account_ref, company_id, context=context)
+
+        return account_ref, taxes_ref, tax_code_ref
+
+    def _create_tax_templates_from_rates(self, cr, uid, obj_wizard, company_id, context=None):
+        '''
+        This function checks if the chosen chart template is configured as containing a full set of taxes, and if
+        it's not the case, it creates the templates for account.tax.code and for account.account.tax objects accordingly
+        to the provided sale/purchase rates. Then it saves the new tax templates as default taxes to use for this chart
+        template.
+
+        :param obj_wizard: browse record of wizard to generate COA from templates
+        :param company_id: id of the company for wich the wizard is running
+        :return: True
+        '''
+        obj_tax_code_template = self.pool.get('account.tax.code.template')
+        obj_tax_temp = self.pool.get('account.tax.template')
+        chart_template = obj_wizard.chart_template_id
+        vals = {}
+        # create tax templates and tax code templates from purchase_tax_rate and sale_tax_rate fields
+        if not chart_template.complete_tax_set:
+            tax_data = {
+                'sale': obj_wizard.sale_tax_rate,
+                'purchase': obj_wizard.purchase_tax_rate,
             }
 
-            if r:
-                #the property exist: modify it
-                property_obj.write(cr, uid, r, vals)
-            else:
-                #create the property
-                property_obj.create(cr, uid, vals)
+            for tax_type, value in tax_data.items():
+                # don't consider cases where entered value in rates are lower than 0
+                if value >= 0.0:
+                    #create the tax code templates for base and tax
+                    base_code_vals = {
+                        'name': (tax_type == 'sale' and _('Taxable Sales at %s') or _('Taxable Purchases at %s')) % value,
+                        'code': (tax_type == 'sale' and _('BASE-S-%s') or _('BASE-P-%s')) %value,
+                        'parent_id': chart_template.tax_code_root_id.id,
+                        'company_id': company_id,
+                    }
+                    new_base_code_id = obj_tax_code_template.create(cr, uid, base_code_vals, context=context)
+                    tax_code_vals = {
+                        'name': (tax_type == 'sale' and _('Tax Received at %s') or _('Tax Paid at %s')) % value,
+                        'code': (tax_type == 'sale' and _('TAX-S-%s') or _('TAX-P-%s')) %value,
+                        'parent_id': chart_template.tax_code_root_id.id,
+                        'company_id': company_id,
+                    }
+                    new_tax_code_id = obj_tax_code_template.create(cr, uid, tax_code_vals, context=context)
+                    #create the tax
+                    tax_template_id = obj_tax_temp.create(cr, uid, {
+                                            'name': _('Tax %s%%') % value,
+                                            'amount': value/100,
+                                            'base_code_id': new_base_code_id,
+                                            'tax_code_id': new_tax_code_id,
+                                            'ref_base_code_id': new_base_code_id,
+                                            'ref_tax_code_id': new_tax_code_id,
+                                            'type_tax_use': tax_type,
+                                            'type': 'percent',
+                                            'sequence': 0,
+                                            'chart_template_id': chart_template.id or False,
+                    }, context=context)
+                    #record this new tax_template as default for this chart template
+                    field_name = tax_type == 'sale' and 'sale_tax' or 'purchase_tax'
+                    vals[field_name] = tax_template_id
+        self.write(cr, uid, obj_wizard.id, vals, context=context)
+        return True
 
-        fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)])
+    def execute(self, cr, uid, ids, context=None):
+        '''
+        This function is called at the confirmation of the wizard to generate the COA from the templates. It will read
+        all the provided information to create the accounts, the banks, the journals, the taxes, the tax codes, the
+        accounting properties... accordingly for the chosen company.
+        '''
+        ir_values_obj = self.pool.get('ir.values')
+        obj_wizard = self.browse(cr, uid, ids[0])
+        company_id = obj_wizard.company_id.id
+        # If the floats for sale/purchase rates have been filled, create templates from them
+        self._create_tax_templates_from_rates(cr, uid, obj_wizard, company_id, context=context)
 
-        if fp_ids:
-            obj_tax_fp = self.pool.get('account.fiscal.position.tax')
-            obj_ac_fp = self.pool.get('account.fiscal.position.account')
+        # Install all the templates objects and generate the real objects
+        acc_template_ref, taxes_ref, tax_code_ref = self._install_template(cr, uid, obj_wizard.chart_template_id.id, company_id, code_digits=obj_wizard.code_digits, obj_wizard=obj_wizard, context=context)
 
-            for position in obj_fiscal_position_template.browse(cr, uid, fp_ids, context=context):
+        # write values of default taxes for product
+        if obj_wizard.sale_tax and taxes_ref:
+            ir_values_obj.set(cr, uid, key='default', key2=False, name="taxes_id", company=company_id,
+                                models =[('product.product',False)], value=[taxes_ref[obj_wizard.sale_tax.id]])
+        if obj_wizard.purchase_tax and taxes_ref:
+                ir_values_obj.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=company_id,
+                                models =[('product.product',False)], value=[taxes_ref[obj_wizard.purchase_tax.id]])
 
-                vals_fp = {
-                    'company_id': company_id,
-                    'name': position.name,
+        # Create Bank journals
+        self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
+        return {'type' : 'ir.actions.act_window_close'}
+
+    def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None):
+        '''
+        This function prepares the value to use for the creation of a bank journal created through the wizard of 
+        generating COA from templates.
+
+        :param line: dictionary containing the values encoded by the user related to his bank account
+        :param current_num: integer corresponding to a counter of the already created bank journals through this wizard.
+        :param default_account_id: id of the default debit.credit account created before for this journal.
+        :param company_id: id of the company for which the wizard is running
+        :return: mapping of field names and values
+        :rtype: dict
+        '''
+        obj_data = self.pool.get('ir.model.data')
+        # Get the id of journal views
+        tmp = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view_multi')
+        view_id_cur = tmp and tmp[1] or False
+        tmp = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view')
+        view_id_cash = tmp and tmp[1] or False
+        vals = {
+                'name': line['acc_name'],
+                'code': _('BNK') + str(current_num),
+                'type': line['account_type'] == 'cash' and 'cash' or 'bank',
+                'company_id': company_id,
+                'analytic_journal_id': False,
+                'currency': False,
+                'default_credit_account_id': default_account_id,
+                'default_debit_account_id': default_account_id,
+        }
+        if line['currency_id']:
+            vals['view_id'] = view_id_cur
+            vals['currency'] = line['currency_id']
+        else:
+            vals['view_id'] = view_id_cash
+        return vals
+
+    def _prepare_bank_account(self, cr, uid, line, new_code, acc_template_ref, ref_acc_bank, company_id, context=None):
+        '''
+        This function prepares the value to use for the creation of the default debit and credit accounts of a
+        bank journal created through the wizard of generating COA from templates.
+
+        :param line: dictionary containing the values encoded by the user related to his bank account
+        :param new_code: integer corresponding to the next available number to use as account code
+        :param acc_template_ref: the dictionary containing the mapping between the ids of account templates and the ids
+            of the accounts that have been generated from them.
+        :param ref_acc_bank: browse record of the account template set as root of all bank accounts for the chosen
+            template
+        :param company_id: id of the company for which the wizard is running
+        :return: mapping of field names and values
+        :rtype: dict
+        '''
+        obj_data = self.pool.get('ir.model.data')
+
+        # Get the id of the user types fr-or cash and bank
+        tmp = obj_data.get_object_reference(cr, uid, 'account', 'data_account_type_cash')
+        cash_type = tmp and tmp[1] or False
+        tmp = obj_data.get_object_reference(cr, uid, 'account', 'data_account_type_bank')
+        bank_type = tmp and tmp[1] or False
+        return {
+                'name': line['acc_name'],
+                'currency_id': line['currency_id'],
+                'code': new_code,
+                'type': 'liquidity',
+                'user_type': line['account_type'] == 'cash' and cash_type or bank_type,
+                'parent_id': acc_template_ref[ref_acc_bank.id] or False,
+                'company_id': company_id,
+        }
+
+    def _create_bank_journals_from_o2m(self, cr, uid, obj_wizard, company_id, acc_template_ref, context=None):
+        '''
+        This function creates bank journals and its accounts for each line encoded in the field bank_accounts_id of the
+        wizard.
+
+        :param obj_wizard: the current wizard that generates the COA from the templates.
+        :param company_id: the id of the company for which the wizard is running.
+        :param acc_template_ref: the dictionary containing the mapping between the ids of account templates and the ids
+            of the accounts that have been generated from them.
+        :return: True
+        '''
+        obj_acc = self.pool.get('account.account')
+        obj_journal = self.pool.get('account.journal')
+        code_digits = obj_wizard.code_digits
+
+        # Build a list with all the data to process
+        journal_data = []
+        if obj_wizard.bank_accounts_id:
+            for acc in obj_wizard.bank_accounts_id:
+                vals = {
+                    'acc_name': acc.acc_name,
+                    'account_type': acc.account_type,
+                    'currency_id': acc.currency_id.id,
                 }
-                new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
+                journal_data.append(vals)
+        ref_acc_bank = obj_wizard.chart_template_id.bank_account_view_id
+        if journal_data and not ref_acc_bank.code:
+            raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of accounts hasn\'t a code.'))
 
-                for tax in position.tax_ids:
-                    vals_tax = {
-                        'tax_src_id': tax_template_ref[tax.tax_src_id.id],
-                        'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
-                        'position_id': new_fp,
-                    }
-                    obj_tax_fp.create(cr, uid, vals_tax)
+        current_num = 1
+        for line in journal_data:
+            # Seek the next available number for the account code
+            while True:
+                new_code = str(ref_acc_bank.code.ljust(code_digits-len(str(current_num)), '0')) + str(current_num)
+                ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', company_id)])
+                if not ids:
+                    break
+                else:
+                    current_num += 1
+            # Create the default debit/credit accounts for this bank journal
+            vals = self._prepare_bank_account(cr, uid, line, new_code, acc_template_ref, ref_acc_bank, company_id, context=context)
+            default_account_id  = obj_acc.create(cr, uid, vals, context=context)
 
-                for acc in position.account_ids:
-                    vals_acc = {
-                        'account_src_id': acc_template_ref[acc.account_src_id.id],
-                        'account_dest_id': acc_template_ref[acc.account_dest_id.id],
-                        'position_id': new_fp,
-                    }
-                    obj_ac_fp.create(cr, uid, vals_acc)
-
-        if obj_multi.sale_tax:
-            ir_values_obj.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id,
-                            models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])
-        if obj_multi.purchase_tax:
-            ir_values_obj.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id,
-                            models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]])
+            #create the bank journal
+            vals_journal = self._prepare_bank_journal(cr, uid, line, current_num, default_account_id, company_id, context=context)
+            obj_journal.create(cr, uid, vals_journal)
+            current_num += 1
+        return True
 
 wizard_multi_charts_accounts()
 
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 85d9805eb32..53195c345f9 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -34,8 +34,6 @@ class account_bank_statement(osv.osv):
             for line in vals['line_ids']:
                 seq += 1
                 line[2]['sequence'] = seq
-                new_line_ids += tuple(line)
-            vals['line_ids'] = new_line_ids
         return super(account_bank_statement, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -129,7 +127,7 @@ class account_bank_statement(osv.osv):
     _name = "account.bank.statement"
     _description = "Bank Statement"
     _columns = {
-        'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'), # readonly for account_cash_statement
+        'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='If you enter a statement name other than /, its created accounting entries move name will be the statement name appended with /1, /2, /3, etc. This allows statement entries to have a reference to the bank statement they appeared on.'), # readonly for account_cash_statement
         'date': fields.date('Date', required=True, states={'confirm': [('readonly', True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True,
             readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index e249f8fa872..430d65e0bf9 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -25,7 +25,7 @@
                 </xpath>
                 <group colspan="8" position="inside">
                     <group colspan="4" width="600">
-                        <field name="charts"/>
+                            <field name="charts"/>
                             <group colspan="4" groups="account.group_account_user">
                                 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
                                 <field name="has_default_company" invisible="1" />
@@ -34,10 +34,6 @@
                                 <field name="date_stop"/>
                                 <field name="period" colspan="4"/>
                             </group>
-                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-                                <field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/>
-                                <field name="purchase_tax" groups="base.group_extended"/>
-                            </group>
                         </group>
                     </group>
                 </data>
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 39cc471c2f6..6fcc211bd84 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -261,7 +261,7 @@ class account_invoice(osv.osv):
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
             help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
         'move_lines':fields.function(_get_lines, type='many2many', relation='account.move.line', string='Entry Lines'),
-        'residual': fields.function(_amount_residual, digits_compute=dp.get_precision('Account'), string='Residual',
+        'residual': fields.function(_amount_residual, digits_compute=dp.get_precision('Account'), string='To Pay',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line','move_id'], 50),
                 'account.invoice.tax': (_get_invoice_tax, None, 50),
@@ -610,15 +610,15 @@ class account_invoice(osv.osv):
             res[r[0]].append( r[1] )
         return res
 
-    def copy(self, cr, uid, id, default={}, context=None):
-        if context is None:
-            context = {}
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
         default.update({
             'state':'draft',
             'number':False,
             'move_id':False,
             'move_name':False,
             'internal_number': False,
+            'period_id': False,
         })
         if 'date_invoice' not in default:
             default.update({
@@ -1642,12 +1642,7 @@ class res_partner(osv.osv):
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-
-        if context is None:
-            context = {}
-
+        default = default or {}
         default.update({'invoice_ids' : []})
         return super(res_partner, self).copy(cr, uid, id, default, context)
 
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4cc1a63db61..55d27e2e842 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -120,7 +120,7 @@
                     <field name="number"/>
                     <field name="partner_id" groups="base.group_user"/>
                     <field name="reference" invisible="1"/>
-                    <field name="name"/>
+                    <field name="name" invisible="1"/>
                     <field name="journal_id" invisible="1"/>
                     <field name="period_id" invisible="1" groups="account.group_account_user"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -269,15 +269,13 @@
                     <newline/>
                     <field name="date_invoice"/>
                     <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>
+                    <field name="payment_term" widget="selection"/>
+                    <newline/>
+                    <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
+                    <field name="name" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
-                            <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" context="{'type': type}"/>
                             <group col="1" colspan="2">
                                 <field name="tax_line" nolabel="1">
@@ -362,13 +360,13 @@
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
-                        <field name="number"/>
+                        <field name="number"
+                            string="Reference"
+                            filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
                         <field name="user_id" widget="selection" string="Salesman">
-                        <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
+                            <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
                         </field>
-                        <field name="origin"/>
-                        <field name="amount_total"/>
                     </group>
                     <newline/>
                     <group>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 55e154eed6d..e54024a6dcb 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -581,14 +581,14 @@ class account_move_line(osv.osv):
         lines = self.browse(cr, uid, ids, context=context)
         for l in lines:
             if l.account_id.type == 'view':
-                return False
+                raise osv.except_osv(_('Error :'), _('You can not create move line on view account %s %s') % (l.account_id.code, l.account_id.name))
         return True
 
     def _check_no_closed(self, cr, uid, ids, context=None):
         lines = self.browse(cr, uid, ids, context=context)
         for l in lines:
             if l.account_id.type == 'closed':
-                return False
+                raise osv.except_osv(_('Error :'), _('You can not create move line on closed account %s %s') % (l.account_id.code, l.account_id.name))
         return True
 
     def _check_company_id(self, cr, uid, ids, context=None):
@@ -1249,6 +1249,8 @@ class account_move_line(osv.osv):
             if len(period_candidate_ids) != 1:
                 raise osv.except_osv(_('Encoding error'), _('No period found or period given is ambigous.'))
             context['period_id'] = period_candidate_ids[0][0]
+        if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
+            context['journal_id'] = context.get('search_default_journal_id')            
         self._update_journal_check(cr, uid, context['journal_id'], context['period_id'], context)
         move_id = vals.get('move_id', False)
         journal = journal_obj.browse(cr, uid, context['journal_id'], context=context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 0d664d45d32..9ae59f62456 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -303,6 +303,9 @@
                 <tree string="Unrealized Gains and losses">
                     <field name="code"/>
                     <field name="name"/>
+                    <field name="parent_id" invisible="1"/>
+                    <field name="user_type" invisible="1"/>
+                    <field name="type" invisible="1"/>
                     <field name="currency_id"/>
                     <field name="exchange_rate"/>
                     <field name="foreign_balance"/>
@@ -326,6 +329,7 @@
         <menuitem
             name="Unrealized Gain or Loss"
             action="action_account_gain_loss"
+            groups="account.group_account_user"
             id="menu_unrealized_gains_losses"
             parent="account.menu_multi_currency"/>
 
@@ -786,7 +790,6 @@
                     <group col="2" colspan="2">
                         <separator string="Reporting Configuration" colspan="4"/>
                         <field name="report_type" select="2"/>
-                        <field name="sign" />                        
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Closing Method" colspan="4"/>
@@ -1753,18 +1756,18 @@
             <field name="arch" type="xml">
                 <form string="Payment Term">
                     <group>
-	                    <group colspan="2" col="4">
-	                        <field name="name" select="1"/>
-	                        <separator string="Amount Computation" colspan="4"/>
-	                        <field name="value" colspan="4"/>
-	                        <field name="value_amount" colspan="4" attrs="{'readonly':[('value','=','balance')]}"/>
-	                    </group>
-	                    <group colspan="2" col="4">
-	                        <field name="sequence"/>
-	                        <separator string="Due Date Computation" colspan="4"/>
-	                        <field name="days" colspan="4"/>
-	                        <field name="days2" colspan="4"/>
-	                    </group>
+                        <group colspan="2" col="4">
+                            <field name="name" select="1"/>
+                            <separator string="Amount Computation" colspan="4"/>
+                            <field name="value" colspan="4"/>
+                            <field name="value_amount" colspan="4" attrs="{'readonly':[('value','=','balance')]}"/>
+                        </group>
+                        <group colspan="2" col="4">
+                            <field name="sequence"/>
+                            <separator string="Due Date Computation" colspan="4"/>
+                            <field name="days" colspan="4"/>
+                            <field name="days2" colspan="4"/>
+                        </group>
                     </group>
                     <newline/>
                     <separator string="Example" colspan="4"/>
@@ -2114,6 +2117,7 @@
 
                             <field name="currency_id"/>
                             <field name="reconcile"/>
+                            <field name="chart_template_id"/>
                             <separator string="Default taxes" colspan="4"/>
                             <field name="tax_ids" colspan="4" nolabel="1"/>
                         </page>
@@ -2184,9 +2188,13 @@
                 <form string="Chart of Accounts Template">
                     <group>
                     <field name="name"/>
-                    <field name="account_root_id"/>
-                    <field name="bank_account_view_id"/>
-                    <field name="tax_code_root_id"/>
+                    <field name="account_root_id" attrs="{'required': [('parent_id', '=', False)]}"/>
+                    <field name="bank_account_view_id" attrs="{'required': [('parent_id', '=', False)]}"/>
+                    <field name="tax_code_root_id" attrs="{'required': [('parent_id', '=', False)]}"/>
+                    <field name="parent_id" />
+                    <!--<field name="code_digits" />-->
+                    <field name="visible" />
+                    <field name="complete_tax_set" />
                     </group>
                     <field name="tax_template_ids" colspan="4" readonly="1" nolabel="1"/>
                     <separator string="Properties" colspan="4"/>
@@ -2270,7 +2278,9 @@
                         <field name="chart_template_id"/>
                         <field name="type"/>
                         <field name="type_tax_use"/>
-                        <field name="price_include"/>
+                        <group colspan="2" col="4">
+                            <field name="price_include"/>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Tax Definition">
@@ -2437,10 +2447,13 @@
                 <group string="res_config_contents" position="replace">
                     <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                     <field name ="code_digits" groups="account.group_account_user"/>
-                    <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
-                    <field name ="seq_journal" groups="account.group_account_user"/>
-                    <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
-                    <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
+                    <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
+                    <field name ="seq_journal" groups="base.group_extended"/>
+                    <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
+                    <field name="purchase_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
+                    <field name ="sale_tax_rate" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
+                    <field name ="purchase_tax_rate" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
+                    <field name ="complete_tax_set" invisible="1"/>
                     <newline/> <!-- extended view because the web UI is not good for one2many -->
                     <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="account.group_account_user">
                         <form string="Bank Information">
@@ -2476,6 +2489,9 @@
             <field eval="5" name="sequence"/>
             <field name="code">
 act_window_ids = pool.get('ir.actions.act_window').search(cr, uid,[('name', 'in', ('Accounting Chart Configuration', 'Generate Chart of Accounts from a Chart Template'))], context=context)
+ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'action_account_configuration_installer')
+if ref:
+    act_window_ids += [ref[1]]
 todo_ids = pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', act_window_ids)], context=context)
 pool.get('ir.actions.todo').write(cr, uid, todo_ids, {'state':'open'}, context=context)
 action = pool.get('res.config').next(cr, uid, [], context)
@@ -2767,10 +2783,14 @@ action = pool.get('res.config').next(cr, uid, [], context)
                         <field name="parent_id"/>
                         <field name="sequence"/>
                         <field name="type"/>
+                        <field name="sign"/>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Report" attrs="{'invisible': [('state','!=','confirm')]}">
-                            <field name="display_detail" attrs="{'invisible': [('type','!=','accounts')]}"/>
+                    <notebook colspan="6">
+                        <page string="Report">
+                            <group colspan="4" col="4">
+                                <field name="display_detail" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}"  colspan="2"/>
+                                <label string="" colspan="2"/>
+                            </group>
                             <newline/>
                             <field name="account_ids" nolabel="1" colspan="6" attrs="{'invisible': [('type', '!=', 'accounts')]}"/>
                             <newline/>
@@ -2779,9 +2799,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="account_type_ids" nolabel="1" attrs="{'invisible': [('type', '!=', 'account_type')]}"/>
                             <newline/>
                         </page>
-                        <page string="Notes" attrs="{'invisible': [('state','!=','confirm')]}">
-                            <field name="note" nolabel="1" colspan="4"/>
-                        </page>
                     </notebook>
                 </form>
             </field>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 5108a62cf3e..ffd2811cba7 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -41,12 +41,11 @@
                 <form string="Account Board">
                     <board style="2-1">
                         <column>
-                            <action name="%(account.action_invoice_tree1)d" string="Customer Invoices to Approve" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
+                            <action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
                             <action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
                         </column>
                         <column>
                             <action name="%(action_treasory_graph)d" string="Treasury"/> <!--groups="account.group_account_manager,account.group_account_user"-->
-                            <action name="%(action_aged_receivable)d" string="Aged Receivables"/> <!--groups="account.group_account_manager,account.group_account_user"-->
                         </column>
                     </board>
                 </form>
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index 0ac7a51405d..7e1de5b5f7e 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -1,26 +1,6 @@
 <openerp>
-    <data>
+    <data noupdate="1">
         <!-- Types -->
-        <record model="account.account.type" id="conf_account_type_receivable">
-          <field name="name">Receivable</field>
-          <field name="code">receivable</field>
-          <field name="report_type">income</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="conf_account_type_payable">
-          <field name="name">Payable</field>
-          <field name="code">payable</field>
-          <field name="report_type">expense</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="conf_account_type_view">
-          <field name="name">View</field>
-          <field name="code">view</field>
-          <field name="close_method">none</field>
-        </record>
-
         <record model="account.account.type" id="account_type_income_view1">
             <field name="name">Income View</field>
             <field name="code">view</field>
@@ -41,78 +21,32 @@
             <field name="code">liability</field>
             <field name="report_type">liability</field>
         </record>
-
-        <record model="account.account.type" id="conf_account_type_income">
-          <field name="name">Income</field>
-          <field name="code">income</field>
-          <field name="report_type">income</field>
-          <field name="close_method">none</field>
-        </record>
-
-        <record model="account.account.type" id="conf_account_type_expense">
-          <field name="name">Expense</field>
-          <field name="code">expense</field>
-          <field name="report_type">expense</field>
-          <field name="close_method">none</field>
-        </record>
-
         <record model="account.account.type" id="conf_account_type_tax">
           <field name="name">Tax</field>
           <field name="code">tax</field>
-          <field name="report_type">expense</field>
           <field name="close_method">unreconciled</field>
+          <field name="report_type">expense</field>
         </record>
-
-        <record model="account.account.type" id="conf_account_type_cash">
-          <field name="name">Cash</field>
-          <field name="code">cash</field>
-          <field name="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="conf_account_type_liability">
-            <field name="name">Liability</field>
-            <field name="code">liability</field>
-            <field name="report_type">liability</field>
-            <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="conf_account_type_asset">
-          <field name="name">Asset</field>
-          <field name="code">asset</field>
-          <field name="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-
         <record model="account.account.type" id="conf_account_type_equity">
           <field name="name">Equity</field>
           <field name="code">equity</field>
+          <field name="close_method">balance</field>
           <field name="report_type">liability</field>
-          <field name="close_method">balance</field>
         </record>
-
-         <record model="account.account.type" id="conf_account_type_bnk">
-          <field name="name">Bank</field>
-          <field name="code">bank</field>
-          <field name="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-         <record model="account.account.type" id="conf_account_type_chk">
+        <record model="account.account.type" id="conf_account_type_chk">
           <field name="name">Check</field>
           <field name="code">check</field>
-          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
+          <field name="report_type">asset</field>
         </record>
 
-
-
         <!-- Account Templates-->
         <record id="conf_chart0" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Configurable Account Chart</field>
             <field eval="0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
            <!-- Balance Sheet -->
@@ -122,7 +56,7 @@
             <field name="name">Balance Sheet</field>
             <field ref="conf_chart0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
             <record id="conf_fas" model="account.account.template">
@@ -162,7 +96,7 @@
                         <field name="name">Purchased Stocks</field>
                         <field ref="conf_cas" name="parent_id"/>
                         <field name="type">other</field>
-                        <field name="user_type" ref="conf_account_type_asset"/>
+                        <field name="user_type" ref="data_account_type_asset"/>
                     </record>
 
                     <record id="conf_a_recv" model="account.account.template">
@@ -171,7 +105,7 @@
                         <field ref="conf_cas" name="parent_id"/>
                         <field name="type">receivable</field>
                         <field eval="True" name="reconcile"/>
-                        <field name="user_type" ref="conf_account_type_receivable"/>
+                        <field name="user_type" ref="data_account_type_receivable"/>
                     </record>
 
                     <record id="conf_ova" model="account.account.template">
@@ -179,7 +113,7 @@
                         <field name="name">Tax Paid</field>
                         <field ref="conf_cas" name="parent_id"/>
                         <field name="type">other</field>
-                        <field name="user_type" ref="conf_account_type_asset"/>
+                        <field name="user_type" ref="data_account_type_asset"/>
                     </record>
 
                     <record id="conf_bnk" model="account.account.template">
@@ -195,7 +129,7 @@
                         <field name="name">Opening Income Account</field>
                         <field ref="conf_cas" name="parent_id"/>
                         <field name="type">other</field>
-                        <field name="user_type" ref="conf_account_type_income"/>
+                        <field name="user_type" ref="data_account_type_income"/>
                     </record>
 
                 <record id="conf_cli" model="account.account.template">
@@ -212,7 +146,7 @@
                         <field ref="conf_cli" name="parent_id"/>
                         <field name="type">payable</field>
                         <field eval="True" name="reconcile"/>
-                        <field name="user_type" ref="conf_account_type_payable"/>
+                        <field name="user_type" ref="data_account_type_payable"/>
                     </record>
 
                     <record id="conf_iva" model="account.account.template">
@@ -220,7 +154,7 @@
                         <field name="name">Tax Received</field>
                         <field ref="conf_cli" name="parent_id"/>
                         <field name="type">other</field>
-                        <field name="user_type" ref="conf_account_type_liability"/>
+                        <field name="user_type" ref="data_account_type_liability"/>
                     </record>
 
                     <record id="conf_a_reserve_and_surplus" model="account.account.template">
@@ -229,7 +163,7 @@
                         <field ref="conf_cli" name="parent_id"/>
                         <field name="type">other</field>
                         <field eval="True" name="reconcile"/>
-                        <field name="user_type" ref="conf_account_type_liability"/>
+                        <field name="user_type" ref="data_account_type_liability"/>
                     </record>
 
                     <record id="conf_o_expense" model="account.account.template">
@@ -237,7 +171,7 @@
                         <field name="name">Opening Expense Account</field>
                         <field ref="conf_cli" name="parent_id"/>
                         <field name="type">other</field>
-                        <field name="user_type" ref="conf_account_type_expense"/>
+                        <field name="user_type" ref="data_account_type_expense"/>
                     </record>
 
         <!-- Profit and Loss -->
@@ -247,7 +181,7 @@
             <field name="name">Profit and Loss</field>
             <field ref="conf_chart0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
             <record id="conf_rev" model="account.account.template">
@@ -263,7 +197,7 @@
                     <field name="name">Product Sales</field>
                     <field ref="conf_rev" name="parent_id"/>
                     <field name="type">other</field>
-                    <field name="user_type" ref="conf_account_type_income"/>
+                    <field name="user_type" ref="data_account_type_income"/>
                 </record>
 
             <record id="conf_cos" model="account.account.template">
@@ -279,7 +213,7 @@
                     <field name="name">Cost of Goods Sold</field>
                     <field ref="conf_cos" name="parent_id"/>
                     <field name="type">other</field>
-                    <field name="user_type" ref="conf_account_type_expense"/>
+                    <field name="user_type" ref="data_account_type_expense"/>
                 </record>
 
             <record id="conf_ovr" model="account.account.template">
@@ -295,7 +229,7 @@
                     <field name="name">Expenses</field>
                     <field ref="conf_ovr" name="parent_id"/>
                     <field name="type">other</field>
-                    <field name="user_type" ref="conf_account_type_expense"/>
+                    <field name="user_type" ref="data_account_type_expense"/>
                 </record>
 
                 <record id="conf_a_salary_expense" model="account.account.template">
@@ -303,7 +237,7 @@
                     <field name="name">Salary Expenses</field>
                     <field ref="conf_ovr" name="parent_id"/>
                     <field name="type">other</field>
-                    <field name="user_type" ref="conf_account_type_expense"/>
+                    <field name="user_type" ref="data_account_type_expense"/>
                 </record>
 
         <!-- Taxes -->
diff --git a/addons/account/data/data_account_type.xml b/addons/account/data/data_account_type.xml
new file mode 100644
index 00000000000..590357ef080
--- /dev/null
+++ b/addons/account/data/data_account_type.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record model="account.account.type" id="data_account_type_view">
+          <field name="name">View</field>
+          <field name="code">view</field>
+          <field name="close_method">none</field>
+        </record>
+        <record model="account.account.type" id="data_account_type_receivable">
+          <field name="name">Receivable</field>
+          <field name="code">receivable</field>
+          <field name="close_method">unreconciled</field>
+        </record>
+        <record model="account.account.type" id="data_account_type_payable">
+          <field name="name">Payable</field>
+          <field name="code">payable</field>
+          <field name="close_method">unreconciled</field>
+        </record>
+        <record model="account.account.type" id="data_account_type_bank">
+          <field name="name">Bank</field>
+          <field name="code">bank</field>
+          <field name="close_method">balance</field>
+        </record>
+        <record model="account.account.type" id="data_account_type_cash">
+          <field name="name">Cash</field>
+          <field name="code">cash</field>
+          <field name="close_method">balance</field>
+        </record>
+        <record model="account.account.type" id="data_account_type_asset">
+          <field name="name">Asset</field>
+          <field name="code">asset</field>
+          <field name="close_method">balance</field>
+          <field name="report_type">asset</field>
+        </record>
+        <record model="account.account.type" id="data_account_type_liability">
+            <field name="name">Liability</field>
+            <field name="code">liability</field>
+            <field name="close_method">balance</field>
+          <field name="report_type">liability</field>
+        </record>
+        <record model="account.account.type" id="data_account_type_income">
+          <field name="name">Income</field>
+          <field name="code">income</field>
+          <field name="close_method">none</field>
+          <field name="report_type">income</field>
+        </record>
+        <record model="account.account.type" id="data_account_type_expense">
+          <field name="name">Expense</field>
+          <field name="code">expense</field>
+          <field name="close_method">none</field>
+          <field name="report_type">expense</field>
+        </record>
+    </data>
+</openerp>
+
diff --git a/addons/account/data/data_financial_report.xml b/addons/account/data/data_financial_report.xml
new file mode 100644
index 00000000000..18624f94749
--- /dev/null
+++ b/addons/account/data/data_financial_report.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- 
+            Financial Reports
+        -->
+        <record id="account_financial_report_balancesheet0" model="account.financial.report">
+            <field name="name">Balance Sheet</field>
+            <field name="type">sum</field>
+        </record>
+        <record id="account_financial_report_assets0" model="account.financial.report">
+            <field name="name">Assets</field>
+            <field name="parent_id" ref="account_financial_report_balancesheet0"/>
+            <field name="display_detail">detail_with_hierarchy</field>
+            <field name="type">account_type</field>
+        </record>
+        <record id="account_financial_report_liability0" model="account.financial.report">
+            <field name="name">Liability</field>
+            <field name="parent_id" ref="account_financial_report_balancesheet0"/>
+            <field name="display_detail">detail_with_hierarchy</field>
+            <field name="type">account_type</field>
+        </record>
+
+        <record id="account_financial_report_profitandloss0" model="account.financial.report">
+            <field name="name">Profit and Loss</field>
+            <field name="type">sum</field>
+        </record>
+        <record id="account_financial_report_income0" model="account.financial.report">
+            <field name="name">Income</field>
+            <field name="parent_id" ref="account_financial_report_profitandloss0"/>
+            <field name="display_detail">detail_with_hierarchy</field>
+            <field name="type">account_type</field>
+        </record>
+        <record id="account_financial_report_expense0" model="account.financial.report">
+            <field name="name">Expense</field>
+            <field name="parent_id" ref="account_financial_report_profitandloss0"/>
+            <field name="display_detail">detail_with_hierarchy</field>
+            <field name="type">account_type</field>
+        </record>
+
+    </data>
+</openerp>
+
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 50b597c8e49..baa94450f02 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -5,58 +5,11 @@
         Account Type
         -->
 
-        <record id="account_type_root" model="account.account.type">
-            <field name="name">View</field>
-            <field name="code">view</field>
-            <field name="close_method">none</field>
-        </record>
-        <record id="account_type_asset" model="account.account.type">
-            <field name="name">Asset</field>
-            <field name="code">asset</field>
-            <field name="report_type">asset</field>
-            <field name="close_method">balance</field>
-        </record>
-        <record id="account_type_receivable" model="account.account.type">
-            <field name="name">Receivable</field>
-            <field name="code">receivable</field>
-            <field name="report_type">asset</field>
-            <field name="close_method">unreconciled</field>
-        </record>
-        <record id="account_type_liability" model="account.account.type">
-            <field name="name">Liability</field>
-            <field name="code">liability</field>
-            <field name="report_type">liability</field>
-            <field name="close_method">balance</field>
-        </record>
-        <record id="account_type_payable" model="account.account.type">
-            <field name="name">Payable</field>
-            <field name="code">payable</field>
-            <field name="report_type">liability</field>
-            <field name="close_method">unreconciled</field>
-        </record>
-        <record id="account_type_income" model="account.account.type">
-            <field name="name">Income</field>
-            <field name="code">income</field>
-            <field name="report_type">income</field>
-            <field name="close_method">none</field>
-        </record>
-        <record id="account_type_expense" model="account.account.type">
-            <field name="name">Expense</field>
-            <field name="code">expense</field>
-            <field name="report_type">expense</field>
-            <field name="close_method">none</field>
-        </record>
         <record id="account_type_cash_equity" model="account.account.type">
             <field name="name">Equity</field>
             <field name="code">equity</field>
+            <field name="close_method">balance</field>
             <field name="report_type">liability</field>
-            <field name="close_method">balance</field>
-        </record>
-        <record id="account_type_cash_moves" model="account.account.type">
-            <field name="name">Cash</field>
-            <field name="code">cash</field>
-            <field name="report_type">asset</field>
-            <field name="close_method">balance</field>
         </record>
 
         <!--
@@ -68,7 +21,7 @@
             <field name="name">Chart For Automated Tests</field>
             <field eval="0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_root"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
         <!-- Balance Sheet -->
@@ -78,14 +31,14 @@
             <field name="name">Balance Sheet - (test)</field>
             <field ref="chart0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_root"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
         <record model="account.account" id="assets_view">
             <field name="name">Assets - (test)</field>
             <field name="code">X10</field>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="bal"/>
         </record>
@@ -95,7 +48,7 @@
             <field name="name">Fixed Assets - (test)</field>
             <field ref="assets_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="xfa" model="account.account">
@@ -103,7 +56,7 @@
             <field name="name">Fixed Asset Account - (test)</field>
             <field ref="fas" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="nca" model="account.account">
@@ -111,7 +64,7 @@
             <field name="name">Net Current Assets - (test)</field>
             <field ref="assets_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="cas" model="account.account">
@@ -119,7 +72,7 @@
             <field name="name">Current Assets - (test)</field>
             <field ref="nca" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="stk" model="account.account">
@@ -127,7 +80,7 @@
             <field name="name">Purchased Stocks - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="a_recv" model="account.account">
@@ -136,7 +89,7 @@
             <field ref="cas" name="parent_id"/>
             <field name="type">receivable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_receivable"/>
+            <field name="user_type" ref="data_account_type_receivable"/>
         </record>
 
         <record id="ova" model="account.account">
@@ -144,7 +97,7 @@
             <field name="name">Output VAT - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="bnk" model="account.account">
@@ -152,7 +105,7 @@
             <field name="name">Bank Current Account - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">liquidity</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="cash" model="account.account">
@@ -160,7 +113,7 @@
             <field name="name">Cash - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">liquidity</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="o_income" model="account.account">
@@ -168,14 +121,14 @@
             <field name="name">Opening Income - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_income"/>
+            <field name="user_type" ref="data_account_type_income"/>
         </record>
 
         <record model="account.account" id="liabilities_view">
             <field name="name">Liabilities - (test)</field>
             <field name="code">X11</field>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_liability"/>
+            <field name="user_type" ref="data_account_type_liability"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="bal"/>
         </record>
@@ -185,7 +138,7 @@
             <field name="name">Current Liabilities - (test)</field>
             <field ref="liabilities_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_liability"/>
+            <field name="user_type" ref="data_account_type_liability"/>
         </record>
 
         <record id="a_pay" model="account.account">
@@ -194,7 +147,7 @@
             <field ref="cli" name="parent_id"/>
             <field name="type">payable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_payable"/>
+            <field name="user_type" ref="data_account_type_payable"/>
         </record>
 
         <record id="iva" model="account.account">
@@ -202,7 +155,7 @@
             <field name="name">Input VAT - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_liability"/>
+            <field name="user_type" ref="data_account_type_liability"/>
         </record>
 
         <record id="rsa" model="account.account">
@@ -210,7 +163,7 @@
             <field name="name">Reserve and Profit/Loss - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_liability"/>
+            <field name="user_type" ref="data_account_type_liability"/>
         </record>
 
         <record id="o_expense" model="account.account">
@@ -218,7 +171,7 @@
             <field name="name">Opening Expense - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <!-- Profit and Loss -->
@@ -228,14 +181,14 @@
             <field name="name">Profit and Loss - (test)</field>
             <field ref="chart0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_root"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
         <record model="account.account" id="income_view">
             <field name="name">Income - (test)</field>
             <field name="code">X20</field>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_income"/>
+            <field name="user_type" ref="data_account_type_income"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="gpf"/>
         </record>
@@ -244,7 +197,7 @@
             <field name="name">Foreign Exchange Gain - (test)</field>
             <field name="code">X201</field>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_income"/>
+            <field name="user_type" ref="data_account_type_income"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="income_view"/>
         </record>
@@ -254,7 +207,7 @@
             <field name="name">Revenue - (test)</field>
             <field ref="income_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_income"/>
+            <field name="user_type" ref="data_account_type_income"/>
         </record>
 
         <record id="a_sale" model="account.account">
@@ -262,14 +215,14 @@
             <field name="name">Product Sales - (test)</field>
             <field ref="rev" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_income"/>
+            <field name="user_type" ref="data_account_type_income"/>
         </record>
 
         <record model="account.account" id="expense_view">
             <field name="name">Expense - (test)</field>
             <field name="code">X21</field>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="gpf"/>
         </record>
@@ -280,7 +233,7 @@
             <field name="name">Cost of Sales - (test)</field>
             <field ref="expense_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <record id="cog" model="account.account">
@@ -288,7 +241,7 @@
             <field name="name">Cost of Goods Sold - (test)</field>
             <field ref="cos" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <record id="ovr" model="account.account">
@@ -296,7 +249,7 @@
             <field name="name">Overheads - (test)</field>
             <field ref="expense_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <record id="a_expense" model="account.account">
@@ -304,14 +257,14 @@
             <field name="name">Expenses - (test)</field>
             <field ref="ovr" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <record model="account.account" id="income_fx_expense">
             <field name="name">Foreign Exchange Loss - (test)</field>
             <field name="code">X2111</field>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="ovr"/>
         </record>
@@ -321,7 +274,7 @@
             <field name="name">Salary Expenses - (test)</field>
             <field ref="ovr" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <!-- Properties -->
diff --git a/addons/account/installer.py b/addons/account/installer.py
index a0157e51c8e..d1b19ef4319 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -23,8 +23,8 @@ import logging
 import time
 import datetime
 from dateutil.relativedelta import relativedelta
-from os.path import join as opj
 from operator import itemgetter
+from os.path import join as opj
 
 from tools.translate import _
 from osv import fields, osv
@@ -58,8 +58,6 @@ class account_installer(osv.osv_memory):
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
-        'sale_tax': fields.float('Sale Tax(%)'),
-        'purchase_tax': fields.float('Purchase Tax(%)'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'has_default_company' : fields.boolean('Has Default Company', readonly=True),
     }
@@ -76,8 +74,6 @@ class account_installer(osv.osv_memory):
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
         'period': 'month',
-        'sale_tax': 0.0,
-        'purchase_tax': 0.0,
         'company_id': _default_company,
         'has_default_company': _default_has_default_company,
         'charts': 'configurable'
@@ -100,9 +96,6 @@ class account_installer(osv.osv_memory):
                     res['fields'][field]['selection'] = cmp_select
         return res
 
-    def on_change_tax(self, cr, uid, id, tax):
-        return {'value': {'purchase_tax': tax}}
-
     def on_change_start_date(self, cr, uid, id, start_date=False):
         if start_date:
             start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d")
@@ -118,92 +111,12 @@ class account_installer(osv.osv_memory):
         if context is None:
             context = {}
         fy_obj = self.pool.get('account.fiscalyear')
-        mod_obj = self.pool.get('ir.model.data')
-        obj_acc_temp = self.pool.get('account.account.template')
-        obj_tax_code_temp = self.pool.get('account.tax.code.template')
-        obj_tax_temp = self.pool.get('account.tax.template')
-        obj_acc_chart_temp = self.pool.get('account.chart.template')
-        record = self.browse(cr, uid, ids, context=context)[0]
         for res in self.read(cr, uid, ids, context=context):
-            if record.charts == 'configurable':
+            if 'charts' in res and res['charts'] == 'configurable':
+                #load generic chart of account
                 fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))
                 tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None)
                 fp.close()
-                s_tax = (res.get('sale_tax', 0.0))/100
-                p_tax = (res.get('purchase_tax', 0.0))/100
-                pur_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_purchases')
-                pur_temp_tax_id = pur_temp_tax and pur_temp_tax[1] or False
-
-                pur_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_output')
-                pur_temp_tax_paid_id = pur_temp_tax_paid and pur_temp_tax_paid[1] or False
-
-                sale_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_sales')
-                sale_temp_tax_id = sale_temp_tax and sale_temp_tax[1] or False
-
-                sale_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_input')
-                sale_temp_tax_paid_id = sale_temp_tax_paid and sale_temp_tax_paid[1] or False
-
-                chart_temp_ids = obj_acc_chart_temp.search(cr, uid, [('name','=','Configurable Account Chart Template')], context=context)
-                chart_temp_id = chart_temp_ids and chart_temp_ids[0] or False
-                if s_tax * 100 > 0.0:
-                    tax_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Tax Received')], context=context)
-                    sales_tax_account_id = tax_account_ids and tax_account_ids[0] or False
-                    vals_tax_code_temp = {
-                        'name': _('TAX %s%%') % (s_tax*100),
-                        'code': _('TAX %s%%') % (s_tax*100),
-                        'parent_id': sale_temp_tax_id
-                    }
-                    new_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_tax_code_temp, context=context)
-                    vals_paid_tax_code_temp = {
-                        'name': _('TAX Received %s%%') % (s_tax*100),
-                        'code': _('TAX Received %s%%') % (s_tax*100),
-                        'parent_id': sale_temp_tax_paid_id
-                    }
-                    new_paid_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_paid_tax_code_temp, context=context)
-                    sales_tax_temp = obj_tax_temp.create(cr, uid, {
-                                            'name': _('Sale TAX %s%%') % (s_tax*100),
-                                            'amount': s_tax,
-                                            'base_code_id': new_tax_code_temp,
-                                            'tax_code_id': new_paid_tax_code_temp,
-                                            'ref_base_code_id': new_tax_code_temp,
-                                            'ref_tax_code_id': new_paid_tax_code_temp,
-                                            'type_tax_use': 'sale',
-                                            'type': 'percent',
-                                            'sequence': 0,
-                                            'account_collected_id': sales_tax_account_id,
-                                            'account_paid_id': sales_tax_account_id,
-                                            'chart_template_id': chart_temp_id,
-                                }, context=context)
-                if p_tax * 100 > 0.0:
-                    tax_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Tax Paid')], context=context)
-                    purchase_tax_account_id = tax_account_ids and tax_account_ids[0] or False
-                    vals_tax_code_temp = {
-                        'name': _('TAX %s%%') % (p_tax*100),
-                        'code': _('TAX %s%%') % (p_tax*100),
-                        'parent_id': pur_temp_tax_id
-                    }
-                    new_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_tax_code_temp, context=context)
-                    vals_paid_tax_code_temp = {
-                        'name': _('TAX Paid %s%%') % (p_tax*100),
-                        'code': _('TAX Paid %s%%') % (p_tax*100),
-                        'parent_id': pur_temp_tax_paid_id
-                    }
-                    new_paid_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_paid_tax_code_temp, context=context)
-                    purchase_tax_temp = obj_tax_temp.create(cr, uid, {
-                                             'name': _('Purchase TAX %s%%') % (p_tax*100),
-                                             'amount': p_tax,
-                                             'base_code_id': new_tax_code_temp,
-                                             'tax_code_id': new_paid_tax_code_temp,
-                                             'ref_base_code_id': new_tax_code_temp,
-                                             'ref_tax_code_id': new_paid_tax_code_temp,
-                                             'type_tax_use': 'purchase',
-                                             'type': 'percent',
-                                             'sequence': 0,
-                                             'account_collected_id': purchase_tax_account_id,
-                                             'account_paid_id': purchase_tax_account_id,
-                                             'chart_template_id': chart_temp_id,
-                                    }, context=context)
-
             if 'date_start' in res and 'date_stop' in res:
                 f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'][0])], context=context)
                 if not f_ids:
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index d6df834f4e8..da6ec7f73a1 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <tree toolbar="1" colors="red:state=='pending';grey:state in ('cancelled','close');blue:type=='view'" string="Analytic Accounts">
                     <field name="complete_name"/>
-                    <field name="code"/>
+                    <field name="code" groups="base.group_extended"/>
                     <field name="quantity"/>
                     <field name="date"/>
                     <field name="user_id" invisible="1"/>
@@ -59,7 +59,7 @@
             <field name="arch" type="xml">
                 <tree colors="red:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
                     <field name="name"/>
-                    <field name="code"/>
+                    <field name="code" groups="base.group_extended"/>
                     <field name="quantity"/>
                     <field name="debit"/>
                     <field name="credit"/>
@@ -82,8 +82,8 @@
             <field name="arch" type="xml">
                 <form string="Analytic account">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" colspan="4"/>
-                        <field name="code" select="1"/>
+                        <field name="name" colspan="4"/>
+                        <field name="code" groups="base.group_extended"/>
                         <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
                         <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                         <field name="type" select="2"/>
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index 90254c53bda..70ceb4b8f83 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -33,13 +33,10 @@ import account_print_overdue
 import account_aged_partner_balance
 #import tax_report
 import account_tax_report
-import account_balance_landscape
 import account_invoice_report
 import account_report
 import account_entries_report
 import account_analytic_entries_report
-import account_balance_sheet
-import account_profit_loss
 import account_treasury_report
 import account_financial_report
 
diff --git a/addons/account/report/account_balance_landscape.py b/addons/account/report/account_balance_landscape.py
deleted file mode 100644
index 4e62a9777c9..00000000000
--- a/addons/account/report/account_balance_landscape.py
+++ /dev/null
@@ -1,393 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import locale
-from report import report_sxw
-
-parents = {
-    'tr':1,
-    'li':1,
-    'story': 0,
-    'section': 0
-}
-
-class account_balance_landscape(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(account_balance_landscape, self).__init__(cr, uid, name, context=context)
-        self.flag=1
-        self.dr_total= 0.00
-        self.cr_total= 0.00
-        self.parent_bal=0
-        self.status=0
-        self.done_total=0
-        self.baldiv={}
-        self.empty_parent=0
-        self.result_total = {}
-        self.total_for_perc=[]
-        self.localcontext.update({
-            'time': time,
-            'lines': self.lines,
-            'get_lines':self.get_lines,
-            'linesForTotal': self.linesForTotal,
-            'linesForYear': self.linesForYear,
-            'get_years':self.get_years,
-            'cal_total':self.cal_total,
-            'total_dr':self.total_dr,
-            'total_cr':self.total_cr
-            })
-        self.context = context
-
-    def linesForYear(self,form):
-        temp=0
-        years={}
-
-        global pattern
-        global show
-        global perc
-        global bal_zero
-        global ref_bal
-
-        pattern=form['compare_pattern']
-
-        if form['show_columns']!=1:
-            show=0
-        else:
-            show=form['show_columns']
-
-        if form['format_perc']!=1:
-            perc=0
-        else:
-            perc=form['format_perc']
-
-        if form['account_choice']=='bal_zero':
-            bal_zero=0
-        else:
-            bal_zero=1
-
-        ctx = self.context.copy()
-
-        if perc==1:
-            if form['select_account']!=False:
-                ref_ac=self.pool.get('account.account').browse(self.cr, self.uid, form['select_account'], ctx.copy())
-                if ref_ac.balance<>0.00:
-                    ref_bal=ref_ac.balance
-                else:
-                    ref_bal=1.00
-            else:
-                ref_bal='nothing'
-        else:
-            ref_bal='nothing'
-
-
-        self.done_total=1
-        self.total_for_perc=self.linesForTotal(form, ids={}, doneAccount={}, level=1)
-        self.done_total=0
-
-        for t1 in range(0,len(form['fiscalyear'])):
-            locale.setlocale(locale.LC_ALL, '')
-            self.result_total["sum_credit" + str(t1)]=locale.format("%.2f", self.result_total["sum_credit" + str(t1)], grouping=True)
-            self.result_total["sum_debit" + str(t1)]=locale.format("%.2f", self.result_total["sum_debit" + str(t1)], grouping=True)
-
-        for temp in range(0,len(form['fiscalyear'])):
-            fy=self.pool.get('account.fiscalyear').name_get(self.cr, self.uid, form['fiscalyear'][temp])
-            years["year"+str(temp)]=fy[0][1][12:16]
-
-        return [years]
-
-
-    def linesForTotal(self, form, ids={}, doneAccount={}, level=1):
-        if not self.done_total==1:
-            return [self.result_total]
-        accounts=[]
-        if not ids:
-            ids = self.ids
-        if not ids:
-            return []
-
-        ctx = self.context.copy()
-
-        for id in form['fiscalyear']:
-            tmp=[]
-
-            ctx['fiscalyear'] = id
-            ctx['periods'] = form['periods']
-            ctx['period_manner'] = form['period_manner']
-            ctx['state'] = form['context'].get('state','all')
-            tmp = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy())
-
-            if tmp:
-                accounts.append(tmp)
-
-        merged_accounts=zip(*accounts)
-        # used to check for the frst record so all sum_credit and sum_debit r set to 0.00
-        if level==1:
-            doneAccount={}
-        for entry in merged_accounts:
-
-            if entry[0].id in doneAccount:
-                continue
-            doneAccount[entry[0].id] = 1
-
-            for k in range(0,len(entry)):
-                temp_credit=0.00
-                temp_debit=0.00
-                if entry[0].type <> 'view':
-                    temp_credit+=entry[k].credit
-                    temp_debit+=entry[k].debit
-
-                if self.flag==1:
-                    self.result_total["sum_credit" + str(k)]=0.00
-                    self.result_total["sum_debit" + str(k)]=0.00
-
-                if form['account_choice']=='bal_zero':
-                    if temp_credit<>temp_debit:
-                        self.result_total["sum_credit" + str(k)]+=temp_credit
-                        self.result_total["sum_debit" + str(k)]+=temp_debit
-                else:
-                    self.result_total["sum_credit" + str(k)]+=temp_credit
-                    self.result_total["sum_debit" + str(k)]+=temp_debit
-
-            self.flag=2
-
-            if entry[0].child_id:
-                ids2 = [(x.code,x.id) for x in entry[0].child_id]
-                ids2.sort()
-
-                result_total_parent = self.linesForTotal(form, [x[1] for x in ids2], doneAccount, level+1)
-
-        return [self.result_total]
-
-    def lines(self, form, ids={}, done={}, level=1):
-        accounts=[]
-        if not ids:
-            ids = self.ids
-        if not ids:
-            return []
-        result = []
-        ctx = self.context.copy()
-        tmp1=[]
-        for id in form['fiscalyear']:
-
-            ctx['fiscalyear'] = id
-            ctx['periods'] = form['periods']
-            ctx['period_manner']=form['period_manner']
-            ctx['state'] = form['context'].get('state','all')
-            tmp1 = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy())
-
-            if tmp1:
-                accounts.append(tmp1)
-
-        if level==1:   #if parent is called,done is not empty when called again.
-            done={}
-
-        def cmp_code(x, y):
-            return cmp(x.code, y.code)
-        for n in range(0,len(accounts)):
-            accounts[n].sort(cmp_code)
-        merged_accounts=zip(*accounts)
-
-        for entry in merged_accounts:
-            j=0
-            checked=1
-
-            if form['account_choice']!='all':    #  if checked,include empty a/c;not otherwise
-                checked=0
-
-            if entry[0].id in done:
-                continue
-            done[entry[0].id] = 1
-
-            if entry[0].child_id:  # this is for parent account,dont check 0 for it
-                checked=4
-                self.status=1 # for displaying it Bold
-            else:
-                self.status=0
-            if checked==0:
-                i=0
-                for i in range(0,len(entry)):
-                    if bal_zero==0:
-                        if entry[i].balance<>0.0:
-                            checked=4
-                            break
-                        else:
-                            checked=3
-                            i=i+1
-                    else:
-                        if entry[i].credit <> 0.0 or entry[i].debit <> 0.0:
-                            checked=4
-                            break
-                        else:
-                            checked=3
-                            i=i+1
-
-            if checked==3:
-                # this is the point where we skip those accounts which are encountered as empty ones
-                continue
-                self.empty_parent=0
-            else:
-                self.empty_parent=1
-                res = {
-                    'code': entry[0].code,
-                    'name': entry[0].name,
-                    'level': level,
-                    'status': self.status,
-                    }
-
-                for j in range(0,len(entry)):
-
-                    locale.setlocale(locale.LC_ALL, '')
-                    res["debit"+str(j)]=locale.format("%.2f", entry[j].debit, grouping=True)
-                    res["credit"+str(j)]=locale.format("%.2f", entry[j].credit, grouping=True)
-                    res["balance"+str(j)]=locale.format("%.2f", entry[j].balance, grouping=True)
-
-
-                    if j==0:
-                        res["bal_cash"+str(j)]="0.00"
-                        res["bal_perc"+str(j)]="0.00%"
-                    else:
-                        temp_cash=entry[j].balance - entry[j-1].balance
-                        res["bal_cash"+str(j)]=locale.format("%.2f", temp_cash, grouping=True)
-                        if entry[j-1].balance<>0.00:
-                            temp_perc=(entry[j].balance - entry[j-1].balance )*100/entry[j-1].balance
-                        else:
-                            temp_perc=(entry[j].balance) *100
-
-                        res["bal_perc"+str(j)]=locale.format("%.2f", temp_perc) + "%"
-
-
-                    if ref_bal=='nothing':
-                        if level==1:
-                            self.parent_bal=1
-                        else:
-                            self.parent_bal=0
-
-                        if self.parent_bal==1:
-                            res["balance_perc"+str(j)]="/"
-                        else:
-                            if entry[j].balance==0.00:
-                                if self.baldiv["baldiv"+str(level-1)+str(j)]<>0.00:
-                                    res["balance_perc"+str(j)]="0.00%"
-                                else:
-                                    res["balance_perc"+str(j)]="/"
-                            else:
-                                if self.baldiv["baldiv"+str(level-1)+str(j)]<>0.00:
-                                    temp=self.baldiv["baldiv"+str(level-1)+str(j)]
-                                    temp1=(entry[j].balance * 100 )/ float(temp)
-                                    temp1=round(temp1,2)
-                                    res["balance_perc" + str(j)]=str(temp1)+"%"
-                                else:
-                                    res["balance_perc"+str(j)]="/"
-                    else:
-                        res["balance_perc"+str(j)]=str( (entry[j].balance * 100 )/ float(ref_bal)) + "%"
-
-            result.append(res)
-
-            if entry[0].child_id:
-
-                for q in range(0,len(form['fiscalyear'])):
-                    self.baldiv["baldiv"+str(level)+str(q)]=entry[q].balance
-
-                ids2 = [(x.code,x.id) for x in entry[0].child_id]
-                ids2.sort()
-                dir=[]
-                dir += self.lines(form, [x[1] for x in ids2], done, level+1)
-                if dir==[]:
-                    for w in range(0,len(form['fiscalyear'])):
-                        if entry[w].credit <> 0.0 or entry[w].debit <> 0.0 or entry[w].balance<>0.00:
-                            dont_pop=1
-                            break
-                        else:
-                            dont_pop=0
-                    if dont_pop==1:
-                        result +=dir
-                    else:
-                        result.pop(-1)   # here we pop up the parent having its children as emprty accounts
-                else:
-                    result +=dir
-
-        return result
-
-    def get_years(self, form):
-        result =[]
-        res={}
-        for temp in range(0, len(form['fiscalyear'])):
-            res={}
-            fy=self.pool.get('account.fiscalyear').name_get(self.cr, self.uid, form['fiscalyear'][temp])
-            res['year']=fy[0][1]
-            res['last_str']=temp
-
-            result.append(res)
-        self.linesForYear(form)
-        return result
-
-    def get_lines(self, year_dict, form):
-        final_result = []
-        res = {}
-        line_l = self.lines(form)
-        self.cal_total(year_dict)
-        if line_l:
-            for l in line_l:
-                res = {}
-                res['code'] = l['code']
-                res['name'] = l['name']
-                res['level'] = l['level']
-                for k,v in l.items():
-                    if k.startswith('debit'+str(year_dict['last_str'])):
-                        res['debit'] = v
-                    if k.startswith('credit'+str(year_dict['last_str'])):
-                        res['credit'] = v
-                    if k.startswith('balance'+str(year_dict['last_str'])) and not k.startswith('balance_perc'+str(year_dict['last_str'])):
-                        res['balance'] =v
-                    if k.startswith('balance_perc'+str(year_dict['last_str'])) and not k.startswith('balance'+str(year_dict['last_str'])):
-                        res['balance_perc'] = v
-                    if form['compare_pattern'] == 'bal_perc':
-                        if k.startswith('bal_perc'+str(year_dict['last_str'])):
-                            res['pattern'] = v
-                    elif form['compare_pattern'] == 'bal_cash':
-                        if k.startswith('bal_cash'+str(year_dict['last_str'])):
-                            res['pattern'] = v
-                    else:
-                        res['pattern'] = ''
-                final_result.append(res)
-        return final_result
-
-    def cal_total(self, year_dict):
-        total_l = self.result_total
-        if total_l:
-            for k,v in total_l.items():
-                if k.startswith('sum_debit'+str(year_dict['last_str'])):
-                    self.dr_total = v
-                elif k.startswith('sum_credit'+str(year_dict['last_str'])):
-                    self.cr_total = v
-                else:
-                    continue
-        return True
-
-    def total_dr(self):
-        return self.dr_total
-
-    def total_cr(self):
-        return self.cr_total
-
-report_sxw.report_sxw('report.account.account.balance.landscape', 'account.account', 'addons/account/report/account_balance_landscape.rml', parser=account_balance_landscape, header="internal landscape")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/report/account_balance_landscape.rml b/addons/account/report/account_balance_landscape.rml
deleted file mode 100644
index d8e4881bbbe..00000000000
--- a/addons/account/report/account_balance_landscape.rml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Account Balance.pdf">
-  <template pageSize="(842.0,595.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="786" height="539"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Tiltle">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_header_account">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
-      <blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
-      <blockBackground colorName="#b3b3b3" start="4,0" stop="4,-1"/>
-      <blockBackground colorName="#b3b3b3" start="5,0" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
-      <blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.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="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <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="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="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_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="15.0" leading="15" alignment="CENTER" spaceBefore="0.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_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(get_years(data['form']), 'y') ]]</para>
-    <blockTable colWidths="785.0" style="Table_Tiltle">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Account Balance - [[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header">Year : [[ y['year'] ]]</para>
-    <blockTable colWidths="56.0,198.0,95.0,110.0,105.0,164.0" style="Table_header_account">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">[[ data['form']['show_columns'] and 'Code' or removeParentNode('blockTable') ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Account Name </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('font') ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Balance</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="56.0,198.0,206.0,268.0" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">[[ data['form']['show_columns'] and removeParentNode('blockTable') or 'Code' ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Account Name </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details"><font>[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('font') ]]</font></para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Balance</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(get_lines(y,data['form']), 'a') ]]</para>
-      <blockTable colWidths="56.0,197.0,94.0,110.0,106.0,162.0" style="Table4">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ a['pattern'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['debit'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['credit'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2"/>
-      <blockTable colWidths="56.0,197.0,94.0,110.0,107.0,85.0,77.0" style="Table2">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ a['pattern'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['debit'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['credit'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="55.0,197.0,94.0,380.0" style="Table6">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font> [[ a['name'] ]]</font></para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ a['pattern'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="54.0,197.0,94.0,275.0,106.0" style="Table5">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font> [[ a['name'] ]]</font></para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ a['pattern'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2"/>
-    </section>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="52.0,291.0,112.0,107.0,164.0" style="Table3">
-      <tr>
-        <td>
-          <para style="terp_default_9">[[ not data['form']['show_columns'] and removeParentNode('blockTable') ]] </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Total :</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">[[ total_dr() ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">[[ total_cr() ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P) : Compare Selected Years In Terms of Cash/Perc" or removeParentNode('font') ]]</para>
-  </story>
-</document>
\ No newline at end of file
diff --git a/addons/account/report/account_balance_landscape_old_backup.rml b/addons/account/report/account_balance_landscape_old_backup.rml
deleted file mode 100644
index 6790082f8dd..00000000000
--- a/addons/account/report/account_balance_landscape_old_backup.rml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Account Balance.pdf">
-  <template pageSize="(1120.0,770.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20" >
-    <pageTemplate id="first">
-      <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table61">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="red"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="12.0" leading="18" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" alignment="CENTER"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P8" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="1.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"/>
-  </stylesheet>
-  <story>
-    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
-      <tr>
-        <td>
-          <para style="Table Contents">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P1">Account Balance</para>
-        </td>
-        <td>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="Table Contents">[[ company.name ]]</para>
-        </td>
-        <td>
-          <para style="P4">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P5">Currency: [[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="P8">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
-     <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13"> [[repeatIn(linesForYear(data['form']),'year_header',td=len(data['form']['fiscalyear'][0][2]),width=[126],value=['year'],type=['string']) ]]</para>
-      <blockTable colWidths="180.0" style="Table6">
-		 <tr>
-          <td>
-            <para style="P1">Account Information</para>
-          </td>
-         </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['Debit','Credit','Balance'],type=['lable','lable','lable']) ]]</para>
-      <blockTable colWidths="30.0,150.0" style="Table6">
-        <tr>
-          <td>
-            <para style="P1">Code</para>
-          </td>
-          <td>
-            <para style="P1">Account Name</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[84,42],value=['Cash','%'],type=['lable','lable']) ]]</para>
-      <blockTable colWidths="180.0" style="Table5">
-        <tr>
-          <td>
-            <para style="P4"></para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13">[[ repeatIn(lines(data['form']),'a',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['debit','credit','balance'],type=['string','string','string']) ]]</para>
-      <blockTable colWidths="0.0,28.0,152.0" style="Table5">
-        <tr>
-        <td>
-            <para style="P3"> </para>
-          </td>
-          <td>
-            <para style="P7">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['code'] ]]</para>
-          </td>
-          <td>
-          <para style="P2"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Helvetica-bold'})) ]][[ a['name'] ]]</font></para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-     <para style="P13">[[ repeatIn(linesForTotal(data['form']),'total',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['sum_debit','sum_credit',''],type=['string','string','lable'] ) ]]</para>
-      <blockTable colWidths="180.0" style="Table6">
-        <tr>
-          <td>
-            <para style="P3">Total:[[ data['form']['show_columns']==0 and removeParentNode('section')]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/account/report/account_balance_old_backup.rml b/addons/account/report/account_balance_old_backup.rml
deleted file mode 100644
index cf67cb6bc3d..00000000000
--- a/addons/account/report/account_balance_old_backup.rml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Account Balance.pdf">
-  <template pageSize="(635.0,842.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="15.0" y1="15.0" width="615" height="772"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-
-    </blockTableStyle>
-    <blockTableStyle id="Table61">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="red"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="12.0" leading="18" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" />
-    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" alignment="CENTER"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P8" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="1.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"/>
-  </stylesheet>
-  <story>
-    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
-      <tr>
-        <td>
-        <para style="Table Contents"><font color="white"> </font></para>
-        </td>
-        <td>
-        <para style="P1">Account balance</para>
-        </td>
-        <td>
-        <para style="P3"><font color="white"> </font></para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        <para style="Table Contents">[[ company.name ]]</para>
-        </td>
-        <td>
-        <para style="P4"><font color="white"> </font></para>
-        </td>
-        <td>
-        <para style="P5">Currency: [[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="P8">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
-     <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13"> [[repeatIn(linesForYear(data['form']),'year_header',td=len(data['form']['fiscalyear'][0][2]),width=[126],value=['year'],type=['string']) ]]</para>
-      <blockTable colWidths="190.0" style="Table6">
-		 <tr>
-          <td>
-          <para style="P1">Account Information</para>
-          </td>
-         </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['Debit','Credit','Balance'],type=['lable','lable','lable']) ]]</para>
-      <blockTable colWidths="30.0,160.0" style="Table6">
-        <tr>
-          <td>
-          <para style="P1">Code</para>
-          </td>
-          <td>
-          <para style="P1">Account Name</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[84,42],value=['Cash','%'],type=['lable','lable']) ]]</para>
-      <blockTable colWidths="190.0" style="Table5">
-        <tr>
-          <td>
-          <para style="P4"><font color="white"> </font></para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13">[[ repeatIn(lines(data['form']),'a',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['debit','credit','balance'],type=['string','string','string']) ]]</para>
-      <condPageBreak height="2cm"/>
-      <blockTable colWidths="0.0,28.0,162.0" style="Table5">
-        <tr>
-        <td>
-        <para style="P3">
-        <font color="white"> </font>
-        </para>
-        </td>
-        <td>
-        <para style="P7">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['code'] ]]</para>
-        </td>
-        <td>
-        <para style="P2"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Helvetica-bold'})) ]][[ a['name'] ]]</font></para>
-        </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-     <para style="P13">[[ repeatIn(linesForTotal(data['form']),'total',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['sum_debit','sum_credit',''],type=['string','string','lable'] ) ]]</para>
-      <blockTable colWidths="190.0" style="Table6">
-        <tr>
-          <td>
-          	 <para style="P3">Total:[[ data['form']['show_columns']==0 and removeParentNode('section')]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
deleted file mode 100644
index ce9e3c51f06..00000000000
--- a/addons/account/report/account_balance_sheet.py
+++ /dev/null
@@ -1,224 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-import pooler
-from report import report_sxw
-from account.report import account_profit_loss
-from common_report_header import common_report_header
-from tools.translate import _
-
-class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header):
-    def __init__(self, cr, uid, name, context=None):
-        super(report_balancesheet_horizontal, self).__init__(cr, uid, name, context=context)
-        self.obj_pl = account_profit_loss.report_pl_account_horizontal(cr, uid, name, context=context)
-        self.result_sum_dr = 0.0
-        self.result_sum_cr = 0.0
-        self.result = {}
-        self.res_bl = {}
-        self.result_temp = []
-        self.localcontext.update({
-            'time': time,
-            'get_lines': self.get_lines,
-            'get_lines_another': self.get_lines_another,
-            'get_company': self._get_company,
-            'get_currency': self._get_currency,
-            'sum_dr': self.sum_dr,
-            'sum_cr': self.sum_cr,
-            'get_data':self.get_data,
-            'get_pl_balance':self.get_pl_balance,
-            'get_fiscalyear': self._get_fiscalyear,
-            'get_account': self._get_account,
-            'get_start_period': self.get_start_period,
-            'get_end_period': self.get_end_period,
-            'get_sortby': self._get_sortby,
-            'get_filter': self._get_filter,
-            'get_journal': self._get_journal,
-            'get_start_date':self._get_start_date,
-            'get_end_date':self._get_end_date,
-            'get_company':self._get_company,
-            'get_target_move': self._get_target_move,
-        })
-        self.context = context
-
-    def set_context(self, objects, data, ids, report_type=None):
-        new_ids = ids
-        if (data['model'] == 'ir.ui.menu'):
-            new_ids = 'chart_account_id' in data['form'] and [data['form']['chart_account_id']] or []
-            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
-        return super(report_balancesheet_horizontal, self).set_context(objects, data, new_ids, report_type=report_type)
-
-    def sum_dr(self):
-        if self.res_bl['type'] == _('Net Profit'):
-            self.result_sum_dr += self.res_bl['balance']*-1
-        return self.result_sum_dr
-
-    def sum_cr(self):
-        if self.res_bl['type'] == _('Net Loss'):
-            self.result_sum_cr += self.res_bl['balance']
-        return self.result_sum_cr
-
-    def get_pl_balance(self):
-        return self.res_bl
-
-    def get_data(self,data):
-        cr, uid = self.cr, self.uid
-        db_pool = pooler.get_pool(self.cr.dbname)
-
-        #Getting Profit or Loss Balance from profit and Loss report
-        self.obj_pl.get_data(data)
-        self.res_bl = self.obj_pl.final_result()
-
-        account_pool = db_pool.get('account.account')
-        currency_pool = db_pool.get('res.currency')
-
-        types = [
-            'liability',
-            'asset'
-        ]
-
-        ctx = self.context.copy()
-        ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
-
-        if data['form']['filter'] == 'filter_period':
-            ctx['period_from'] = data['form'].get('period_from', False)
-            ctx['period_to'] =  data['form'].get('period_to', False)
-        elif data['form']['filter'] == 'filter_date':
-            ctx['date_from'] = data['form'].get('date_from', False)
-            ctx['date_to'] =  data['form'].get('date_to', False)
-        ctx['state'] = data['form'].get('target_move', 'all')
-        cal_list = {}
-        pl_dict = {}
-        account_dict = {}
-        account_id = data['form'].get('chart_account_id', False)
-        account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx)
-        accounts = account_pool.browse(cr, uid, account_ids, context=ctx)
-
-        if not self.res_bl:
-            self.res_bl['type'] = _('Net Profit')
-            self.res_bl['balance'] = 0.0
-
-        if self.res_bl['type'] == _('Net Profit'):
-            self.res_bl['type'] = _('Net Profit')
-        else:
-            self.res_bl['type'] = _('Net Loss')
-        pl_dict  = {
-            'code': self.res_bl['type'],
-            'name': self.res_bl['type'],
-            'level': False,
-            'balance':self.res_bl['balance'],
-        }
-        for typ in types:
-            accounts_temp = []
-            for account in accounts:
-                if (account.user_type.report_type) and (account.user_type.report_type == typ):
-                    account_dict = {
-                        'id': account.id,
-                        'code': account.code,
-                        'name': account.name,
-                        'level': account.level,
-                        'balance': account.balance != 0 and account.balance * account.user_type.sign or account.balance,
-                        'type': account.type,
-                    }
-                    currency = account.currency_id and account.currency_id or account.company_id.currency_id
-                    if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_dr += account.balance
-                    if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_cr += account.balance
-                    if data['form']['display_account'] == 'movement':
-                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
-                            accounts_temp.append(account_dict)
-                    elif data['form']['display_account'] == 'not_zero':
-                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
-                            accounts_temp.append(account_dict)
-                    else:
-                        accounts_temp.append(account_dict)
-                    if account.id == data['form']['reserve_account_id']:
-                        pl_dict['level'] = account['level'] + 1
-                        accounts_temp.append(pl_dict)
-
-            self.result[typ] = accounts_temp
-            cal_list[typ]=self.result[typ]
-
-        if cal_list:
-            temp = {}
-            for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))):
-                if i < len(cal_list['liability']) and i < len(cal_list['asset']):
-                    temp={
-                          'type': cal_list['liability'][i]['type'],
-                          'code': cal_list['liability'][i]['code'],
-                          'name': cal_list['liability'][i]['name'],
-                          'level': cal_list['liability'][i]['level'],
-                          'balance':cal_list['liability'][i]['balance'],
-                          'type1': cal_list['asset'][i]['type'],
-                          'code1': cal_list['asset'][i]['code'],
-                          'name1': cal_list['asset'][i]['name'],
-                          'level1': cal_list['asset'][i]['level'],
-                          'balance1':cal_list['asset'][i]['balance'],
-                          }
-                    self.result_temp.append(temp)
-                else:
-                    if i < len(cal_list['asset']):
-                        temp={
-                              'type': '',
-                              'code': '',
-                              'name': '',
-                              'level': False,
-                              'balance':False,
-                              'type1': cal_list['asset'][i]['type'],
-                              'code1': cal_list['asset'][i]['code'],
-                              'name1': cal_list['asset'][i]['name'],
-                              'level1': cal_list['asset'][i]['level'],
-                              'balance1':cal_list['asset'][i]['balance'],
-                          }
-                        self.result_temp.append(temp)
-                    if  i < len(cal_list['liability']):
-                        temp={
-                              'type': cal_list['liability'][i]['type'],
-                              'code': cal_list['liability'][i]['code'],
-                              'name': cal_list['liability'][i]['name'],
-                              'level': cal_list['liability'][i]['level'],
-                              'balance':cal_list['liability'][i]['balance'],
-                              'type1': '',
-                              'code1': '',
-                              'name1': '',
-                              'level1': False,
-                              'balance1':False,
-                          }
-                        self.result_temp.append(temp)
-        return None
-
-    def get_lines(self):
-        return self.result_temp
-
-    def get_lines_another(self, group):
-        return self.result.get(group, [])
-
-report_sxw.report_sxw('report.account.balancesheet.horizontal', 'account.account',
-    'addons/account/report/account_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal,
-    header='internal landscape')
-
-report_sxw.report_sxw('report.account.balancesheet', 'account.account',
-    'addons/account/report/account_balance_sheet.rml',parser=report_balancesheet_horizontal,
-    header='internal')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
deleted file mode 100644
index 620ec05b16a..00000000000
--- a/addons/account/report/account_balance_sheet.rml
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Balance Sheet.pdf">
-  <template pageSize="(595.0,842.0)" title="Balance Sheet" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Heading">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Company_Name">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Date_from_To">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Account_Line_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Net_Profit_Loss">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,1" stop="-1,-1"/>
-    </blockTableStyle>
-   <blockTableStyle id="Table2_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-    </blockTableStyle>
-
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Left" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_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_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-
-    <paraStyle name="terp_level_1_code" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_1_name" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_1_balance" fontName="Helvetica-Bold" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_code" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent=".0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_code" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_code_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_name" fontName="Helvetica" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_balance_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_4_name" fontName="Helvetica" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_4_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-
-    <blockTableStyle id="Table1">
-      <blockTopPadding start="0,0" stop="-1,0" length="15"/>
-      <blockFont name="Helvetica-Bold" size="10.0" />
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,1" thickness="1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockTopPadding start="0,0" stop="-1,0" length="10"/>
-      <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBELOW" colorName="#666666" start="1,1" stop="1,1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Balance Sheet</para>
-        </td>
-      </tr>
-    </blockTable>
-        <para style="terp_default_8">[[ get_data(data) or removeParentNode('para') ]]</para>
-        <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-      <blockTable colWidths="120.0,100.0,140.0,90.0,90.0" style="Table2_header" >
-      <tr>
-        <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
-        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
-    <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
-      </tr>
-  <tr>
-     <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
-       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
-          <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
-        <tr>
-                 <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-              <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
-            </tr>
-            <tr>
-              <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="65.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
-        <tr>
-              <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-              <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
-            </tr>
-            <tr>
-              <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-            </tr>
-           </blockTable>
-          </td>
-    <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-    <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
-  </tr>
-  </blockTable>
-      <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Left">Assets</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-      </tr>
-      <tr style="Table3">
-          [[ repeatIn(get_lines_another('asset'),'a' ) ]]
-          [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
-        <td><para style="terp_level_3_code">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]]<i>[[ a['code'] ]]</i></para></td>
-        <td><para style="terp_level_3_name">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]]</para></td>
-        <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</para></td>
-        <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</u></para></td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Balance:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj = company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-    <condPageBreak height="20cm"/>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Left">Liabilities</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-      </tr>
-      <tr style="Table3">
-          [[ repeatIn(get_lines_another('liability'),'a' ) ]]
-          [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
-        <td><para style="terp_level_3_code">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]]<i>[[ a['code'] ]]</i></para></td>
-        <td><para style="terp_level_3_name">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]]</para></td>
-        <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</para></td>
-        <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</u></para></td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Balance:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj = company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
deleted file mode 100644
index b2d54e33466..00000000000
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Balance Sheet.pdf">
-  <template pageSize="(842.0,595.0)" title="Balance Sheet" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Heading">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Company_Name">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Date_from_To">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Account_Line_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,1" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Main_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Liability_side">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Asset_Side_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Net_Profit_Loss">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-   <blockTableStyle id="Table2_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-    </blockTableStyle>
-        <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-     <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>
-
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" rightIndent="0.0" leftIndent="1.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" rightIndent="121.0" leftIndent="-1.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="10" alignment="CENTER" spaceBefore="6.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_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="terp_header_Centre">Balance Sheet</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-  <para style="terp_default_8">[[ get_data(data) or removeParentNode('para') ]]</para>
-
-      <blockTable colWidths="250.0,100.0,150.0,120.0,150.0" style="Table2_header" >
-      <tr>
-        <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
-        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By  [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
-    <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
-      </tr>
-  <tr>
-     <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
-       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
-          <blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
-        <tr>
-                 <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-              <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
-            </tr>
-            <tr>
-              <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
-        <tr>
-              <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-              <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
-            </tr>
-            <tr>
-              <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-            </tr>
-           </blockTable>
-          </td>
-    <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-    <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para></td>
-  </tr>
-  </blockTable>
-      <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="80.0,210.16,100.32,80.0,210.16,100.32" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Assets</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Liabilities</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font>[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code1'] ]]<font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">
-          <font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(a['balance1'], currency_obj=company.currency_id) ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            [[ a['code'] ]]<font>[[ ( a['level']&lt;4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white">[[ '. '*(a['level']-1) ]]</font>
-            <font>[[ ( a['level']&lt;4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">
-            <font>[[ ( a['level']&lt;4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
-            <font>[[(a['code'] and a['name']) and formatLang(a['balance'], currency_obj=company.currency_id) or removeParentNode('font')]]</font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="290.16,100.32,290.16,100.32" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Balance:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Balance:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-  </story>
-</document>
-
diff --git a/addons/account/report/account_financial_report.py b/addons/account/report/account_financial_report.py
index e9da0a1cd7b..c3b1f5e2e1a 100644
--- a/addons/account/report/account_financial_report.py
+++ b/addons/account/report/account_financial_report.py
@@ -64,29 +64,30 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
                 vals['balance_cmp'] = self.pool.get('account.financial.report').browse(self.cr, self.uid, report.id, context=data['form']['comparison_context']).balance
             lines.append(vals)
             account_ids = []
-            if report.type == 'accounts' and report.display_detail and report.account_ids:
+            if report.type == 'accounts' and report.account_ids:
                 account_ids = account_obj._get_children_and_consol(self.cr, self.uid, [x.id for x in report.account_ids])
             elif report.type == 'account_type' and report.account_type_ids:
                 account_ids = account_obj.search(self.cr, self.uid, [('user_type','in', [x.id for x in report.account_type_ids])])
             if account_ids:
                 for account in account_obj.browse(self.cr, self.uid, account_ids, context=data['form']['used_context']):
-                    if account.type != 'view':
-                        flag = False
-                        vals = {
-                            'name': account.code + ' ' + account.name,
-                            'balance':  account.balance != 0 and account.balance * account.user_type.sign or account.balance,
-                            'type': 'account',
-                            'level': 6,
-                            'account_type': account.type,
-                        }
-                        if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance']):
+                    if report.display_detail == 'detail_flat' and account.type == 'view':
+                        continue
+                    flag = False
+                    vals = {
+                        'name': account.code + ' ' + account.name,
+                        'balance':  account.balance != 0 and account.balance * report.sign or account.balance,
+                        'type': 'account',
+                        'level': report.display_detail == 'detail_with_hierarchy' and min(account.level,6) or 6,
+                        'account_type': account.type,
+                    }
+                    if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance']):
+                        flag = True
+                    if data['form']['enable_filter']:
+                        vals['balance_cmp'] = account_obj.browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance
+                        if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance_cmp']):
                             flag = True
-                        if data['form']['enable_filter']:
-                            vals['balance_cmp'] = account_obj.browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance
-                            if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance_cmp']):
-                                flag = True
-                        if flag:
-                            lines.append(vals)
+                    if flag:
+                        lines.append(vals)
         return lines
 
 report_sxw.report_sxw('report.account.financial.report', 'account.financial.report',
diff --git a/addons/account/report/account_financial_report.rml b/addons/account/report/account_financial_report.rml
index 6a94f02c719..e3b5f3663f9 100644
--- a/addons/account/report/account_financial_report.rml
+++ b/addons/account/report/account_financial_report.rml
@@ -130,15 +130,13 @@
     <paraStyle name="terp_level_1_name" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_level_1_balance" fontName="Helvetica-Bold" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_level_2_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent=".0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent=".0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_2_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_3_name" fontName="Helvetica" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_3_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_3_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_3_balance_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_level_4_name" fontName="Helvetica" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_4_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_5_name" fontName="Helvetica" fontSize="8.0" leftIndent="40.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_5_balance" fontName="Helvetica-Oblique" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_6_name" fontName="Helvetica" fontSize="8.0" leftIndent="50.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_6_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_4_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
 
     <blockTableStyle id="Table1">
       <blockTopPadding start="0,0" stop="-1,0" length="15"/>
@@ -229,13 +227,13 @@
           <para style="terp_tblheader_Details_Right">Balance</para>
         </td>
       </tr>
-      <tr style="Table1">
+      <tr style="Table3">
           [[ repeatIn(get_lines(data), 'a') ]]
           [[ (a.get('level') &lt;&gt; 0) or removeParentNode('tr') ]]
           [[ setTag('tr','tr',{'style': 'Table'+str(min(3,'level' in a and a.get('level') or 1))}) ]]
-          <td><para style="terp_level_1_name">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_name'}) ]] [[ a.get('name') ]]</para></td>
-          <td>[[ a.get('level') == 4 or removeParentNode('td') ]]<para style="terp_level_1_balance"><u>[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</u></para></td>
-          <td>[[ a.get('level') &lt;&gt; 4 or removeParentNode('td') ]]<para style="terp_level_1_balance">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</para></td>
+          <td><para style="terp_level_3_name">[[ (a.get('account_type') =='view' and a.get('level') &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.get('level')))+'_name'}) ]][[ a.get('name') ]]</para></td>
+          <td>[[ (a.get('level') &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a.get('account_type') =='view' and a.get('level') &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]]</para></td>
+          <td>[[ a.get('level') == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]]</u></para></td>
       </tr>
     </blockTable>
     <para style="Standard">
@@ -258,11 +256,11 @@
           [[ repeatIn(get_lines(data), 'a') ]]
           [[ (a.get('level') &lt;&gt; 0) or removeParentNode('tr') ]]
           [[ setTag('tr','tr',{'style': 'Table'+str(min(3,'level' in a and a.get('level') or 1))}) ]]
-          <td><para style="terp_level_1_name">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_name'}) ]] [[ a.get('name') ]]</para></td>
-          <td>[[ a.get('level') == 4 or removeParentNode('td') ]]<para style="terp_level_1_balance"><u>[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</u></para></td>
-          <td>[[ a.get('level') &lt;&gt; 4 or removeParentNode('td') ]]<para style="terp_level_1_balance">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</para></td>
-          <td>[[ a.get('level') == 4 or removeParentNode('td') ]]<para style="terp_level_1_balance"><u>[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance_cmp'))]] [[company.currency_id.symbol]]</u></para></td>
-          <td>[[ a.get('level') &lt;&gt; 4 or removeParentNode('td') ]]<para style="terp_level_1_balance">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance_cmp'))]] [[company.currency_id.symbol]]</para></td>
+          <td><para style="terp_level_3_name">[[ (a.get('account_type') =='view' and a.get('level') &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.get('level')))+'_name'}) ]][[ a.get('name') ]]</para></td>
+          <td>[[ (a.get('level') &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a.get('account_type') =='view' and a.get('level') &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]]</para></td>
+          <td>[[ a.get('level') == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]]</u></para></td>
+          <td>[[ (a.get('level') &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a.get('account_type') =='view' and a.get('level') &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance_cmp'), currency_obj = company.currency_id) ]]</para></td>
+          <td>[[ a.get('level') == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.get('balance_cmp'), currency_obj = company.currency_id) ]]</u></para></td>
       </tr>
     </blockTable>
     <para style="Standard">
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 598f6c40278..cd43f416fce 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -70,7 +70,7 @@
                     <filter icon="terp-go-month" string="Month-1"
                             domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="last month"/>
-                    <separator orientation="vertical"/>              	
+                    <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -121,7 +121,7 @@
                     <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
-                    <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
+                    <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
@@ -138,7 +138,7 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
         <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 
diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
deleted file mode 100644
index 0918dcb2699..00000000000
--- a/addons/account/report/account_profit_horizontal.rml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Profit and Loss.pdf">
-  <template pageSize="(842.0,595.0)" title="Profit And Loss" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Heading">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Company_Name">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Date_from_To">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_debit_credit">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Account_Line_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,1" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Main_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Expense_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Income_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-     <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Net_Profit_Loss">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Final_Result">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-   <blockTableStyle id="Table2_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-    </blockTableStyle>
-
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" rightIndent="2.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="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_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Profit And Loss</para>
-        </td>
-      </tr>
-    </blockTable>
-        <para style="Standard">
-      <font color="white"> </font>
-    </para>
- 		<para style="P2">[[ get_data(data) or removeParentNode('para')]]</para>
-      <blockTable colWidths="250.0,100.0,150.0,120.0,150.0" style="Table2_header">
-      <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
-        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
-      </tr>
-	<tr>
-	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
-       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
-				<tr>
-	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
-	        	</tr>
-	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-	        	</tr>
-        	</blockTable>
-        	<blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
-				<tr>
-			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
-	        	</tr>
-	        	<tr>
-			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-	        	</tr>
-        	 </blockTable>
-        	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-		<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para></td>
-	</tr>
-	</blockTable>
-        <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="80.0,210.16,100.32,80.0,210.16,100.32" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Expenses</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Income</para>
-        </td>
-        <td>
-          <para style="P1">Balance</para>
-        </td>
-      </tr>
-        <tr>
-          <td>
-            <para style="terp_default_9">
-
-              <font>[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]][[ a['name'] ]]</font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance']), currency_obj=company.currency_id) ]]</font></para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              [[ a['code1'] ]]<font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and  formatLang(abs(a['balance1']), currency_obj=company.currency_id) or removeParentNode('font') ]]</font></para>
-          </td>
-        </tr>
-      </blockTable>
-    <blockTable colWidths="80.0,210.16,100.32,80.0,210.16,100.32" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9"></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(abs(final_result()['balance']), currency_obj=company.currency_id) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9"></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance']), currency_obj=company.currency_id) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-
-    <blockTable colWidths="290.16,100.32,290.16,100.32" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr()), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr()), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-  </story>
-</document>
-
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
deleted file mode 100644
index 27182cdbd21..00000000000
--- a/addons/account/report/account_profit_loss.py
+++ /dev/null
@@ -1,198 +0,0 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import pooler
-from report import report_sxw
-from common_report_header import common_report_header
-from tools.translate import _
-
-class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
-
-    def __init__(self, cr, uid, name, context=None):
-        super(report_pl_account_horizontal, self).__init__(cr, uid, name, context=context)
-        self.result_sum_dr = 0.0
-        self.result_sum_cr = 0.0
-        self.res_pl = {}
-        self.result = {}
-        self.result_temp = []
-        self.localcontext.update( {
-            'time': time,
-            'get_lines': self.get_lines,
-            'get_lines_another': self.get_lines_another,
-            'get_currency': self._get_currency,
-            'get_data': self.get_data,
-            'sum_dr': self.sum_dr,
-            'sum_cr': self.sum_cr,
-            'final_result': self.final_result,
-            'get_fiscalyear': self._get_fiscalyear,
-            'get_account': self._get_account,
-            'get_start_period': self.get_start_period,
-            'get_end_period': self.get_end_period,
-            'get_sortby': self._get_sortby,
-            'get_filter': self._get_filter,
-            'get_journal': self._get_journal,
-            'get_start_date':self._get_start_date,
-            'get_end_date':self._get_end_date,
-            'get_company':self._get_company,
-            'get_target_move': self._get_target_move,
-        })
-        self.context = context
-
-    def set_context(self, objects, data, ids, report_type=None):
-        new_ids = ids
-        if (data['model'] == 'ir.ui.menu'):
-            new_ids = 'chart_account_id' in data['form'] and [data['form']['chart_account_id']] or []
-            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
-        return super(report_pl_account_horizontal, self).set_context(objects, data, new_ids, report_type=report_type)
-
-
-    def final_result(self):
-        return self.res_pl
-
-    def sum_dr(self):
-        if self.res_pl['type'] == _('Net Profit'):
-            self.result_sum_dr += self.res_pl['balance']
-        return self.result_sum_dr
-
-    def sum_cr(self):
-        if self.res_pl['type'] == _('Net Loss'):
-            self.result_sum_cr += self.res_pl['balance']
-        return self.result_sum_cr
-
-    def get_data(self, data):
-        cr, uid = self.cr, self.uid
-        db_pool = pooler.get_pool(self.cr.dbname)
-
-        account_pool = db_pool.get('account.account')
-        currency_pool = db_pool.get('res.currency')
-
-        types = [
-            'expense',
-            'income'
-                ]
-
-        ctx = self.context.copy()
-        ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
-
-        if data['form']['filter'] == 'filter_period':
-            ctx['period_from'] = data['form'].get('period_from', False)
-            ctx['period_to'] =  data['form'].get('period_to', False)
-        elif data['form']['filter'] == 'filter_date':
-            ctx['date_from'] = data['form'].get('date_from', False)
-            ctx['date_to'] =  data['form'].get('date_to', False)
-
-        cal_list = {}
-        account_id = data['form'].get('chart_account_id', False)
-        company_currency = account_pool.browse(self.cr, self.uid, account_id).company_id.currency_id
-        account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx)
-        accounts = account_pool.browse(cr, uid, account_ids, context=ctx)
-
-        for typ in types:
-            accounts_temp = []
-            for account in accounts:
-                if (account.user_type.report_type) and (account.user_type.report_type == typ):
-                    currency = account.currency_id and account.currency_id or account.company_id.currency_id
-                    if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_dr += account.debit - account.credit
-                    if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_cr += account.credit - account.debit
-                    if data['form']['display_account'] == 'movement':
-                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
-                            accounts_temp.append(account)
-                    elif data['form']['display_account'] == 'not_zero':
-                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
-                            accounts_temp.append(account)
-                    else:
-                        accounts_temp.append(account)
-            if currency_pool.is_zero(self.cr, self.uid, company_currency, (self.result_sum_dr-self.result_sum_cr)):
-                self.res_pl['type'] = None
-                self.res_pl['balance'] = 0.0
-            elif self.result_sum_dr > self.result_sum_cr:
-                self.res_pl['type'] = _('Net Loss')
-                self.res_pl['balance'] = (self.result_sum_dr - self.result_sum_cr)
-            else:
-                self.res_pl['type'] = _('Net Profit')
-                self.res_pl['balance'] = (self.result_sum_cr - self.result_sum_dr)
-            self.result[typ] = accounts_temp
-            cal_list[typ] = self.result[typ]
-        if cal_list:
-            temp = {}
-            for i in range(0,max(len(cal_list['expense']),len(cal_list['income']))):
-                if i < len(cal_list['expense']) and i < len(cal_list['income']):
-                    temp={
-                          'code': cal_list['expense'][i].code,
-                          'name': cal_list['expense'][i].name,
-                          'level': cal_list['expense'][i].level,
-                          'balance': cal_list['expense'][i].balance != 0 and \
-                                    cal_list['expense'][i].balance * cal_list['expense'][i].user_type.sign or \
-                                    cal_list['expense'][i].balance,
-                          'code1': cal_list['income'][i].code,
-                          'name1': cal_list['income'][i].name,
-                          'level1': cal_list['income'][i].level,
-                          'balance1': cal_list['income'][i].balance != 0 and \
-                                        cal_list['income'][i].balance * cal_list['income'][i].user_type.sign or \
-                                        cal_list['income'][i].balance,
-                          }
-                    self.result_temp.append(temp)
-                else:
-                    if i < len(cal_list['income']):
-                        temp={
-                              'code': '',
-                              'name': '',
-                              'level': False,
-                              'balance':False,
-                              'code1': cal_list['income'][i].code,
-                              'name1': cal_list['income'][i].name,
-                              'level1': cal_list['income'][i].level,
-                              'balance1': cal_list['income'][i].balance != 0 and \
-                                            cal_list['income'][i].balance * cal_list['income'][i].user_type.sign \
-                                            or cal_list['income'][i].balance,
-                              }
-                        self.result_temp.append(temp)
-                    if  i < len(cal_list['expense']):
-                        temp={
-                              'code': cal_list['expense'][i].code,
-                              'name': cal_list['expense'][i].name,
-                              'level': cal_list['expense'][i].level,
-                              'balance': cal_list['expense'][i].balance != 0 and \
-                                            cal_list['expense'][i].balance * cal_list['expense'][i].user_type.sign \
-                                            or cal_list['expense'][i].balance,
-                              'code1': '',
-                              'name1': '',
-                              'level1': False,
-                              'balance1':False,
-                              }
-                        self.result_temp.append(temp)
-        return None
-
-    def get_lines(self):
-        return self.result_temp
-
-    def get_lines_another(self, group):
-        return self.result.get(group, [])
-
-report_sxw.report_sxw('report.pl.account.horizontal', 'account.account',
-    'addons/account/report/account_profit_horizontal.rml',parser=report_pl_account_horizontal, header='internal landscape')
-
-report_sxw.report_sxw('report.pl.account', 'account.account',
-    'addons/account/report/account_profit_loss.rml',parser=report_pl_account_horizontal, header='internal')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml
deleted file mode 100644
index 28fe167aef5..00000000000
--- a/addons/account/report/account_profit_loss.rml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Profit and Loss.pdf">
-  <template pageSize="(595.0,842.0)" title="Profit and Loss" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Heading">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Company_Name">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Date_from_To">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Account_Line_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="MIDDLE"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-     <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Net_Profit_Loss">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Final_Result">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-   <blockTableStyle id="Table2_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" rightIndent="2.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="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_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-
-    <paraStyle name="terp_level_1_code" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_1_name" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_1_balance" fontName="Helvetica-Bold" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_code" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent=".0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_code" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_code_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_name" fontName="Helvetica" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_balance_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_4_name" fontName="Helvetica" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_4_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-
-    <blockTableStyle id="Table1">
-      <blockTopPadding start="0,0" stop="-1,0" length="15"/>
-      <blockFont name="Helvetica-Bold" size="10.0" />
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,1" thickness="1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockTopPadding start="0,0" stop="-1,0" length="10"/>
-      <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBELOW" colorName="#666666" start="1,1" stop="1,1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-
-
-</stylesheet>
-  <images/>
-  <story>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Profit And Loss</para>
-        </td>
-      </tr>
-    </blockTable>
-
-    <para style="P2">[[ get_data(data) or removeParentNode('para')]]</para>
-        <para style="Standard">
-      <font color="white"> </font>
-    </para>
-      <blockTable colWidths="125.0,100.0,140.0,80.0,90.0" style="Table2_header">
-      <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
-        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
-        <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
-      </tr>
-	<tr>
-	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
-       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
-				<tr>
-	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
-	        	</tr>
-	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-	        	</tr>
-        	</blockTable>
-        	<blockTable colWidths="65.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
-				<tr>
-			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
-	        	</tr>
-	        	<tr>
-			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-	        	</tr>
-        	 </blockTable>
-        	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-		<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
-	</tr>
-	</blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header">Expenses</para>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-      </tr>
-      <tr style="Table3">
-          [[ repeatIn(get_lines_another('expense'),'a' ) ]]
-          [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
-        <td><para style="terp_level_3_code">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]]<i>[[ a.code ]]</i></para></td>
-        <td><para style="terp_level_3_name">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]]</para></td>
-        <td>[[ (a.level &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</para></td>
-        <td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</u></para></td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9"></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(final_result()['balance'], currency_obj=company.currency_id) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-     <condPageBreak height="20cm"/>
-    <para style="terp_default_Right_9_Bold">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header">Incomes</para>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Account</para>
-        </td>
-        <td>
-          <para style="P1">Balance</para>
-        </td>
-      </tr>
-      <tr style="Table3">
-          [[ repeatIn(get_lines_another('income'),'a' ) ]]
-          [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
-        <td><para style="terp_level_3_code">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]]<i>[[ a.code ]]</i></para></td>
-        <td><para style="terp_level_3_name">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]]</para></td>
-        <td>[[ (a.level &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</para></td>
-        <td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</u></para></td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table4">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9"></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(final_result()['balance'], currency_obj=company.currency_id) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="426.0,113.0" style="Table4">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_Right_9_Bold">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index c928ff3c8fe..64498127dc5 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -2,14 +2,17 @@
 <openerp><data>
 
     <record id="group_account_invoice" model="res.groups">
-        <field name="name">Accounting / Invoicing &amp; Payments</field>
+        <field name="name">Invoicing &amp; Payments</field>
+        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
     </record>
     <record id="group_account_user" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Accounting / Accountant</field>
+        <field name="name">Accountant</field>
+        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
     <record id="group_account_manager" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Accounting / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
 
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 79e4dbb0c03..d1cb87bd434 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -1,134 +1,105 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_product_account_user","product.product.account.user","product.model_product_product","group_account_user",1,0,0,0
-"access_account_payment_term","account.payment.term","model_account_payment_term","account.group_account_user",1,0,0,0
-"access_account_payment_term_line","account.payment.term.line","model_account_payment_term_line","account.group_account_user",1,0,0,0
-"access_account_account_type","account.account.type","model_account_account_type","account.group_account_user",1,0,0,0
-"access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0
-"access_account_tax_internal_user","account.tax internal user","model_account_tax","base.group_user",1,0,0,0
-"access_account_account","account.account","model_account_account","account.group_account_user",1,0,0,0
-"access_account_account_user","account.account user","model_account_account","base.group_user",1,0,0,0
-"access_account_account_partner_manager","account.account partner manager","model_account_account","base.group_partner_manager",1,0,0,0
-"access_account_journal_view","account.journal.view","model_account_journal_view","account.group_account_user",1,0,0,0
-"access_account_journal_column","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0
-"access_account_journal","account.journal","model_account_journal","account.group_account_user",1,0,0,0
-"access_account_period","account.period","model_account_period","account.group_account_user",1,0,0,0
-"access_account_journal_period_manager","account.journal.period manager","model_account_journal_period","account.group_account_manager",1,0,0,0
-"access_account_journal_period","account.journal.period","model_account_journal_period","account.group_account_user",1,1,1,1
-"access_account_move","account.move","model_account_move","account.group_account_user",1,1,1,1
-"access_account_move_line","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1
-"access_account_move_reconcile","account.move.reconcile","model_account_move_reconcile","account.group_account_user",1,1,1,1
-"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_account_invoice",1,0,0,0
-"access_account_tax","account.tax","model_account_tax","account.group_account_invoice",1,0,0,0
-"access_account_model","account.model","model_account_model","account.group_account_user",1,1,1,1
-"access_account_model_line","account.model.line","model_account_model_line","account.group_account_user",1,1,1,1
-"access_account_model_manager","account.model","model_account_model","account.group_account_manager",1,1,1,1
-"access_account_model_line_manager","account.model.line","model_account_model_line","account.group_account_manager",1,1,1,1
-"access_account_subscription","account.subscription","model_account_subscription","account.group_account_user",1,1,1,1
-"access_account_subscription_line","account.subscription.line","model_account_subscription_line","account.group_account_user",1,1,1,1
-"access_account_subscription_manager","account.subscription manager","model_account_subscription","account.group_account_manager",1,0,0,0
-"access_account_subscription_line_manager","account.subscription.line manager","model_account_subscription_line","account.group_account_manager",1,0,0,0
-"access_account_account_template","account.account.template","model_account_account_template","account.group_account_manager",1,1,1,1
-"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,1,1,1
-"access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
-"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
-"access_account_bank_statement","account.bank.statement","model_account_bank_statement","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,1,1,1
-"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
-"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0
-"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_account_user",1,0,0,0
-"access_account_analytic_journal_user","account.analytic.journal","model_account_analytic_journal","base.group_user",1,1,1,0
-"access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
-"access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
-"access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
-"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1
-"access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
-"access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
-"access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
-"access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,1,1,1
-"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,1,1,1
-"access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,1,1,1
-"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
-"access_account_account_manager","account.account","model_account_account","account.group_account_manager",1,1,1,1
-"access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,1,1,1
-"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,1,1,1
-"access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
-"access_account_journal_invoice","account.journal invoice","model_account_journal","account.group_account_invoice",1,0,0,0
-"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,1,1,1
-"access_account_period_invoice","account.period invoice","model_account_period","account.group_account_invoice",1,0,0,0
-"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,1,1,1
-"access_account_invoice_group_invoice","account.invoice group invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
-"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","account.group_account_manager",1,1,1,1
-"access_account_analytic_journal_manager","account.analytic.journal","model_account_analytic_journal","account.group_account_manager",1,1,1,1
-"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1
-"access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
-"access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
-"access_account_fiscalyear_partner_manager","account.fiscalyear.partnermanager","model_account_fiscalyear","base.group_partner_manager",1,0,0,0
-"access_account_fiscalyear_employee","account.fiscalyear employee","model_account_fiscalyear","base.group_user",1,0,0,0
-"access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
-"access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
-"access_res_currency_rate_type_account_manager","res.currency.rate.type account manager","base.model_res_currency_rate_type","group_account_manager",1,1,1,1
-"access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
-"access_account_invoice_user","account.invoice.line user","model_account_invoice_line","base.group_user",1,0,0,0
-"access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
-"access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",1,0,0,0
-"access_account_account_sale_manager","account.account sale manager","model_account_account","base.group_sale_manager",1,0,0,0
-"access_account_journal_sale_manager","account.journal sale manager","model_account_journal","base.group_sale_manager",1,0,0,0
-"access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
-"access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
-"access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
-"access_account_fiscal_position_template","account.fiscal.position.template","model_account_fiscal_position_template","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_tax_template","account.fiscal.position.tax.template","model_account_fiscal_position_tax_template","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
-"access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
-"access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
-"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,1,1,1
-"access_temp_range","temp.range","model_temp_range","account.group_account_manager",1,0,0,0
-"access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,1,1,1
-"access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_account_manager",1,1,1,1
-"access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,1,1,1
-"access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,1,1,1
-"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,1,1,1
-"access_res_partner_group_account_manager","res_partner group_account_manager","model_res_partner","account.group_account_manager",1,0,0,0
-"access_account_invoice_accountant","account.invoice accountant","model_account_invoice","account.group_account_user",1,0,0,0
-"access_account_tax_code_accountant","account.tax.code accountant","model_account_tax_code","account.group_account_user",1,1,1,1
-"access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,0,0,0
-"access_account_move_manager","account.move manager","model_account_move","account.group_account_manager",1,0,0,0
-"access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
-"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
-"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
-"access_account_entries_report_user","account.entries.report","model_account_entries_report","account.group_account_user",1,0,0,0
-"access_account_entries_report_invoice","account.entries.report","model_account_entries_report","account.group_account_invoice",1,0,0,0
-"access_account_entries_report_employee","account.entries.report employee","model_account_entries_report","base.group_user",1,0,0,0
-"access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1
-"access_account_journal_view_invoice","account.journal.view invoice","model_account_journal_view","account.group_account_invoice",1,1,1,1
-"access_account_journal_column_invoice","account.journal.column invoice","model_account_journal_column","account.group_account_invoice",1,1,1,1
-"access_account_invoice_tax_manager","account.invoice.tax manager","model_account_invoice_tax","account.group_account_manager",1,0,0,0
-"access_account_invoice_tax_accountant","account.invoice.tax accountant","model_account_invoice_tax","account.group_account_user",1,0,0,0
-"access_account_move_reconcile_manager","account.move.reconcile manager","model_account_move_reconcile","account.group_account_manager",1,0,0,0
-"access_account_analytic_line_invoice","account.analytic.line invoice","model_account_analytic_line","account.group_account_invoice",1,1,1,1
-"access_account_invoice_line_accountant","account.invoice.line accountant","model_account_invoice_line","account.group_account_user",1,0,0,0
-"access_res_partner_address_accountant","res.partner.address accountant","base.model_res_partner_address","account.group_account_user",1,0,0,0
-"access_account_invoice_line_manager","account.invoice.line manager","model_account_invoice_line","account.group_account_manager",1,0,0,0
-"access_account_account_invoice","account.account invoice","model_account_account","account.group_account_invoice",1,1,1,1
-"access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
-"access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1
-"access_account_account_type_invoice","account.account.type invoice","model_account_account_type","account.group_account_invoice",1,1,1,1
-"access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
-"access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
-"access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
-"access_account_tax_sale_manager","account.tax sale manager","model_account_tax","base.group_sale_salesman",1,0,0,0
-"access_account_journal_sale_manager","account.journal sale manager","model_account_journal","base.group_sale_salesman",1,0,0,0
-"access_account_invoice_tax_sale_manager","account.invoice.tax  sale manager","model_account_invoice_tax","base.group_sale_salesman",1,0,0,0
-"access_account_sequence_fiscal_year_sale_user","account.sequence.fiscalyear.sale.user","model_account_sequence_fiscalyear","base.group_sale_salesman",1,1,1,0
-"access_account_sequence_fiscal_year_sale_manager","account.sequence.fiscalyear.sale.manager","model_account_sequence_fiscalyear","base.group_sale_manager",1,1,1,1
-"access_account_treasury_report_manager","account.treasury.report.manager","model_account_treasury_report","account.group_account_manager",1,0,0,0
-"access_account_financial_report","account.financial.report","model_account_financial_report","account.group_account_user",1,1,1,1
-"access_account_financial_report_invoice","account.financial.report invoice","model_account_financial_report","account.group_account_invoice",1,0,0,0
-"access_account_financial_report_manager","account.financial.report","model_account_financial_report","account.group_account_manager",1,1,1,1
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_product_product_account_user,product.product.account.user,product.model_product_product,group_account_user,1,0,0,0
+access_account_payment_term,account.payment.term,model_account_payment_term,account.group_account_user,1,0,0,0
+access_account_payment_term_line,account.payment.term.line,model_account_payment_term_line,account.group_account_user,1,0,0,0
+access_account_account_type,account.account.type,model_account_account_type,account.group_account_user,1,0,0,0
+access_account_tax_internal_user,account.tax internal user,model_account_tax,base.group_user,1,0,0,0
+access_account_account,account.account,model_account_account,account.group_account_user,1,0,0,0
+access_account_account_user,account.account user,model_account_account,base.group_user,1,0,0,0
+access_account_account_partner_manager,account.account partner manager,model_account_account,base.group_partner_manager,1,0,0,0
+access_account_journal_view,account.journal.view,model_account_journal_view,account.group_account_user,1,0,0,0
+access_account_journal_column,account.journal.column,model_account_journal_column,account.group_account_user,1,0,0,0
+access_account_journal_period_manager,account.journal.period manager,model_account_journal_period,account.group_account_manager,1,0,0,0
+access_account_tax_code,account.tax.code,model_account_tax_code,account.group_account_invoice,1,0,0,0
+access_account_tax,account.tax,model_account_tax,account.group_account_invoice,1,0,0,0
+access_account_model,account.model,model_account_model,account.group_account_user,1,1,1,1
+access_account_model_line,account.model.line,model_account_model_line,account.group_account_user,1,1,1,1
+access_account_subscription,account.subscription,model_account_subscription,account.group_account_user,1,1,1,1
+access_account_subscription_line,account.subscription.line,model_account_subscription_line,account.group_account_user,1,1,1,1
+access_account_subscription_manager,account.subscription manager,model_account_subscription,account.group_account_manager,1,0,0,0
+access_account_subscription_line_manager,account.subscription.line manager,model_account_subscription_line,account.group_account_manager,1,0,0,0
+access_account_account_template,account.account.template,model_account_account_template,account.group_account_manager,1,1,1,1
+access_account_tax_code_template,account.tax.code.template,model_account_tax_code_template,account.group_account_manager,1,1,1,1
+access_account_chart_template,account.chart.template,model_account_chart_template,account.group_account_manager,1,1,1,1
+access_account_tax_template,account.tax.template,model_account_tax_template,account.group_account_manager,1,1,1,1
+access_account_bank_statement,account.bank.statement,model_account_bank_statement,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,1,1,1
+access_account_analytic_line_manager,account.analytic.line manager,model_account_analytic_line,account.group_account_manager,1,0,0,0
+access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,base.group_user,1,0,0,0
+access_account_analytic_journal,account.analytic.journal,model_account_analytic_journal,account.group_account_user,1,0,0,0
+access_account_analytic_journal_user,account.analytic.journal,model_account_analytic_journal,base.group_user,1,1,1,0
+access_account_invoice_uinvoice,account.invoice,model_account_invoice,account.group_account_invoice,1,1,1,1
+access_account_invoice_line_uinvoice,account.invoice.line,model_account_invoice_line,account.group_account_invoice,1,1,1,1
+access_account_invoice_tax_uinvoice,account.invoice.tax,model_account_invoice_tax,account.group_account_invoice,1,1,1,1
+access_account_move_uinvoice,account.move,model_account_move,account.group_account_invoice,1,1,1,1
+access_account_move_line_uinvoice,account.move.line invoice,model_account_move_line,account.group_account_invoice,1,1,1,1
+access_account_move_reconcile_uinvoice,account.move.reconcile,model_account_move_reconcile,account.group_account_invoice,1,1,1,1
+access_account_journal_period_uinvoice,account.journal.period,model_account_journal_period,account.group_account_invoice,1,1,1,1
+access_account_payment_term_manager,account.payment.term,model_account_payment_term,account.group_account_manager,1,1,1,1
+access_account_payment_term_line_manager,account.payment.term.line,model_account_payment_term_line,account.group_account_manager,1,1,1,1
+access_account_tax_manager,account.tax,model_account_tax,account.group_account_manager,1,1,1,1
+access_account_journal_manager,account.journal,model_account_journal,account.group_account_manager,1,1,1,1
+access_account_journal_invoice,account.journal invoice,model_account_journal,account.group_account_invoice,1,0,0,0
+access_account_period_manager,account.period,model_account_period,account.group_account_manager,1,1,1,1
+access_account_period_invoice,account.period invoice,model_account_period,account.group_account_invoice,1,0,0,0
+access_account_invoice_group_invoice,account.invoice group invoice,model_account_invoice,account.group_account_invoice,1,1,1,1
+access_account_analytic_journal_manager,account.analytic.journal,model_account_analytic_journal,account.group_account_manager,1,1,1,1
+access_account_fiscalyear,account.fiscalyear,model_account_fiscalyear,account.group_account_manager,1,1,1,1
+access_account_fiscalyear_invoice,account.fiscalyear.invoice,model_account_fiscalyear,account.group_account_invoice,1,0,0,0
+access_account_fiscalyear_partner_manager,account.fiscalyear.partnermanager,model_account_fiscalyear,base.group_partner_manager,1,0,0,0
+access_account_fiscalyear_employee,account.fiscalyear employee,model_account_fiscalyear,base.group_user,1,0,0,0
+access_res_currency_account_manager,res.currency account manager,base.model_res_currency,group_account_manager,1,1,1,1
+access_res_currency_rate_account_manager,res.currency.rate account manager,base.model_res_currency_rate,group_account_manager,1,1,1,1
+access_res_currency_rate_type_account_manager,res.currency.rate.type account manager,base.model_res_currency_rate_type,group_account_manager,1,1,1,1
+access_account_invoice_user,account.invoice user,model_account_invoice,base.group_user,1,0,0,0
+access_account_invoice_user,account.invoice.line user,model_account_invoice_line,base.group_user,1,0,0,0
+access_account_payment_term_partner_manager,account.payment.term partner manager,model_account_payment_term,base.group_user,1,0,0,0
+access_account_payment_term_line_partner_manager,account.payment.term.line partner manager,model_account_payment_term_line,base.group_user,1,0,0,0
+access_account_account_sale_manager,account.account sale manager,model_account_account,base.group_sale_manager,1,0,0,0
+access_account_fiscal_position_product_manager,account.fiscal.position account.manager,model_account_fiscal_position,account.group_account_manager,1,1,1,1
+access_account_fiscal_position_tax_product_manager,account.fiscal.position.tax account.manager,model_account_fiscal_position_tax,account.group_account_manager,1,1,1,1
+access_account_fiscal_position_account_product_manager,account.fiscal.position account.manager,model_account_fiscal_position_account,account.group_account_manager,1,1,1,1
+access_account_fiscal_position,account.fiscal.position all,model_account_fiscal_position,base.group_user,1,0,0,0
+access_account_fiscal_position_tax,account.fiscal.position.tax all,model_account_fiscal_position_tax,base.group_user,1,0,0,0
+access_account_fiscal_position_account,account.fiscal.position all,model_account_fiscal_position_account,base.group_user,1,0,0,0
+access_account_fiscal_position_template,account.fiscal.position.template,model_account_fiscal_position_template,account.group_account_manager,1,1,1,1
+access_account_fiscal_position_tax_template,account.fiscal.position.tax.template,model_account_fiscal_position_tax_template,account.group_account_manager,1,1,1,1
+access_account_fiscal_position_account_template,account.fiscal.position.account.template,model_account_fiscal_position_account_template,account.group_account_manager,1,1,1,1
+access_account_sequence_fiscal_year_user,account.sequence.fiscalyear user,model_account_sequence_fiscalyear,base.group_user,1,0,0,0
+access_temp_range,temp.range,model_temp_range,account.group_account_manager,1,0,0,0
+access_report_aged_receivable,report.aged.receivable,model_report_aged_receivable,account.group_account_manager,1,1,1,1
+access_report_invoice_created,report.invoice.created,model_report_invoice_created,account.group_account_manager,1,1,1,1
+access_report_account_type_sales,report.account_type.sales,model_report_account_type_sales,account.group_account_manager,1,1,1,1
+access_report_account_sales,report.account.sales,model_report_account_sales,account.group_account_manager,1,1,1,1
+access_account_invoice_report,account.invoice.report,model_account_invoice_report,account.group_account_manager,1,1,1,1
+access_res_partner_group_account_manager,res_partner group_account_manager,model_res_partner,account.group_account_manager,1,0,0,0
+access_account_invoice_accountant,account.invoice accountant,model_account_invoice,account.group_account_user,1,0,0,0
+access_account_tax_code_accountant,account.tax.code accountant,model_account_tax_code,account.group_account_user,1,1,1,1
+access_account_move_line_manager,account.move.line manager,model_account_move_line,account.group_account_manager,1,0,0,0
+access_account_move_manager,account.move manager,model_account_move,account.group_account_manager,1,0,0,0
+access_account_entries_report_manager,account.entries.report,model_account_entries_report,account.group_account_manager,1,1,1,1
+access_account_entries_report_invoice,account.entries.report,model_account_entries_report,account.group_account_invoice,1,0,0,0
+access_account_entries_report_employee,account.entries.report employee,model_account_entries_report,base.group_user,1,0,0,0
+access_analytic_entries_report_manager,analytic.entries.report,model_analytic_entries_report,account.group_account_manager,1,0,0,0
+access_account_cashbox_line,account.cashbox.line,model_account_cashbox_line,account.group_account_user,1,1,1,1
+access_account_journal_view_invoice,account.journal.view invoice,model_account_journal_view,account.group_account_invoice,1,1,1,1
+access_account_journal_column_invoice,account.journal.column invoice,model_account_journal_column,account.group_account_invoice,1,1,1,1
+access_account_invoice_tax_accountant,account.invoice.tax accountant,model_account_invoice_tax,account.group_account_user,1,0,0,0
+access_account_move_reconcile_manager,account.move.reconcile manager,model_account_move_reconcile,account.group_account_manager,1,0,0,0
+access_account_analytic_line_invoice,account.analytic.line invoice,model_account_analytic_line,account.group_account_invoice,1,1,1,1
+access_account_invoice_line_accountant,account.invoice.line accountant,model_account_invoice_line,account.group_account_user,1,0,0,0
+access_res_partner_address_accountant,res.partner.address accountant,base.model_res_partner_address,account.group_account_user,1,0,0,0
+access_account_account_invoice,account.account invoice,model_account_account,account.group_account_invoice,1,1,1,1
+access_res_partner_address_invoice,res.partner.address invoice,base.model_res_partner_address,account.group_account_invoice,1,1,1,1
+access_account_analytic_accountant,account.analytic.account accountant,analytic.model_account_analytic_account,account.group_account_user,1,1,1,1
+access_account_account_type_invoice,account.account.type invoice,model_account_account_type,account.group_account_invoice,1,1,1,1
+access_report_account_receivable_invoice,report.account.receivable.invoice,model_report_account_receivable,account.group_account_invoice,1,1,1,1
+access_account_sequence_fiscal_year_invoice,account.sequence.fiscalyear invoice,model_account_sequence_fiscalyear,account.group_account_invoice,1,1,1,1
+access_account_tax_sale_manager,account.tax sale manager,model_account_tax,base.group_sale_salesman,1,0,0,0
+access_account_journal_sale_manager,account.journal sale manager,model_account_journal,base.group_sale_salesman,1,0,0,0
+access_account_invoice_tax_sale_manager,account.invoice.tax  sale manager,model_account_invoice_tax,base.group_sale_salesman,1,0,0,0
+access_account_sequence_fiscal_year_sale_user,account.sequence.fiscalyear.sale.user,model_account_sequence_fiscalyear,base.group_sale_salesman,1,1,1,0
+access_account_sequence_fiscal_year_sale_manager,account.sequence.fiscalyear.sale.manager,model_account_sequence_fiscalyear,base.group_sale_manager,1,1,1,1
+access_account_treasury_report_manager,account.treasury.report.manager,model_account_treasury_report,account.group_account_manager,1,0,0,0
+access_account_financial_report,account.financial.report,model_account_financial_report,account.group_account_user,1,1,1,1
+access_account_financial_report_invoice,account.financial.report invoice,model_account_financial_report,account.group_account_invoice,1,0,0,0
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 40ba7ea7127..c2797f274e7 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -37,24 +37,15 @@
     data_dict = {'chart_account_id':ref('account.chart0')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account')
--
-  Print the Account Balance Sheet in Horizontal mode
--
-  !python {model: account.account}: |
-    ctx={}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
-    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
-    from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Account Balance Sheet in Normal mode
 -
   !python {model: account.account}: |
     ctx={}
     ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
-    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
+    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False, 'account_report_id': ref('account_financial_report_balancesheet0')}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
+    test_reports.try_report_action(cr, uid, 'action_account_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Account Balance Report in Normal mode through the wizard - From Account Chart
 -
@@ -147,18 +138,9 @@
   !python {model: account.account}: |
     ctx={}
     ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
-    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False,'target_move': 'all'}
+    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False,'target_move': 'all', 'account_report_id': ref('account_financial_report_balancesheet0')}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
--
-  Print the Profit-Loss Report in Horizontal Mode
--
-  !python {model: account.account}: |
-    ctx={}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
-    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True,'target_move': 'all'}
-    from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
+    test_reports.try_report_action(cr, uid, 'action_account_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
  Print the Analytic Balance Report through the wizard
 -
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 88ae17f3c7b..a78cf12050b 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -64,9 +64,6 @@ import account_report_account_balance
 
 import account_change_currency
 
-import account_report_balance_sheet
-import account_report_profit_loss
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index eb4319a56b6..fc460eceb11 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -56,18 +56,18 @@ class account_change_currency(osv.osv_memory):
             if invoice.company_id.currency_id.id == invoice.currency_id.id:
                 new_price = line.price_unit * rate
                 if new_price <= 0:
-                    raise osv.except_osv(_('Error'), _('New currency is not confirured properly !'))
+                    raise osv.except_osv(_('Error'), _('New currency is not configured properly !'))
 
             if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id == new_currency:
                 old_rate = invoice.currency_id.rate
                 if old_rate <= 0:
-                    raise osv.except_osv(_('Error'), _('Currnt currency is not confirured properly !'))
+                    raise osv.except_osv(_('Error'), _('Current currency is not configured properly !'))
                 new_price = line.price_unit / old_rate
 
             if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id != new_currency:
                 old_rate = invoice.currency_id.rate
                 if old_rate <= 0:
-                    raise osv.except_osv(_('Error'), _('Current currency is not confirured properly !'))
+                    raise osv.except_osv(_('Error'), _('Current currency is not configured properly !'))
                 new_price = (line.price_unit / old_rate ) * rate
             obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price})
         obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py
index de9cae3a00c..92c623a9524 100644
--- a/addons/account/wizard/account_financial_report.py
+++ b/addons/account/wizard/account_financial_report.py
@@ -38,9 +38,19 @@ class accounting_report(osv.osv_memory):
         'date_to_cmp': fields.date("End Date"),
     }
 
+    def _get_account_report(self, cr, uid, context=None):
+        menu_obj = self.pool.get('ir.ui.menu')
+        report_obj = self.pool.get('account.financial.report')
+        report_ids = []
+        if context.get('active_id'):
+            menu = menu_obj.browse(cr, uid, context.get('active_id')).name
+            report_ids = report_obj.search(cr, uid, [('name','ilike',menu)])
+        return report_ids and report_ids[0] or False
+
     _defaults = {
             'filter_cmp': 'filter_no',
             'target_move': 'posted',
+            'account_report_id': _get_account_report,
     }
 
     def _build_comparison_context(self, cr, uid, ids, data, context=None):
diff --git a/addons/account/wizard/account_financial_report_view.xml b/addons/account/wizard/account_financial_report_view.xml
index 1472da4ba87..4be6fb5e95c 100644
--- a/addons/account/wizard/account_financial_report_view.xml
+++ b/addons/account/wizard/account_financial_report_view.xml
@@ -40,6 +40,24 @@
              <field name="target">new</field>
        </record>
 
+      <menuitem
+            parent="account.menu_finance_legal_statement"
+            id="final_accounting_reports"
+            name="Accounting Reports"/>
+
+      <menuitem icon="STOCK_PRINT"
+                name="Profit And Loss"
+                action="account.action_account_report"
+                id="menu_account_pl_report"
+                parent="final_accounting_reports"/>
+
+      <menuitem icon="STOCK_PRINT"
+            name="Balance Sheet"
+            action="account.action_account_report"
+            groups="group_account_user,group_account_manager"
+            id="menu_account_bs_report"
+            parent="final_accounting_reports"/>
+
        <menuitem icon="STOCK_PRINT"
             name="Financial Report"
             action="action_account_report"
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 436ea20a3c2..ec74320e135 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -62,6 +62,8 @@ class account_invoice_refund(osv.osv_memory):
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         journal_obj = self.pool.get('account.journal')
         user_obj = self.pool.get('res.users')
+        # remove the entry with key 'form_view_ref', otherwise fields_view_get crashes
+        context.pop('form_view_ref', None)
         res = super(account_invoice_refund,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
         type = context.get('type', 'out_invoice')
         company_id = user_obj.browse(cr, uid, uid, context=context).company_id.id
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
deleted file mode 100644
index 01a89168a43..00000000000
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-from tools.translate import _
-
-class account_bs_report(osv.osv_memory):
-    """
-    This wizard will provide the account balance sheet report by periods, between any two dates.
-    """
-    _name = 'account.bs.report'
-    _inherit = "account.common.account.report"
-    _description = 'Account Balance Sheet Report'
-
-    def _get_def_reserve_account(self, cr, uid, context=None):
-        chart_id = self._get_account(cr, uid, context=context)
-        res = self.onchange_chart_id(cr, uid, [], chart_id, context=context)
-        if not res:
-            return False
-        return res['value']['reserve_account_id']
-
-    _columns = {
-        'display_type': fields.boolean("Landscape Mode"),
-        'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',
-                                      help='This account is used for transferring Profit/Loss (If It is Profit: Amount will be added, Loss : Amount will be deducted.), as calculated in Profit & Loss Report',
-                                      domain = [('type','=','other')]),
-        'journal_ids': fields.many2many('account.journal', 'account_bs_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
-    }
-
-    _defaults={
-        'display_type': False,
-        'journal_ids': [],
-        'reserve_account_id': _get_def_reserve_account,
-    }
-
-    def onchange_chart_id(self, cr, uid, ids, chart_id, context=None):
-        if not chart_id:
-            return {}
-        account = self.pool.get('account.account').browse(cr, uid, chart_id , context=context)
-        if not account.company_id.property_reserve_and_surplus_account:
-            return {'value': {'reserve_account_id': False}}
-        return {'value': {'reserve_account_id': account.company_id.property_reserve_and_surplus_account.id}}
-
-
-    def _print_report(self, cr, uid, ids, data, context=None):
-        if context is None:
-            context = {}
-        data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0])
-        if not data['form']['reserve_account_id']:
-            raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
-        data = self.pre_print_report(cr, uid, ids, data, context=context)
-        if data['form']['display_type']:
-            return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'account.balancesheet.horizontal',
-                'datas': data,
-            }
-        else:
-            return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'account.balancesheet',
-                'datas': data,
-            }
-
-account_bs_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
deleted file mode 100644
index faac52388a1..00000000000
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-     <data>
-
-        <record id="account_bs_report_view" model="ir.ui.view">
-            <field name="name">Account Balance Sheet</field>
-            <field name="model">account.bs.report</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.account_common_report_view" />
-            <field name="arch" type="xml">
-            <data>
-            <xpath expr="//field[@name='chart_account_id']" position="replace">
-                <field name="chart_account_id" widget="selection" on_change="onchange_chart_id(chart_account_id)"/>
-            </xpath>
-            <xpath expr="//field[@name='journal_ids']" position="replace">
-                <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
-            </xpath>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Balance Sheet" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
-            </xpath>
-            <xpath expr="//field[@name='target_move']" position="after">
-                <field name="display_account"/>
-                <field name="reserve_account_id"/>
-                <field name="display_type"/>
-                <newline/>
-            </xpath>
-            </data>
-            </field>
-        </record>
-
-        <record id="action_account_bs_report" model="ir.actions.act_window">
-             <field name="name">Balance Sheet</field>
-             <field name="res_model">account.bs.report</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">form</field>
-             <field name="view_id" ref="account_bs_report_view"/>
-             <field name="target">new</field>
-       </record>
-
-       <menuitem icon="STOCK_PRINT"
-            name="Balance Sheet"
-            action="action_account_bs_report"
-            groups="group_account_user,group_account_manager"
-            id="menu_account_bs_report"
-            parent="final_accounting_reports"/>
-
-    </data>
-</openerp>
diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py
deleted file mode 100644
index f4c2897bfe0..00000000000
--- a/addons/account/wizard/account_report_profit_loss.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-
-class account_pl_report(osv.osv_memory):
-    """
-    This wizard will provide the account profit and loss report by periods, between any two dates.
-    """
-    _inherit = "account.common.account.report"
-    _name = "account.pl.report"
-    _description = "Account Profit And Loss Report"
-
-    _columns = {
-        'display_type': fields.boolean("Landscape Mode"),
-        'journal_ids': fields.many2many('account.journal', 'account_pl_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
-    }
-
-    _defaults = {
-        'display_type': False,
-        'journal_ids': [],
-    }
-
-    def _print_report(self, cr, uid, ids, data, context=None):
-        if context is None:
-            context = {}
-        data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
-        if data['form']['display_type']:
-            return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'pl.account.horizontal',
-                'datas': data,
-            }
-        else:
-            return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'pl.account',
-                'datas': data,
-            }
-
-account_pl_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_profit_loss_view.xml b/addons/account/wizard/account_report_profit_loss_view.xml
deleted file mode 100644
index 75b6766ff87..00000000000
--- a/addons/account/wizard/account_report_profit_loss_view.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-     <data>
-
-        <record id="account_pl_report_view" model="ir.ui.view">
-            <field name="name">Profit and Loss</field>
-            <field name="model">account.pl.report</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.account_common_report_view" />
-            <field name="arch" type="xml">
-            <data>
-            <xpath expr="//field[@name='journal_ids']" position="replace">
-                <field name="journal_ids" required="0" colspan="4" nolabel="1" readonly="1"/>
-            </xpath>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Profit And Loss" colspan="4"/>
-                <label nolabel="1" colspan="4" string="The Profit and Loss report gives you an overview of your company profit and loss in a single document"/>
-            </xpath>
-            <xpath expr="//field[@name='fiscalyear_id']" position="after">
-                   <field name="display_account"/>
-                   <field name="display_type"/>
-            </xpath>
-            </data>
-            </field>
-        </record>
-
-         <record id="action_account_pl_report" model="ir.actions.act_window">
-             <field name="name">Account Profit And Loss</field>
-             <field name="res_model">account.pl.report</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">form</field>
-             <field name="view_id" ref="account_pl_report_view"/>
-             <field name="target">new</field>
-       </record>
-
-       <menuitem
-            parent="account.menu_finance_legal_statement"
-            id="final_accounting_reports"
-            name="Accounting Reports"/>
-
-        <menuitem icon="STOCK_PRINT"
-                name="Profit And Loss"
-                action="action_account_pl_report"
-                id="menu_account_pl_report"
-                parent="final_accounting_reports"/>
-
-    </data>
-</openerp>
diff --git a/addons/account_accountant/static/src/img/icon.png b/addons/account_accountant/static/src/img/icon.png
new file mode 100644
index 00000000000..1e25fc1efaf
Binary files /dev/null and b/addons/account_accountant/static/src/img/icon.png differ
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index ee887e1ff6a..01ef6a3cb81 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -46,7 +46,6 @@ user-wise as well as month wise.
                     ],
     'demo_xml'  : [],
     'installable': True,
-    'application': True,
     'active'    : False,
     'certificate': '0042927202589',
 }
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 1f6444c7351..e8647bd1aac 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -32,13 +32,11 @@
                              help="Analytic Accounts with a past deadline in one month." />
 
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="partner_id" select="1">
+                        <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
+                        <field name="partner_id">
                             <filter string="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
                         </field>
                         <field name="user_id">
-                            <filter string="My Accounts" domain="[('user_id','=',uid)]" icon="terp-personal" name="my_accounts" />
                             <filter string="No Account Manager" domain="[('user_id', '=', False)]" icon="terp-personal-" />
                         </field>
 
@@ -64,7 +62,7 @@
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="context">{'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
+            <field name="context">{'search_default_has_partner':1, 'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
             <field name="domain">[('type','=','normal')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
             <field name="help">You will find here the contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours. OpenERP automatically sets these analytic accounts to the pending state, in order to raise a warning during the timesheets recording. Salesmen should review all pending accounts and reopen or close the according to the negotiation with the customer.</field>
@@ -76,7 +74,7 @@
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="context">{'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1}</field>
+            <field name="context">{'search_default_has_partner':1, 'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1}</field>
             <field name="domain">[('type','=','normal')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
         </record>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 9bf66c18344..73c98e650f8 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -16,14 +16,14 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <group name="invoice_stats" position="inside">
-                    <field name="hours_qtt_non_invoiced"/>
-                    <field name="ca_to_invoice"/>
+                    <field name="hours_qtt_non_invoiced" attrs="{'invisible': [('to_invoice','=',0)]}"/>
+                    <field name="ca_to_invoice" attrs="{'invisible': [('to_invoice','=',0)]}"/>
                     <label string="" colspan="1"/>
                     <button
                         name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
                         string="Create Invoice"
                         type="action"
-                        attrs="{'readonly':[('ca_to_invoice','=',0.0)]}"
+                        attrs="{'readonly':[('ca_to_invoice','=',0.0)], 'invisible': [('to_invoice','=',0)]}"
                         icon="gtk-go-forward"/>
                 </group>
             </field>
diff --git a/addons/account_analytic_analysis/i18n/fa.po b/addons/account_analytic_analysis/i18n/fa.po
new file mode 100644
index 00000000000..66a9afc14de
--- /dev/null
+++ b/addons/account_analytic_analysis/i18n/fa.po
@@ -0,0 +1,293 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:48+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_invoiced:0
+msgid ""
+"Number of hours that can be invoiced plus those that already have been "
+"invoiced."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_ca:0
+msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours:0
+msgid "Computed using the formula: Maximum Quantity - Hours Tot."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
+#, python-format
+msgid "AccessError"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show\n"
+"important data to project manager of services companies.\n"
+"Adds menu to show relevant information to each manager..\n"
+"\n"
+"You can also view the report of account analytic summary\n"
+"user-wise as well as month wise.\n"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,theorical_margin:0
+msgid "Computed using the formula: Theorial Revenue - Total Costs"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_invoiced_date:0
+msgid ""
+"If invoice from the costs, this is the date of the latest work or cost that "
+"have been invoiced."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
+msgid "Billing"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_date:0
+msgid "Date of Last Cost/Work"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,total_cost:0
+msgid "Total Costs"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_quantity:0
+msgid ""
+"Number of hours you spent on the analytic account (from timesheet). It "
+"computes on all journal of type 'general'."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_theorical:0
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,user_ids:0
+#: field:account_analytic_analysis.summary.user,user:0
+msgid "User"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin:0
+msgid "Computed using the formula: Invoiced Amount - Total Costs."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Uninvoiced Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
+msgid "report_account_analytic"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_invoiced:0
+msgid "Invoiced Amount"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_invoiced_date:0
+msgid "Date of Last Invoiced Cost"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_invoiced:0
+msgid "Invoiced Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin:0
+msgid "Real Margin"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_invoiced:0
+msgid "Total customer invoiced amount for this account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
+msgid "Hours summary by month"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin_rate:0
+msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of hours (from journal of type 'general') that can be invoiced if you "
+"invoice based on analytic account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Analytic accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_ca:0
+msgid "Remaining Revenue"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_to_invoice:0
+msgid ""
+"If invoice from analytic account, the remaining amount you can invoice to "
+"the customer based on the total costs."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,revenue_per_hour:0
+msgid "Computed using the formula: Invoiced Amount / Hours Tot."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,revenue_per_hour:0
+msgid "Revenue per Hours (real)"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,unit_amount:0
+#: field:account_analytic_analysis.summary.user,unit_amount:0
+msgid "Total Time"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,month_ids:0
+#: field:account_analytic_analysis.summary.month,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
+msgid "Overpassed Accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
+msgid "All Uninvoiced Entries"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,total_cost:0
+msgid ""
+"Total of costs for this account. It includes real costs (from invoices) and "
+"indirect costs, like time spent on timesheets."
+msgstr ""
diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv
index 80b9f37db1f..4bdabaf6a87 100644
--- a/addons/account_analytic_analysis/security/ir.model.access.csv
+++ b/addons/account_analytic_analysis/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
-access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
+access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
diff --git a/addons/account_analytic_default/i18n/fa.po b/addons/account_analytic_default/i18n/fa.po
new file mode 100644
index 00000000000..12d1ee51946
--- /dev/null
+++ b/addons/account_analytic_default/i18n/fa.po
@@ -0,0 +1,191 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_analytic_default
+#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
+msgid "Account Analytic Default"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"select a partner which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"partner, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
+msgid "Analytic Rules"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,analytic_id:0
+msgid "Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Current"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_stop:0
+msgid "Default end date for this Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"select a company which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"company, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
+msgid "Entries"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid ""
+"select a user which will use analytical account specified in analytic default"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
+msgid "Analytic Defaults"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.module.module,description:account_analytic_default.module_meta_information
+msgid ""
+"\n"
+"Allows to automatically select analytic accounts based on criterions:\n"
+"* Product\n"
+"* Partner\n"
+"* User\n"
+"* Company\n"
+"* Date\n"
+"    "
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"select a product which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"product, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Accounts"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of analytic distribution"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
diff --git a/addons/account_analytic_default/security/ir.model.access.csv b/addons/account_analytic_default/security/ir.model.access.csv
index f92a9fd4dfa..cdfebbbb156 100644
--- a/addons/account_analytic_default/security/ir.model.access.csv
+++ b/addons/account_analytic_default/security/ir.model.access.csv
@@ -1,5 +1,4 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0
-access_account_analytic_default_manager,account.analytic.default.manager,model_account_analytic_default,account.group_account_manager,1,1,1,1
-access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1
-access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,base.group_sale_salesman,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0
+access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1
+access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,base.group_sale_salesman,1,1,1,1
diff --git a/addons/account_analytic_plans/i18n/fa.po b/addons/account_analytic_plans/i18n/fa.po
new file mode 100644
index 00000000000..f6002894647
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/fa.po
@@ -0,0 +1,530 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-12-18 16:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid ""
+"This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: view:account.crossovered.analytic:0
+#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+msgid "Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,name:0
+#: field:account.analytic.plan.line,plan_id:0
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: view:account.crossovered.analytic:0
+#: field:account.crossovered.analytic,journal_ids:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
+#: view:analytic.plan.create.model:0
+#, python-format
+msgid "Distribution Model Saved"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "No analytic plan defined !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+msgid "Analytic Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.module.module,description:account_analytic_plans.module_meta_information
+msgid ""
+"This module allows to use several analytic plans, according to the general "
+"journal,\n"
+"so that multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+"  Projects\n"
+"      Project 1\n"
+"          SubProj 1.1\n"
+"          SubProj 1.2\n"
+"      Project 2\n"
+"  Salesman\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must\n"
+"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+"Fabien. The amount can also be split. The following example is for\n"
+"an invoice that touches the two subproject and assigned to one salesman:\n"
+"\n"
+"Plan1:\n"
+"    SubProject 1.1 : 50%\n"
+"    SubProject 1.2 : 50%\n"
+"Plan2:\n"
+"    Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,\n"
+"for one account entry.\n"
+"The analytic plan validates the minimum and maximum percentage at the time "
+"of creation\n"
+"of distribution models.\n"
+"        "
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#, python-format
+msgid "Please put a name and a code before saving the model !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.default,analytics_id:0
+#: view:account.analytic.plan.instance:0
+#: field:account.analytic.plan.instance,name:0
+#: field:account.bank.statement.line,analytics_id:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
+#, python-format
+msgid "Value Error"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_analytic_plans/security/ir.model.access.csv b/addons/account_analytic_plans/security/ir.model.access.csv
index f7f141ac15a..9ba40d5c1c3 100644
--- a/addons/account_analytic_plans/security/ir.model.access.csv
+++ b/addons/account_analytic_plans/security/ir.model.access.csv
@@ -1,8 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_analytic_plan","account.analytic.plan","model_account_analytic_plan","account.group_account_user",1,1,1,1
-"access_account_analytic_plan_line","account.analytic.plan.line","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
-"access_account_analytic_plan_instance","account.analytic.plan.instance","model_account_analytic_plan_instance","account.group_account_user",1,1,1,1
-"access_account_analytic_plan_instance_line","account.analytic.plan.instance.line","model_account_analytic_plan_instance_line","account.group_account_user",1,1,1,1
-"access_account_analytic_plan_line_invoice","account.analytic.plan.line.invoice","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
-"access_account_analytic_plan_instance_manager","account.analytic.plan.instance manager","model_account_analytic_plan_instance","account.group_account_manager",1,1,1,1
-"access_account_analytic_plan_instance_line_manager","account.analytic.plan.instance.line manager","model_account_analytic_plan_instance_line","account.group_account_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_analytic_plan,account.analytic.plan,model_account_analytic_plan,account.group_account_user,1,1,1,1
+access_account_analytic_plan_line,account.analytic.plan.line,model_account_analytic_plan_line,account.group_account_user,1,1,1,1
+access_account_analytic_plan_instance,account.analytic.plan.instance,model_account_analytic_plan_instance,account.group_account_user,1,1,1,1
+access_account_analytic_plan_instance_line,account.analytic.plan.instance.line,model_account_analytic_plan_instance_line,account.group_account_user,1,1,1,1
+access_account_analytic_plan_line_invoice,account.analytic.plan.line.invoice,model_account_analytic_plan_line,account.group_account_user,1,1,1,1
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 52ec0588e88..432021a78c9 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -36,7 +36,7 @@ when the invoice is created to transfer this amount to the debtor or creditor ac
 Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account""",
     "images"   : ["images/account_anglo_saxon.jpeg"],
     "depends"   : ["product", "purchase"],
-    "category"  : "Accounting & Finance",
+    "category"  : "Hidden/Dependency",
     "init_xml"  : [],
     "demo_xml"  : [],
     "update_xml" : ["product_view.xml",],
diff --git a/addons/account_anglo_saxon/i18n/fa.po b/addons/account_anglo_saxon/i18n/fa.po
new file mode 100644
index 00000000000..f42287436a3
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/fa.po
@@ -0,0 +1,107 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at the moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account\n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index 5ae0629c4eb..a8745fa088b 100644
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -34,8 +34,11 @@
     ],
     "demo_xml" : [ 'account_asset_demo.xml'
     ],
-    'test': ['test/account_asset.yml',
-             ],
+    'test': [
+        'test/account_asset_demo.yml',
+        'test/account_asset.yml',
+        'test/account_asset_wizard.yml',
+    ],
     "update_xml" : [
         "security/account_asset_security.xml",
         "security/ir.model.access.csv",
@@ -45,7 +48,6 @@
         "account_asset_view.xml",
         "account_asset_invoice_view.xml",
         "report/account_asset_report_view.xml",
-
     ],
     "active": False,
     "installable": True,
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 894c22b46dc..08058a52efa 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -131,7 +131,7 @@ class account_asset_asset(osv.osv):
         if asset.prorata:
             undone_dotation_number += 1
         return undone_dotation_number
-    
+
     def compute_depreciation_board(self, cr, uid, ids, context=None):
         depreciation_lin_obj = self.pool.get('account.asset.depreciation.line')
         for asset in self.browse(cr, uid, ids, context=context):
@@ -141,7 +141,7 @@ class account_asset_asset(osv.osv):
             old_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id), ('move_id', '=', False)])
             if old_depreciation_line_ids:
                 depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context)
-            
+
             amount_to_depr = residual_amount = asset.value_residual
             if asset.prorata:
                 depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d')
@@ -198,6 +198,16 @@ class account_asset_asset(osv.osv):
             res.setdefault(id, 0.0)
         return res
 
+    def onchange_company_id(self, cr, uid, ids, company_id=False, context=None):
+        val = {}
+        if company_id:
+            company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+            if company.currency_id.company_id and company.currency_id.company_id.id != company_id:
+                val['currency_id'] = False
+            else:
+                val['currency_id'] = company.currency_id.id
+        return {'value': val}
+
     _columns = {
         'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.char('Asset', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -224,7 +234,7 @@ class account_asset_asset(osv.osv):
         'method_end': fields.date('Ending Date', readonly=True, states={'draft':[('readonly',False)]}),
         'method_progress_factor': fields.float('Degressive Factor', readonly=True, states={'draft':[('readonly',False)]}),
         'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'),
-        'method_time': fields.selection([('number','Number of Depreciations'),('end','Ending Date')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, 
+        'method_time': fields.selection([('number','Number of Depreciations'),('end','Ending Date')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]},
                                   help="Choose the method to use to compute the dates and number of depreciation lines.\n"\
                                        "  * Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" \
                                        "  * Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."),
@@ -246,7 +256,7 @@ class account_asset_asset(osv.osv):
         'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.asset',context=context),
     }
-    
+
     def _check_recursion(self, cr, uid, ids, context=None, parent=None):
         return super(account_asset_asset, self)._check_recursion(cr, uid, ids, context=context, parent=parent)
 
@@ -295,7 +305,7 @@ class account_asset_asset(osv.osv):
         result = []
         period_obj = self.pool.get('account.period')
         depreciation_obj = self.pool.get('account.asset.depreciation.line')
-        period = period_obj.browse(cr, uid, period_id, context=context) 
+        period = period_obj.browse(cr, uid, period_id, context=context)
         depreciation_ids = depreciation_obj.search(cr, uid, [('asset_id', 'in', ids), ('depreciation_date', '<', period.date_stop), ('depreciation_date', '>', period.date_start), ('move_check', '=', False)], context=context)
         return depreciation_obj.create_move(cr, uid, depreciation_ids, context=context)
 
@@ -394,7 +404,7 @@ class account_asset_depreciation_line(osv.osv):
             self.write(cr, uid, line.id, {'move_id': move_id}, context=context)
             created_move_ids.append(move_id)
             if can_close:
-                asset_obj.write(cr, uid, [line.asset_id.id], {'state': 'close'}, context=context)                
+                asset_obj.write(cr, uid, [line.asset_id.id], {'state': 'close'}, context=context)
         return created_move_ids
 
 account_asset_depreciation_line()
@@ -416,7 +426,7 @@ class account_asset_history(osv.osv):
         'user_id': fields.many2one('res.users', 'User', required=True),
         'date': fields.date('Date', required=True),
         'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
-        'method_time': fields.selection([('number','Number of Depreciations'),('end','Ending Date')], 'Time Method', required=True, 
+        'method_time': fields.selection([('number','Number of Depreciations'),('end','Ending Date')], 'Time Method', required=True,
                                   help="The method to use to compute the dates and number of depreciation lines.\n"\
                                        "Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" \
                                        "Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."),
@@ -430,7 +440,7 @@ class account_asset_history(osv.osv):
         'date': lambda *args: time.strftime('%Y-%m-%d'),
         'user_id': lambda self, cr, uid, ctx: uid
     }
-    
+
 account_asset_history()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index e986ef4bf0d..aeb0514c47e 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -2,7 +2,7 @@
 <data>
 
     <!--
-        Asset Category 
+        Asset Category
      -->
 
     <record model="ir.ui.view" id="view_account_asset_category_form">
@@ -51,9 +51,7 @@
             <tree string="Asset category">
                 <field name="name"/>
                 <field name="journal_id"/>
-                <field name="method_time"/>
                 <field name="method"/>
-                <field name="open_asset"/>
                 <field name="company_id" groups="base.group_multi_company"/>
             </tree>
         </field>
@@ -89,14 +87,14 @@
                  <field name="salvage_value"/>
                  <field name="value_residual"/>
                  <field name="currency_id"/>
-                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                 <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
               </group>
               <notebook colspan="4">
                  <page string="General">
                     <separator string="Other Information" colspan="4"/>
-                    <field name="parent_id"/>
                     <field name="partner_id"/>
                     <field name="purchase_date"/>
+                    <field name="parent_id" groups="base.group_extended"/>
                     <newline/>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Dates" colspan="2"/>
@@ -105,7 +103,7 @@
                         <field name="method_period"/>
                         <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
                         <newline/>
-                        <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/> 
+                        <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Method" colspan="2"/>
@@ -121,7 +119,7 @@
                        <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
                     </group>
                  </page>
-                 <page string="Depreciation board">
+                 <page string="Depreciation Board">
                     <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
                        <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
                           <field name="depreciation_date"/>
@@ -211,9 +209,9 @@
             </search>
         </field>
     </record>
-    
+
     <!--
-        Asset History 
+        Asset History
      -->
 
     <record model="ir.ui.view" id="view_account_asset_history_form">
@@ -276,7 +274,7 @@
             </field>
         </field>
     </record>
-    
+
     <record id="view_account_move_line_filter_inherit" model="ir.ui.view">
         <field name="name">Journal Items (Search)</field>
         <field name="model">account.move.line</field>
@@ -290,8 +288,12 @@
     </record>
 
     <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance"/>
-    <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree" action="action_account_asset_asset_tree"/>
-      <record model="ir.actions.act_window" id="action_account_asset_asset_form">
+    <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree"
+        groups="base.group_extended"
+        sequence="100"
+        action="action_account_asset_asset_tree"/>
+
+    <record model="ir.actions.act_window" id="action_account_asset_asset_form">
         <field name="name">Assets</field>
         <field name="res_model">account.asset.asset</field>
         <field name="view_type">form</field>
@@ -300,7 +302,7 @@
     </record>
 
     <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_form" action="action_account_asset_asset_form"/>
-    
+
     <act_window id="act_entries_open" name="Entries" res_model="account.move.line" src_model="account.asset.asset" context="{'search_default_asset_id': [active_id], 'default_asset_id': active_id}"/>
 
     <menuitem id="menu_finance_config_assets" name="Assets" parent="account.menu_finance_accounting"/>
@@ -312,19 +314,19 @@
     </record>
 
     <menuitem parent="menu_finance_config_assets" id="menu_action_account_asset_asset_list_normal" action="action_account_asset_asset_list_normal"/>
-    
+
     <record model="ir.actions.act_window" id="action_account_asset_asset_form_normal">
         <field name="name">Review Asset Categories</field>
         <field name="res_model">account.asset.category</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    
+
     <record id="asset_category_form_view_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_account_asset_asset_form_normal"/>
         <field name="category_id" ref="account.category_accounting_configuration"/>
         <field name="sequence">3</field>
     </record>
-    
+
 </data>
 </openerp>
diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po
index 126515e07a9..6683b7227db 100755
--- a/addons/account_asset/i18n/pt.po
+++ b/addons/account_asset/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 12:54+0000\n"
-"PO-Revision-Date: 2011-07-12 12:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-10 11:58+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
@@ -27,12 +27,12 @@ msgstr "Activos em Aberto"
 #: field:account.asset.property,method_end:0
 #: field:account.asset.property.history,method_end:0
 msgid "Ending date"
-msgstr ""
+msgstr "Data final"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation board"
-msgstr ""
+msgstr "Painel de amortização"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -60,7 +60,7 @@ msgstr "Linear"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change duration"
-msgstr ""
+msgstr "Alterar a duração"
 
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
@@ -70,12 +70,12 @@ msgstr "Activos filho"
 #. module: account_asset
 #: field:account.asset.board,value_asset:0
 msgid "Asset Value"
-msgstr "Valor do Imobilizado"
+msgstr "Valor do Ativo"
 
 #. module: account_asset
 #: wizard_field:account.asset.modify,init,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Motivo"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -94,7 +94,7 @@ msgstr "Movimentos gerados"
 #: field:account.asset.property,method_delay:0
 #: field:account.asset.property.history,method_delay:0
 msgid "Number of interval"
-msgstr ""
+msgstr "Número de intervalo"
 
 #. module: account_asset
 #: wizard_button:account.asset.compute,asset_compute,asset_open:0
@@ -136,7 +136,7 @@ msgstr "Histórico de alterações"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation entries"
-msgstr ""
+msgstr "Lançamentos de amortização"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -158,12 +158,12 @@ msgstr "Terceiro"
 #: field:account.asset.property,method_period:0
 #: field:account.asset.property.history,method_period:0
 msgid "Period per interval"
-msgstr ""
+msgstr "Período por intervalo"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation duration"
-msgstr ""
+msgstr "Duração da amortização"
 
 #. module: account_asset
 #: field:account.asset.property,account_analytic_id:0
@@ -178,7 +178,7 @@ msgstr "Estado"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation methods"
-msgstr ""
+msgstr "Métodos de amortização"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -188,12 +188,12 @@ msgstr "Outra informação"
 #. module: account_asset
 #: field:account.asset.board,value_asset_cumul:0
 msgid "Cumul. value"
-msgstr ""
+msgstr "Valor acumulado"
 
 #. module: account_asset
 #: view:account.asset.property:0
 msgid "Assets methods"
-msgstr ""
+msgstr "Métodos de imobilizado"
 
 #. module: account_asset
 #: constraint:ir.ui.view:0
@@ -203,7 +203,7 @@ msgstr "XML Inválido para a Arquitectura de Vista!"
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_property
 msgid "Asset property"
-msgstr ""
+msgstr "Propriedade do ativo"
 
 #. module: account_asset
 #: wizard_view:account.asset.compute,asset_compute:0
@@ -273,7 +273,7 @@ msgstr "Nome do activo"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Accounts information"
-msgstr ""
+msgstr "Informação das contas"
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
@@ -291,7 +291,7 @@ msgstr "Rascunho"
 #. module: account_asset
 #: field:account.asset.property,type:0
 msgid "Depr. method type"
-msgstr ""
+msgstr "Tipo de método de amotiz."
 
 #. module: account_asset
 #: field:account.asset.property,account_asset_id:0
@@ -311,7 +311,7 @@ msgstr "Normal"
 #. module: account_asset
 #: field:account.asset.property,method_progress_factor:0
 msgid "Progressif factor"
-msgstr ""
+msgstr "Fator de progressividade"
 
 #. module: account_asset
 #: field:account.asset.asset,localisation:0
@@ -326,7 +326,7 @@ msgstr "Método de cálculo"
 #. module: account_asset
 #: field:account.asset.property,method_time:0
 msgid "Time method"
-msgstr ""
+msgstr "Método temporal"
 
 #. module: account_asset
 #: field:account.asset.asset,active:0
@@ -341,7 +341,7 @@ msgstr "Utilizador"
 #. module: account_asset
 #: field:account.asset.asset,property_ids:0
 msgid "Asset method name"
-msgstr ""
+msgstr "Nome do método de ativo"
 
 #. module: account_asset
 #: field:account.asset.asset,date:0
@@ -368,7 +368,7 @@ msgstr "Histórico"
 #. module: account_asset
 #: field:account.asset.property,account_actif_id:0
 msgid "Depreciation account"
-msgstr ""
+msgstr "Conta de amortização"
 
 #. module: account_asset
 #: field:account.asset.asset,period_id:0
@@ -412,24 +412,24 @@ msgstr ""
 #. module: account_asset
 #: model:ir.module.module,shortdesc:account_asset.module_meta_information
 msgid "Asset management"
-msgstr "Gestão de Activo"
+msgstr "Gestão do Imobilizado"
 
 #. module: account_asset
 #: view:account.asset.board:0
 #: field:account.asset.property,board_ids:0
 #: model:ir.model,name:account_asset.model_account_asset_board
 msgid "Asset board"
-msgstr ""
+msgstr "Painel do imobilizado"
 
 #. module: account_asset
 #: field:account.asset.asset,state:0
 msgid "Global state"
-msgstr ""
+msgstr "Estado global"
 
 #. module: account_asset
 #: selection:account.asset.property,method_time:0
 msgid "Delay"
-msgstr ""
+msgstr "Demora"
 
 #. module: account_asset
 #: wizard_view:account.asset.close,init:0
@@ -439,7 +439,7 @@ msgstr "Informação geral"
 #. module: account_asset
 #: field:account.asset.property,journal_analytic_id:0
 msgid "Analytic journal"
-msgstr ""
+msgstr "Diário analítico"
 
 #. module: account_asset
 #: field:account.asset.property,name:0
@@ -454,7 +454,7 @@ msgstr "Diário"
 #. module: account_asset
 #: field:account.asset.property.history,name:0
 msgid "History name"
-msgstr "Nome de História"
+msgstr "Nome de histórico"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -477,13 +477,13 @@ msgstr "Categoria de activos"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation"
-msgstr ""
+msgstr "Amortização"
 
 #. module: account_asset
 #: field:account.asset.asset,code:0
 #: field:account.asset.category,code:0
 msgid "Asset code"
-msgstr "Código de imobilizado"
+msgstr "Código do ativo"
 
 #. module: account_asset
 #: field:account.asset.asset,value_total:0
diff --git a/addons/account_asset/security/ir.model.access.csv b/addons/account_asset/security/ir.model.access.csv
index 928cad25ebd..d6eda4016c9 100755
--- a/addons/account_asset/security/ir.model.access.csv
+++ b/addons/account_asset/security/ir.model.access.csv
@@ -1,11 +1,11 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_asset_category","account.asset.category","model_account_asset_category","account.group_account_user",1,0,0,0
-"access_account_asset_asset","account.asset.asset","model_account_asset_asset","account.group_account_user",1,0,0,0
-"access_account_asset_history","account.asset.history","model_account_asset_history","account.group_account_user",1,0,0,0
-"access_account_asset_category_manager","account.asset.category","model_account_asset_category","account.group_account_manager",1,1,1,1
-"access_account_asset_asset_manager","account.asset.asset","model_account_asset_asset","account.group_account_manager",1,1,1,1
-"access_account_asset_history_manager","account.asset.history","model_account_asset_history","account.group_account_manager",1,1,1,1
-"access_account_asset_depreciation_line","account.asset.depreciation.line","model_account_asset_depreciation_line","account.group_account_user",1,0,0,0
-"access_account_asset_depreciation_line_manager","account.asset.depreciation.line","model_account_asset_depreciation_line","account.group_account_manager",1,1,1,1
-"access_asset_asset_report","asset.asset.report","model_asset_asset_report","account.group_account_user",1,0,0,0
-"access_asset_asset_report_manager","asset.asset.report","model_asset_asset_report","account.group_account_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_asset_category,account.asset.category,model_account_asset_category,account.group_account_user,1,0,0,0
+access_account_asset_asset,account.asset.asset,model_account_asset_asset,account.group_account_user,1,0,0,0
+access_account_asset_history,account.asset.history,model_account_asset_history,account.group_account_user,1,0,0,0
+access_account_asset_category_manager,account.asset.category,model_account_asset_category,account.group_account_manager,1,1,1,1
+access_account_asset_asset_manager,account.asset.asset,model_account_asset_asset,account.group_account_manager,1,1,1,1
+access_account_asset_history_manager,account.asset.history,model_account_asset_history,account.group_account_manager,1,1,1,1
+access_account_asset_depreciation_line,account.asset.depreciation.line,model_account_asset_depreciation_line,account.group_account_user,1,0,0,0
+access_account_asset_depreciation_line_manager,account.asset.depreciation.line,model_account_asset_depreciation_line,account.group_account_manager,1,1,1,1
+access_asset_asset_report,asset.asset.report,model_asset_asset_report,account.group_account_user,1,0,0,0
+access_asset_asset_report_manager,asset.asset.report,model_asset_asset_report,account.group_account_manager,1,1,1,1
diff --git a/addons/account_asset/static/src/img/icon.png b/addons/account_asset/static/src/img/icon.png
new file mode 100644
index 00000000000..c7ffdceadaa
Binary files /dev/null and b/addons/account_asset/static/src/img/icon.png differ
diff --git a/addons/account_asset/test/account_asset.yml b/addons/account_asset/test/account_asset.yml
index b56aa028c61..e9f75737eba 100644
--- a/addons/account_asset/test/account_asset.yml
+++ b/addons/account_asset/test/account_asset.yml
@@ -1,55 +1,35 @@
 -
-  In order to test Account Asset I create Asset and confirm it and check it's Depriciation lines
-- 
-  I Create an Asset Category
-- 
-  !record {model: account.asset.category, id: account_asset_category_landbuildings0}:
-    account_asset_id: account.xfa
-    account_depreciation_id: account.xfa
-    account_expense_depreciation_id: account.a_expense
-    journal_id: account.expenses_journal
-    name: Land & Buildings
-- 
-  I Create an Account Asset
-- 
-  !record {model: account.asset.asset, id: account_asset_asset_Land0}:
-    category_id: account_asset_category_landbuildings0
-    code: land
-    name: Land
-    partner_id: base.res_partner_14
-    purchase_value: 5000.0
-    state: draft
--
-  I check Initially that Account Asset is in the "Draft" state
--
-  !assert {model: account.asset.asset, id: account_asset_asset_Land0}:
-    - state == 'draft'
--
-  I Confirm Account Asset using Confirm Asset button
+  In order to test the process of Account Asset, I perform a action to confirm Account Asset.
 -
   !python {model: account.asset.asset}: |
-    self.validate(cr, uid, [ref("account_asset_asset_Land0")])
+    self.validate(cr, uid, [ref("account_asset_asset_vehicles0")])
 -
-  I check Asset is in running state after pressing Confirm button on asset
+  I check Asset is now in Open state.
 -
-  !assert {model: account.asset.asset, id: account_asset_asset_Land0}:
+  !assert {model: account.asset.asset, id: account_asset_asset_vehicles0, severity: error, string: Asset should be in Open state}:
     - state == 'open'
 -
-  I Compute Account Asset using Compute button and check the number of depreciation lines created
+  I compute depreciation lines for asset of CEO's Car .
 -
   !python {model: account.asset.asset}: |
-    self.compute_depreciation_board(cr, uid, [ref("account_asset_asset_Land0")])
+    self.compute_depreciation_board(cr, uid, [ref("account_asset_asset_vehicles0")])
     # pressing computation button can be remove if creation of depreciation lines while asset is created
-    value = self.browse(cr, uid, [ref("account_asset_asset_Land0")])[0]
-    assert value.method_number == len(value.depreciation_line_ids)
+    value = self.browse(cr, uid, [ref("account_asset_asset_vehicles0")])[0]
+    assert value.method_number == len(value.depreciation_line_ids), 'Depreciation lines not created correctly'
 -
-  I Create Account Move using create move button on depreciation lines
+  I create account move for all depreciation lines.
 -
   !python {model: account.asset.depreciation.line}: |
-    ids = self.search(cr, uid, [('asset_id','=',ref('account_asset_asset_Land0'))])
+    ids = self.search(cr, uid, [('asset_id','=',ref('account_asset_asset_vehicles0'))])
     self.create_move(cr, uid, ids)
 -
-  I Check that After creating all the moves of depreciation lines the state is in "Close" state
+  I check the move line is created.
 -
-  !assert {model: account.asset.asset, id: account_asset_asset_Land0}:
+  !python {model: account.asset.asset}: |
+    asset = self.browse(cr, uid, [ref("account_asset_asset_vehicles0")])[0]
+    assert len(asset.depreciation_line_ids) == len(asset.account_move_line_ids), 'Move lines not created correctly'
+-
+  I Check that After creating all the moves of depreciation lines the state "Close".
+-
+  !assert {model: account.asset.asset, id: account_asset_asset_vehicles0}:
     - state == 'close'
diff --git a/addons/account_asset/test/account_asset_demo.yml b/addons/account_asset/test/account_asset_demo.yml
new file mode 100644
index 00000000000..c0871d05268
--- /dev/null
+++ b/addons/account_asset/test/account_asset_demo.yml
@@ -0,0 +1,9 @@
+-
+  !record {model: account.asset.category, id: account_asset_category_fixedassets0}:
+    account_asset_id: account.xfa
+-
+  !record {model: account.asset.asset, id: account_asset_asset_vehicles0}:
+    category_id: account_asset_category_sale
+-
+  !record {model: account.asset.asset, id: account_asset_asset_vehicles0}:
+    method_number: 10
diff --git a/addons/account_asset/test/account_asset_wizard.yml b/addons/account_asset/test/account_asset_wizard.yml
new file mode 100644
index 00000000000..7b77e5cfdda
--- /dev/null
+++ b/addons/account_asset/test/account_asset_wizard.yml
@@ -0,0 +1,27 @@
+-
+  I create a record to change the duration of asset for calculating depreciation.
+-
+  !record {model: asset.modify, id: asset_modify_number_0, context: "{'active_id': ref('account_asset_asset_office0')}"}:
+    method_number: 10.0
+-
+  I change the duration.
+-
+  !python {model: asset.modify}: |
+    context = {"active_id":ref('account_asset_asset_office0')}
+    self.modify(cr, uid, [ref("asset_modify_number_0")], context=context)
+-
+  I check the proper depreciation lines created.
+-
+  !assert {model: account.asset.asset, id: account_asset.account_asset_asset_office0}:
+    - method_number == len(depreciation_line_ids) -1
+-
+  I create a period to compute a asset on period.
+-
+  !record {model: asset.depreciation.confirmation.wizard, id: asset_compute_period_0}:
+    {}
+-
+  I compute a asset on period.
+-
+  !python {model: asset.depreciation.confirmation.wizard}: |
+    context = {"active_ids": [ref("menu_asset_depreciation_confirmation_wizard")], "active_id":ref('menu_asset_depreciation_confirmation_wizard')}
+    self.asset_compute(cr, uid, [ref("asset_compute_period_0")], context=context)
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index e4782ee0d2a..15076588ed5 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Budgets',
+    'name': 'Budgets Management',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Accounting & Finance',
     'complexity': "normal",
     'description': """
 This module allows accountants to manage analytic and crossovered budgets.
diff --git a/addons/account_budget/i18n/fa.po b/addons/account_budget/i18n/fa.po
new file mode 100644
index 00000000000..9981083fe36
--- /dev/null
+++ b/addons/account_budget/i18n/fa.po
@@ -0,0 +1,441 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_budget
+#: field:crossovered.budget,creating_user_id:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
+#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
+msgid "Budgetary Positions"
+msgstr ""
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Printed at:"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Confirm"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,validating_user_id:0
+msgid "Validate User"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "at"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Currency:"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget.lines,percentage:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "to"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid ""
+"A budget is a forecast of your company's income and expenses expected for a "
+"period in the future. With a budget, a company is able to carefully look at "
+"how much money they are taking in during a given period, and figure out the "
+"best way to divide it among various categories. By keeping track of where "
+"your money goes, you may be less likely to overspend, and more likely to "
+"meet your financial goals. Forecast a budget by detailing the expected "
+"revenue per analytic account and monitor its evolution based on the actuals "
+"realised during that period."
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr ""
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Total :"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_analytic
+#: model:ir.model,name:account_budget.model_account_budget_report
+msgid "Account Budget report for analytic account"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+msgid "Theoritical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr ""
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr ""
+
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.module.module,description:account_budget.module_meta_information
+msgid ""
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget and Master Budget in order to ensure the total planned is not\n"
+"greater/lower than what he planned for this Budget/Master Budget. Each list "
+"of\n"
+"record can also be switched to a graphical view of it.\n"
+"\n"
+"Three reports are available:\n"
+"    1. The first is available from a list of Budgets. It gives the "
+"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+"\n"
+"    2. The second is a summary of the previous one, it only gives the "
+"spreading, for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+"    3. The last one is available from the Analytic Chart of Accounts. It "
+"gives the spreading, for the selected Analytic Accounts, of the Master "
+"Budgets per Budgets.\n"
+"\n"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget.lines,analytic_account_id:0
+#: model:ir.model,name:account_budget.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Budget :"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:account.budget.post,account_ids:0
+msgid "Accounts"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: field:account.analytic.account,crossovered_budget_line:0
+#: view:account.budget.post:0
+#: field:account.budget.post,crossovered_budget_line:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget,crossovered_budget_line:0
+#: view:crossovered.budget.lines:0
+#: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
+msgid "Budget Lines"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+#: view:crossovered.budget:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.module.module,shortdesc:account_budget.module_meta_information
+msgid "Budget Management"
+msgstr ""
+
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Analysis from"
+msgstr ""
diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv
index b2eb33f3d04..1298884a856 100644
--- a/addons/account_budget/security/ir.model.access.csv
+++ b/addons/account_budget/security/ir.model.access.csv
@@ -1,7 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crossovered_budget","crossovered.budget","model_crossovered_budget","account.group_account_manager",1,0,0,0
-"access_crossovered_budget_lines","crossovered.budget.lines","model_crossovered_budget_lines","account.group_account_manager",1,1,1,1
-"access_account_budget_post","account.budget.post","model_account_budget_post","account.group_account_manager",1,0,0,0
-"access_account_budget_post_accountant","account.budget.post accountant","model_account_budget_post","account.group_account_user",1,1,1,1
-"access_crossovered_budget_accountant","crossovered.budget accountant","model_crossovered_budget","account.group_account_user",1,1,1,1
-"access_crossovered_budget_lines_accountant","crossovered.budget.lines accountant","model_crossovered_budget_lines","account.group_account_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crossovered_budget,crossovered.budget,model_crossovered_budget,account.group_account_manager,1,0,0,0
+access_account_budget_post,account.budget.post,model_account_budget_post,account.group_account_manager,1,0,0,0
+access_account_budget_post_accountant,account.budget.post accountant,model_account_budget_post,account.group_account_user,1,1,1,1
+access_crossovered_budget_accountant,crossovered.budget accountant,model_crossovered_budget,account.group_account_user,1,1,1,1
+access_crossovered_budget_lines_accountant,crossovered.budget.lines accountant,model_crossovered_budget_lines,account.group_account_user,1,1,1,1
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index 647146f98fb..252e8ffd3d0 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Cancel Entries",
+    "name" : "Cancel Journal Entries",
     "version" : "1.1",
     "author" : "OpenERP SA",
     "category": 'Accounting & Finance',
diff --git a/addons/account_cancel/i18n/fa.po b/addons/account_cancel/i18n/fa.po
new file mode 100644
index 00000000000..807d683515c
--- /dev/null
+++ b/addons/account_cancel/i18n/fa.po
@@ -0,0 +1,32 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid ""
+"\n"
+"    Module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr ""
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index d476eb1f443..c0c9245a477 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Template of Charts of Accounts',
     'version': '1.1',
-    "category": 'Accounting & Finance',
+    "category": 'Hidden/Dependency',
     'description': """
 Remove minimal account chart.
 =============================
diff --git a/addons/account_chart/i18n/fa.po b/addons/account_chart/i18n/fa.po
new file mode 100644
index 00000000000..3aca6c7161a
--- /dev/null
+++ b/addons/account_chart/i18n/fa.po
@@ -0,0 +1,28 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr ""
+
+#. module: account_chart
+#: model:ir.module.module,shortdesc:account_chart.module_meta_information
+msgid "Charts of Accounts"
+msgstr ""
diff --git a/addons/account_coda/i18n/fa.po b/addons/account_coda/i18n/fa.po
new file mode 100644
index 00000000000..4f0fb9af76c
--- /dev/null
+++ b/addons/account_coda/i18n/fa.po
@@ -0,0 +1,259 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:51
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"Set here the default account that will be used, if the partner is found but "
+"does not have the bank account, or if he is domiciled"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:167
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"\n"
+"    Module provides functionality to import\n"
+"    bank statements from coda files.\n"
+"    "
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:311
+#, python-format
+msgid "Result"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
+msgstr ""
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv
index 9eb831185d5..74fe7b0e8ce 100644
--- a/addons/account_coda/security/ir.model.access.csv
+++ b/addons/account_coda/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_coda","account.coda","model_account_coda","account.group_account_user",1,0,0,0
-"access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
-"access_account_coda_import_user","account.coda","model_account_coda","account.group_account_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_coda,account.coda,model_account_coda,account.group_account_user,1,0,0,0
+access_account_coda_manager,account.coda,model_account_coda,account.group_account_manager,1,1,1,1
+access_account_coda_import_user,account.coda,model_account_coda,account.group_account_user,1,0,0,0
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 3fe52186f03..c8a548db9e8 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -57,7 +57,10 @@ Note that if you want to check the followup level for a given partner/account en
         'account_followup_data.xml',
     ],
     'demo_xml': [],
-    'test': ['test/account_followup.yml'],
+    'test': [
+        'test/account_followup.yml',
+        'test/account_followup_report.yml',
+    ],
     'installable': True,
     'active': False,
     'certificate': '0072481076453',
diff --git a/addons/account_followup/i18n/fa.po b/addons/account_followup/i18n/fa.po
new file mode 100644
index 00000000000..7d5a113dd86
--- /dev/null
+++ b/addons/account_followup/i18n/fa.po
@@ -0,0 +1,718 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:48+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:295
+#, python-format
+msgid "Followup Summary"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Search Followup"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.module.module,description:account_followup.module_meta_information
+msgid ""
+"\n"
+"    Modules to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"\n"
+"    You can define your multiple levels of recall through the menu:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Once it is defined, you can automatically print recalls every day\n"
+"    through simply clicking on the menu:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    It will generate a PDF with all the letters according to the the\n"
+"    different levels of recall defined. You can define different policies\n"
+"    for different companies. You can also send mail to the customer.\n"
+"\n"
+"    Note that if you want to change the followup level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:290
+#, python-format
+msgid ""
+"\n"
+"\n"
+"E-Mail sent to following Partners successfully. !\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,followup_line:0
+msgid "Follow-Up"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup,company_id:0
+#: view:account_followup.stat:0
+#: field:account_followup.stat,company_id:0
+#: field:account_followup.stat.by.partner,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account_followup
+#: field:account.followup.print.all,email_subject:0
+msgid "Email Subject"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,help:account_followup.action_followup_stat
+msgid ""
+"Follow up on the reminders sent over to your partners for unpaid invoices."
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "Legend"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Ok"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Select Partners to Remind"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_followup
+#: field:account.followup.print,date:0
+msgid "Follow-up Sending Date"
+msgstr ""
+
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "Net Days"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
+#: model:ir.ui.menu,name:account_followup.account_followup_menu
+msgid "Follow-Ups"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Balance > 0"
+msgstr ""
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(heading)s: Move line header"
+msgstr ""
+
+#. module: account_followup
+#: view:res.company:0
+#: field:res.company,follow_up_msg:0
+msgid "Follow-up Message"
+msgstr ""
+
+#. module: account_followup
+#: field:account.followup.print,followup_id:0
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,partner_id:0
+#: field:account_followup.stat.by.partner,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Date :"
+msgstr ""
+
+#. module: account_followup
+#: field:account.followup.print.all,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:138
+#, python-format
+msgid "Invoices Reminder"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup
+msgid "Account Follow Up"
+msgstr ""
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "End of Month"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Not Litigation"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(user_signature)s: User name"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print:0
+msgid ""
+"This feature allows you to send reminders to partners with pending invoices. "
+"You can send them the default message for unpaid invoices or manually enter "
+"a message should you need to remind them of a specific information."
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Ref"
+msgstr ""
+
+#. module: account_followup
+#: help:account_followup.followup.line,sequence:0
+msgid "Gives the sequence order when displaying a list of follow-up lines."
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,email_body:0
+msgid "Email body"
+msgstr ""
+
+#. module: account_followup
+#: field:account.move.line,followup_line_id:0
+msgid "Follow-up Level"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,date_followup:0
+#: field:account_followup.stat.by.partner,date_followup:0
+msgid "Latest followup"
+msgstr ""
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+"we can resolve the matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: field:account.followup.print.all,partner_lang:0
+msgid "Send Email in Partner Language"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Partner Selection"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup.line,description:0
+msgid "Printed Message"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
+#: model:ir.ui.menu,name:account_followup.account_followup_print_menu
+msgid "Send followups"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat.by.partner:0
+msgid "Partner to Remind"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup.line,followup_id:0
+#: field:account_followup.stat,followup_id:0
+msgid "Follow Ups"
+msgstr ""
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount staid unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days , then legal action for the "
+"recovery of the debt, will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Send Mails"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
+msgid "Followup Statistics by Partner"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.module.module,shortdesc:account_followup.module_meta_information
+msgid "Accounting follow-ups management"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
+#. module: account_followup
+#: help:account.followup.print,date:0
+msgid ""
+"This field allow you to select a forecast date to plan your follow-ups"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Due"
+msgstr ""
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:56
+#, python-format
+msgid "Select Partners"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Email Settings"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "Print Follow Ups"
+msgstr ""
+
+#. module: account_followup
+#: field:account.move.line,followup_date:0
+msgid "Latest Follow-up"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Sub-Total:"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat
+msgid "Followup Statistics"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Paid"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s: User Name"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_followup
+#: field:account.followup.print.all,email_conf:0
+msgid "Send email confirmation"
+msgstr ""
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:287
+#, python-format
+msgid ""
+"All E-mails have been successfully sent to Partners:.\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(company_name)s: User's Company name"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Followup Lines"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(partner_name)s: Partner Name"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Follow-Up lines"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(company_currency)s: User's Company Currency"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: field:account_followup.stat,balance:0
+#: field:account_followup.stat.by.partner,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup.line,start:0
+msgid "Type of Term"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_print
+#: model:ir.model,name:account_followup.model_account_followup_print_all
+msgid "Print Followup & Send Mail to Customers"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
+msgid "Last move"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
+msgid "Followup Report"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print:0
+#: view:account.followup.print.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "Follow-Up Lines"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Litigation"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat.by.partner,max_followup_id:0
+msgid "Max Follow Up Level"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
+msgid "Payable Items"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(followup_amount)s: Total Amount Due"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: view:account_followup.followup.line:0
+msgid "%(date)s: Current Date"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Followup Level"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,description:0
+#: report:account_followup.followup.print:0
+msgid "Description"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "This Fiscal year"
+msgstr ""
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Partner entries"
+msgstr ""
+
+#. module: account_followup
+#: help:account.followup.print.all,partner_lang:0
+msgid ""
+"Do not change message text, if you want to send email in partner language, "
+"or configure from company"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
+msgid "Receivable Items"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+#: model:ir.actions.act_window,name:account_followup.action_followup_stat
+#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
+msgid "Follow-ups Sent"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup,name:0
+#: field:account_followup.followup.line,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,date_move:0
+#: field:account_followup.stat.by.partner,date_move:0
+msgid "First move"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Li."
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:289
+#, python-format
+msgid ""
+"E-Mail not sent to following Partners, Email not available !\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print:0
+msgid "Continue"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup.line,delay:0
+msgid "Days of delay"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+#: field:account.followup.print.all,summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(line)s: Ledger Posting lines"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "%(company_name)s: User's Company Name"
+msgstr ""
+
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Customer Ref :"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
+msgid "%(partner_name)s: Partner name"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Latest Followup Date"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup_line
+msgid "Follow-Up Criteria"
+msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
index c2a842cfd4c..420ca92b289 100644
--- a/addons/account_followup/report/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -68,7 +68,7 @@ class account_followup_stat(osv.osv):
         cr.execute("""
             create or replace view account_followup_stat as (
                 SELECT
-                    l.id as id,
+                    l.partner_id AS id,
                     l.partner_id AS partner_id,
                     min(l.date) AS date_move,
                     max(l.date) AS date_move_last,
diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv
index 7b7e2af7ba8..75af9bf44f2 100644
--- a/addons/account_followup/security/ir.model.access.csv
+++ b/addons/account_followup/security/ir.model.access.csv
@@ -1,7 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_followup_followup_line","account_followup.followup.line","model_account_followup_followup_line","account.group_account_user",1,0,0,0
-"access_account_followup_stat_manager","account_followup.stat.manager","model_account_followup_stat","account.group_account_manager",1,1,1,1
-"access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1
-"access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0
-"access_account_followup_stat_invoice","account_followup.stat.invoice","model_account_followup_stat","account.group_account_invoice",1,1,1,1
-"access_account_followup_stat_by_partner_manager","account_followup.stat.by.partner","model_account_followup_stat_by_partner","account.group_account_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_followup_followup_line,account_followup.followup.line,model_account_followup_followup_line,account.group_account_user,1,0,0,0
+access_account_followup_followup_line_manager,account_followup.followup.line.manager,model_account_followup_followup_line,account.group_account_manager,1,1,1,1
+access_account_followup_followup_accountant,account_followup.followup user,model_account_followup_followup,account.group_account_user,1,0,0,0
+access_account_followup_stat_invoice,account_followup.stat.invoice,model_account_followup_stat,account.group_account_invoice,1,1,1,1
+access_account_followup_stat_by_partner_manager,account_followup.stat.by.partner,model_account_followup_stat_by_partner,account.group_account_manager,1,1,1,1
diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml
index 2650a40a7ad..da7da258d21 100644
--- a/addons/account_followup/test/account_followup.yml
+++ b/addons/account_followup/test/account_followup.yml
@@ -1,91 +1,25 @@
 -
-  In order to test account followup module in OpenERP I create a FollowUp structure
+  In order to test account followup module in OpenERP, I change the state of invoice to "open".
 -
-  !record {model: res.company, id: ymltest_company_2}:
-        name: Acme 2
+  !record {model: account.invoice, id: account.demo_invoice_0}:
+    check_total: 14.0
 -
-  !record {model: account_followup.followup, id: account_followup_followup_testfollowups0}:
-    description: First letter after 15 net days, 30 net days and 45 days end of month levels.
-    company_id: ymltest_company_2
-    followup_line:
-      - delay: 15
-        name: 'level 0: 15 days'
-        sequence: 0
-        start: days
-        description: Dear %(partner_name)s,\n\nException made if there was a mistake
-          of ours, it seems that the following amount staid unpaid. Please, take appropriate
-          measures in order to carry out this payment in the next 1 days.\n\nWould your
-          payment have been carried out after this mail was sent, please consider the
-          present one as void. Do not hesitate to contact our accounting department at
-          (+32).10.68.94.39.\n\nBest Regards,\n
-      - delay: 30
-        name: 'level1: 30 days'
-        sequence: 1
-        start: days
-        description: Dear %(partner_name)s,\n\nException made if there was a mistake
-          of ours, it seems that the following amount staid unpaid. Please, take appropriate
-          measures in order to carry out this payment in the next 2 days.\n\nWould your
-          payment have been carried out after this mail was sent, please consider the
-          present one as void. Do not hesitate to contact our accounting department at
-          (+32).10.68.94.39.\n\nBest Regards,\n
-      - delay: 45
-        name: 'level 2: 45 days'
-        sequence: 2
-        start: days
-        description: Dear %(partner_name)s,\n\nException made if there was a mistake
-          of ours, it seems that the following amount staid unpaid. Please, take appropriate
-          measures in order to carry out this payment in the next 3 days.\n\nWould your
-          payment have been carried out after this mail was sent, please consider the
-          present one as void. Do not hesitate to contact our accounting department at
-          (+32).10.68.94.39.\n\nBest Regards,
-    name: My followups
-
+  !workflow {model: account.invoice, action: invoice_open, ref: account.demo_invoice_0}
 -
-  I create an invoice
--
-  !record {model: account.invoice, id: account_invoice_followup}:
-    account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
-    company_id: base.main_company
-    currency_id: base.EUR
-    invoice_line:
-      - account_id: account.a_sale
-        name: '[PC1] Basic PC'
-        price_unit: 450.0
-        quantity: 1.0
-        product_id: product.product_product_pc1
-        uos_id: product.product_uom_unit
-    journal_id: account.sales_journal
-    partner_id: base.res_partner_desertic_hispafuentes
-    reference_type: none
-
-
--
-  I change the state of the invoice using create button
--
-  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_followup}
-
--
-  I create a send followup record
+  I create a followup.
 -
   !record {model: account.followup.print, id: account_followup_print_0}:
-    date: !eval time.strftime('%Y-%m-%d')
-    followup_id: account_followup_followup_testfollowups0
-
-
+    {}
 -
-  I Select Followup and clicked on Continue Button
+  I select the followup to send it to the partner.
 -
   !python {model: account.followup.print}: |
     self.do_continue(cr, uid, [ref("account_followup_print_0")], {"lang": 'en_US',
       "active_model": "ir.ui.menu", "active_ids": [ref("account_followup.account_followup_print_menu")],
       "tz": False, "active_id": ref("account_followup.account_followup_print_menu"),
       })
-
-
 -
-  I select partners whom I want to send followups
+  I select partners whom I want to send followups.
 -
   !record {model: account.followup.print.all, id: account_followup_print_all_0}:
     email_body: 'Date : %(date)s\n\nDear %(partner_name)s,\n\nPlease find in attachment
@@ -95,15 +29,12 @@
     partner_ids:
       - base.res_partner_desertic_hispafuentes
     partner_lang: 1
-
-
 -
-  I clicked on Print Follow Ups to print Followups reports
+  I send a followup mail to partner.
 -
   !python {model: account.followup.print.all}: |
     import time
-    self.do_print(cr, uid, [ref("account_followup_print_all_0")], {"lang": 'en_US',
+    self.do_mail(cr, uid, [ref("account_followup_print_all_0")], {"lang": 'en_US',
       "active_model": "ir.ui.menu", "active_ids": [ref("account_followup.account_followup_print_menu")],
-      "tz": False, "date": time.strftime('%Y-%m-%d'), "followup_id": ref("account_followup_followup_testfollowups0"), "active_id": ref("account_followup.account_followup_print_menu"),
-      "company_id": ref('base.main_company'),
+      "tz": False, "date": time.strftime('%Y-%m-%d'), "followup_id": ref("account_followup.demo_followup1"), "active_id": ref("account_followup.account_followup_print_menu"),
       })
diff --git a/addons/account_followup/test/account_followup_report.yml b/addons/account_followup/test/account_followup_report.yml
new file mode 100644
index 00000000000..1aab384dc3b
--- /dev/null
+++ b/addons/account_followup/test/account_followup_report.yml
@@ -0,0 +1,10 @@
+-
+  In order to test the report I print followup report.
+-
+  !python {model: account.followup.print.all}: |
+    import time
+    ctx = {'form_view_ref':'account_followup.view_account_followup_print_all', 'followup_id': ref('account_followup.demo_followup1'),'date': time.strftime('%Y-%m-%d'),'model': 'account_followup.followup','active_ids':[ref('account_followup_print_all_0')], 'company_id':ref('base.main_company')}
+    data_dict = {'email_conf': 1}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_followup_print_all', context=ctx, wiz_data=data_dict,wiz_buttons=["Print Follow Ups"], our_module='account_followup')
+
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index ea1083f26ff..014fa2bb326 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -93,7 +93,7 @@ class account_followup_stat_by_partner(osv.osv):
         cr.execute("""
             create or replace view account_followup_stat_by_partner as (
                 SELECT
-                    l.partner_id * 10000 + l.company_id as id,
+                    l.partner_id AS id,
                     l.partner_id AS partner_id,
                     min(l.date) AS date_move,
                     max(l.date) AS date_move_last,
diff --git a/addons/account_invoice_layout/i18n/fa.po b/addons/account_invoice_layout/i18n/fa.po
new file mode 100644
index 00000000000..742b7fbd93d
--- /dev/null
+++ b/addons/account_invoice_layout/i18n/fa.po
@@ -0,0 +1,366 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Note:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+#: field:notify.message,name:0
+msgid "Title"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
+msgid "Invoices with Layout and Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Note"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:notify.message,msg:0
+msgid ""
+"This notification will appear at the bottom of the Invoices when printed."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.module.module,description:account_invoice_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides some features to improve the layout of the "
+"invoices.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of an invoice\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    Moreover, there is one option which allows you to print all the selected "
+"invoices with a given special message at the bottom of it. This feature can "
+"be very useful for printing your invoices with end-of-year wishes, special "
+"punctual conditions...\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice,abstract_line_ids:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.line:0
+msgid "Seq."
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
+msgid "Notification Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice lines."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,functional_field:0
+msgid "Source Account"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Base"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Page Break"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:account.invoice.special.msg,message:0
+msgid "Message to Print at the bottom of report"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Select Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
+msgid "Invoices with Layout"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description / Taxes"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "ERP & CRM Solutions..."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,sequence:0
+msgid "Sequence Number"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
+msgid "Account Invoice Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Origin"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
+msgid "Invoices Layout Improvement"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Print"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tax"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
+#: report:notify_account.invoice:0
+msgid "Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.special.msg,message:0
+msgid "Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
+msgid "All Notification Messages"
+msgstr ""
diff --git a/addons/account_invoice_layout/security/ir.model.access.csv b/addons/account_invoice_layout/security/ir.model.access.csv
index c838392e6eb..98878fc91bf 100644
--- a/addons/account_invoice_layout/security/ir.model.access.csv
+++ b/addons/account_invoice_layout/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_notify_message,notify.message,model_notify_message,account.group_account_invoice,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_notify_message,notify.message,model_notify_message,account.group_account_invoice,1,1,1,1
diff --git a/addons/account_payment/i18n/fa.po b/addons/account_payment/i18n/fa.po
new file mode 100644
index 00000000000..d69fa3f3ba7
--- /dev/null
+++ b/addons/account_payment/i18n/fa.po
@@ -0,0 +1,714 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_payment
+#: field:payment.order,date_scheduled:0
+msgid "Scheduled date if fixed"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.module.module,description:account_payment.module_meta_information
+msgid ""
+"\n"
+"This module provides :\n"
+"* a more efficient way to manage invoice payment.\n"
+"* a basic mechanism to easily plug various automated payment.\n"
+"    "
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"When an order is placed the state is 'Draft'.\n"
+" Once the bank is confirmed the state is set to 'Confirmed'.\n"
+" Then the order is paid the state is 'Done'."
+msgstr ""
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred date"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order.create,entries:0
+msgid "Entries"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Used Account"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "_Add to payment order"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
+#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
+msgid "Payment Populate statement"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_payment
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+msgid "New Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_payment
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Execution Type"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: field:payment.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution date"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Bank or Cash Journal for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+#: view:payment.order:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Desitination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.module.module,shortdesc:account_payment.module_meta_information
+msgid "Payment Management"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr ""
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Value Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Type"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "No partner defined on entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_payment
+#: field:account.payment.populate.statement,lines:0
+#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
+msgid "Payment Lines"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "ADD"
+msgstr ""
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
+#: view:payment.order:0
+#: view:payment.order.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid ""
+"A payment order is a payment request from your company to pay a supplier "
+"invoice or a customer credit note. Here you can register all payment orders "
+"that should be done, keep track of all payment orders and mention the "
+"invoice reference and the partner the payment should be done for."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+#: report:payment.order:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_payment/i18n/sr@latin.po b/addons/account_payment/i18n/sr@latin.po
index 6efe331146d..13925099baf 100644
--- a/addons/account_payment/i18n/sr@latin.po
+++ b/addons/account_payment/i18n/sr@latin.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-23 15:17+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-13 15:21+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-14 04:45+0000\n"
+"X-Generator: Launchpad (build 14487)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
-msgstr "Zakazani datum ako je fiskno"
+msgstr "Zakazani datum ako je fiksiran"
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -30,7 +30,7 @@ msgstr "Valuta partnera"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Set to draft"
-msgstr "Postavi za obradu"
+msgstr "Postavi kao pripremu"
 
 #. module: account_payment
 #: help:payment.order,mode:0
@@ -41,7 +41,7 @@ msgstr "Odaberite način plaćanja koji će biti primenjen."
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr "Grupirano po"
+msgstr "Grupiši po..."
 
 #. module: account_payment
 #: model:ir.module.module,description:account_payment.module_meta_information
@@ -52,6 +52,11 @@ msgid ""
 "* a basic mechanism to easily plug various automated payment.\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul omogućava:\n"
+"*efikasniji način za upravljanje isplaćivanja faktura\n"
+"*osnovni mehanizam za lako obrađivanje automatizovanih načina isplate\n"
+"    "
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -98,7 +103,7 @@ msgstr "Zeljeni Datum"
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr "slobodno"
+msgstr "Slobodno"
 
 #. module: account_payment
 #: field:payment.order.create,entries:0
@@ -108,18 +113,18 @@ msgstr "Stavke"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Used Account"
-msgstr "Koristeni Nalog"
+msgstr "Korišteni nalog"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
 #: field:payment.order.create,duedate:0
 msgid "Due Date"
-msgstr "Datum dospeća"
+msgstr "Krajnji rok"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Ne možete da napravite poteznu liniju na zatvorenim računima."
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -135,7 +140,7 @@ msgstr "_Dodaj u nalog za plaćanje"
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
 #: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
 msgid "Payment Populate statement"
-msgstr "Ispuna sadrzaja fakture"
+msgstr "Ispunjavanje sadržaja fakture"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -146,12 +151,12 @@ msgstr "Iznos"
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Pogrešna vrednost kredita ili debita u ulazu računa !"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
-msgstr "Ukupno u valuti preduzeca"
+msgstr "Ukupno u valuti preduzeća"
 
 #. module: account_payment
 #: selection:payment.order,state:0
@@ -172,7 +177,7 @@ msgstr "Referenca"
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "Red plaćanja mora biti jedinstven!"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -212,7 +217,7 @@ msgstr "Efektivni datum fakture"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr "Tip Izuzetka"
+msgstr "Tip Izvršavanja"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -229,7 +234,7 @@ msgstr "Stanje"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Transaction Information"
-msgstr "Informacije Transakcije"
+msgstr "Informacije o transakciji"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
@@ -257,8 +262,8 @@ msgid ""
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
 msgstr ""
-"Odaberite opciju za nalog za plaćanje: \"Fiksno\" znači datum naveden od "
-"vaše strane. \"Direktno\" znači direktno izvršenje. \"Datum odgode\" znači "
+"Odaberite opciju za nalog za plaćanje: \"Fiksirano\" znači datum naveden s "
+"Vaše strane. \"Direktno\" znači direktno izvršenje. \"Datum odgode\" znači "
 "zakazan datum izvršenja."
 
 #. module: account_payment
@@ -280,12 +285,12 @@ msgstr "Datum izvršenja"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Dnevnik banke ili keša za način plaćanja"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Fixed date"
-msgstr "Fiksni datum"
+msgstr "Fiksirani datum"
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
@@ -301,18 +306,19 @@ msgstr "Ciljni račun"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr "Pretrazi naloge za placanje"
+msgstr "Pretraži naloge za plaćanje"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Ne možete napraviti poteznu liniju na primaćem/platežnom računu bez partnera"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
-msgstr "Kreirano"
+msgstr "Napravljeno"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -327,17 +333,17 @@ msgstr "Ukupni iznos valute"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Make Payments"
-msgstr "Napravite plaćanja"
+msgstr "Izvršite plaćanja"
 
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr "Tip Komunikacije"
+msgstr "Tip komunikacije"
 
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
 msgid "Payment Management"
-msgstr "Menadzment Plaćanja"
+msgstr "Upravljanje plaćanjem"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
@@ -347,7 +353,7 @@ msgstr "Red Izvoda iz Banke"
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Due date"
-msgstr "Krajnji Rok"
+msgstr "Krajnji rok"
 
 #. module: account_payment
 #: field:account.invoice,amount_to_pay:0
@@ -391,7 +397,7 @@ msgstr "Način plaćanja"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr "Datum"
+msgstr "Datum valute"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -412,23 +418,23 @@ msgstr "Priprema"
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
-msgstr "Nasljedna poruka komunikacije."
+msgstr "Naredna poruka komunikacije."
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "No partner defined on entry line"
-msgstr "Partner nije definisan"
+msgstr "Partner nije definisan na redu stavke"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
 msgid "Address of the Ordering Customer."
-msgstr "Adresa kupca naručitelja."
+msgstr "Adresa naručitelja."
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "Populate Statement:"
-msgstr "Popuni sadrzaj:"
+msgstr "Popuni sadržaj:"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -438,7 +444,7 @@ msgstr "Ukupno potražuje"
 #. module: account_payment
 #: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr "Odaberite datum ako ste odabrali fiksni željeni datum"
+msgstr "Odaberite datum ako ste odabrali fiksirani željeni datum"
 
 #. module: account_payment
 #: field:payment.order,user_id:0
@@ -454,12 +460,12 @@ msgstr "Redovi plaćanja"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
 msgid "Journal Items"
-msgstr "Sadrzaj Dnevnika"
+msgstr "Stavke dnevnika"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Preduzeće mora biti isto za sve vezane račune i periode."
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -492,12 +498,12 @@ msgstr "Ukupno:"
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation date"
-msgstr "Datum kreiranja"
+msgstr "Datum pravljenja"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "ADD"
-msgstr "Dodaj"
+msgstr "DODAJ"
 
 #. module: account_payment
 #: view:account.bank.statement:0
@@ -517,22 +523,22 @@ msgstr "Iznos u valuti preduzeca"
 #. module: account_payment
 #: help:payment.line,partner_id:0
 msgid "The Ordering Customer"
-msgstr "Kupac naručitelj"
+msgstr "Naručitelj"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
 msgid "Account make payment"
-msgstr "Izvrsi placanje naloga"
+msgstr "Izvrši plaćanje naloga"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr "Referenca fakture"
+msgstr "Ref. fakture"
 
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
-msgstr "Vaše veze"
+msgstr "Vaš poziv na broj"
 
 #. module: account_payment
 #: field:payment.order,mode:0
@@ -578,7 +584,7 @@ msgstr "Otkaži"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Information"
-msgstr "Informacija"
+msgstr "Informacije"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -588,6 +594,10 @@ msgid ""
 "that should be done, keep track of all payment orders and mention the "
 "invoice reference and the partner the payment should be done for."
 msgstr ""
+"Nalog za plaćanje je zahtev za plaćanje od strane Vašeg preduzeća za isplatu "
+"faktura nabavke ili kupaca. Ovde možete snimiti sve naloge za plaćanje na "
+"čekanju, pratite sve naloge za plaćanje i pomenete poziv na broj za datu "
+"fakturu i kom partneru treba izvršiti isplatu."
 
 #. module: account_payment
 #: help:payment.line,amount:0
@@ -612,12 +622,12 @@ msgstr "Komunikacija 2"
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank account"
-msgstr "Destinacioni bankovni račun"
+msgstr "Ciljni bankovni račun"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr "Jeste li sigurni da zelite da izvrsite isplatu?"
+msgstr "Jeste li sigurni da želite da izvršite isplatu?"
 
 #. module: account_payment
 #: view:payment.mode:0
@@ -639,7 +649,7 @@ msgstr "Potvrdi plaćanja"
 #: field:payment.line,company_currency:0
 #: report:payment.order:0
 msgid "Company Currency"
-msgstr "Valuta preduzeca"
+msgstr "Valuta preduzeća"
 
 #. module: account_payment
 #: model:ir.ui.menu,name:account_payment.menu_main_payment
@@ -651,7 +661,7 @@ msgstr "Isplata"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr "Isplata  Faktura / Placanje"
+msgstr "Isplata  Faktura / Plaćanje"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
@@ -664,13 +674,13 @@ msgid ""
 "Used as the message between ordering customer and current company. Depicts "
 "'What do you want to say to the recipient about this order ?'"
 msgstr ""
-"Koristi se kao poruka izmedju narucioca i date kompanije. Objasnjava ' Sta "
-"ste to hteli reci kupcu o ovoj narudzbi?'"
+"Koristi se kao poruka između naručioca i date kompanije. Prikazuje ' Šta "
+"želite reći kupcu o ovoj narudžbini?'"
 
 #. module: account_payment
 #: field:payment.mode,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -681,7 +691,7 @@ msgstr "Bankovni račun"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Entry Information"
-msgstr "Unos Informacije"
+msgstr "Informacije o unosu"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
@@ -702,7 +712,7 @@ msgstr "Ukupno"
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr "Izvrsi placanje"
+msgstr "Izvrši placanje"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
@@ -713,7 +723,7 @@ msgstr "Partner"
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
 msgid "Populate Payment"
-msgstr "Popuni Placanje"
+msgstr "Popuni plaćanje"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
@@ -723,7 +733,7 @@ msgstr "Bankovni račun za način plaćanja"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Ne možete napraviti poteznu liniju na računu po viđenju"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
diff --git a/addons/account_payment/security/ir.model.access.csv b/addons/account_payment/security/ir.model.access.csv
index a4b6fe0af5e..864b7656964 100644
--- a/addons/account_payment/security/ir.model.access.csv
+++ b/addons/account_payment/security/ir.model.access.csv
@@ -1,11 +1,8 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_payment_mode","payment.mode","model_payment_mode","group_account_payment",1,1,1,1
-"access_payment_order","payment.order","model_payment_order","group_account_payment",1,1,1,1
-"access_payment_line","payment.line","model_payment_line","group_account_payment",1,1,1,1
-"access_account_journal_payement","account.journal payment","account.model_account_journal","group_account_payment",1,0,0,0
-"access_account_invoice_payment","account.invoice payment","account.model_account_invoice","group_account_payment",1,0,0,0
-"access_account_move_line_payment","account.move.line payment","account.model_account_move_line","group_account_payment",1,0,0,0
-"access_payment_order_accountant","payment.order accountant","model_payment_order","account.group_account_user",1,1,1,1
-"access_payment_order_manager","payment.order manager","model_payment_order","account.group_account_manager",1,0,0,0
-"access_payment_order_invoice","payment.order invoice","model_payment_order","account.group_account_invoice",1,1,1,1
-"access_payment_line_invoice","payment.line invoice","model_payment_line","account.group_account_invoice",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_payment_mode,payment.mode,model_payment_mode,group_account_payment,1,1,1,1
+access_payment_order,payment.order,model_payment_order,group_account_payment,1,1,1,1
+access_payment_line,payment.line,model_payment_line,group_account_payment,1,1,1,1
+access_account_journal_payement,account.journal payment,account.model_account_journal,group_account_payment,1,0,0,0
+access_account_invoice_payment,account.invoice payment,account.model_account_invoice,group_account_payment,1,0,0,0
+access_account_move_line_payment,account.move.line payment,account.model_account_move_line,group_account_payment,1,0,0,0
+access_payment_order_manager,payment.order manager,model_payment_order,account.group_account_manager,1,0,0,0
diff --git a/addons/account_sequence/i18n/fa.po b/addons/account_sequence/i18n/fa.po
new file mode 100644
index 00000000000..953f96793b6
--- /dev/null
+++ b/addons/account_sequence/i18n/fa.po
@@ -0,0 +1,221 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_sequence/i18n/pt.po b/addons/account_sequence/i18n/pt.po
index 84c22715b25..e2e827d4e57 100644
--- a/addons/account_sequence/i18n/pt.po
+++ b/addons/account_sequence/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-24 03:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-09 10:09+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-10 04:56+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -28,12 +28,13 @@ msgstr ""
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
+"Não pode criar registos em períodos ou diários diferentes no mesmo movimento"
 
 #. module: account_sequence
 #: help:account.move,internal_sequence_number:0
 #: help:account.move.line,internal_sequence_number:0
 msgid "Internal Sequence Number"
-msgstr ""
+msgstr "Número interno de sequência"
 
 #. module: account_sequence
 #: help:account.sequence.installer,number_next:0
@@ -43,12 +44,12 @@ msgstr ""
 #. module: account_sequence
 #: field:account.sequence.installer,number_next:0
 msgid "Next Number"
-msgstr ""
+msgstr "Próximo número"
 
 #. module: account_sequence
 #: field:account.sequence.installer,number_increment:0
 msgid "Increment Number"
-msgstr ""
+msgstr "Incremento"
 
 #. module: account_sequence
 #: model:ir.module.module,description:account_sequence.module_meta_information
@@ -57,6 +58,10 @@ msgid ""
 "    This module maintains internal sequence number for accounting entries.\n"
 "    "
 msgstr ""
+"\n"
+"    Esse módulo gere os números de sequência internos dos lançamentos "
+"contabilísticos.\n"
+"    "
 
 #. module: account_sequence
 #: model:ir.module.module,shortdesc:account_sequence.module_meta_information
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 535f76b8d64..69186cea00c 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -91,10 +91,10 @@ class account_voucher(osv.osv):
         return False
 
     def _get_payment_rate_currency(self, cr, uid, context=None):
-        '''
+        """
         Return the default value for field payment_rate_currency_id: the currency of the journal
         if there is one, otherwise the currency of the user's company
-        '''
+        """
         if context is None: context = {}
         journal_pool = self.pool.get('account.journal')
         journal_id = context.get('journal_id', False)
@@ -141,20 +141,22 @@ class account_voucher(osv.osv):
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         mod_obj = self.pool.get('ir.model.data')
         if context is None: context = {}
-        if not view_id and context.get('invoice_type', False):
-            if context.get('invoice_type', False) in ('out_invoice', 'out_refund'):
-                result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
-            else:
-                result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form')
-            result = result and result[1] or False
-            view_id = result
-        if not view_id and view_type == 'form' and context.get('line_type', False):
-            if context.get('line_type', False) == 'customer':
-                result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
-            else:
-                result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form')
-            result = result and result[1] or False
-            view_id = result
+
+        if view_type == 'form':
+            if not view_id and context.get('invoice_type'):
+                if context.get('invoice_type') in ('out_invoice', 'out_refund'):
+                    result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
+                else:
+                    result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form')
+                result = result and result[1] or False
+                view_id = result
+            if not view_id and context.get('line_type'):
+                if context.get('line_type') == 'customer':
+                    result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
+                else:
+                    result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form')
+                result = result and result[1] or False
+                view_id = result
 
         res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
         doc = etree.XML(res['arch'])
@@ -366,8 +368,6 @@ class account_voucher(osv.osv):
 
         line_ids = resolve_o2m_operations(cr, uid, line_pool, line_ids, ["amount"], context)
 
-        total = 0.0
-        total_tax = 0.0
         for line in line_ids:
             line_amount = 0.0
             line_amount = line.get('amount',0.0)
@@ -828,8 +828,6 @@ class account_voucher(osv.osv):
         :return: mapping between fieldname and value of account move line to create
         :rtype: dict
         '''
-        move_line_obj = self.pool.get('account.move.line')
-        currency_obj = self.pool.get('res.currency')
         voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
         debit = credit = 0.0
         # TODO: is there any other alternative then the voucher type ??
@@ -868,7 +866,6 @@ class account_voucher(osv.osv):
         :return: mapping between fieldname and value of account move to create
         :rtype: dict
         '''
-        move_obj = self.pool.get('account.move')
         seq_obj = self.pool.get('ir.sequence')
         voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
         if voucher_brw.number:
@@ -990,6 +987,7 @@ class account_voucher(osv.osv):
             context = {}
         move_line_obj = self.pool.get('account.move.line')
         currency_obj = self.pool.get('res.currency')
+        tax_obj = self.pool.get('account.tax')
         tot_line = line_total
         rec_lst_ids = []
 
@@ -1116,7 +1114,6 @@ class account_voucher(osv.osv):
         :return: mapping between fieldname and value of account move line to create
         :rtype: dict
         '''
-        move_line_obj = self.pool.get('account.move.line')
         currency_obj = self.pool.get('res.currency')
         move_line = {}
 
@@ -1178,9 +1175,6 @@ class account_voucher(osv.osv):
             context = {}
         move_pool = self.pool.get('account.move')
         move_line_pool = self.pool.get('account.move.line')
-        currency_pool = self.pool.get('res.currency')
-        tax_obj = self.pool.get('account.tax')
-        seq_obj = self.pool.get('ir.sequence')
         for voucher in self.browse(cr, uid, ids, context=context):
             if voucher.move_id:
                 continue
@@ -1210,7 +1204,7 @@ class account_voucher(osv.osv):
             # Create the writeoff line if needed
             ml_writeoff = self.writeoff_move_line_get(cr, uid, voucher.id, line_total, move_id, name, company_currency, current_currency, context)
             if ml_writeoff:
-                ml_writeoff_id = move_line_pool.create(cr, uid, ml_writeoff, context)
+                move_line_pool.create(cr, uid, ml_writeoff, context)
             # We post the voucher.
             self.write(cr, uid, [voucher.id], {
                 'move_id': move_id,
diff --git a/addons/account_voucher/i18n/fa.po b/addons/account_voucher/i18n/fa.po
new file mode 100644
index 00000000000..2cf94347ae1
--- /dev/null
+++ b/addons/account_voucher/i18n/fa.po
@@ -0,0 +1,1020 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 16:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+msgid "Unreconciliation transactions"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:247
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Ref"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Customer Journal Entries"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Voucher Date"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Particulars"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:sale.receipt.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:596
+#, python-format
+msgid "Cannot delete Voucher(s) which are already opened or paid !"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
+msgid "Voucher Print"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.module.module,description:account_voucher.module_meta_information
+msgid ""
+"Account Voucher module includes all the basic requirements of\n"
+"    Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, "
+"etc...\n"
+"    * Voucher Entry\n"
+"    * Voucher Receipt\n"
+"    * Cheque Register\n"
+"    "
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_bills
+msgid "Bill Payment"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:746
+#, python-format
+msgid ""
+"You have to configure account base code and account tax code on the '%s' tax!"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:182
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
+#, python-format
+msgid "Import Entries"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
+msgid "Account voucher unreconcile"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
+msgid ""
+"When you sell products to a customer, you can give him a sales receipt or an "
+"invoice. When the sales receipt is confirmed, it creates journal items "
+"automatically and you can record the customer payment related to this sales "
+"receipt."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Pay Bill"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,company_id:0
+#: field:account.voucher.line,company_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,reference:0
+msgid "Transaction reference number."
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
+msgid "Unreconcile entries"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Statistics"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Search Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,account_id:0
+#: field:account.voucher.line,account_id:0
+#: field:sale.receipt.report,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,line_dr_ids:0
+msgid "Debits"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+msgid "Ok"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
+msgid ""
+"From this report, you can have an overview of the amount invoiced to your "
+"customer as well as payment delays. The tool search can also be used to "
+"personalise your Invoices reports and so, match this analysis to your needs."
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,date_due:0
+#: field:account.voucher.line,date_due:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,narration:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
+msgid ""
+"Sales payment allows you to register the payments you receive from your "
+"customers. In order to record a payment, you must enter the customer, the "
+"payment method (=the journal) and the payment amount. OpenERP will propose "
+"to you automatically the reconciliation of this payment with the open "
+"invoices or sales receipts."
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,move_line_id:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,reference:0
+msgid "Ref #"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,amount:0
+#: report:voucher.print:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Options"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Other Information"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: selection:sale.receipt.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,date:0
+msgid "Date payment"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Supplier Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,tax_id:0
+msgid "Tax"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,nbr:0
+msgid "# of Voucher Lines"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Information"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice:0
+msgid "Go"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Paid Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.bank.statement:0
+msgid "Import Invoices"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Account :"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "On Account of :"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Write-Off Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Lines"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Date:"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,state:0
+#: view:sale.receipt.report:0
+msgid "State"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
+msgid "Accounting Voucher Entries"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.unreconcile,remove:0
+msgid "Want to remove accounting entries too ?"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
+msgid "Voucher Entries"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:645
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
+msgid "Vouchers Entries"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,name:0
+msgid "Memo"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:596
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Information"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+msgid "Unreconciliation"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.invoice:0
+#: code:addons/account_voucher/invoice.py:32
+#, python-format
+msgid "Pay Invoice"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:746
+#, python-format
+msgid "No Account Base Code and Account Tax Code!"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,tax_amount:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Entry"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,payment_option:0
+msgid "Payment Difference"
+msgstr ""
+
+#. module: account_voucher
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "To Review"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Expense Lines"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,line_ids:0
+#: field:account.statement.from.invoice.lines,line_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
+#: model:ir.model,name:account_voucher.model_account_voucher_line
+msgid "Voucher Lines"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,currency_id:0
+#: field:sale.receipt.report,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+msgid "Payable and Receivables"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Later or Group Funds"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+#: report:voucher.print:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Currency:"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"The supplier payment form allows you to track the payment you do to your "
+"suppliers. When you select a supplier, the payment method and an amount for "
+"the payment, OpenERP will propose to reconcile your payment with the open "
+"supplier invoices or bills."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,type:0
+msgid "Cr/Dr"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,audit:0
+msgid "Audit Complete ?"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Terms"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to unreconcile this record ?"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,date:0
+#: field:account.voucher.line,date_original:0
+#: field:sale.receipt.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:sale.receipt.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Number:"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.bank.statement.line,amount_reconciled:0
+msgid "Amount reconciled"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,analytic_id:0
+msgid "Write-Off Analytic Account"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Directly"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,pre_line:0
+msgid "Previous Payments ?"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
+msgid "Journal Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Compute Tax"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher.line,type:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:645
+#, python-format
+msgid "Please define a sequence on the journal !"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Supplier Journal Entries"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Through :"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payment"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Post"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Invoices and outstanding transactions"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Date"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"Voucher.                         \n"
+"* The 'Pro-forma' when voucher is in Pro-forma state,voucher does not have "
+"an voucher number.                         \n"
+"* The 'Posted' state is used when user create voucher,a voucher number is "
+"generated and voucher entries are created in account                         "
+"\n"
+"* The 'Cancelled' state is used when user cancel voucher."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.model,name:account_voucher.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,number:0
+msgid "Number"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Information"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipt Analysis"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,voucher_id:0
+#: model:res.request.link,name:account_voucher.req_link_voucher
+msgid "Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Items"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice:0
+#: view:account.statement.from.invoice.lines:0
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,move_ids:0
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payment"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice
+msgid "Import Invoices in Statement"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Pay"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher.line,type:0
+msgid "Debit"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to confirm this record ?"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Reconcile with Write-Off"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Method"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "Canceled"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.statement.from.invoice,journal_ids:0
+#: view:account.voucher:0
+#: field:account.voucher,journal_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,line_cr_ids:0
+msgid "Credits"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,amount_original:0
+msgid "Original Amount"
+msgstr ""
+
+#. module: account_voucher
+#: report:voucher.print:0
+msgid "State:"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.bank.statement.line,voucher_id:0
+#: view:account.invoice:0
+#: view:account.voucher:0
+#: field:account.voucher,pay_now:0
+#: selection:account.voucher,type:0
+#: field:sale.receipt.report,pay_now:0
+#: selection:sale.receipt.report,type:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+#: report:voucher.print:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Customer"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Write-Off Comment"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,type:0
+msgid "Default Type"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_statement_from_invoice
+#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
+msgid "Entries by Statement from Invoices"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,move_id:0
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_voucher
+#: field:sale.receipt.report,state:0
+msgid "Voucher State"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,date:0
+msgid "Effective date for accounting entries"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Keep Open"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,untax_amount:0
+msgid "Untax Amount"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_sale_receipt_report
+msgid "Sales Receipt Statistics"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher.line,amount_unreconciled:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,amount:0
+msgid "Total"
+msgstr ""
diff --git a/addons/account_voucher/security/ir.model.access.csv b/addons/account_voucher/security/ir.model.access.csv
index a8d9c7f580b..eac7fc13818 100644
--- a/addons/account_voucher/security/ir.model.access.csv
+++ b/addons/account_voucher/security/ir.model.access.csv
@@ -1,9 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_voucher_user","account.voucher","model_account_voucher","account.group_account_user",1,1,1,1
-"access_account_voucher_line_accountant","account.voucher.line.accountant","model_account_voucher_line","account.group_account_user",1,1,1,1
-"access_account_voucher_manager","account.voucher","model_account_voucher","account.group_account_manager",1,0,0,0
-"access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,0,0,0
-"access_account_voucher_invoice","account.voucher invoice","model_account_voucher","account.group_account_invoice",1,1,1,1
-"access_account_voucher_line_invoice","account.voucher.line invoice","model_account_voucher_line","account.group_account_invoice",1,1,1,1
-"access_sale_receipt_report_manager","account.sale.receipt.report","model_sale_receipt_report","account.group_account_manager",1,1,1,1
-"access_sale_receipt_report_user","account.sale.receipt.report","model_sale_receipt_report","account.group_account_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_voucher_manager,account.voucher,model_account_voucher,account.group_account_manager,1,0,0,0
+access_account_voucher_line_manager,account.voucher.line,model_account_voucher_line,account.group_account_manager,1,0,0,0
+access_account_voucher_invoice,account.voucher invoice,model_account_voucher,account.group_account_invoice,1,1,1,1
+access_account_voucher_line_invoice,account.voucher.line invoice,model_account_voucher_line,account.group_account_invoice,1,1,1,1
+access_sale_receipt_report_manager,account.sale.receipt.report,model_sale_receipt_report,account.group_account_manager,1,1,1,1
+access_sale_receipt_report_user,account.sale.receipt.report,model_sale_receipt_report,account.group_account_user,1,0,0,0
diff --git a/addons/account_voucher/static/src/img/icon.png b/addons/account_voucher/static/src/img/icon.png
new file mode 100644
index 00000000000..b66773a109e
Binary files /dev/null and b/addons/account_voucher/static/src/img/icon.png differ
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index 3432d3cf27b..d75c386e259 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -51,7 +51,7 @@
     name: "cash account in usd"
     code: "Xcash usd"
     type: 'liquidity'
-    user_type: "account.account_type_cash_moves"
+    user_type: "account.data_account_type_cash"
 
 -
   I create a bank journal with USD as currency
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index f31a7393a8e..ff8db125682 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -46,7 +46,7 @@
     name: "cash account in chf"
     code: "Xcash chf"
     type: 'liquidity'
-    user_type: "account.account_type_cash_moves"
+    user_type: "account.data_account_type_cash"
 
 -
   I create a bank journal with CHF as currency
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5cf9b42be0b..01095d2f265 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -205,6 +205,7 @@
                             <group col="2" colspan="1">
                                 <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
+                                    <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
                                     <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/>
@@ -356,6 +357,7 @@
                             <group col="2" colspan="1">
                                 <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
+                                    <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
                                     <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index e4d728c8867..5fb3fc22b97 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -75,7 +75,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                     statement.currency.id, amount, context=ctx)
 
             context.update({'move_line_ids': [line.id]})
-            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), date=line_date, context=context)
+            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, amount=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), date=line_date, context=context)
             voucher_res = { 'type':(amount < 0 and 'payment' or 'receipt'),
                             'name': line.name,
                             'partner_id': line.partner_id.id,
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 4e10e243d61..33f1f281851 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -20,11 +20,11 @@
 ##############################################################################
 
 {
-    "name" : "Analytic Account",
+    "name" : "Analytic Accounting",
     "version": "1.1",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category": 'Accounting & Finance',
+    "category": 'Hidden/Dependency',
     "depends" : ["base", "decimal_precision"],
     "description": """
 Module for defining analytic accounting object.
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 2ecaeee0f15..ee541e3cef1 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -301,6 +301,17 @@ class account_analytic_line(osv.osv):
     }
 
     _order = 'date desc'
+    
+    def _check_no_view(self, cr, uid, ids, context=None):
+        analytic_lines = self.browse(cr, uid, ids, context=context)
+        for line in analytic_lines:
+            if line.account_id.type == 'view':
+                return False
+        return True
+    
+    _constraints = [
+        (_check_no_view, 'You can not create analytic line on view account.', ['account_id']),
+    ]    
 
 account_analytic_line()
 
diff --git a/addons/analytic/i18n/fa.po b/addons/analytic/i18n/fa.po
new file mode 100644
index 00000000000..d9802dca47a
--- /dev/null
+++ b/addons/analytic/i18n/fa.po
@@ -0,0 +1,255 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 17:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state.                           "
+"       \n"
+"* If any associated partner is there, it can be in 'Open' state.             "
+"                     \n"
+"* If any pending balance is there it can be in 'Pending'.                    "
+"               \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project.                            "
+"     \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr ""
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 165bb92f6b9..3f8ec1036be 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -16,6 +16,7 @@
     </record>
     
     <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Useability / Analytic Accounting</field>
+        <field name="name">Analytic Accounting</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 </data></openerp>
diff --git a/addons/analytic/security/ir.model.access.csv b/addons/analytic/security/ir.model.access.csv
index 0a6c192eb56..4a08a4aa60d 100644
--- a/addons/analytic/security/ir.model.access.csv
+++ b/addons/analytic/security/ir.model.access.csv
@@ -1,2 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/analytic_journal_billing_rate/i18n/fa.po b/addons/analytic_journal_billing_rate/i18n/fa.po
new file mode 100644
index 00000000000..c928e9d2e66
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/fa.po
@@ -0,0 +1,95 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-12-18 17:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module allows you to define what is the default invoicing rate for "
+"a specific journal on a given account. This is mostly used when a user "
+"encodes his timesheet: the values are retrieved and the fields are auto-"
+"filled... but the possibility to change these values is still available.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the account data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"Analytic Journal Billing Rate, Define the default invoicing rate for a "
+"specific journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
diff --git a/addons/analytic_journal_billing_rate/security/ir.model.access.csv b/addons/analytic_journal_billing_rate/security/ir.model.access.csv
index 0b03709a81b..b4a604b2362 100644
--- a/addons/analytic_journal_billing_rate/security/ir.model.access.csv
+++ b/addons/analytic_journal_billing_rate/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_analytic_journal_rate_user","analytic journal rate user","model_analytic_journal_rate_grid","account.group_account_manager",1,0,0,0
-"access_analytic_journal_rate_manager","analytic journal rate manager","model_analytic_journal_rate_grid","account.group_account_manager",1,1,1,1
-"access_analytic_journal_rate_account_manager","analytic journal rateaccount manager","model_analytic_journal_rate_grid","account.group_account_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_analytic_journal_rate_user,analytic journal rate user,model_analytic_journal_rate_grid,account.group_account_manager,1,0,0,0
+access_analytic_journal_rate_manager,analytic journal rate manager,model_analytic_journal_rate_grid,account.group_account_manager,1,1,1,1
+access_analytic_journal_rate_account_manager,analytic journal rateaccount manager,model_analytic_journal_rate_grid,account.group_account_manager,1,1,1,1
diff --git a/addons/analytic_user_function/i18n/fa.po b/addons/analytic_user_function/i18n/fa.po
new file mode 100644
index 00000000000..5cf714dd82f
--- /dev/null
+++ b/addons/analytic_user_function/i18n/fa.po
@@ -0,0 +1,103 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-12-18 17:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:97
+#: code:addons/analytic_user_function/analytic_user_function.py:132
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.module.module,description:analytic_user_function.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module allows you to define what is the default function of a "
+"specific user on a given account. This is mostly used when a user encodes "
+"his timesheet: the values are retrieved and the fields are auto-filled... "
+"but the possibility to change these values is still available.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the employee data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
+msgid "Analytic User Function"
+msgstr ""
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic_user_funct_grid:0
+msgid "User's Product for this Analytic Account"
+msgstr ""
diff --git a/addons/analytic_user_function/security/ir.model.access.csv b/addons/analytic_user_function/security/ir.model.access.csv
index d8f2f0d2116..fe48e329aea 100644
--- a/addons/analytic_user_function/security/ir.model.access.csv
+++ b/addons/analytic_user_function/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_analytic_user_funct_user","analytic user funct user","model_analytic_user_funct_grid","account.group_account_manager",1,0,0,0
-"access_analytic_user_funct_manager","analytic user funct manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
-"access_analytic_user_funct_account_manager","analytic user funct account manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
-"access_analytic_user_funct_grid_hr_user","analytic user funct grid hr user","model_analytic_user_funct_grid","base.group_hr_user",1,0,0,0
-"access_analytic_user_funct_grid_hr_manager","analytic user funct grid hr manager","model_analytic_user_funct_grid","base.group_hr_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_analytic_user_funct_user,analytic user funct user,model_analytic_user_funct_grid,account.group_account_manager,1,0,0,0
+access_analytic_user_funct_manager,analytic user funct manager,model_analytic_user_funct_grid,account.group_account_manager,1,1,1,1
+access_analytic_user_funct_account_manager,analytic user funct account manager,model_analytic_user_funct_grid,account.group_account_manager,1,1,1,1
+access_analytic_user_funct_grid_hr_user,analytic user funct grid hr user,model_analytic_user_funct_grid,base.group_hr_user,1,0,0,0
+access_analytic_user_funct_grid_hr_manager,analytic user funct grid hr manager,model_analytic_user_funct_grid,base.group_hr_manager,1,1,1,1
diff --git a/addons/anonymization/i18n/fa.po b/addons/anonymization/i18n/fa.po
new file mode 100644
index 00000000000..e413048add4
--- /dev/null
+++ b/addons/anonymization/i18n/fa.po
@@ -0,0 +1,226 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 17:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,shortdesc:anonymization.module_meta_information
+msgid "Database anonymization module"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two records having the same model and the same field"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,description:anonymization.module_meta_information
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"    "
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr ""
diff --git a/addons/anonymization/security/ir.model.access.csv b/addons/anonymization/security/ir.model.access.csv
index 5531738338b..745913eaa65 100644
--- a/addons/anonymization/security/ir.model.access.csv
+++ b/addons/anonymization/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ir_model_fields_anonymization_group_system","ir_model_fields_anonymization group_user","model_ir_model_fields_anonymization","base.group_system",1,1,1,1
-"access_ir_model_fields_anonymization_user","ir_model_fields_anonymization user","model_ir_model_fields_anonymization",,1,0,0,0
-"access_ir_model_fields_anonymization_history_group_system","ir_model_fields_anonymization_history group_user","model_ir_model_fields_anonymization_history","base.group_system",1,1,1,1
-"access_ir_model_fields_anonymization_history_user","ir_model_fields_anonymization_history user","model_ir_model_fields_anonymization_history",,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ir_model_fields_anonymization_group_system,ir_model_fields_anonymization group_user,model_ir_model_fields_anonymization,base.group_system,1,1,1,1
+access_ir_model_fields_anonymization_user,ir_model_fields_anonymization user,model_ir_model_fields_anonymization,,1,0,0,0
+access_ir_model_fields_anonymization_history_group_system,ir_model_fields_anonymization_history group_user,model_ir_model_fields_anonymization_history,base.group_system,1,1,1,1
+access_ir_model_fields_anonymization_history_user,ir_model_fields_anonymization_history user,model_ir_model_fields_anonymization_history,,1,0,0,0
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 8aad18575ff..36622a5750d 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -37,7 +37,6 @@ It installs the profile for associations to manage events, registrations, member
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'application': True,
     'certificate': '0078696047261',
     'images': ['images/association1.jpeg'],
 }
diff --git a/addons/association/i18n/fa.po b/addons/association/i18n/fa.po
new file mode 100644
index 00000000000..cc4a856312f
--- /dev/null
+++ b/addons/association/i18n/fa.po
@@ -0,0 +1,135 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 19:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr ""
+
+#. module: association
+#: model:ir.actions.act_window,name:association.action_config_install_module
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Association Application Configuration"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr ""
diff --git a/addons/association/security/ir.model.access.csv b/addons/association/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/association/security/ir.model.access.csv
+++ b/addons/association/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index 0475890e1e9..c3cba1d7255 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Auction Management',
+    'name': 'Auction Houses',
     'version': '1.0',
     'category': 'Specific Industry Applications',
     'complexity': "normal",
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index e93cc3ea04d..5566719a56d 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -21,7 +21,7 @@
         <field name="parent_id" eval="0">
             <value search="[('type','=','view')]" model="account.account"/>
         </field>
-        <field name="user_type" ref="account.account_type_root"/>
+        <field name="user_type" ref="account.data_account_type_view"/>
     </record>
 
     <record model="account.account" id="auction_expense_view">
@@ -32,13 +32,13 @@
         <field name="parent_id" eval="0">
             <value search="[('type','=','view')]" model="account.account"/>
         </field>
-        <field name="user_type" ref="account.account_type_expense"/>
+        <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
 
     <record model="account.account" id="auction_income">
         <field name="name">Auction Adjudications</field>
         <field name="code">A7x*</field>
-        <field name="user_type" ref="account.account_type_income"/> 
+        <field name="user_type" ref="account.data_account_type_income"/> 
         <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_income_view"/>
@@ -47,7 +47,7 @@
     <record model="account.account" id="auction_expense">
         <field name="name">Auction Adjudication Expenses</field>
         <field name="code">A6x*</field>
-        <field name="user_type" ref="account.account_type_expense"/>
+        <field name="user_type" ref="account.data_account_type_expense"/>
         <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_expense_view"/>
diff --git a/addons/auction/i18n/fa.po b/addons/auction/i18n/fa.po
new file mode 100644
index 00000000000..0f94b50d82e
--- /dev/null
+++ b/addons/auction/i18n/fa.po
@@ -0,0 +1,2294 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 19:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_report_menu
+msgid "Reporting"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_taken
+msgid "Auction taken"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,partner_id:0
+#: field:auction.lots,seller_id:0
+#: view:report.auction:0
+#: field:report.auction,seller:0
+msgid "Seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,name:0
+msgid "Title"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,text:0
+msgid "SMS Message"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid " "
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Warning, Erase The Object Adjudication Price and Its Buyer!"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id1:0
+msgid "First Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+msgid "Object"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.object.date,obj_num:0
+msgid "# of Objects"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Authors"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
+#: field:auction.lots.buyer_map,ach_uid:0
+#: field:auction.lots.make.invoice.buyer,buyer_id:0
+#: field:auction.pay.buy,buyer_id:0
+#: report:buyer.list:0
+#: view:report.auction:0
+#: field:report.auction,buyer:0
+#: report:report.auction.buyer.result:0
+msgid "Buyer"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,object:0
+msgid "No of objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,paid_vnd:0
+msgid ""
+"When state of Seller Invoice is 'Paid', this field is selected as True."
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of paid items (based on invoices):"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,amount:0
+#: field:auction.lots.make.invoice.buyer,amount:0
+msgid "Invoiced Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,name:0
+msgid "Auction object name"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_aie_category
+msgid "aie.category"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,amount:0
+#: field:auction.pay.buy,amount:0
+#: field:auction.pay.buy,amount2:0
+#: field:auction.pay.buy,amount3:0
+msgid "Amount"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_deposit_border
+#: model:ir.ui.menu,name:auction.menu_auction_deposit_border
+msgid "Deposit border"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Reference"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,state:0
+msgid ""
+"When auction starts the state is 'Draft'.\n"
+" At the end of auction, the state becomes 'Closed'."
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount3:0
+msgid "Amount For Third Bank Statement"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_num:0
+msgid "List Number"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Date:"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,name:0
+msgid "Cost Name"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: field:auction.dates,state:0
+#: view:auction.lots:0
+#: field:auction.lots,state:0
+#: view:report.auction:0
+#: field:report.auction,state:0
+msgid "State"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "First Auction Date"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "January"
+msgstr ""
+
+#. module: auction
+#: help:auction.lot.category,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the auction "
+"lot category without removing it."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Ref"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,total_price:0
+msgid "Total Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Total Adj."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS - Gateway: clickatell','Bulk SMS send"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,costs:0
+msgid "Deposit cost"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.auction,state:0
+#: selection:report.object.encoded,state:0
+msgid "Unsold"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Search Auction deposit"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_num:0
+msgid "List number in depositer inventory"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Items"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax5
+#: field:auction.dates,seller_costs:0
+msgid "Seller Costs"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
+#: field:auction.lots,bid_lines:0
+#: model:ir.actions.report.xml,name:auction.bid_auction
+#: model:ir.ui.menu,name:auction.menu_action_bid_open
+msgid "Bids"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Buyer Map"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_ret:0
+msgid "# obj ret"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_bid
+msgid "Bid Auctions"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,image:0
+msgid "Object Image"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#, python-format
+msgid "No buyer is set for this lot."
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "The Buyer \"%s\" has no Invoice Address."
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Commissions"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit_cost
+msgid "Auction Deposit Cost"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border Form"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,statement_id:0
+msgid "Bank statement line for given buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,aie_categ:0
+msgid "Category"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
+msgid "Map buyer username to Partners"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Search Auction Lots"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,net_revenue:0
+msgid "Net Revenue"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.adjudication,state:0
+#: field:report.object.encoded,state:0
+msgid "Status"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_sms_send
+msgid "SMS Send"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "August"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+msgid "Sold"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "June"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#, python-format
+msgid "No Lots belong to this Auction Date"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "October"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,name:0
+msgid "Bid date"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_wizard_emporte
+msgid "Deliveries Management"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_desc:0
+msgid "Object Description"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist2_id:0
+msgid "Artist/Author2"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line1"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
+msgid "Make Invoice for Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_revenue:0
+#: field:report.object.encoded,gross_revenue:0
+msgid "Gross revenue"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_pay_buy
+msgid "Pay objects of the buyer"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction2:0
+msgid "End date of auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "Send SMS"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,name2:0
+msgid "Short Description (2)"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
+msgid "Buyers"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id4
+msgid "VAT 12%"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Invoices"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.res_w_buyer
+msgid "Results with buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,price:0
+msgid "Maximum Price"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction1:0
+msgid "Start date of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_auction_move
+msgid "Auction Move"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,buyer_costs:0
+msgid "Account tax for buyer"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Next Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Select lots which are Sold"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,statement_id:0
+msgid "Payment"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "The object \"%s\" has no buyer assigned."
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Keep until sold"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Last Auction Date"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_seller
+msgid "Seller Costs (12%)"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,paid_vnd:0
+msgid "Seller Paid"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+#: view:report.object.encoded:0
+msgid "Objects statistics"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of sellers:"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,date:0
+#: field:report.object.encoded,date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:report.object.encoded,state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items taken away:"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction
+#: view:report.auction:0
+msgid "Auction's Summary"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "%)"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer Information"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_revenue:0
+msgid "Buyer Price - Seller Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,objects:0
+#: field:auction.lots.make.invoice.buyer,objects:0
+msgid "# of objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est2:0
+msgid "Maximum Estimation"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,buyer_price:0
+msgid "Buyer price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Bids Details"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,is_ok:0
+msgid "Buyer's payment"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "End of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard
+#: model:ir.model,name:auction.model_auction_catalog_flagey
+msgid "Auction Catalog Flagey"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "March"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax4
+msgid "Seller Costs1"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of buyers:"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,costs:0
+msgid "Indirect costs"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,seller_costs:0
+msgid "Account tax for seller"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Auction Management"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,journal_seller_id:0
+msgid "Seller Journal"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:auction.dates,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+#: selection:report.auction.adjudication,state:0
+#: selection:report.object.encoded,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,state:0
+msgid ""
+" * The 'Draft' state is used when a object is encoding as a new object.      "
+"           \n"
+"* The 'Unsold' state is used when object does not sold for long time, user "
+"can also set it as draft state after unsold.                 \n"
+"* The 'Paid' state is used when user pay for the object                 \n"
+"* The 'Sold' state is used when user buy the object."
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Type"
+msgstr ""
+
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "children aie category"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,ach_emp:0
+msgid "When state is Taken Away, this field is marked as True"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_taken
+msgid "Gestion emporte"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.dates:0
+#: view:auction.lots:0
+#: field:auction.lots,auction_id:0
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_menu_root
+#: view:report.auction:0
+msgid "Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.lot.category:0
+#: model:ir.ui.menu,name:auction.menu_auction_object_cat
+msgid "Object Categories"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,app_id:0
+msgid "API ID"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
+msgid "Bid ID"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Min Estimate:"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "September"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,net_margin:0
+msgid "Net Margin"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,vnd_lim_net:0
+msgid "Net limit ?"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,child_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of commissions:"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,auction:0
+#: field:auction.dates,name:0
+msgid "Auction Name"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_num:0
+msgid "# of Encoded obj."
+msgstr ""
+
+#. module: auction
+#: field:aie.category,parent_id:0
+msgid "Parent aie Category"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "(Keep empty for automatic number)"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "No Invoice Address"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_huissier
+msgid "Bailiffs Listing"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "This record does not exist !"
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,total:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount:0
+msgid "Amount For First Bank Statement"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_object_date
+#: view:report.auction.object.date:0
+msgid "Objects per day"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,author_right:0
+msgid "Account tax for author commission"
+msgstr ""
+
+#. module: auction
+#: model:product.template,name:auction.monproduit_product_template
+msgid "Oeuvres a 21%"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,adj:0
+msgid "Adj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,name:0
+#: field:report.auction.adjudication,date:0
+msgid "Date"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_ret:0
+msgid "Price retired"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Extra Costs"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Map "
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,paid_ach:0
+msgid "Buyer Invoice Reconciled"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,date_dep:0
+msgid "Deposit date"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.id_deposit
+msgid "Deposits"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,specific_cost_ids:0
+msgid "Specific Costs"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "To pay ("
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer
+msgid "Buyer Costs (20%)"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Dashboard"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.actions.act_window,name:auction.action_auction_dates_next
+#: model:ir.ui.menu,name:auction.auction_date_menu
+#: model:ir.ui.menu,name:auction.menu_auction_dates_next1
+msgid "Auctions"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice
+msgid "Make invoice"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "November"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: view:auction.lots:0
+msgid "History"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,code:0
+msgid "Code"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Nr."
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
+msgid "Barcode batch"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Num"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Cancel"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer's Payment History"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: field:auction.artists,biography:0
+msgid "Biography"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Inventory"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+msgid "Create Invoices For Seller"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_margin:0
+msgid "Net margin"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_local:0
+msgid "Auction Location"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Analytic"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,paid_ach:0
+msgid ""
+"When state of Buyer Invoice is 'Paid', this field is selected as True."
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Cat.N"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Decrease limit of 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,adj_total:0
+#: field:report.auction.adjudication,adj_total:0
+msgid "Total Adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice_buyer
+msgid "Invoice Buyer objects"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "My Auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_margin:0
+msgid "(Gross Revenue*100.0)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,contact_tel:0
+msgid "Contact Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Price"
+msgstr ""
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "-"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Photos"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,number:0
+#: field:auction.lots.make.invoice.buyer,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
+#: code:addons/auction/wizard/auction_lots_numerotate.py:77
+#: code:addons/auction/wizard/auction_lots_numerotate.py:95
+#: code:addons/auction/wizard/auction_lots_numerotate.py:122
+#: code:addons/auction/wizard/auction_lots_numerotate.py:137
+#: code:addons/auction/wizard/auction_lots_numerotate.py:173
+#, python-format
+msgid "Active IDs not Found"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:117
+#, python-format
+msgid "Connection to WWW.Auction-in-Europe.com failed !"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,gross_revenue:0
+msgid "Gross Revenue"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction board"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,name:0
+#: view:auction.artists:0
+#: report:bids.lots:0
+msgid "Name"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,name:0
+#: field:auction.lots,bord_vnd_id:0
+msgid "Depositer Inventory"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "The Buyer has no Invoice Address."
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total adj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,user:0
+msgid "Login"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_adjudication
+msgid "report_auction_adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_lots_3
+msgid "Seller Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_type:0
+#: field:report.auction,lot_type:0
+msgid "Object category"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Mark Lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots
+msgid "Auction Object"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_num:0
+#: field:auction.lots.enable,confirm_en:0
+msgid "Catalog Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Accounting"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.bid_phone
+msgid "Bids phones"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_estimation:0
+msgid "Avg estimation"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Debit:"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,author_right:0
+msgid "Author rights"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.dates:0
+#: view:auction.deposit:0
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Group By..."
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_id:0
+msgid "Account journal for buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,bid_lines:0
+#: report:auction.bids:0
+#: report:bids.lots:0
+#: model:ir.model,name:auction.model_auction_bid_line
+msgid "Bid"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total net rev."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Update"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_seller_menu
+msgid "Sellers"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_est2:0
+msgid "Maximum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Notes"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Move to Auction date"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of unsold items:"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,auction_id:0
+#: view:auction.dates:0
+#: field:auction.lots.auction.move,auction_id:0
+msgid "Auction Date"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid ", ID"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Adj.("
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.lot_list_inv
+msgid "Lots List - Landscape"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+msgid "Author/Artist"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_login:0
+#: field:auction.lots.buyer_map,ach_login:0
+msgid "Buyer Username"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_local:0
+msgid "Location"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Month -1"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,is_ok:0
+msgid "When buyer pay for bank statement', this field is marked"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_emp:0
+msgid "Taken Away"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total gross rev."
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_est1:0
+msgid "Minimum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Date"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "This lot does not exist !"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "July"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,call:0
+msgid "To be Called"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree
+msgid "Min est/Adj/Max est"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est1:0
+msgid "Minimum Estimation"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_sms_send
+msgid "Sms send "
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move
+msgid "Change Auction Date"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,birth_death_dates:0
+msgid "Lifespan"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,method:0
+msgid "Withdrawned method"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Commissions"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction
+#: model:ir.ui.menu,name:auction.menu_report_auction
+msgid "Auction Analysis"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid "Payment aborted !"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,price:0
+msgid "Withdrawn price"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Beginning of the auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id3:0
+msgid "Third Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,month:0
+#: field:report.auction.object.date,month:0
+msgid "Month"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Max Estimate:"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Statistical"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit
+msgid "Auction Deposit Border"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
+msgid "Object statistics"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_margin:0
+msgid "(Net Revenue * 100)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_history
+msgid "Lot History"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id5
+msgid "VAT 5%"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo1:0
+msgid "First Exposition Day"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Lot"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_artists
+msgid "auction.artists"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_price:0
+msgid "Avg Price."
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id2:0
+msgid "Second Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,journal_id:0
+msgid "Buyer Journal"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Phone"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,active:0
+msgid "Active"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Exposition Dates"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax1
+msgid "TVA"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,important:0
+msgid "To be Emphatized"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Total:"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax2
+msgid "TVA1"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.object.date:0
+msgid "Objects per Day"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,seller_invoice_history:0
+#: field:auction.lots,sel_inv_id:0
+#: view:auction.lots.make.invoice:0
+msgid "Seller Invoice"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo2:0
+msgid "Last exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "Missed buyer !"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Flagey"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#, python-format
+msgid ""
+"Two different buyers for the same invoice !\n"
+"Please correct this problem before invoicing"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoice"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,vnd_lim:0
+msgid "Seller limit"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,transfer:0
+msgid "Transfer"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line3"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line2"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_ret:0
+msgid "Object Ret"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.adjudication:0
+msgid "Total adjudication"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Contact the Seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.taken,lot_ids:0
+msgid "Lots Emportes"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_margin:0
+msgid "Net Margin (%)"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid ")"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Seller Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_all_objects
+#: model:ir.ui.menu,name:auction.auction_all_objects_menu
+msgid "Objects"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Invoices"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Paid:"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,total_neg:0
+msgid "Allow Negative Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount2:0
+msgid "Amount For Second Bank Statement"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,auction_id:0
+#: field:report.auction,auction:0
+#: field:report.auction.adjudication,name:0
+msgid "Auction date"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS Text"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction1:0
+msgid "First Auction Day"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create Invoices For Buyer"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Names"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: model:ir.ui.menu,name:auction.menu_auction_artist
+msgid "Artists"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay Objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo1:0
+msgid "Beginning exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
+msgid "Open lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
+msgid "Deposit slip"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_enable
+msgid "Lots Enable"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Lots"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,seller_price:0
+msgid "Seller price"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buy_id_list
+msgid "Buyer List"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Buyer costs("
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,statement_id1:0
+#: field:auction.pay.buy,statement_id2:0
+#: field:auction.pay.buy,statement_id3:0
+msgid "Statement"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,seller_price:0
+#: help:auction.lots.make.invoice,amount:0
+msgid "Seller Price"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax20
+#: model:account.tax,name:auction.auction_tax6
+msgid "Frais de vente"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id1
+msgid "VAT 1%"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax
+msgid "Droit d'auteur"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_buyer_map
+msgid "Map Buyer"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.object.date,name:0
+msgid "Created date"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,bord_vnd_id:0
+msgid ""
+"Provide deposit information: seller, Withdrawned Method, Object, Deposit "
+"Costs"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_revenue:0
+#: field:report.object.encoded,net_revenue:0
+msgid "Net revenue"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#: code:addons/auction/wizard/auction_pay_buy.py:87
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items:"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer_author
+msgid "Author rights (4%)"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,estimation:0
+msgid "Estimation"
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,description:auction.module_meta_information
+msgid ""
+"\n"
+"     This module manages the records of the artists,\n"
+"     the articles to be put up for auction,the buyers and\n"
+"     sellers.\n"
+"\n"
+"     It completely manages an auction such as managing bids,\n"
+"     keeping track of the sold articles along with the paid\n"
+"     and unpaid objects including delivery of the articles.\n"
+"     Dashboards for auction that includes:\n"
+"       * My Latest Objects (list)\n"
+"       * My Latest Deposits (list)\n"
+"       * Objects Statistics (list)\n"
+"       * My Objects By Day (list)\n"
+"    "
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "OK"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buyer_form_id
+msgid "Buyer Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,partner_id:0
+msgid "Buyer Name"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,day:0
+msgid "Day"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
+msgid "Invoice Seller objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_margin:0
+msgid "Gross Margin (%)"
+msgstr ""
+
+#. module: auction
+#: selection:auction.dates,state:0
+#: selection:report.auction.adjudication,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Search Next Auction Dates"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print Auction Catalog Flagey Report..."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_avance:0
+msgid "Buyer Advance"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_comm:0
+msgid "Commission"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Catalog Flagey Report"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_price:0
+msgid "Object Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Bids Lines"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Catalog"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,auction_id:0
+msgid "Auction for object"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,account:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_config_menu
+msgid "Configuration"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid ""
+"You should pay all the total: \"%.2f\" are missing to accomplish the payment."
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_pay_buy
+msgid "Pay buy"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_outils_menu
+msgid "Tools Bar Codes"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,deposit_id:0
+msgid "Deposit"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo2:0
+msgid "Last Exposition Day"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_able
+msgid "Lots able"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id3
+msgid "VAT 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,name:0
+msgid "Artist/Author Name"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "December"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,image:0
+msgid "Image"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,buyer_price:0
+#: help:auction.lots.make.invoice.buyer,amount:0
+msgid "Buyer Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_category
+msgid "Auction Lots Category"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id2
+msgid "VAT 20%"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer_sel
+msgid "Auction payment for seller"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+msgid "Taken away"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_form_id
+msgid "Seller List"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Costs"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "........."
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary tree view"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Adj"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.model,name:auction.model_auction_dates
+msgid "Auction Dates"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_open
+msgid "Auction DashBoard"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,user_id:0
+#: field:report.auction.adjudication,user_id:0
+#: field:report.auction.object.date,user_id:0
+#: field:report.object.encoded,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "Missed Address !"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_revenue:0
+msgid "Buyer Price - Seller Price - Indirect Cost"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
+msgid "Open Bids"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,pseudo:0
+msgid "Pseudo"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Not sold"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax3
+#: field:auction.dates,buyer_costs:0
+msgid "Buyer Costs"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction Date:"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:116
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,buyer_invoice_history:0
+#: field:auction.lots,ach_inv_id:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Buyer Invoice"
+msgstr ""
+
+#. module: auction
+#: report:auction.bids:0
+msgid "Tel"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist_id:0
+msgid "Artist/Author"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.total_result1
+msgid "Auction Totals with lists"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "General Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.buyer_map:0
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+#: view:auction.lots.sms.send:0
+#: view:auction.pay.buy:0
+msgid "Close"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_object_encoded
+msgid "Object encoded"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Search Auction Bid"
+msgstr ""
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "Est"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Commissions"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Object statistic"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_seller_id:0
+msgid "Account journal for seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction2:0
+msgid "Last Auction Day"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Objects Description"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:87
+#, python-format
+msgid "No auction date for \"%s\": Please set one."
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: report:bids.phones.details:0
+msgid "Description"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "May"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_price:0
+msgid "Adjudication price"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,password:0
+msgid "Password"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "February"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "April"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay objects"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "# objects"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Adjudication:"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.details_bids_phones
+msgid "Bids per lot (phone)"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,buyer_login:0
+msgid "Buyer Login"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,tax_id:0
+msgid "Expenses"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer
+msgid "Auction payer"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction name:"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.art2
+msgid "Artists Biography"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,year:0
+msgid "Year"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,history_ids:0
+msgid "Auction history"
+msgstr ""
diff --git a/addons/auction/i18n/hr.po b/addons/auction/i18n/hr.po
index 378e9b72a77..63c0293e770 100644
--- a/addons/auction/i18n/hr.po
+++ b/addons/auction/i18n/hr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-08-03 03:02+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-12-19 11:59+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:26+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
 msgid "Reporting"
-msgstr "Reporting"
+msgstr "Izvještavanje"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_taken
@@ -29,7 +29,7 @@ msgstr ""
 #. module: auction
 #: view:auction.lots:0
 msgid "Set to draft"
-msgstr "Mettre en brouillon"
+msgstr "Postavi na nacrt"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -38,24 +38,24 @@ msgstr "Mettre en brouillon"
 #: view:report.auction:0
 #: field:report.auction,seller:0
 msgid "Seller"
-msgstr "Vendeur"
+msgstr "Prodavač"
 
 #. module: auction
 #: field:auction.lots,name:0
 msgid "Title"
-msgstr ""
+msgstr "Naziv"
 
 #. module: auction
 #: field:auction.lots.sms.send,text:0
 msgid "SMS Message"
-msgstr "Message SMS"
+msgstr "SMS Poruka"
 
 #. module: auction
 #: view:auction.catalog.flagey:0
 #: view:auction.lots.auction.move:0
 #: view:auction.lots.make.invoice.buyer:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -65,23 +65,23 @@ msgstr ""
 #. module: auction
 #: help:auction.pay.buy,statement_id1:0
 msgid "First Bank Statement For Buyer"
-msgstr ""
+msgstr "Prvi bankovni izvadak za kupca"
 
 #. module: auction
 #: field:auction.bid_line,lot_id:0
 #: field:auction.lot.history,lot_id:0
 msgid "Object"
-msgstr "Objet"
+msgstr "Objekt"
 
 #. module: auction
 #: field:report.auction.object.date,obj_num:0
 msgid "# of Objects"
-msgstr "# d'objets"
+msgstr "# objekata"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Authors"
-msgstr ""
+msgstr "Autori"
 
 #. module: auction
 #: view:auction.bid:0
@@ -96,23 +96,23 @@ msgstr ""
 #: field:report.auction,buyer:0
 #: report:report.auction.buyer.result:0
 msgid "Buyer"
-msgstr "Acheteur"
+msgstr "Kupac"
 
 #. module: auction
 #: field:report.auction,object:0
 msgid "No of objects"
-msgstr "Nb d'objets"
+msgstr "Broj objekata"
 
 #. module: auction
 #: help:auction.lots,paid_vnd:0
 msgid ""
 "When state of Seller Invoice is 'Paid', this field is selected as True."
-msgstr ""
+msgstr "Kad je status računa prodavača 'Plaćeno', polje je DA."
 
 #. module: auction
 #: report:auction.total.rml:0
 msgid "# of paid items (based on invoices):"
-msgstr ""
+msgstr "# plaćenih artikala (na osnovi računa)"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -123,17 +123,17 @@ msgstr ""
 #: field:auction.lots.make.invoice,amount:0
 #: field:auction.lots.make.invoice.buyer,amount:0
 msgid "Invoiced Amount"
-msgstr "Montant facturé"
+msgstr "Fakturirani iznos"
 
 #. module: auction
 #: help:auction.lots,name:0
 msgid "Auction object name"
-msgstr ""
+msgstr "Ime predmeta aukcije"
 
 #. module: auction
 #: model:ir.model,name:auction.model_aie_category
 msgid "aie.category"
-msgstr ""
+msgstr "aie.category"
 
 #. module: auction
 #: field:auction.deposit.cost,amount:0
@@ -141,18 +141,18 @@ msgstr ""
 #: field:auction.pay.buy,amount2:0
 #: field:auction.pay.buy,amount3:0
 msgid "Amount"
-msgstr "Montant"
+msgstr "Iznos"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_deposit_border
 #: model:ir.ui.menu,name:auction.menu_auction_deposit_border
 msgid "Deposit border"
-msgstr "Bordereau de dépôt"
+msgstr "Granica depozita"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Reference"
-msgstr ""
+msgstr "Vezna oznaka"
 
 #. module: auction
 #: help:auction.dates,state:0
@@ -160,11 +160,13 @@ msgid ""
 "When auction starts the state is 'Draft'.\n"
 " At the end of auction, the state becomes 'Closed'."
 msgstr ""
+"Na početku aukcije status je 'Nacrt'.\n"
+" Na kraju aukcije, status se mijenja u 'Zatvoreno'."
 
 #. module: auction
 #: field:auction.dates,account_analytic_id:0
 msgid "Analytic Account"
-msgstr "Compte analytique"
+msgstr "Analitički konto"
 
 #. module: auction
 #: help:auction.pay.buy,amount3:0
@@ -179,7 +181,7 @@ msgstr "N° de liste"
 #. module: auction
 #: report:buyer.list:0
 msgid "Date:"
-msgstr ""
+msgstr "Datum:"
 
 #. module: auction
 #: field:auction.deposit.cost,name:0
@@ -194,7 +196,7 @@ msgstr "Nom du coût"
 #: view:report.auction:0
 #: field:report.auction,state:0
 msgid "State"
-msgstr "État"
+msgstr "Status"
 
 #. module: auction
 #: view:auction.dates:0
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
index 3caf93a2430..087151cb6ea 100644
--- a/addons/auction/security/auction_security.xml
+++ b/addons/auction/security/auction_security.xml
@@ -2,11 +2,19 @@
 <openerp>
 <data noupdate="0">
 
+    <record model="ir.module.category" id="module_category_auction">
+        <field name="name">Auction</field>
+        <field name="parent_id" ref="base.module_category_specific_industry_applications"/>
+        <field name="sequence">26</field>
+    </record>
+
     <record id="group_auction_user" model="res.groups">
-        <field name="name">Auction / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="module_category_auction"/>
     </record>
     <record id="group_auction_manager" model="res.groups">
-        <field name="name">Auction / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="module_category_auction"/>
         <field name="implied_ids" eval="[(4, ref('group_auction_user'))]"/>
     </record>
 
diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index 94c9c1f83aa..351ca866f6d 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -1,35 +1,35 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_auction_artists","auction.artists","model_auction_artists","group_auction_manager",1,1,1,1
-"access_auction_dates_user","auction.dates user","model_auction_dates","group_auction_user",1,0,0,0
-"access_auction_dates_manager","auction.dates manager","model_auction_dates","group_auction_manager",1,1,1,1
-"access_auction_deposit_manager","auction.deposit manager","model_auction_deposit","group_auction_manager",1,1,1,1
-"access_auction_deposit_user","auction.deposit user","model_auction_deposit","group_auction_user",1,0,0,0
-"access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","group_auction_manager",1,1,1,1
-"access_auction_lot_category","auction.lot.category","model_auction_lot_category","group_auction_user",1,0,0,0
-"access_auction_lot_category_manager","auction.lot.category manager","model_auction_lot_category","group_auction_manager",1,1,1,1
-"access_auction_lots","auction.lots","model_auction_lots","group_auction_user",1,1,1,0
-"access_auction_lots_manager","auction.lots manager","model_auction_lots","group_auction_manager",1,0,0,0
-"access_auction_bid","auction.bid","model_auction_bid","group_auction_user",1,1,1,1
-"access_auction_bid_manager","auction.bid manager","model_auction_bid","group_auction_manager",1,0,0,0
-"access_auction_bid_line","auction.bid.line","model_auction_bid_line","group_auction_user",1,1,1,1
-"access_auction_bid_line_manager","auction.bid.line manager","model_auction_bid_line","group_auction_manager",1,0,0,0
-"access_auction_lot_history","auction.lot.history","model_auction_lot_history","group_auction_user",1,1,1,1
-"access_auction_lot_history_manager","auction.lot.history manager","model_auction_lot_history","group_auction_manager",1,0,0,0
-"access_report_auction","report.auction","model_report_auction","group_auction_manager",1,1,1,1
-"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","group_auction_manager",1,1,1,1
-"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","group_auction_manager",1,1,1,1
-"access_report_object_encoded","report.object.encoded","model_report_object_encoded","group_auction_manager",1,1,1,1
-"access_aie_category","aie.category","model_aie_category","group_auction_manager",1,1,1,1
-"access_auction_account_tax_user","account.tax user","account.model_account_tax","group_auction_user",1,0,0,0
-"access_auction_account_tax","account.tax manager","account.model_account_tax","group_auction_manager",1,1,1,0
-"access_auction_account_fiscalyear","account.fiscalyear manager","account.model_account_fiscalyear","group_auction_manager",1,1,1,0
-"access_auction_account_journal","account.journal manager","account.model_account_journal","group_auction_manager",1,1,1,0
-"access_auction_account_invoice","account.invoice manager","account.model_account_invoice","group_auction_manager",1,1,1,0
-"access_auction_account_invoice_line","account.invoice.line manager","account.model_account_invoice_line","group_auction_manager",1,1,1,0
-"access_auction_account_invoice_tax","account.invoice.tax manager","account.model_account_invoice_tax","group_auction_manager",1,1,1,0
-"access_auction_account_analytic_journal","account.analytic.journal manager","account.model_account_analytic_journal","group_auction_manager",1,1,1,0
-"access_auction_account_period","account.period manager","account.model_account_period","group_auction_manager",1,1,1,0
-"access_auction_account_move","account.move manager","account.model_account_move","group_auction_manager",1,1,1,0
-"access_auction_account_move_line","account.move.line manager","account.model_account_move_line","group_auction_manager",1,1,1,0
-"access_auction_account_journal_period","account.journal.period manager","account.model_account_journal_period","group_auction_manager",1,1,1,0
-"access_auction_account_analytic_line","account.analytic.line manager","account.model_account_analytic_line","group_auction_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_auction_artists,auction.artists,model_auction_artists,group_auction_manager,1,1,1,1
+access_auction_dates_user,auction.dates user,model_auction_dates,group_auction_user,1,0,0,0
+access_auction_dates_manager,auction.dates manager,model_auction_dates,group_auction_manager,1,1,1,1
+access_auction_deposit_manager,auction.deposit manager,model_auction_deposit,group_auction_manager,1,1,1,1
+access_auction_deposit_user,auction.deposit user,model_auction_deposit,group_auction_user,1,0,0,0
+access_auction_deposit_cost,auction.deposit.cost,model_auction_deposit_cost,group_auction_manager,1,1,1,1
+access_auction_lot_category,auction.lot.category,model_auction_lot_category,group_auction_user,1,0,0,0
+access_auction_lot_category_manager,auction.lot.category manager,model_auction_lot_category,group_auction_manager,1,1,1,1
+access_auction_lots,auction.lots,model_auction_lots,group_auction_user,1,1,1,0
+access_auction_lots_manager,auction.lots manager,model_auction_lots,group_auction_manager,1,0,0,0
+access_auction_bid,auction.bid,model_auction_bid,group_auction_user,1,1,1,1
+access_auction_bid_manager,auction.bid manager,model_auction_bid,group_auction_manager,1,0,0,0
+access_auction_bid_line,auction.bid.line,model_auction_bid_line,group_auction_user,1,1,1,1
+access_auction_bid_line_manager,auction.bid.line manager,model_auction_bid_line,group_auction_manager,1,0,0,0
+access_auction_lot_history,auction.lot.history,model_auction_lot_history,group_auction_user,1,1,1,1
+access_auction_lot_history_manager,auction.lot.history manager,model_auction_lot_history,group_auction_manager,1,0,0,0
+access_report_auction,report.auction,model_report_auction,group_auction_manager,1,1,1,1
+access_report_auction_object_date,report.auction.object.date,model_report_auction_object_date,group_auction_manager,1,1,1,1
+access_report_auction_adjudication,report.auction.adjudication,model_report_auction_adjudication,group_auction_manager,1,1,1,1
+access_report_object_encoded,report.object.encoded,model_report_object_encoded,group_auction_manager,1,1,1,1
+access_aie_category,aie.category,model_aie_category,group_auction_manager,1,1,1,1
+access_auction_account_tax_user,account.tax user,account.model_account_tax,group_auction_user,1,0,0,0
+access_auction_account_tax,account.tax manager,account.model_account_tax,group_auction_manager,1,1,1,0
+access_auction_account_fiscalyear,account.fiscalyear manager,account.model_account_fiscalyear,group_auction_manager,1,1,1,0
+access_auction_account_journal,account.journal manager,account.model_account_journal,group_auction_manager,1,1,1,0
+access_auction_account_invoice,account.invoice manager,account.model_account_invoice,group_auction_manager,1,1,1,0
+access_auction_account_invoice_line,account.invoice.line manager,account.model_account_invoice_line,group_auction_manager,1,1,1,0
+access_auction_account_invoice_tax,account.invoice.tax manager,account.model_account_invoice_tax,group_auction_manager,1,1,1,0
+access_auction_account_analytic_journal,account.analytic.journal manager,account.model_account_analytic_journal,group_auction_manager,1,1,1,0
+access_auction_account_period,account.period manager,account.model_account_period,group_auction_manager,1,1,1,0
+access_auction_account_move,account.move manager,account.model_account_move,group_auction_manager,1,1,1,0
+access_auction_account_move_line,account.move.line manager,account.model_account_move_line,group_auction_manager,1,1,1,0
+access_auction_account_journal_period,account.journal.period manager,account.model_account_journal_period,group_auction_manager,1,1,1,0
+access_auction_account_analytic_line,account.analytic.line manager,account.model_account_analytic_line,group_auction_manager,1,1,1,1
diff --git a/addons/audittrail/i18n/fa.po b/addons/audittrail/i18n/fa.po
new file mode 100644
index 00000000000..b50458d5c57
--- /dev/null
+++ b/addons/audittrail/i18n/fa.po
@@ -0,0 +1,377 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 19:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: audittrail
+#: model:ir.module.module,shortdesc:audittrail.module_meta_information
+msgid "Audit Trail"
+msgstr ""
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:81
+#, python-format
+msgid "WARNING: audittrail is not part of the pool"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,log_id:0
+msgid "Log"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: selection:audittrail.rule,state:0
+msgid "Subscribed"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_rule
+msgid "Audittrail Rule"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_log_tree
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
+msgid "Audit Logs"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: view:audittrail.rule:0
+msgid "Group By..."
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: field:audittrail.rule,state:0
+msgid "State"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: selection:audittrail.rule,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value:0
+msgid "Old Value"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
+msgid "View log"
+msgstr ""
+
+#. module: audittrail
+#: help:audittrail.rule,log_read:0
+msgid ""
+"Select this if you want to keep track of read/open on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,method:0
+msgid "Method"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.view.log,from:0
+msgid "Log From"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,log:0
+msgid "Log ID"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,res_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: audittrail
+#: help:audittrail.rule,user_id:0
+msgid "if  User is not added then it will applicable for all users"
+msgstr ""
+
+#. module: audittrail
+#: help:audittrail.rule,log_workflow:0
+msgid ""
+"Select this if you want to keep track of workflow on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,user_id:0
+msgid "Users"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Log Lines"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,object_id:0
+#: field:audittrail.rule,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.view.log,to:0
+msgid "Log To"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value Text: "
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Search Audittrail Rule"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
+msgid "Audit Rules"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value : "
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,name:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,timestamp:0
+msgid "Date"
+msgstr ""
+
+#. module: audittrail
+#: help:audittrail.rule,log_write:0
+msgid ""
+"Select this if you want to keep track of modification on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_create:0
+msgid "Log Creates"
+msgstr ""
+
+#. module: audittrail
+#: help:audittrail.rule,object_id:0
+msgid "Select object for which you want to generate log."
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value Text : "
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_workflow:0
+msgid "Log Workflow"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.module.module,description:audittrail.module_meta_information
+msgid ""
+"\n"
+"    This module gives the administrator the rights\n"
+"    to track every user operation on all the objects\n"
+"    of the system.\n"
+"\n"
+"    Administrator can subscribe rules for read,write and\n"
+"    delete on objects and can check logs.\n"
+"    "
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_read:0
+msgid "Log Reads"
+msgstr ""
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:82
+#, python-format
+msgid "Change audittrail depends -- Setting rule as DRAFT"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,line_ids:0
+msgid "Log lines"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,field_id:0
+msgid "Fields"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rules"
+msgstr ""
+
+#. module: audittrail
+#: help:audittrail.rule,log_unlink:0
+msgid ""
+"Select this if you want to keep track of deletion on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,action_id:0
+msgid "Action ID"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Users (if User is not added then it will applicable for all users)"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "UnSubscribe"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_unlink:0
+msgid "Log Deletes"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,field_description:0
+msgid "Field Description"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Search Audittrail Log"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_write:0
+msgid "Log Writes"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+msgid "Open Logs"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value_text:0
+msgid "New value Text"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,name:0
+msgid "Rule Name"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value:0
+msgid "New Value"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "AuditTrail Logs"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log
+msgid "Audittrail Log"
+msgstr ""
+
+#. module: audittrail
+#: help:audittrail.rule,log_action:0
+msgid ""
+"Select this if you want to keep track of actions on the object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value : "
+msgstr ""
+
+#. module: audittrail
+#: sql_constraint:audittrail.rule:0
+msgid ""
+"There is a rule defined on this object\n"
+" You can not define other on the same!"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value_text:0
+msgid "Old value Text"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+msgid "Cancel"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_view_log
+msgid "View Log"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log_line
+msgid "Log Line"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_action:0
+msgid "Log Action"
+msgstr ""
+
+#. module: audittrail
+#: help:audittrail.rule,log_create:0
+msgid ""
+"Select this if you want to keep track of creation on any record of the "
+"object of this rule"
+msgstr ""
diff --git a/addons/audittrail/security/ir.model.access.csv b/addons/audittrail/security/ir.model.access.csv
index 877cf622ad4..1d2198fd661 100644
--- a/addons/audittrail/security/ir.model.access.csv
+++ b/addons/audittrail/security/ir.model.access.csv
@@ -1,4 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_audittrail_rule_all_users","audittrail rule all","model_audittrail_rule","base.group_user",1,0,0,0
-"access_audittrail_log_all_users","audittrail log all","model_audittrail_log","base.group_user",1,0,1,0
-"access_audittrail_log_line_all_users","audittrail log line all","model_audittrail_log_line","base.group_user",1,0,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_audittrail_rule_all_users,audittrail rule all,model_audittrail_rule,base.group_system,1,1,1,0
+access_audittrail_rule_all_access,audittrail rule all,model_audittrail_rule,base.group_erp_manager,1,1,1,0
+access_audittrail_log_all_users,audittrail log all,model_audittrail_log,base.group_user,1,0,1,0
+access_audittrail_log_line_all_users,audittrail log line all,model_audittrail_log_line,base.group_user,1,0,1,0
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index a8788bdddcb..56da3350347 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Action Rule',
+    'name': 'Automated Action Rules',
     'version': '1.0',
     'category': 'Sales Management',
     'description': """
diff --git a/addons/base_action_rule/i18n/fa.po b/addons/base_action_rule/i18n/fa.po
new file mode 100644
index 00000000000..17ad95ee7bd
--- /dev/null
+++ b/addons/base_action_rule/i18n/fa.po
@@ -0,0 +1,502 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 19:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_user:0
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"Use automated actions to automatically trigger actions for various screens. "
+"Example: a lead created by a specific user may be automatically set to a "
+"specific sales team, or an opportunity which still has status pending after "
+"14 days might trigger an automatic reminder email."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_email:0
+msgid "Email-id of the persons whom mail is to be sent"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_watchers:0
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:314
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr ""
diff --git a/addons/base_action_rule/i18n/hr.po b/addons/base_action_rule/i18n/hr.po
new file mode 100644
index 00000000000..470382f382f
--- /dev/null
+++ b/addons/base_action_rule/i18n/hr.po
@@ -0,0 +1,531 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_vat
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 13:06+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_user:0
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
+msgstr ""
+"Check this if you want the rule to send an email to the responsible person."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Remind Partner"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Kategorija partnera"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr "Mail to Watchers (CC)"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Button Pressed"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Object"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Mail to these Emails"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Set State to"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "E-mail od"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "Sadržaj Emaila"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Days"
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr "Zadnje pokretanje"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Minute"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Naziv pravila"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+"Check this if you want the rule to send a reminder by email to the partner."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr "Uvjeti na model Partner"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Krajnji rok"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr "%(object_subject)s = Object subject"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "Email Reminders"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr "Posebna Ključne riječi koje se koriste u The Body"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"Use automated actions to automatically trigger actions for various screens. "
+"Example: a lead created by a specific user may be automatically set to a "
+"specific sales team, or an opportunity which still has status pending after "
+"14 days might trigger an automatic reminder email."
+msgstr ""
+"Use automated actions to automatically trigger actions for various screens. "
+"Example: a lead created by a specific user may be automatically set to a "
+"specific sales team, or an opportunity which still has status pending after "
+"14 days might trigger an automatic reminder email."
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_email:0
+msgid "Email-id of the persons whom mail is to be sent"
+msgstr "Email-id of the persons whom mail is to be sent"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr "Action Rule"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Fields to Change"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Datum kreiranja"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Datum zadnje akcije"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "Sati"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr "%(object_id)s = Object ID"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr "Delay After Trigger Date"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr "Remind with Attachment"
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Neispravni argumenti"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr "Set Responsible to"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "Ništa"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr "%(object_user_phone)s = Tel. odgovorne osobe"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+"Pravilo koristi AND operator. Model se mora poklapati sa svim ne praznim "
+"poljima, tako da pravilo izvrši akciju opisanoj u tabu 'Akcije'."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "Delay type"
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr "Call Object Method"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "Email To"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_watchers:0
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
+msgstr ""
+"Označite ukoliko želite označiti pravilo CC (slanje na bilo koju drugu "
+"osobnu definiranu ovom akcijom)."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr "%(partner)s = Naziv partnera"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "Bilješka"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr "Delay after trigger date"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "Uvjeti"
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+msgstr ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "Aktivan"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:314
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr "Remind Responsible"
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr "Gives the sequence order when displaying a list of rules."
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Months"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr "Filter"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr "ir.cron"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr "%(object_description)s = Opis objekta"
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Error: The mail is not well formated"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr "Email Actions"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr "Email Information"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr "Action Rules"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr "Sadržaj maila"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr "Odgovoran"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr "%(partner_email)s = Partner Email"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr "%(object_date)s = Datum kreiranja"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr "%(object_user_email)s = Responsible Email"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "Mail body"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+"Check this if you want the rule to send a reminder by email to the user."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr "Server Action to be Triggered"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr "Mail to Responsible"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr "Add Watchers (Cc)"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr "Conditions on Model Fields"
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr "Automatske akcije"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "Serverske akcije"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr "Regex na naziv resursa"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr "Conditions on Timing"
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "Akcije"
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr "%(object_user)s = Odgovorna osoba"
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "Kreiraj datum"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr "Conditions on States"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr "Datum okidača"
diff --git a/addons/base_action_rule/security/ir.model.access.csv b/addons/base_action_rule/security/ir.model.access.csv
index 4d2e612b384..92d3d55649f 100644
--- a/addons/base_action_rule/security/ir.model.access.csv
+++ b/addons/base_action_rule/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_base_action_rule","base.action.rule","model_base_action_rule",,1,0,0,0
-"access_base_action_rule_config","base.action.rule config","model_base_action_rule",base.group_system,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_base_action_rule,base.action.rule,model_base_action_rule,,1,0,0,0
+access_base_action_rule_config,base.action.rule config,model_base_action_rule,base.group_system,1,1,1,1
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 6edb978301f..c6ab9c4628e 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Basic Calendar Functionality",
+    "name" : "Calendar Layer",
     "version" : "1.0",
     "depends" : ["base", "mail"],
     'complexity': "easy",
@@ -32,9 +32,12 @@ It supports:
     - Calendar of events
     - Alerts (create requests)
     - Recurring events
-    - Invitations to people""",
+    - Invitations to people
+
+If you need to manage your meetings, you should install the CRM module.
+    """,
     "author" : "OpenERP SA",
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
     "init_xml" : [
         'base_calendar_data.xml'
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 45624a280f1..265c3bb93e6 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1009,10 +1009,19 @@ class calendar_event(osv.osv):
             else:
                 result[event] = ""
         return result
-    
-      
-    
-    
+
+    def _rrule_write(self, obj, cr, uid, ids, field_name, field_value, args, context=None):
+        data = self._get_empty_rrule_data()
+        if field_value:
+            data['recurrency'] = True
+            for event in self.browse(cr, uid, ids, context=context):
+                rdate = rule_date or event.date
+                update_data = self._parse_rrule(field_value, dict(data), rdate)
+                data.update(update_data)
+                super(calendar_event, obj).write(cr, uid, ids, data, context=context)
+        return True
+
+
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'sequence': fields.integer('Sequence'),
@@ -1023,7 +1032,7 @@ class calendar_event(osv.osv):
         'duration': fields.float('Duration', states={'done': [('readonly', True)]}),
         'description': fields.text('Description', states={'done': [('readonly', True)]}),
         'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
-             ('confidential', 'Confidential')], 'Mark as', states={'done': [('readonly', True)]}),
+             ('confidential', 'Public for Employees')], 'Mark as', states={'done': [('readonly', True)]}),
         'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
                                                 'Show as', states={'done': [('readonly', True)]}),
@@ -1036,7 +1045,7 @@ defines the list of date/time exceptions for a recurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="Defines a \
 rule or repeating pattern of time to exclude from the recurring rule."),
         'rrule': fields.function(_get_rulestring, type='char', size=124, \
-                                    store=True, string='Recurrent Rule'),
+                    fnct_inv=_rrule_write, store=True, string='Recurrent Rule'),
         'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
                             ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
                             ('yearly', 'Yearly'),],
@@ -1079,7 +1088,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         'active': fields.boolean('Active', help="If the active field is set to \
          true, it will allow you to hide the event alarm information without removing it."),
         'recurrency': fields.boolean('Recurrent', help="Recurrent Meeting"),
-        'edit_all': fields.boolean('Edit All', help="Edit all Occurrences  of recurrent Meeting."),
     }
     
     def default_organizer(self, cr, uid, context=None):
@@ -1102,83 +1110,68 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             'active': 1,
             'user_id': lambda self, cr, uid, ctx: uid,
             'organizer': default_organizer,
-            'edit_all' : False,
     }
 
-    def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100, context=None):
+    def get_recurrent_ids(self, cr, uid, select, domain, limit=100, context=None):
         """Gives virtual event ids for recurring events based on value of Recurrence Rule
         This method gives ids of dates that comes between start date and end date of calendar views
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param base_start_date: Get Start Date
-        @param base_until_date: Get End Date
         @param limit: The Number of Results to Return """
         if not context:
             context = {}
 
-        virtual_id = context and context.get('virtual_id', False) or False
-
-        if isinstance(select, (str, int, long)):
-            ids = [select]
-        else:
-            ids = select
         result = []
-        if ids and virtual_id:
-            for data in super(calendar_event, self).read(cr, uid, ids, context=context):
-                start_date = base_start_date and datetime.strptime(base_start_date[:10]+ ' 00:00:00' , "%Y-%m-%d %H:%M:%S") or False
-                until_date = base_until_date and datetime.strptime(base_until_date[:10]+ ' 23:59:59', "%Y-%m-%d %H:%M:%S") or False
-                event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
+        for data in super(calendar_event, self).read(cr, uid, select, context=context):
+            if not data['rrule']:
+                result.append(data['id'])
+                continue
+            event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
 #                To check: If the start date is replace by event date .. the event date will be changed by that of calendar code
-                
-                if not data['rrule']:
-                    if start_date and (event_date < start_date):
-                        continue
-                    if until_date and (event_date > until_date):
-                        continue
-                    idval = data['id']
-                    result.append(idval)                        
-                else:
-                    start_date = event_date
-                    exdate = data['exdate'] and data['exdate'].split(',') or []
-                    rrule_str = data['rrule']
-                    new_rrule_str = []
-                    rrule_until_date = False
-                    is_until = False
-                    for rule in rrule_str.split(';'):
-                        name, value = rule.split('=')
-                        if name == "UNTIL":
-                            is_until = True
-                            value = parser.parse(value)
-                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d %H:%M:%S"))
-                            if until_date and until_date >= rrule_until_date:
-                                until_date = rrule_until_date
-                            if until_date:
-                                value = until_date.strftime("%Y%m%d%H%M%S")
-                            else:
-                                value = value.strftime("%Y%m%d%H%M%S")
-                        new_rule = '%s=%s' % (name, value)
-                        new_rrule_str.append(new_rule)
-                    if not is_until and until_date:
-                        value = until_date.strftime("%Y%m%d%H%M%S")
-                        name = "UNTIL"
-                        new_rule = '%s=%s' % (name, value)
-                        new_rrule_str.append(new_rule)
-                    new_rrule_str = ';'.join(new_rrule_str)
-                    rdates = get_recurrent_dates(str(new_rrule_str), exdate, start_date, data['exrule'])
-                    
-                    for r_date in rdates:
-                        if start_date and r_date < start_date:
-                            continue
-                        if until_date and r_date > until_date:
-                            continue
-                        idval = real_id2base_calendar_id(data['id'], r_date.strftime("%Y-%m-%d %H:%M:%S"))
-                        result.append(idval)
 
-        if result:
-            ids = list(set(result))
+            if not data['rrule']:
+                continue
+
+            exdate = data['exdate'] and data['exdate'].split(',') or []
+            rrule_str = data['rrule']
+            new_rrule_str = []
+            rrule_until_date = False
+            is_until = False
+            for rule in rrule_str.split(';'):
+                name, value = rule.split('=')
+                if name == "UNTIL":
+                    is_until = True
+                    value = parser.parse(value)
+                    rrule_until_date = parser.parse(value.strftime("%Y-%m-%d %H:%M:%S"))
+                    value = value.strftime("%Y%m%d%H%M%S")
+                new_rule = '%s=%s' % (name, value)
+                new_rrule_str.append(new_rule)
+            new_rrule_str = ';'.join(new_rrule_str)
+            rdates = get_recurrent_dates(str(new_rrule_str), exdate, event_date, data['exrule'])
+            for r_date in rdates:
+                ok = True
+                for arg in domain:
+                    if arg[0] in ('date', 'date_deadline'):
+                        if (arg[1]=='='):
+                            ok = ok and r_date.strftime('%Y-%m-%d')==arg[2]
+                        if (arg[1]=='>'):
+                            ok = ok and r_date.strftime('%Y-%m-%d')>arg[2]
+                        if (arg[1]=='<'):
+                            ok = ok and r_date.strftime('%Y-%m-%d')<arg[2]
+                        if (arg[1]=='>='):
+                            ok = ok and r_date.strftime('%Y-%m-%d')>=arg[2]
+                        if (arg[1]=='<='):
+                            ok = ok and r_date.strftime('%Y-%m-%d')<=arg[2]
+                if not ok:
+                    continue
+                idval = real_id2base_calendar_id(data['id'], r_date.strftime("%Y-%m-%d %H:%M:%S"))
+                result.append(idval)
+
         if isinstance(select, (str, int, long)):
             return ids and ids[0] or False
+        else:
+            ids = list(set(result))
         return ids
 
     def compute_rule_string(self, datas):
@@ -1243,17 +1236,17 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             'week_list' : False
         }
 
-    def _write_rrule(self, cr, uid, ids, field_value, rule_date=False, context=None):
-        data = self._get_empty_rrule_data()
-        
-        if field_value:
-            data['recurrency'] = True
-            for event in self.browse(cr, uid, ids, context=context):
-                rdate = rule_date or event.date
-                update_data = self._parse_rrule(field_value, dict(data), rdate)
-                data.update(update_data)
-                #parse_rrule
-                self.write(cr, uid, event.id, data, context=context)
+    #def _write_rrule(self, cr, uid, ids, field_value, rule_date=False, context=None):
+    #    data = self._get_empty_rrule_data()
+    #    
+    #    if field_value:
+    #        data['recurrency'] = True
+    #        for event in self.browse(cr, uid, ids, context=context):
+    #            rdate = rule_date or event.date
+    #            update_data = self._parse_rrule(field_value, dict(data), rdate)
+    #            data.update(update_data)
+    #            #parse_rrule
+    #            self.write(cr, uid, event.id, data, context=context)
         
 
     def _parse_rrule(self, rule, data, date_start):
@@ -1311,9 +1304,9 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             return res
 
     def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
+        context = context or {}
         args_without_date = []
-        start_date = False
-        until_date = False
+        filter_date = []
 
         for arg in args:
             if arg[0] == "id":
@@ -1323,17 +1316,18 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             elif arg[0] not in ('date', unicode('date'), 'date_deadline', unicode('date_deadline')):
                 args_without_date.append(arg)
             else:
-                if arg[1] in ('>', '>='):
-                    if start_date:
-                        continue
-                    start_date = arg[2]
-                elif arg[1] in ('<', '<='):
-                    if until_date:
-                        continue
-                    until_date = arg[2]
+                if context.get('virtual_id', True):
+                    args_without_date.append('|')
+                args_without_date.append(arg)
+                if context.get('virtual_id', True):
+                    args_without_date.append(('recurrency','=',1))
+                filter_date.append(arg)
+
         res = super(calendar_event, self).search(cr, uid, args_without_date, \
                                  0, 0, order, context, count=False)
-        res = self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit, context=context)
+        if context.get('virtual_id', True):
+            res = self.get_recurrent_ids(cr, uid, res, args, limit, context=context)
+
         if count:
             return len(res)
         elif limit:
@@ -1341,17 +1335,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         else:
             return res
 
-    def get_edit_all(self, cr, uid, id, vals=None):
-        """
-            return true if we have to edit all meeting from the same recurrent
-            or only on occurency
-        """
-        meeting = self.read(cr,uid, id, ['edit_all', 'recurrency'] )
-        if(vals and 'edit_all' in vals): #we jsut check edit_all
-            return vals['edit_all']
-        else: #it's a recurrent event and edit_all is already check
-            return meeting['recurrency'] and meeting['edit_all']
-
     def _get_data(self, cr, uid, id, context=None):
         res = self.read(cr, uid, [id],['date', 'date_deadline'])
         return res[0]
@@ -1370,101 +1353,63 @@ rule or repeating pattern of time to exclude from the recurring rule."),
 
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        if context is None:
-            context = {}
+        context = context or {}
         if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-            
-       
-            
-        new_ids = []
+            ids = [ids]
         res = False
-        for event_id in select:
+
+        # Special write of complex IDS
+        for event_id in ids[:]:
+            if len(str(event_id).split('-')) == 1:
+                continue
+            ids.remove(event_id)
             real_event_id = base_calendar_id2real_id(event_id)
-            edit_all = self.get_edit_all(cr, uid, event_id, vals=vals)
-            if edit_all:
-                if self.need_to_update(event_id, vals):
-                    res = self._get_data(cr, uid, real_event_id, context=context)
-                    vals.update(res)
-                event_id = real_event_id
+            if not vals.get('recurrency', True):
+                ids.append(real_event_id)
+                continue
 
             #if edit one instance of a reccurrent id
-            if len(str(event_id).split('-')) > 1 and not edit_all:
-                data = self.read(cr, uid, event_id, ['date', 'date_deadline', \
-                                                    'rrule', 'duration', 'exdate'])
-                if data.get('rrule'):
-                    data.update(vals)
-                    data.update({
-                        'recurrent_uid': real_event_id,
-                        'recurrent_id': data.get('date'),
-                        'rrule_type': 'none',
-                        'rrule': '',
-                        'edit_all': False,
-                        'recurrency' : False,
-                        })
+            data = self.read(cr, uid, event_id, ['date', 'date_deadline', \
+                                                'rrule', 'duration', 'exdate'])
+            if data.get('rrule'):
+                data.update(vals)
+                data.update({
+                    'recurrent_uid': real_event_id,
+                    'recurrent_id': data.get('date'),
+                    'rrule_type': 'none',
+                    'rrule': '',
+                    'recurrency' : False,
+                    })
 
-                    new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
+                new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
 
-                    date_new = event_id.split('-')[1]
-                    date_new = time.strftime("%Y%m%dT%H%M%S", \
-                                 time.strptime(date_new, "%Y%m%d%H%M%S"))
-                    exdate = (data['exdate'] and (data['exdate'] + ',')  or '') + date_new
-                    res = self.write(cr, uid, [real_event_id], {'exdate': exdate})
+                date_new = event_id.split('-')[1]
+                date_new = time.strftime("%Y%m%dT%H%M%S", \
+                             time.strptime(date_new, "%Y%m%d%H%M%S"))
+                exdate = (data['exdate'] and (data['exdate'] + ',')  or '') + date_new
+                res = self.write(cr, uid, [real_event_id], {'exdate': exdate})
 
-                    context.update({'active_id': new_id, 'active_ids': [new_id]})
-                    continue
-            if not real_event_id in new_ids:
-                new_ids.append(real_event_id)
+                context.update({'active_id': new_id, 'active_ids': [new_id]})
+                continue
 
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
 
-        updated_vals = self.onchange_dates(cr, uid, new_ids,
-            vals.get('date', False),
-            vals.get('duration', False),
-            vals.get('date_deadline', False),
-            vals.get('allday', False),
-            context=context)
-        vals.update(updated_vals.get('value', {}))
-        if new_ids:
-            if 'rrule' in vals.keys():
-                if 'date' in vals.keys():
-                    date_to_write = vals['date']
-                else:
-                    date_to_write = False
-                self._write_rrule(cr, uid, new_ids, vals['rrule'], date_to_write, context)
-                
-            res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
+        res = super(calendar_event, self).write(cr, uid, ids, vals, context=context)
 
         if ('alarm_id' in vals or 'base_calendar_alarm_id' in vals)\
                 or ('date' in vals or 'duration' in vals or 'date_deadline' in vals):
-            # change alarm details
             alarm_obj = self.pool.get('res.alarm')
-            alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', context=context)
+            alarm_obj.do_alarm_create(cr, uid, ids, self._name, 'date', context=context)
         return res or True and False
 
-    def browse(self, cr, uid, ids, context=None, list_class=None, fields_process=None):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        select = map(lambda x: base_calendar_id2real_id(x), select)
-        res = super(calendar_event, self).browse(cr, uid, select, context, \
-                                                    list_class, fields_process)
-        if isinstance(ids, (str, int, long)):
-            return res and res[0] or False
-
-        return res
-
     def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
         if not context:
             context = {}
             
         if 'date' in groupby:
             raise osv.except_osv(_('Warning !'), _('Group by date not supported, use the calendar view instead'))
-        virtual_id = context.get('virtual_id', False)
+        virtual_id = context.get('virtual_id', True)
         context.update({'virtual_id': False})
         res = super(calendar_event, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby)
         for re in res:
@@ -1472,15 +1417,19 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             for groupname in groupby:
                 if re.get(groupname + "_count"):
                     del re[groupname + "_count"]
-            re.get('__context').update({'virtual_id' : virtual_id})
+            re.get('__context', {}).update({'virtual_id' : virtual_id})
         return res
 
     def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
         # FIXME This whole id mangling has to go!
         if context is None:
             context = {}
-        
+        fields2 = fields and fields[:] or None
 
+        EXTRAFIELDS = ('class','user_id','date','duration')
+        for f in EXTRAFIELDS:
+            if fields and (f not in fields):
+                fields2.append(f)
 
         if isinstance(ids, (str, int, long)):
             select = [ids]
@@ -1488,17 +1437,13 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             select = ids
         select = map(lambda x: (x, base_calendar_id2real_id(x)), select)
         result = []
-        if fields and 'date' not in fields:
-            fields.append('date')
-        if fields and 'duration' not in fields:
-            fields.append('duration')
 
         real_data = super(calendar_event, self).read(cr, uid,
                     [real_id for base_calendar_id, real_id in select],
-                    fields=fields, context=context, load=load)
+                    fields=fields2, context=context, load=load)
         real_data = dict(zip([x['id'] for x in real_data], real_data))
 
-        for base_calendar_id, real_id in select:                
+        for base_calendar_id, real_id in select:
             res = real_data[real_id].copy()
             ls = base_calendar_id2real_id(base_calendar_id, with_date=res and res.get('duration', 0) or 0)
             if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
@@ -1507,9 +1452,25 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             res['id'] = base_calendar_id
 
             result.append(res)
+
+        for r in result:
+            if r['user_id']:
+                user_id = type(r['user_id']) in (tuple,list) and r['user_id'][0] or r['user_id']
+                if user_id==uid:
+                    continue
+            if r['class']=='private':
+                for f in r.keys():
+                    if f not in ('id','date','date_deadline','duration','user_id','state'):
+                        r[f] = False
+                    if f=='name':
+                        r[f] = _('Busy')
+
+        for r in result:
+            for k in EXTRAFIELDS:
+                if (k in r) and ((not fields) or (k not in fields)):
+                    del r[k]
         if isinstance(ids, (str, int, long)):
             return result and result[0] or False
-        
         return result
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -1520,68 +1481,49 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
         return res
-    
-    
+
     def unlink(self, cr, uid, ids, context=None):
         if not isinstance(ids, list):
             ids = [ids]
-            
         res = False
-        for id in ids:
-            data_list = self.read(cr, uid, [id], ['date', 'rrule', 'exdate'], context=context)
-            if len(data_list) < 1:
+        for event_id in ids[:]:
+            if len(str(event_id).split('-')) == 1:
                 continue
-            event_data = data_list[0]
-            event_id = event_data['id']
 
-            if self.get_edit_all(cr, uid, event_id, vals=None):
-                event_id = base_calendar_id2real_id(event_id)
+            real_event_id = base_calendar_id2real_id(event_id)
+            data = self.read(cr, uid, real_event_id, ['exdate'], context=context)
+            date_new = event_id.split('-')[1]
+            date_new = time.strftime("%Y%m%dT%H%M%S", \
+                         time.strptime(date_new, "%Y%m%d%H%M%S"))
+            exdate = (data['exdate'] and (data['exdate'] + ',')  or '') + date_new
+            self.write(cr, uid, [real_event_id], {'exdate': exdate})
+            ids.remove(event_id)
 
-            if isinstance(event_id, (int, long)):
-                res = super(calendar_event, self).unlink(cr, uid, event_id, context=context)
-                self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name)
-                self.unlink_events(cr, uid, [event_id], context=context)
-            else:
-                str_event, date_new = event_id.split('-')
-                event_id = int(str_event)
-                if event_data['rrule']:
-                    # Remove one of the recurrent event
-                    date_new = time.strftime("%Y%m%dT%H%M%S", \
-                                 time.strptime(date_new, "%Y%m%d%H%M%S"))
-                    exdate = (event_data['exdate'] and (event_data['exdate'] + ',')  or '') + date_new
-                    res = self.write(cr, uid, [event_id], {'exdate': exdate})
-                else:
-                    res = super(calendar_event, self).unlink(cr, uid, [event_id], context=context)
-                    self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name)
-                    self.unlink_events(cr, uid, [event_id], context=context)
+        res = super(calendar_event, self).unlink(cr, uid, ids, context=context)
+        self.pool.get('res.alarm').do_alarm_unlink(cr, uid, ids, self._name)
+        self.unlink_events(cr, uid, ids, context=context)
         return res
 
+
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
 
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
-        
-        if 'date' in vals and 'rrule' in vals and vals['rrule']:
-            update_datas = self._parse_rrule(vals['rrule'], self._get_empty_rrule_data(), vals['date'])
-            update_datas['recurrency'] = True
-            vals.update(update_datas)
 
-        updated_vals = self.onchange_dates(cr, uid, [],
-            vals.get('date', False),
-            vals.get('duration', False),
-            vals.get('date_deadline', False),
-            vals.get('allday', False),
-            context=context)
-        vals.update(updated_vals.get('value', {}))
+        #updated_vals = self.onchange_dates(cr, uid, [],
+        #    vals.get('date', False),
+        #    vals.get('duration', False),
+        #    vals.get('date_deadline', False),
+        #    vals.get('allday', False),
+        #    context=context)
+        #vals.update(updated_vals.get('value', {}))
+
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
-       
         return res
-    
-    
 
     def do_tentative(self, cr, uid, ids, context=None, *args):
         """ Makes event invitation as Tentative
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 3ce934b4ded..16064762f9b 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -242,8 +242,7 @@
                         <field name="alarm_id" string="Reminder"
                             widget="selection" />
                         <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
-                           <field name="recurrency"/>      
-                           <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}" />                                    
+                           <field name="recurrency"/>
                         </group>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index 9977f96141b..3dac47653f2 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -1,7 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1
-"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1
-"access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1
-"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1
-"access_calendar_event","calendar.event","model_calendar_event","base.group_user",1,1,1,1
-"access_calendar_attendee_survey_user","calendar.attendee","model_calendar_attendee","base.group_survey_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_calendar_attendee,calendar.attendee,model_calendar_attendee,base.group_user,1,1,1,1
+access_calendar_alarm,calendar.alarm,model_calendar_alarm,base.group_user,1,1,1,1
+access_res_alarm,res.alarm,model_res_alarm,base.group_user,1,1,1,1
+access_calendar_todo,calendar.todo,model_calendar_todo,base.group_user,1,1,1,1
+access_calendar_event,calendar.event,model_calendar_event,base.group_user,1,1,1,1
+access_calendar_attendee_survey_user,calendar.attendee,model_calendar_attendee,base.group_survey_user,1,0,0,0
diff --git a/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml b/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
index b6afeb6906e..693f0d81c6b 100644
--- a/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
+++ b/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
@@ -72,7 +72,7 @@
   !python {model: crm.meeting}: |
      from base_calendar import base_calendar
      base_cal_id = base_calendar.real_id2base_calendar_id(ref('crm_meeting_sprintreview0'), '2011-09-01 13:01:00')
-     self.write(cr, uid, [base_cal_id], {'name': 'Sprint Review for google modules', 'edit_all': True})
+     self.write(cr, uid, [base_cal_id], {'name': 'Sprint Review for google modules'})
 -
   I check whether all the records are edited or not.
 -
diff --git a/addons/base_contact/__init__.py b/addons/base_contact/__init__.py
index 84054cd59e7..aa3d3b43064 100644
--- a/addons/base_contact/__init__.py
+++ b/addons/base_contact/__init__.py
@@ -20,7 +20,4 @@
 ##############################################################################
 
 import base_contact
-import base_contact_installer
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index f5969b6e309..14f90106fef 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -19,15 +19,14 @@
 #
 ##############################################################################
 
-
 {
-    'name': 'Base Contact',
+    'name': 'Contacts Management',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Customer Relationship Management',
     'complexity': "expert",
     'description': """
-This module allows you to manage your contacts entirely.
-========================================================
+This module allows you to manage your contacts
+==============================================
 
 It lets you define:
     * contacts unrelated to a partner,
@@ -45,10 +44,8 @@ Pay attention that this module converts the existing addresses into "addresses +
     'depends': ['base','process'],
     'init_xml': [],
     'update_xml': [
-        'security/base_contact_security.xml',
         'security/ir.model.access.csv',
         'base_contact_view.xml',
-        'base_contact_installer_view.xml',
         'process/base_contact_process.xml'
     ],
     'demo_xml': ['base_contact_demo.xml'],
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 9a4b0eace6b..420894f23d9 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+import addons
 
 class res_partner_contact(osv.osv):
     """ Partner Contact """
@@ -27,81 +28,45 @@ class res_partner_contact(osv.osv):
     _name = "res.partner.contact"
     _description = "Contact"
 
-    def _main_job(self, cr, uid, ids, fields, arg, context=None):
-        """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of partner contact’s IDs
-            @fields: Get Fields
-            @param context: A standard dictionary for contextual values
-            @param arg: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...]. """
-        res = dict.fromkeys(ids, False)
-
-        res_partner_job_obj = self.pool.get('res.partner.job')
-        all_job_ids = res_partner_job_obj.search(cr, uid, [])
-        all_job_names = dict(zip(all_job_ids, res_partner_job_obj.name_get(cr, uid, all_job_ids, context=context)))
-
-        for contact in self.browse(cr, uid, ids, context=context):
-            if contact.job_ids:
-                res[contact.id] = all_job_names.get(contact.job_ids[0].id, False)
-
-        return res
+    def _name_get_full(self, cr, uid, ids, prop, unknow_none, context=None):
+        result = {}
+        for rec in self.browse(cr, uid, ids, context=context):
+            result[rec.id] = rec.last_name+' '+(rec.first_name or '')
+        return result
 
     _columns = {
-        'name': fields.char('Last Name', size=64, required=True),
+        'name': fields.function(_name_get_full, string='Name', size=64, type="char", store=True),
+        'last_name': fields.char('Last Name', size=64, required=True),
         'first_name': fields.char('First Name', size=64),
         'mobile': fields.char('Mobile', size=64),
-        'title': fields.many2one('res.partner.title','Title'),
+        'title': fields.many2one('res.partner.title','Title', domain=[('domain','=','contact')]),
         'website': fields.char('Website', size=120),
         'lang_id': fields.many2one('res.lang', 'Language'),
-        'job_ids': fields.one2many('res.partner.job', 'contact_id', 'Functions and Addresses'),
+        'job_ids': fields.one2many('res.partner.address', 'contact_id', 'Functions and Addresses'),
         'country_id': fields.many2one('res.country','Nationality'),
         'birthdate': fields.date('Birth Date'),
         'active': fields.boolean('Active', help="If the active field is set to False,\
                  it will allow you to hide the partner contact without removing it."),
-        'partner_id': fields.related('job_ids', 'address_id', 'partner_id', type='many2one',\
+        'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\
                          relation='res.partner', string='Main Employer'),
         'function': fields.related('job_ids', 'function', type='char', \
                                  string='Main Function'),
-        'job_id': fields.function(_main_job, type='many2one',\
-                                 relation='res.partner.job', string='Main Job'),
         'email': fields.char('E-Mail', size=240),
         'comment': fields.text('Notes', translate=True),
-        'photo': fields.binary('Image'),
-
+        'photo': fields.binary('Photo'),
     }
+
+    def _get_photo(self, cr, uid, context=None):
+        photo_path = addons.get_module_resource('base_contact', 'images', 'photo.png')
+        return open(photo_path, 'rb').read().encode('base64')
+
     _defaults = {
+        'photo' : _get_photo,
         'active' : lambda *a: True,
     }
 
     _order = "name,first_name"
 
-    def name_get(self, cr, user, ids, context=None):
-
-        """ will return name and first_name.......
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param user: the current user’s ID for security checks,
-            @param ids: List of create menu’s IDs
-            @return: name and first_name
-            @param context: A standard dictionary for contextual values
-        """
-
-        if not len(ids):
-            return []
-        res = []
-        for contact in self.browse(cr, user, ids, context=context):
-            _contact = ""
-            if contact.title:
-                _contact += "%s "%(contact.title.name)
-            _contact += contact.name or ""
-            if contact.name and contact.first_name:
-                _contact += " "
-            _contact += contact.first_name or ""
-            res.append((contact.id, _contact))
-        return res
-    
     def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=None):
         if not args:
             args = []
@@ -112,151 +77,175 @@ class res_partner_contact(osv.osv):
         else:
             ids = self.search(cr, uid, args, limit=limit, context=context)
         return self.name_get(cr, uid, ids, context=context)
-    
+
+    def name_get(self, cr, uid, ids, context=None):
+        result = {}
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = obj.name or '/'
+            if obj.partner_id:
+                result[obj.id] = result[obj.id] + ', ' + obj.partner_id.name
+        return result.items()
+
+    def _auto_init(self, cr, context=None):
+        def table_exists(view_name):
+            cr.execute('SELECT count(relname) FROM pg_class WHERE relname = %s', (view_name,))
+            value = cr.fetchone()[0]
+            return bool(value == 1)
+
+        exists = table_exists(self._table)
+        super(res_partner_contact, self)._auto_init(cr, context)
+
+        if not exists:
+            cr.execute("""
+                INSERT INTO
+                    res_partner_contact
+                    (id,name,last_name,title,active)
+                SELECT
+                    id,COALESCE(name, '/'),COALESCE(name, '/'),title,true
+                FROM
+                    res_partner_address""")
+            cr.execute("alter table res_partner_address add contact_id int references res_partner_contact")
+            cr.execute("update res_partner_address set contact_id=id")
+            cr.execute("select setval('res_partner_contact_id_seq', (select max(id)+1 from res_partner_contact))")
+
 res_partner_contact()
 
+class res_partner_location(osv.osv):
+    _name = 'res.partner.location'
+    _rec_name = 'street'
+    _columns = {
+        'street': fields.char('Street', size=128),
+        'street2': fields.char('Street2', size=128),
+        'zip': fields.char('Zip', change_default=True, size=24),
+        'city': fields.char('City', size=128),
+        'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
+        'country_id': fields.many2one('res.country', 'Country'),
+        'partner_id': fields.many2one('res.partner', 'Partner Name', ondelete='set null', select=True, help="Keep empty for a private address, not related to partner."),
+        'company_id': fields.many2one('res.company', 'Company',select=1),
+        'job_ids': fields.one2many('res.partner.address', 'location_id', 'Contacts'),
+        'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\
+                         relation='res.partner', string='Main Partner'),
+    }
+    _defaults = {
+        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner.address', context=c),
+    }
+    def _auto_init(self, cr, context=None):
+        def table_exists(view_name):
+            cr.execute('SELECT count(relname) FROM pg_class WHERE relname = %s', (view_name,))
+            value = cr.fetchone()[0]
+            return bool(value == 1)
+
+        exists = table_exists(self._table)
+        super(res_partner_location, self)._auto_init(cr, context)
+
+        if not exists:
+            cr.execute("""
+                INSERT INTO
+                    res_partner_location
+                    (id,street,street2,zip,city,
+                     state_id,country_id,company_id)
+                SELECT
+                    id,street,street2,zip,city,
+                    state_id,country_id,company_id
+                FROM
+                    res_partner_address""")
+            cr.execute("alter table res_partner_address add location_id int references res_partner_location")
+            cr.execute("update res_partner_address set location_id=id")
+            cr.execute("select setval('res_partner_location_id_seq', (select max(id)+1 from res_partner_address))")
+
+    def name_get(self, cr, uid, ids, context=None):
+        result = {}
+        for obj in self.browse(cr, uid, ids, context=context):
+            res = []
+            if obj.partner_id: res.append(obj.partner_id.name_get()[0][1])
+            if obj.city: res.append(obj.city)
+            if obj.country_id: res.append(obj.country_id.name_get()[0][1])
+            result[obj.id] = ', '.join(res)
+        return result.items()
+
+res_partner_location()
 
 class res_partner_address(osv.osv):
-
-    #overriding of the name_get defined in base in order to remove the old contact name
-    def name_get(self, cr, user, ids, context=None):
-        """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param user: the current user,
-            @param ids: List of partner address’s IDs
-            @param context: A standard dictionary for contextual values
-        """
-
-        if not len(ids):
-            return []
-        res = []
-        if context is None: 
-            context = {}
-        for r in self.read(cr, user, ids, ['zip', 'city', 'partner_id', 'street']):
-            if context.get('contact_display', 'contact')=='partner' and r['partner_id']:
-                res.append((r['id'], r['partner_id'][1]))
-            else:
-                addr = str('')
-                addr += "%s %s %s" % (r.get('street', '') or '', r.get('zip', '') \
-                                    or '', r.get('city', '') or '')
-                res.append((r['id'], addr.strip() or '/'))
-        return res
-
-    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
-        if not args:
-            args=[]
-        ids = self.search(cr, user, [('name',operator,name)] + args, limit=limit, context=context)
-        jobs = self.pool.get('res.partner.job')
-        if name:
-            job_ids = jobs.search(cr, user, [('contact_id', operator, name)] + args, limit=limit, context=context)
-            for job in jobs.browse(cr, user, job_ids):
-                ids += [job.address_id.id]
-        return self.name_get(cr, user, ids, context)
-
-    _name = 'res.partner.address'
     _inherit = 'res.partner.address'
-    _description ='Partner Address'
+
+    def _default_location_id(self, cr, uid, context=None):
+        context = context or {}
+        if not context.get('default_partner_id',False):
+            return False
+        ids = self.pool.get('res.partner.location').search(cr, uid, [('partner_id','=',context['default_partner_id'])], context=context)
+        return ids and ids[0] or False
+
+    def onchange_location_id(self,cr, uid, ids, location_id=False, context={}):
+        if not location_id:
+            return {}
+        location = self.pool.get('res.partner.location').browse(cr, uid, location_id, context=context)
+        return {'value':{
+            'street': location.street,
+            'street2': location.street2,
+            'zip': location.zip,
+            'city': location.city,
+            'country_id': location.country_id and location.country_id.id or False,
+            'state_id': location.state_id and location.state_id.id or False,
+        }}
 
     _columns = {
-        'job_id': fields.related('job_ids','contact_id','job_id',type='many2one',\
-                         relation='res.partner.job', string='Main Job'),
-        'job_ids': fields.one2many('res.partner.job', 'address_id', 'Contacts'),
-    }
-res_partner_address()
+        'location_id' : fields.many2one('res.partner.location', 'Location'),
+        'contact_id' : fields.many2one('res.partner.contact', 'Contact'),
+
+        # fields from location
+        'street': fields.related('location_id', 'street', string='Street', type="char", store=True, size=128),
+        'street2': fields.related('location_id', 'street2', string='Street2', type="char", store=True, size=128),
+        'zip': fields.related('location_id', 'zip', string='Zip', type="char", store=True, change_default=True, size=24),
+        'city': fields.related('location_id', 'city', string='City', type="char", store=True, size=128),
+        'state_id': fields.related('location_id', 'state_id', relation="res.country.state", string='Fed. State', type="many2one", store=True, domain="[('country_id','=',country_id)]"),
+        'country_id': fields.related('location_id', 'country_id', type='many2one', string='Country', store=True, relation='res.country'),
+
+        'phone': fields.char('Phone', size=64),
+        'fax': fields.char('Fax', size=64),
+        'email': fields.char('E-Mail', size=240),
+
+        # fields from contact
+        'mobile' : fields.related('contact_id', 'mobile', type='char', size=64, string='Mobile'),
+        'name' : fields.related('contact_id', 'name', type='char', size=64, string="Contact Name", store=True),
+        'title' : fields.related('contact_id', 'title', type='many2one', relation='res.partner.title', string="Title", store=True),
+    }
+    def create(self, cr, uid, data, context={}):
+        if not data.get('location_id', False):
+            loc_id = self.pool.get('res.partner.location').create(cr, uid, {
+                'street': data.get('street',''),
+                'street2': data.get('street2',''),
+                'zip': data.get('zip',''),
+                'city': data.get('city',''),
+                'country_id': data.get('country_id',False),
+                'state_id': data.get('state_id',False)
+            }, context=context)
+            data['location_id'] = loc_id
+        result = super(res_partner_address, self).create(cr, uid, data, context=context)
+        return result
 
-class res_partner_job(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
-        """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param user: the current user,
-            @param ids: List of partner address’s IDs
-            @param context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-
-        if not ids:
-            return []
-        res = []
-
-        jobs = self.browse(cr, uid, ids, context=context)
-
-        contact_ids = [rec.contact_id.id for rec in jobs]
-        contact_names = dict(self.pool.get('res.partner.contact').name_get(cr, uid, contact_ids, context=context))
-
-        for r in jobs:
-            function_name = r.function
-            funct = function_name and (", " + function_name) or ""
-            res.append((r.id, contact_names.get(r.contact_id.id, '') + funct))
-
-        return res
-
-    _name = 'res.partner.job'
-    _description ='Contact Partner Function'
-    _order = 'sequence_contact'
-
-    _columns = {
-        'name': fields.related('address_id', 'partner_id', type='many2one',\
-                     relation='res.partner', string='Partner', help="You may\
-                     enter Address first,Partner will be linked automatically if any."),
-        'address_id': fields.many2one('res.partner.address', 'Address', \
-                        help='Address which is linked to the Partner'), # TO Correct: domain=[('partner_id', '=', name)]
-        'contact_id': fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
-        'function': fields.char('Partner Function', size=64, help="Function of this contact with this partner"),
-        'sequence_contact': fields.integer('Contact Seq.',help='Order of\
-                     importance of this address in the list of addresses of the linked contact'),
-        'sequence_partner': fields.integer('Partner Seq.',help='Order of importance\
-                 of this job title in the list of job title of the linked partner'),
-        'email': fields.char('E-Mail', size=240, help="Job E-Mail"),
-        'phone': fields.char('Phone', size=64, help="Job Phone no."),
-        'fax': fields.char('Fax', size=64, help="Job FAX no."),
-        'extension': fields.char('Extension', size=64, help='Internal/External extension phone number'),
-        'other': fields.char('Other', size=64, help='Additional phone field'),
-        'date_start': fields.date('Date Start',help="Start date of job(Joining Date)"),
-        'date_stop': fields.date('Date Stop', help="Last date of job"),
-        'state': fields.selection([('past', 'Past'),('current', 'Current')], \
-                                'State', required=True, help="Status of Address"),
-    }
+        result = {}
+        for rec in self.browse(cr,uid, ids, context=context):
+            res = []
+            if rec.partner_id:
+                res.append(rec.partner_id.name_get()[0][1])
+            if rec.contact_id and rec.contact_id.name:
+                res.append(rec.contact_id.name)
+            if rec.location_id:
+                if rec.location_id.city: res.append(rec.location_id.city)
+                if rec.location_id.country_id: res.append(rec.location_id.country_id.name_get()[0][1])
+            result[rec.id] = ', '.join(res)
+        return result.items()
 
     _defaults = {
-        'sequence_contact' : lambda *a: 0,
-        'state': lambda *a: 'current',
+        'location_id': _default_location_id
     }
-    
-    def onchange_name(self, cr, uid, ids, address_id='', name='', context=None):    
-        return {'value': {'address_id': address_id}, 'domain':{'partner_id':'name'}}     
-    
-    def onchange_partner(self, cr, uid, _, partner_id, context=None):
-        """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user,
-            @param _: List of IDs,
-            @partner_id : ID of the Partner selected,
-            @param context: A standard dictionary for contextual values
-        """
-        return {'value': {'address_id': False}}
 
-    def onchange_address(self, cr, uid, _, address_id, context=None):
-        """
-            @@param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user,
-            @param _: List of IDs,
-            @address_id : ID of the Address selected,
-            @param context: A standard dictionary for contextual values
-        """
-        partner_id = False
-        if address_id:
-            address = self.pool.get('res.partner.address')\
-                        .browse(cr, uid, address_id, context=context)
-            partner_id = address.partner_id.id
-        return {'value': {'name': partner_id}}
-    
-res_partner_job()
+    def default_get(self, cr, uid, fields=[], context=None):
+        context = context or {}
+        if 'default_type' in context:
+            del context['default_type']
+        return super(res_partner_address, self).default_get(cr, uid, fields, context)
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+res_partner_address()
 
diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
index 35390caca77..888ef6b54b7 100644
--- a/addons/base_contact/base_contact_demo.xml
+++ b/addons/base_contact/base_contact_demo.xml
@@ -3,183 +3,123 @@
     <data>
 
         <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+            <field eval="[(4,ref('base.group_sale_salesman'))]" name="groups_id"/>
         </record>
 
         <!-- Create the contacts -->
         <record id="res_partner_contact_mortier0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Benoit&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Mortier&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Benoit</field>
+            <field name="last_name">Mortier</field>
             <field name="title" ref="base.res_partner_title_sir"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_jacot0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Laurent&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Jacot&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Laurent</field>
+            <field name="last_name">Jacot</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_passot0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Thomas&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Passot&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Thomas</field>
+            <field name="last_name">Passot</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lacarte0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Etienne&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Lacarte&quot;&quot;&quot;" name="name"/>
-            <field eval="1" name="active"/>
+            <field name="first_name">Etienne</field>
+            <field name="last_name">Lacarte</field>
         </record>
         <record id="res_partner_contact_tang0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Tang&quot;&quot;&quot;" name="name"/>
-            <field eval="1" name="active"/>
+            <field name="last_name">Tang</field>
         </record>
         <record id="res_partner_contact_wong0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Wong&quot;&quot;&quot;" name="name"/>
-            <field eval="1" name="active"/>
+            <field name="last_name">Wong</field>
         </record>
         <record id="res_partner_contact_lavente0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Jean-Guy&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Lavente&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Jean-Guy</field>
+            <field name="last_name">Lavente</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lelitre0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Sylvie&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Lelitre&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Sylvie</field>
+            <field name="last_name">Lelitre</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_grosbonnet0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Arthur&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Grosbonnet&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Arthur</field>
+            <field name="last_name">Grosbonnet</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lesbrouffe0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Karine&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Lesbrouffe&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Karine</field>
+            <field name="last_name">Lesbrouffe</field>
             <field ref="base.res_partner_title_madam" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_zen0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Zen&quot;&quot;&quot;" name="name"/>
-            <field eval="1" name="active"/>
+            <field name="last_name">Zen</field>
         </record>
         <record id="res_partner_contact_pinckears0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;http://fptiny.blogspot.com/&quot;&quot;&quot;" name="website"/>
-            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Pinckaers&quot;&quot;&quot;" name="name"/>
+            <field name="website">http://fptiny.blogspot.com/</field>
+            <field name="first_name">Fabien</field>
+            <field name="last_name">Pinckaers</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_debois0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Marc&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Debois&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Marc</field>
+            <field name="last_name">Debois</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_luu0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Phuong&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Luu&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Phuong</field>
+            <field name="last_name">Luu</field>
             <field ref="base.res_partner_title_madam" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_elkhayat0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Najlaa&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Khayat&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Najlaa</field>
+            <field name="last_name">Khayat</field>
             <field ref="base.res_partner_title_madam" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_depaoli0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Quentin&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Paolino&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Quentin</field>
+            <field name="last_name">Paolino</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_semal0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Fabian&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;W.&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Fabian</field>
+            <field name="last_name">W.</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_vandewerve0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Yvan&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;van de Werve&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Yvan</field>
+            <field name="last_name">Van</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lambotte0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Henry&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Lambotte&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Henry</field>
+            <field name="last_name">Lambotte</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_laurent0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Olivier&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Laurent&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Olivier</field>
+            <field name="last_name">Laurent</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_simonis0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Christophe&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Dupont&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Christophe</field>
+            <field name="last_name">Dupont</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_wirtel0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Stéphane&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Andre&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Stéphane</field>
+            <field name="last_name">Andre</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_mignon0" model="res.partner.contact">
-            <field eval="&quot;&quot;&quot;Philippe&quot;&quot;&quot;" name="first_name"/>
-            <field eval="&quot;&quot;&quot;Antoine&quot;&quot;&quot;" name="name"/>
+            <field name="first_name">Philippe</field>
+            <field name="last_name">Antoine</field>
             <field ref="base.res_partner_title_sir" name="title"/>
-            <field eval="1" name="active"/>
         </record>
 
 
-        <!-- Create the addresses -->
-        <record id="base.main_address" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Grand-Rosière&quot;&quot;&quot;" name="city"/>
-            <field eval="&quot;&quot;&quot;+32.81.73.35.01&quot;&quot;&quot;" name="fax"/>
-            <field eval="&quot;&quot;&quot;1367&quot;&quot;&quot;" name="zip"/>
-            <!-- The partner associated with the main company should not have a country specified in the demo data,
-                 as it may conflicts with the accounting installing chart wizard. This wizard will indeed try to
-                 install the localization module accordingly to this variable automatically. Thus, in demo data,
-                 everyone would have the belgian chart of account by default, what should be avoided. -->
-            <!-- <field name="country_id" ref="base.be"/> --> 
-            <field eval="&quot;&quot;&quot;+32.81.81.37.00&quot;&quot;&quot;" name="phone"/>
-            <field eval="&quot;&quot;&quot;Chaussée de Namur, 40&quot;&quot;&quot;" name="street"/>
-        </record>
-        <record id="res_partner_address_0" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Louvain-La-Neuve&quot;&quot;&quot;" name="city"/>
-            <field eval="&quot;&quot;&quot;1348&quot;&quot;&quot;" name="zip"/>
-            <field eval="&quot;&quot;&quot;contact&quot;&quot;&quot;" name="type"/>
-            <!-- The partner associated with the main company should not have a country specified in the demo data,
-                 as it may conflicts with the accounting installing chart wizard. This wizard will indeed try to
-                 install the localization module accordingly to this variable automatically. Thus, in demo data,
-                 everyone would have the belgian chart of account by default, what should be avoided. -->
-            <!-- <field name="country_id" ref="base.be"/> -->
-            <field eval="&quot;&quot;&quot;rue du pré, 115&quot;&quot;&quot;" name="street"/>
-            <field eval="1" name="active"/>
-        </record>
-        <record id="res_partner_address_1" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Charleroi&quot;&quot;&quot;" name="city"/>
-            <field eval="&quot;&quot;&quot;6000&quot;&quot;&quot;" name="zip"/>
-            <field eval="&quot;&quot;&quot;contact&quot;&quot;&quot;" name="type"/>
-            <!-- The partner associated with the main company should not have a country specified in the demo data,
-                 as it may conflicts with the accounting installing chart wizard. This wizard will indeed try to
-                 install the localization module accordingly to this variable automatically. Thus, in demo data,
-                 everyone would have the belgian chart of account by default, what should be avoided. -->
-            <!-- <field name="country_id" ref="base.be"/> -->
-            <field eval="&quot;&quot;&quot;Boulevars Tirou, 32&quot;&quot;&quot;" name="street"/>
-            <field eval="1" name="active"/>
-        </record>
-
         <!-- Create the jobs -->
+        <!--
         <record id="res_partner_job_0" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_1"/>
             <field name="function">Salesman</field>
@@ -189,13 +129,13 @@
         <record id="res_partner_job_1" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_2"/>
             <field name="function">Salesman</field>
-            <field eval="&quot;&quot;&quot;contact@tecsas.fr&quot;&quot;&quot;" name="email"/>
+            <field name="email">contact@tecsas.fr</field>
             <field name="contact_id" ref="res_partner_contact_jacot0"/>
         </record>
         <record id="res_partner_job_2" model="res.partner.job">
             <field name="address_id" ref="base.res_partner_address_3"/>
             <field name="function">CTO</field>
-            <field eval="&quot;&quot;&quot;info@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">info@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_passot0"/>
         </record>
         <record id="res_partner_job_3" model="res.partner.job">
@@ -244,74 +184,74 @@
         <record id="res_partner_job_11" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">Salesman</field>
-            <field eval="&quot;&quot;&quot;re@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">re@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_mignon0"/>
         </record>
         <record id="res_partner_job_12" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">CTO</field>
-            <field eval="&quot;&quot;&quot;st@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">st@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_wirtel0"/>
         </record>
         <record id="res_partner_job_13" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">CTO</field>
-            <field eval="&quot;&quot;&quot;ch@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">ch@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_simonis0"/>
         </record>
         <record id="res_partner_job_14" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">CTO</field>
-            <field eval="&quot;&quot;&quot;ol@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">ol@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_laurent0"/>
         </record>
         <record id="res_partner_job_15" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">CTO</field>
-            <field eval="&quot;&quot;&quot;fl@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">fl@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_lambotte0"/>
         </record>
         <record id="res_partner_job_16" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">Salesman</field>
-            <field eval="&quot;&quot;&quot;av@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">av@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_vandewerve0"/>
         </record>
         <record id="res_partner_job_17" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">CTO</field>
-            <field eval="&quot;&quot;&quot;fb@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">fb@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_semal0"/>
         </record>
         <record id="res_partner_job_18" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">CTO</field>
-            <field eval="&quot;&quot;&quot;qd@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">qd@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_depaoli0"/>
         </record>
         <record id="res_partner_job_19" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">CTO</field>
-            <field eval="&quot;&quot;&quot;ne@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">ne@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_elkhayat0"/>
         </record>
         <record id="res_partner_job_20" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">CTO</field>
-            <field eval="&quot;&quot;&quot;ph@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">ph@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_luu0"/>
         </record>
         <record id="res_partner_job_21" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">CEO</field>
-            <field eval="&quot;&quot;&quot;fp@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">fp@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_pinckears0"/>
             <field name="sequence_partner">-1</field>
         </record>
         <record id="res_partner_job_22" model="res.partner.job">
             <field name="address_id" ref="base.main_address"/>
             <field name="function">Salesman</field>
-            <field eval="&quot;&quot;&quot;cd@mycompany.com&quot;&quot;&quot;" name="email"/>
+            <field name="email">cd@mycompany.com</field>
             <field name="contact_id" ref="res_partner_contact_debois0"/>
         </record>
         <record id="res_partner_job_23" model="res.partner.job">
@@ -321,18 +261,19 @@
             <field name="function">PA</field>
         </record>
         <record id="res_partner_job_24" model="res.partner.job">
-            <field eval="1" name="sequence_contact"/>
+            <field name="sequence_contact">1</field>
             <field name="address_id" ref="res_partner_address_1"/>
             <field name="contact_id" ref="res_partner_contact_lacarte0"/>
             <field name="function">PA</field>
             <field name="sequence_contact">5</field>
         </record>
         <record id="res_partner_job_25" model="res.partner.job">
-            <field eval="2" name="sequence_contact"/>
+            <field name="sequence_contact">2</field>
             <field name="address_id" ref="base.res_partner_address_1"/>
             <field name="contact_id" ref="res_partner_contact_lacarte0"/>
             <field name="function">CEO</field>
             <field name="sequence_contact">1</field>
         </record>
+        -->
     </data>
 </openerp>
diff --git a/addons/base_contact/base_contact_installer.py b/addons/base_contact/base_contact_installer.py
deleted file mode 100644
index 4568fa25193..00000000000
--- a/addons/base_contact/base_contact_installer.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class base_contact_installer(osv.osv_memory):
-    _name = 'base.contact.installer'
-    _inherit = 'res.config.installer'
-
-    _columns = {
-        'name': fields.char('Name', size=64),
-        'migrate': fields.boolean('Migrate', help="If you select this, all addresses will be migrated."),
-    }
-
-    def execute(self, cr, uid, ids, context=None):
-        """
-        This function is used to create contact and address from existing partner address
-        """
-        obj = self.pool.get("base.contact.installer").browse(cr, uid, uid, context=context)
-        if obj.migrate:
-            # Enable PL/pgSQL if not enabled yet in the database
-            cr.execute("SELECT 1 FROM pg_language WHERE lanname = 'plpgsql'")
-            if not cr.fetchone():
-                cr.execute("CREATE LANGUAGE plpgsql;")
-
-            cr.execute("""DROP TRIGGER IF EXISTS contactjob on res_partner_contact;
-                          CREATE OR REPLACE FUNCTION add_to_job() RETURNS TRIGGER AS $contactjob$
-                            DECLARE
-                            new_name varchar;
-                            new_phonenum varchar;
-                            BEGIN
-                               IF(TG_OP='INSERT') THEN
-                               INSERT INTO res_partner_job(contact_id, address_id, function, state) VALUES(NEW.id, NEW.website::integer,NEW.first_name, 'current');
-                               UPDATE res_partner_contact set first_name=Null, website=Null, active=True where id=NEW.id;
-                            END IF;
-                            RETURN NEW;
-                            END;
-                          $contactjob$ LANGUAGE plpgsql;
-                          CREATE TRIGGER contactjob AFTER INSERT ON res_partner_contact FOR EACH ROW EXECUTE PROCEDURE add_to_job();""")
-
-            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.execute("DROP TRIGGER  IF EXISTS contactjob  on res_partner_contact")
-
-            cr.execute("DROP FUNCTION IF EXISTS  add_to_job()")
-
-base_contact_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml
deleted file mode 100644
index 2feed9113db..00000000000
--- a/addons/base_contact/base_contact_installer_view.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<openerp>
-    <data>
-        <record id="view_base_contact_installer" model="ir.ui.view">
-            <field name="name">base.contact.installer.view</field>
-            <field name="model">base.contact.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">Address's Migration to Contacts</attribute>
-                    </form>
-
-                    <separator string="title" position="attributes">
-                        <attribute name="string">Select the Option for Addresses Migration</attribute>
-                    </separator>
-                    <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">You can migrate Partner's current addresses to the contact.</attribute>
-                    </xpath>
-                    <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                        <attribute name="rowspan">13</attribute>
-                        <attribute name="string"/>
-                    </xpath>
-                    <xpath expr="//button[@string='Install Modules']" position="attributes">
-                        <attribute name="string">Configure</attribute>
-                    </xpath>
-                    <group colspan="8">
-                        <group colspan="2" col="2">
-                            <label string="Due to changes in Address and Partner's relation, some of the details from address are needed to be migrated into contact information." colspan="4"/>
-                            <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">
-                                <field name="migrate" string="Migrate" colspan="1"/>
-                            </group>
-                        </group>
-                    </group>
-                </data>
-            </field>
-        </record>
-
-        <record id="action_base_contact_installer" model="ir.actions.act_window">
-            <field name="name">Address Migration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base.contact.installer</field>
-            <field name="view_id" ref="view_base_contact_installer"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <record id="base_contact_installer_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_base_contact_installer"/>
-            <field name="category_id" ref="base.category_administration_config"/>
-            <field name="sequence">3</field>
-            <field name="type">automatic</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 1dc73f16f72..475d85a5c1e 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -30,15 +30,15 @@
         <field name="arch" type="xml">
             <form string="Partner Contact">
                 <group colspan="4" col="6">
-                    <field name="title" select="1" widget="selection" domain="[('domain', '=', 'contact')]" size="0"/>
-                    <field name="name" select="1"/>
+                    <field name="last_name" select="1"/>
                     <field name="first_name" select="1"/>
+                    <field name="title" select="1" widget="selection" domain="[('domain', '=', 'contact')]" size="0"/>
                 </group>
                 <notebook colspan="4" >
-                    <page string="General">                        
+                    <page string="General">
                        <group colspan="4" col="4">
                             <group colspan="2" col="4">
-                                <separator string="Communication" colspan="4"/>
+                                <separator string="Personal Information" colspan="4"/>
                                 <field name="mobile"/>
                                 <field name="email"  widget="email"/>
                                 <field name="website"/>
@@ -47,54 +47,36 @@
                                 <separator string="Photo" colspan="4"/>
                                 <field name="photo" widget='image' nolabel="1"/>
                             </group>
-                       </group> 
+                       </group>
                        <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
                             <form string="Functions and Addresses">
-                               <group colspan="4" col="4">
-                                   <field name="sequence_contact" />
-                                   <field name="function"/>
-                                   <field name="name" on_change="onchange_name(name,address_id)"/> 
-                                   <field name="address_id"/>                                   
-                                   <field name="date_start" />
-                                   <field name="date_stop" />
-                                   <field name="state" />
-                                   
-                               </group>
-                                <separator string="Communication" colspan="4"/>
-                               <group colspan="4" col="4">
-                                   <field name="phone"/>
-                                   <field name="fax"/>
-                                   <field name="email" widget="email"/>
-                                   <field name="extension"/>
-                                   <field name="other"/>
-                               </group>
-                            </form>
-                            <tree string="Functions and Addresses">
-                                <field name="sequence_contact" string="Seq."/>
-                                <field name="function"/>
-                                <field name="name" on_change="onchange_partner(name)"/> 
-								<field name="address_id" attrs="{'required': [('name', '!=', False)]}" on_change="onchange_address(address_id)"/>
+                                <field name="location_id"/>
+                                <field name="function" />
+                                <separator string="Professional Info" colspan="4"/>
                                 <field name="phone"/>
                                 <field name="fax"/>
-                                <field name="extension"/>
-                                <field name="other"/>
+                                <field name="email" widget="email"/>
+                            </form>
+                            <tree string="Functions and Addresses">
+                                <field name="location_id"/>
+                                <field name="function"/>
+                                <field name="phone"/>
                                 <field name="email"/>
-                                <field name="state" />
                             </tree>
                         </field>
                     </page>
-                    <page string="Extra Information">                        
+                    <page string="Extra Information">
                         <field name="active"/>
                         <field name="lang_id" widget="selection"/>
-                        <field name="partner_id" invisible="1" select="1"/>                                
-                        <field name="function" invisible="1" />  
+                        <field name="partner_id" invisible="1" select="1"/>
+                        <field name="function" invisible="1" />
                         <field name="country_id"/>
                         <field name="birthdate"/>
                     </page>
                     <page string="Notes">
                         <field name="comment" nolabel="1"/>
                     </page>
-                    
+
                 </notebook>
             </form>
         </field>
@@ -108,8 +90,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Partner Contact">
-                <field name="name"/>
-                <field name="first_name"/>
+                <field name="name" string="First/Lastname"
+                    filter_domain="['|', ('firstname','ilike', self), ('lastname','ilike',self)]"/>
                 <field name="partner_id" string="Partner"/>
             </search>
         </field>
@@ -132,7 +114,7 @@
         <field name="name">Addresses</field>
     </record>
 
-    <!--    
+    <!--
     Contacts for Suppliers
     -->
     <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
@@ -141,7 +123,7 @@
             parent="base.menu_purchase_root" sequence="3"/>
     <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
             parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
-    <menuitem name="Contacts" id="menu_purchases_partner_contact_form" action="action_partner_contact_form" 
+    <menuitem name="Contacts" id="menu_purchases_partner_contact_form" action="action_partner_contact_form"
             parent = "base.menu_procurement_management_supplier" sequence="2"/>
 
     <!-- Views for Partners Form View -->
@@ -152,119 +134,45 @@
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1" position="replace">
-                <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1">
-                    <form string="Address">
-                       <group  colspan="2" col="2">
-                           <separator string="Postal Address" colspan="2" col="2"/>
-                           <field name="type" />
-                           <field name="street"/>
-                           <field name="street2"/>
-                           <field name="zip"/>
-                           <field name="city"/>
-                           <field name="country_id" completion="1"/>
-                           <field name="state_id"/>
-                        </group>
-                        <group colspan="2" col="2">
-                           <separator string="Communication" colspan="2" col="2"/>
-                           <field name="phone"/>
-                           <field name="fax"/>
-                           <field name="email" widget="email"/>
-                        </group>
-                        <field name="job_ids" mode="tree,form" nolabel="1" colspan="4">
-                            <tree string="Contacts" editable="top">
-                                <field name="sequence_partner"/>
-                                <field name="contact_id"/>
-                                <field name="function"/>
-                                <field name="phone"/>
-                                <field name="fax"/>
-                                <field name="extension"/>
-                                <field name="other"/>
-                                <field name="email"/>
-                            </tree>
-                            <form string="Contacts">
-                            <group colspan="4" col="4">
-                                <field name="sequence_partner"/>
-                                <field name="contact_id"/>
-                                <field name="function"/>
-                            </group>
-                            <separator string="Communication" colspan="4"/>
-                            <group colspan="4" col="4">
-                                <field name="phone"/>
-                                <field name="fax"/>
-                                <field name="extension"/>
-                                <field name="other"/>
-                                <field name="email" widget="email"/>
-                            </group>
-                            </form>
-                        </field>
-                    </form>
-                    <tree string="Addresses">
-                        <field name="type"/>
-                        <field name="zip"/>
-                        <field name="city"/>
-                        <field name="country_id"/>
-                        <field name="phone"/>
-                        <field name="job_ids"/>
-                    </tree>
-                </field>
-            </field>
+            <separator string="Postal Address" position="after">
+                <field name="location_id" on_change="onchange_location_id(location_id)"/>
+            </separator>
+            <xpath expr="//field[@string='Contact Name']" position="replace">
+                <field name="contact_id"/>
+            </xpath>
+            <field name="title" position="replace"/>
+        </field>
+    </record>
+
+    <!-- Views for Addresses -->
+
+    <record model="ir.ui.view" id="view_partner_location_form">
+        <field name="name">res.partner.location.form</field>
+        <field name="model">res.partner.location</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Locations">
+                <field name="street" colspan="4"/>
+                <field name="street2" colspan="4"/>
+                <field name="zip"/>
+                <field name="city"/>
+                <field name="country_id" />
+                <field name="state_id"/>
+            </form>
         </field>
     </record>
 
 
-<!-- don't display the categories, since it is displayed in an other tab-->
-
-        <record model="ir.ui.view" id="view_partner_form_inherit2">
-            <field name="name">res.partner.form</field>
-            <field name="type">form</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <field name="category_id" position="replace">
-                </field>
-            </field>
-        </record>
-
-<!-- don't display the categories label-->
-
-        <record model="ir.ui.view" id="view_partner_form_inherit2bis">
-            <field name="name">res.partner.form</field>
-            <field name="type">form</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <separator colspan="4" string="Categories" position="replace"/>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_partner_form_inherit3">
-            <field name="name">res.partner.form</field>
-            <field name="type">form</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Categories">
-                        <separator colspan="4" string="Categories"/>
-                        <field colspan="4" name="category_id" nolabel="1"/>
-                    </page>
-                </notebook>
-            </field>
-        </record>
-
-
-    <!-- Views for Addresses -->
-
-    <record model="ir.ui.view" id="view_partner_address_tree_inherited1">
-        <field name="name">Partner addresses inherited</field>
-        <field name="model">res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_tree"/>
+    <record model="ir.ui.view" id="view_partner_location_tree">
+        <field name="name">res.partner.location.tree</field>
+        <field name="model">res.partner.location</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <field name="name" position="replace">
-                <field name='job_ids' string='# of Contacts'/>
-            </field>
+            <tree string="Locations">
+                <field name="city"/>
+                <field name="country_id" />
+                <field name="state_id"/>
+            </tree>
         </field>
     </record>
 
@@ -273,152 +181,16 @@
         <field name='model'>res.partner.address</field>
         <field name="inherit_id" ref="base.view_partner_address_form1"/>
         <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <field name="type" position="replace">
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_partner_address_form_inherited1">
-        <field name='name'>res.partner.address.form.inherited1</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
         <field name='arch' type='xml'>
             <field name="name" position="replace">
-            </field>
-        </field>
-    </record>
-
-    <record id='view_partner_address_form_inherited2' model='ir.ui.view'>
-        <field name='name'>res.partner.address.form.inherited2</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <field name="title" position="replace">
-            </field>
-        </field>
-    </record>
-
-    <record id='view_partner_address_form_inherited3' model='ir.ui.view'>
-        <field name='name'>res.partner.address.form.inherited3</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <field name="function" position="replace">
-            </field>
-        </field>
-    </record>
-
-    <record id='view_partner_address_form_inherited4' model='ir.ui.view'>
-        <field name='name'>res.partner.address.form.inherited4</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <field name='mobile' position="replace">
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_partner_address_form_inherited6">
-        <field name='name'>res.partner.address.form.inherited6</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <field name="partner_id" position="replace">
-                <field name='partner_id' select='1'/>
-                <field name='type' select='2'/>
-                <field name='job_id' invisible="1"/>
-            </field>
-        </field>
-    </record>
-
-    <record id="view_res_partner_address_filter" model="ir.ui.view">
-        <field name="name">res.partner.address.select</field>
-        <field name="model">res.partner.address</field>
-        <field name="type">search</field>
-        <field name="inherit_id" ref="base.view_res_partner_address_filter"/>
-        <field name="arch" type="xml">
-            <search string="Search Contact">
-                   <field name="job_ids"/>
-            </search>
-        </field>
-    </record>
-
-    <!-- Views for partner job Tree view  -->
-
-    <record model="ir.ui.view" id="view_partner_job_tree">
-        <field name="name">res.partner.job.tree</field>
-        <field name="model">res.partner.job</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Contact Functions">
                 <field name="contact_id"/>
-                <field name="function"/>
-                <field name="name"/>
-                <field name="address_id"/>
-                <field name="email"/>
-                <field name="phone"/>
-                <field name="fax"/>
-                <field name="extension"/>
-                <field name="state" />
-            </tree>
+            </field>
+            <separator string="Postal Address" position="after">
+                <field name="location_id" on_change="onchange_location_id(location_id)"/>
+            </separator>
+            <field name="title" position="replace"/>
         </field>
     </record>
 
-<!-- Views for partner job Form view  -->
-
-    <record model="ir.ui.view" id="view_partner_job_form">
-        <field name="name">res.partner.job.form</field>
-        <field name="model">res.partner.job</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Contact Functions">
-	             <field name="name" select="1" on_change="onchange_partner(name)"/>
-	             <field name="address_id" select="1" attrs="{'required': [('name', '!=', False)]}" on_change="onchange_address(address_id)"/>
-	             <field name="contact_id" select="1"/>
-	             <field name="function" select="1"/>
-	             <field name="email" widget="email"/>
-	             <field name="phone"/>
-	             <field name="fax"/>
-	             <field name="extension"/>
-	             <field name="sequence_contact" groups="base.group_user"/>
-	             <field name="sequence_partner" groups="base.group_user"/>
-	             <field name="date_start" groups="base.group_user"/>
-	             <field name="date_stop" groups="base.group_user"/>
-	             <field name="state" />
-            </form>
-        </field>
-    </record>
-
-    <!-- Menuitem for res.partner.job -->
-
-    <record model="ir.actions.act_window" id="action_res_partner_job">
-        <field name="name">Contact's Jobs</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">res.partner.job</field>
-        <field name="view_type">form</field>
-    </record>
-
-    <act_window domain="[('name', '=', active_id)]"
-        id="act_res_partner_jobs" name="Partner Contacts"
-        res_model="res.partner.job"
-        src_model="res.partner"
-        />
-
-    <!-- Act window defining a shorcut on partner address to open all his jobs -->
-
-    <act_window
-        id="act_res_partner_jobs" 
-        name="Open Jobs"
-        context="{'search_default_address_id': [active_id], 'default_address_id': active_id}"
-        res_model="res.partner.job"
-        src_model="res.partner.address"
-        />
-
 </data>
 </openerp>
diff --git a/addons/base_contact/i18n/fa.po b/addons/base_contact/i18n/fa.po
new file mode 100644
index 00000000000..8a6ad08dc5f
--- /dev/null
+++ b/addons/base_contact/i18n/fa.po
@@ -0,0 +1,514 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_contact
+#: field:res.partner.contact,title:0
+msgid "Title"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,date_start:0
+msgid "Start date of job(Joining Date)"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Select the Option for Addresses Migration"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,function:0
+msgid "Function of this contact with this partner"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,state:0
+msgid "Status of Address"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,name:0
+msgid ""
+"You may                     enter Address first,Partner will be linked "
+"automatically if any."
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,fax:0
+msgid "Job FAX no."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,date_stop:0
+msgid "Last date of job"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+#: field:base.contact.installer,migrate:0
+msgid "Migrate"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.contact,active:0
+msgid ""
+"If the active field is set to False,                 it will allow you to "
+"hide the partner contact without removing it."
+msgstr ""
+
+#. module: base_contact
+#: model:ir.module.module,description:base_contact.module_meta_information
+msgid ""
+"\n"
+"        This module allows you to manage your contacts entirely.\n"
+"\n"
+"    It lets you define\n"
+"        *contacts unrelated to a partner,\n"
+"        *contacts working at several addresses (possibly for different "
+"partners),\n"
+"        *contacts with possibly different functions for each of its job's "
+"addresses\n"
+"\n"
+"    It also adds new menu items located in\n"
+"        Partners \\ Contacts\n"
+"        Partners \\ Functions\n"
+"\n"
+"    Pay attention that this module converts the existing addresses into "
+"\"addresses + contacts\". It means that some fields of the addresses will be "
+"missing (like the contact name), since these are supposed to be defined in "
+"an other object.\n"
+"    "
+msgstr ""
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+msgid "Contact's Jobs"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid ""
+"Order of importance                 of this job title in the list of job "
+"title of the linked partner"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,phone:0
+msgid "Job Phone no."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,email:0
+msgid "Job E-Mail"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner:0
+#: view:res.partner.contact:0
+msgid "Communication"
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,config_logo:0
+#: field:res.partner.contact,photo:0
+msgid "Image"
+msgstr ""
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_address
+msgid "Partner Addresses"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Address's Migration to Contacts"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,sequence_contact:0
+msgid "Contact Seq."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "Search Contact"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
+#: model:process.node,name:base_contact.process_node_contacts0
+#: view:res.partner:0
+#: field:res.partner.address,job_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid ""
+"Due to changes in Address and Partner's relation, some of the details from "
+"address are needed to be migrated into contact information."
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,address_id:0
+msgid "Address which is linked to the Partner"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,function:0
+msgid "Partner Function"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Otherwise these details will not be visible from address/contact."
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_base_contact_installer
+msgid "base.contact.installer"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Do you want to migrate your Address data in Contact Data?"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,function:0
+msgid "Main Function"
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Photo"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr ""
+
+#. module: base_contact
+#: help:base.contact.installer,migrate:0
+msgid "If you select this, all addresses will be migrated."
+msgstr ""
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Current"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,first_name:0
+msgid "First Name"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_job
+msgid "Contact Partner Function"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,other:0
+msgid "Other"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_function0
+msgid "Function"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.address,job_id:0
+#: field:res.partner.contact,job_id:0
+msgid "Main Job"
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_contacttofunction0
+msgid "Defines contacts and functions."
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner:0
+#: field:res.partner.job,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,country_id:0
+msgid "Nationality"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Open Jobs"
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "You can migrate Partner's current addresses to the contact."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,partner_id:0
+msgid "Main Employer"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
+msgid "Address Migration"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Postal Address"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_addresses0
+#: view:res.partner:0
+msgid "Addresses"
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,sequence_contact:0
+msgid ""
+"Order of                     importance of this address in the list of "
+"addresses of the linked contact"
+msgstr ""
diff --git a/addons/base_contact/i18n/hr.po b/addons/base_contact/i18n/hr.po
index 2293b1b95f5..1b7fb29409c 100644
--- a/addons/base_contact/i18n/hr.po
+++ b/addons/base_contact/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-08-03 01:01+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-19 13:06+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 "Language: hr\n"
 
 #. module: base_contact
@@ -35,27 +35,27 @@ msgstr "Fax"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "title"
-msgstr ""
+msgstr "naslov"
 
 #. module: base_contact
 #: help:res.partner.job,date_start:0
 msgid "Start date of job(Joining Date)"
-msgstr ""
+msgstr "Start date of job(Joining Date)"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Select the Option for Addresses Migration"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
 msgid "Function of this contact with this partner"
-msgstr ""
+msgstr "Funkcija kontakta kod ovog partnera"
 
 #. module: base_contact
 #: help:res.partner.job,state:0
 msgid "Status of Address"
-msgstr ""
+msgstr "Status of Address"
 
 #. module: base_contact
 #: help:res.partner.job,name:0
@@ -63,22 +63,24 @@ msgid ""
 "You may                     enter Address first,Partner will be linked "
 "automatically if any."
 msgstr ""
+"You may                     enter Address first,Partner will be linked "
+"automatically if any."
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
 msgid "Job FAX no."
-msgstr ""
+msgstr "Job FAX no."
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
 msgid "Mobile"
-msgstr "Mobitel"
+msgstr "Mobilni"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: field:res.partner.contact,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
@@ -88,18 +90,18 @@ msgstr "Ljudi s kojima radite."
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
 msgid "Define functions and address."
-msgstr "Definiraj Funkcije i Adrese"
+msgstr "Definicija funkcija i adresa"
 
 #. module: base_contact
 #: help:res.partner.job,date_stop:0
 msgid "Last date of job"
-msgstr ""
+msgstr "Datum zadnjeg posla"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 #: field:base.contact.installer,migrate:0
 msgid "Migrate"
-msgstr ""
+msgstr "Migrate"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -110,7 +112,7 @@ msgstr "Partner"
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr "Poslovi na istoj Adresi Partnera"
+msgstr "Poslovi na istoj adresi partnera"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
@@ -128,6 +130,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"If the active field is set to False,                 it will allow you to "
+"hide the partner contact without removing it."
 
 #. module: base_contact
 #: model:ir.module.module,description:base_contact.module_meta_information
@@ -157,7 +161,7 @@ msgstr ""
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact"
-msgstr "Osnovna Osoba"
+msgstr "Osnovni kontakt"
 
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
@@ -167,7 +171,7 @@ msgstr "Datum Završetka"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 msgid "Contact's Jobs"
-msgstr "Poslovi Osobe"
+msgstr "Poslovi osobe"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -180,6 +184,8 @@ msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
 msgstr ""
+"Order of importance                 of this job title in the list of job "
+"title of the linked partner"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
@@ -189,39 +195,39 @@ msgstr "Ekstenzija"
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr "Unutarnja/Vanjska Ekstenzija Tel. broja"
+msgstr "Interna/eksterna ekstenzija tel. broja"
 
 #. module: base_contact
 #: help:res.partner.job,phone:0
 msgid "Job Phone no."
-msgstr ""
+msgstr "Telefon na poslu"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr "Funkcije i Adrese"
+msgstr "Funkcije i adrese"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 #: field:res.partner.job,contact_id:0
 msgid "Contact"
-msgstr "Osoba"
+msgstr "Contact"
 
 #. module: base_contact
 #: help:res.partner.job,email:0
 msgid "Job E-Mail"
-msgstr ""
+msgstr "Job E-Mail"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr "Partner Seq."
+msgstr "Partner r.br."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr "Funkcija na Adresu - Function to address"
+msgstr "Funkcija na adresu"
 
 #. module: base_contact
 #: field:base.contact.installer,progress:0
@@ -237,38 +243,38 @@ msgstr "Prezime osobe"
 #: view:res.partner:0
 #: view:res.partner.contact:0
 msgid "Communication"
-msgstr ""
+msgstr "Veza"
 
 #. module: base_contact
 #: field:base.contact.installer,config_logo:0
 #: field:res.partner.contact,photo:0
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Past"
-msgstr "Prošli"
+msgstr "Prošlost"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Adrese partnera"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Address's Migration to Contacts"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr "Seq. Osobe"
+msgstr "R.br. kontakta"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Traži kontakt"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -278,7 +284,7 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr "Kontakti"
+msgstr "Contacts"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -286,57 +292,59 @@ msgid ""
 "Due to changes in Address and Partner's relation, some of the details from "
 "address are needed to be migrated into contact information."
 msgstr ""
+"Due to changes in Address and Partner's relation, some of the details from "
+"address are needed to be migrated into contact information."
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
 msgid "Working and private addresses."
-msgstr "Poslovne i Privatne Adrese"
+msgstr "Poslovne i privatne Adrese"
 
 #. module: base_contact
 #: help:res.partner.job,address_id:0
 msgid "Address which is linked to the Partner"
-msgstr ""
+msgstr "Adresa koja je povezana na Partnera"
 
 #. module: base_contact
 #: field:res.partner.job,function:0
 msgid "Partner Function"
-msgstr "Funkcija Partnera"
+msgstr "Funkcija partnera"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr "Dodatno polje za tel. broj"
+msgstr "Dodatni telefon"
 
 #. module: base_contact
 #: field:res.partner.contact,website:0
 msgid "Website"
-msgstr "Web stranica"
+msgstr "Web stranice"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
+msgstr "Otherwise these details will not be visible from address/contact."
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Postavke"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
 #: field:res.partner.job,email:0
 msgid "E-Mail"
-msgstr "E-Mail"
+msgstr "Email"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_base_contact_installer
 msgid "base.contact.installer"
-msgstr ""
+msgstr "base.contact.installer"
 
 #. module: base_contact
 #: view:res.partner.job:0
 msgid "Contact Functions"
-msgstr "Funkcije Osoba"
+msgstr "Funkcije osobe"
 
 #. module: base_contact
 #: field:res.partner.job,phone:0
@@ -346,7 +354,7 @@ msgstr "Telefon"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr ""
+msgstr "Do you want to migrate your Address data in Contact Data?"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
@@ -361,12 +369,12 @@ msgstr "Glavna funkcija"
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
 msgid "Define partners and their addresses."
-msgstr "Definiraj Partnere i njihove Adrese"
+msgstr "Definiraj partnere i adrese"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr "Seq."
+msgstr "R.br."
 
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
@@ -386,17 +394,17 @@ msgstr "Tvrtke s kojima radite."
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Partner Contact"
-msgstr "Osoba kod Partnera"
+msgstr "Osoba kod partnera"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General"
-msgstr "Općenit"
+msgstr "Općenito"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Photo"
-msgstr ""
+msgstr "Photo"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
@@ -406,12 +414,12 @@ msgstr "Datum rođenja"
 #. module: base_contact
 #: help:base.contact.installer,migrate:0
 msgid "If you select this, all addresses will be migrated."
-msgstr ""
+msgstr "If you select this, all addresses will be migrated."
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr "Tekući"
+msgstr "Trenutno"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
@@ -421,12 +429,12 @@ msgstr "Ime osobe"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr "Funkcija Osobe Partnera - Contact Partner Function"
+msgstr "Funkcija osobe kod partnera"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
 msgid "Other"
-msgstr "Drugi"
+msgstr "Ostale"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
@@ -437,17 +445,17 @@ msgstr "Funkcija"
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr "Glavni Posao"
+msgstr "Glavni posao"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
 msgid "Defines contacts and functions."
-msgstr "Određuje Osobe i Funkcije"
+msgstr "Određuje osobe i funkcije"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
-msgstr "Osoba na Funkciju - Contact to Function"
+msgstr "Osoba na funkciju"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -458,37 +466,37 @@ msgstr "Adresa"
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
-msgstr "Državljanstvo"
+msgstr "Nacionalnost"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "Otvori poslove"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
-msgstr ""
+msgstr "You can migrate Partner's current addresses to the contact."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr "Glavni Poslodavac."
+msgstr "Glavni poslodavac."
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
-msgstr ""
+msgstr "Address Migration"
 
 #. module: base_contact
 #: view:res.partner:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Poštanska adresa"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -499,19 +507,19 @@ msgstr "Adrese"
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr "Partner na Adresu"
+msgstr "Partner na adresu"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr "Datum Početka"
+msgstr "Datum početka"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
 msgid ""
 "Order of                     importance of this address in the list of "
 "addresses of the linked contact"
-msgstr ""
+msgstr "Redoslijed važnosti  adrese u popisu adresa povezanog kontakta."
 
 #~ msgid "res.partner.contact"
 #~ msgstr "res.partner.contact"
diff --git a/addons/base_contact/process/base_contact_process.xml b/addons/base_contact/process/base_contact_process.xml
index f5b754e7ad9..54b9ed08cd9 100644
--- a/addons/base_contact/process/base_contact_process.xml
+++ b/addons/base_contact/process/base_contact_process.xml
@@ -36,15 +36,6 @@
 			<field eval="1" name="flow_start"/>
 		</record>
 
-		<record id="process_node_function0" model="process.node">
-			<field name="model_id" ref="base_contact.model_res_partner_job"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Jobs at a same partner address.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Function&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_basecontactprocess0"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
 		<record id="process_node_addresses0" model="process.node">
 			<field name="menu_id" ref="base.menu_partner_address_form"/>
 			<field name="model_id" ref="base.model_res_partner_address"/>
@@ -59,22 +50,6 @@
 		Process Transition
 	-->
 
-		<record id="process_transition_contacttofunction0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Contact to function&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Defines contacts and functions.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_function0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_contacts0"/>
-		</record>
-
-		<record id="process_transition_functiontoaddress0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Function to address&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Define functions and address.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_addresses0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_function0"/>
-		</record>
-
 		<record id="process_transition_partnertoaddress0" model="process.transition">
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Partner to address&quot;&quot;&quot;" name="name"/>
@@ -84,4 +59,4 @@
 		</record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/base_contact/security/base_contact_security.xml b/addons/base_contact/security/base_contact_security.xml
deleted file mode 100644
index 56a995c76a8..00000000000
--- a/addons/base_contact/security/base_contact_security.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    
-</data>
-</openerp>
diff --git a/addons/base_contact/security/ir.model.access.csv b/addons/base_contact/security/ir.model.access.csv
index 16cfad100a3..5df17cf17e6 100644
--- a/addons/base_contact/security/ir.model.access.csv
+++ b/addons/base_contact/security/ir.model.access.csv
@@ -1,7 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_res_partner_contact","res.partner.contact","model_res_partner_contact","base.group_partner_manager",1,1,1,1
-"access_res_partner_job","res.partner.job","model_res_partner_job","base.group_partner_manager",1,1,1,1
 "access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact","base.group_user",1,0,0,0
-"access_res_partner_job_all","res.partner.job all","model_res_partner_job","base.group_user",1,0,0,0
 "access_group_sale_salesman","res.partner.contact.sale.salesman","model_res_partner_contact","base.group_sale_salesman",1,1,1,0
-"access_res_partner_job_salesman","res.partner.job.salesman","model_res_partner_job","base.group_sale_salesman",1,1,1,0
diff --git a/addons/base_contact/test/base_contact00.yml b/addons/base_contact/test/base_contact00.yml
index 775b5636caa..c2ff49199f7 100644
--- a/addons/base_contact/test/base_contact00.yml
+++ b/addons/base_contact/test/base_contact00.yml
@@ -3,31 +3,17 @@
     *contacts unrelated to a partner,
     *contacts working at several addresses (possibly for different partners),
     *contacts with possibly different functions for each of its job's addresses
--  |
-   In order to assign language to contacts first I will create Language FR
-   (Remove)
-- 
-    !record {model: res.lang, id: res_lang_french0}:
-      code: fr_BE
-      date_format: '%m/%d/%Y'
-      decimal_point: '.'
-      direction: ltr
-      grouping: '[]'
-      name: French
-      time_format: '%H:%M:%S'
 -  |
    In order to check contacts first I will create contact unrelated to a partner
 - 
     !record {model: res.partner.contact, id: res_partner_contact_williams0}:
         country_id: base.be
         first_name: Laura
+        last_name: Henrion
         job_ids:
             - email: lwilliams@mydomain.com
               function: PA
               phone: (+32).10.45.18.77
-              sequence_contact: 1
-              state: current
-        lang_id: res_lang_french0
         mobile: (+32).10.45.18.77
         name: Williams
 -   |
@@ -41,54 +27,12 @@
               street: 23, street ways
               type: default
               zip: '2324324'
-              job_ids:
-                - address_id: res_partner_address_1
-                  function: CEO
-                  contact_id: res_partner_contact_williams0
-                  sequence_partner: 2
-                  state: current
-        lang: fr_BE
-        name: Laura's Company
+              function: CEO
+              contact_id: res_partner_contact_williams0
+        name: Lauras Company
         ref: LC
-
--   |
+- 
     Now I will check that the new job is assigned properly to contact or not
 -
     !assert {model: res.partner.contact, id: res_partner_contact_williams0}:
-        - len(job_ids) >= 2
--   |
-    In order to check contacts working at several addresses for different partners
-    I will create contact with 2 different addresses
-- 
-  !record {model: res.partner.contact, id: res_partner_contact_pauwels0}:
-        country_id: base.be
-        first_name: Nicolas
-        job_ids:
-          - address_id: base.res_partner_address_1
-            function: CTO
-            state: current
-          - address_id: base.res_partner_address_3000
-            function: CEO
-            state: current
-        lang_id: res_lang_french0
-        mobile: (+32).23.44.32.12
-        name: Pauwels
-
--   |
-    In order to check one contact working at one partner with different functions
-    I will create contact with 2 different jobs with different function but the same address
-- 
-  !record {model: res.partner.contact, id: res_partner_contact_mortier0}:
-    country_id: base.be
-    first_name: Christina
-    job_ids:
-      - address_id: base.res_partner_address_1
-        function: CEO
-        state: past
-      - address_id: base.res_partner_address_1
-        function: CTO
-        state: current
-    lang_id: base_contact.res_lang_french0
-    mobile: (+32).10.45.18.77
-    name: Mortier
-
+        - len(job_ids) == 2
diff --git a/addons/base_crypt/i18n/fa.po b/addons/base_crypt/i18n/fa.po
new file mode 100644
index 00000000000..1821a871468
--- /dev/null
+++ b/addons/base_crypt/i18n/fa.po
@@ -0,0 +1,71 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-18 20:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 14525)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr ""
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
diff --git a/addons/base_crypt/i18n/hr.po b/addons/base_crypt/i18n/hr.po
new file mode 100644
index 00000000000..b3f4eee0b57
--- /dev/null
+++ b/addons/base_crypt/i18n/hr.po
@@ -0,0 +1,86 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 12:11+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Ne možete imati dva korisnika sa istim korisničkim imenom !"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Odabrana organizacija nije među dozvoljenim organizacijama za ovog korisnika"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "Molim navedite zaporku!"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr ""
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Greška"
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
+"Ovaj modul mijenja zaporku u čitljivom tekstu za šifriranom zaporkom,\n"
+"onemogućujući čitanje originalne zaporke.\n"
+"Za postojećeg korisnika, ukljanjanje čitljive zaporke dešava se priv put kad "
+"se korisnik prijavljuje \n"
+"u bazu podataka, nakon instalacije base crypt modula.\n"
+"Nakon instalacije ovog modula neće biti moguće doznati zaboravljenu zaporku "
+"vašeg korisnika.\n"
+"Jedino riješenje je da admin postavi novu zaporku.\n"
+"\n"
+"Napomena: instalacija ovog modula ne znači da možete ignorirati osnovne "
+"mjere sigurnosti,\n"
+"jer se zaporka i dlaje prenosi nešifrirana preko mreže (klijent),\n"
+"osim ako ne koristite sigurnosne protokole poput XML-RPSC.\n"
+"                    "
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 2692e63e55d..bf9162601b1 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'IBAN Bank Accounts',
     'version': '1.0',
-    "category": 'Accounting & Finance',
+    "category": 'Hidden/Dependency',
     'complexity': "easy",
     'description': """
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity.
diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py
index 6ddf2e82541..157b88960bf 100644
--- a/addons/base_iban/base_iban.py
+++ b/addons/base_iban/base_iban.py
@@ -85,12 +85,14 @@ class res_partner_bank(osv.osv):
         #overwrite to format the iban number correctly
         if (vals.get('state',False)=='iban') and vals.get('acc_number', False):
             vals['acc_number'] = _format_iban(vals['acc_number'])
+            vals['acc_number'] = _pretty_iban(vals['acc_number'])
         return super(res_partner_bank, self).create(cr, uid, vals, context)
 
     def write(self, cr, uid, ids, vals, context=None):
         #overwrite to format the iban number correctly
         if (vals.get('state',False)=='iban') and vals.get('acc_number', False):
             vals['acc_number'] = _format_iban(vals['acc_number'])
+            vals['acc_number'] = _pretty_iban(vals['acc_number'])
         return super(res_partner_bank, self).write(cr, uid, ids, vals, context)
 
     def check_iban(self, cr, uid, ids, context=None):
diff --git a/addons/base_iban/i18n/fa.po b/addons/base_iban/i18n/fa.po
new file mode 100644
index 00000000000..b06330c3d27
--- /dev/null
+++ b/addons/base_iban/i18n/fa.po
@@ -0,0 +1,92 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:49+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+msgid "Create IBAN bank accounts"
+msgstr ""
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:120
+#, python-format
+msgid ""
+"The IBAN does not seems to be correct. You should have entered something "
+"like this %s"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr ""
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr ""
+
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bic"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
+msgid "iban"
+msgstr ""
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:121
+#, python-format
+msgid "The IBAN is invalid, It should begin with the country code"
+msgstr ""
+
+#. module: base_iban
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr ""
+
+#. module: base_iban
+#: model:ir.module.module,description:base_iban.module_meta_information
+msgid ""
+"\n"
+"This module installs the base for IBAN (International Bank Account Number) "
+"bank accounts and checks for its validity.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
+msgid "acc_number"
+msgstr ""
diff --git a/addons/base_iban/i18n/hr.po b/addons/base_iban/i18n/hr.po
index 7cfe604a6a5..3a214c81f34 100644
--- a/addons/base_iban/i18n/hr.po
+++ b/addons/base_iban/i18n/hr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-08-03 03:36+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-19 12:16+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:53+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:49+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 "Language: hr\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 msgid "Create IBAN bank accounts"
-msgstr ""
+msgstr "Kreiraj IBAN bankovne račune"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:120
@@ -28,7 +28,7 @@ msgstr ""
 msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
-msgstr ""
+msgstr "Izgleda da IBAN nije točan. Trebali ste unijeti nešto kao %s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -38,12 +38,12 @@ msgstr "Pošt. Broj"
 #. module: base_iban
 #: help:res.partner.bank,iban:0
 msgid "International Bank Account Number"
-msgstr "Međunarodni broj Bankovnog računa"
+msgstr "Međunarodni broj bankovnog računa"
 
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Bankovni računi"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
@@ -64,7 +64,7 @@ msgstr "iban"
 #: code:addons/base_iban/base_iban.py:121
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
-msgstr ""
+msgstr "Neispravan IBAN. Mora početi sa oznakom države"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
@@ -74,7 +74,7 @@ msgstr "IBAN"
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr "IBAN konto"
+msgstr "IBAN račun"
 
 #. module: base_iban
 #: model:ir.module.module,description:base_iban.module_meta_information
@@ -85,11 +85,16 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul instalira osnovu za IBAN (International Bank Account Number) "
+"bankovne račune i provjera njihovu ispravnost.\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
-msgstr "Broj konta"
+msgstr "acc_number"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
diff --git a/addons/base_module_quality/i18n/fa.po b/addons/base_module_quality/i18n/fa.po
new file mode 100644
index 00000000000..7e85fa80987
--- /dev/null
+++ b/addons/base_module_quality/i18n/fa.po
@@ -0,0 +1,664 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#, python-format
+msgid "Suggestion"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:100
+#, python-format
+msgid "Programming Error"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:31
+#, python-format
+msgid "Method Test"
+msgstr ""
+
+#. module: base_module_quality
+#: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
+msgid "Base module quality - To check the quality of other modules"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:34
+#, python-format
+msgid ""
+"\n"
+"Test checks for fields, views, security rules, dependancy level\n"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:127
+#, python-format
+msgid "O(n) or worst"
+msgstr ""
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Skipped"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:46
+#, python-format
+msgid "Module has no objects"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:49
+#, python-format
+msgid "Speed Test"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:54
+#, python-format
+msgid "The module does not contain the __openerp__.py file"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:82
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
+#, python-format
+msgid "Object Name"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:54
+#: code:addons/base_module_quality/method_test/method_test.py:61
+#: code:addons/base_module_quality/method_test/method_test.py:68
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:34
+#, python-format
+msgid ""
+"This test checks if the module satisfies the current coding standard used by "
+"OpenERP."
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/quality_save_report.py:46
+#, python-format
+msgid "No report to save!"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of dependancy in %"
+msgstr ""
+
+#. module: base_module_quality
+#: help:module.quality.detail,state:0
+msgid ""
+"The test will be completed only if the module is installed or if the test "
+"may be processed on uninstalled module."
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
+#, python-format
+msgid "Result (/10)"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:33
+#, python-format
+msgid "Terp Test"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:33
+#, python-format
+msgid "Object Test"
+msgstr ""
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Save Report"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/module_quality_check.py:46
+#: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
+#, python-format
+msgid "Quality Check"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:128
+#, python-format
+msgid "Not Efficient"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/wizard/quality_save_report.py:46
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:35
+#, python-format
+msgid "Unit Test"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "Reading Complexity"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:267
+#, python-format
+msgid "Result of pep8_test in %"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:50
+#, python-format
+msgid "Module does not have 'unit_test/test.py' file"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,ponderation:0
+msgid "Ponderation"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of Security in %"
+msgstr ""
+
+#. module: base_module_quality
+#: help:module.quality.detail,ponderation:0
+msgid ""
+"Some tests are more critical than others, so they have a bigger weight in "
+"the computation of final rating"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:120
+#, python-format
+msgid "No enough data"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
+#, python-format
+msgid "Result (/1)"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N (Number of Records)"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:133
+#, python-format
+msgid "No data"
+msgstr ""
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_detail
+msgid "module.quality.detail"
+msgstr ""
+
+#. module: base_module_quality
+#: wizard_field:quality_detail_save,init,module_file:0
+msgid "Save report"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:34
+#, python-format
+msgid ""
+"This test checks where object has workflow or not on it if there is a state "
+"field and several buttons on it and also checks validity of workflow xml file"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
+#, python-format
+msgid "Result in %"
+msgstr ""
+
+#. module: base_module_quality
+#: wizard_view:quality_detail_save,init:0
+msgid "Standard entries"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:58
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:88
+#, python-format
+msgid "No python file found"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
+#: view:module.quality.check:0
+#: view:module.quality.detail:0
+#, python-format
+msgid "Result"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,message:0
+msgid "Message"
+msgstr ""
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Detail"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,note:0
+msgid "Note"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:85
+#, python-format
+msgid ""
+"<html>O(1) means that the number of SQL requests to read the object does not "
+"depand on the number of objects we are reading. This feature is mostly "
+"wished.\n"
+"</html>"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:120
+#, python-format
+msgid "__openerp__.py file"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
+#, python-format
+msgid "Status"
+msgstr ""
+
+#. module: base_module_quality
+#: view:module.quality.check:0
+#: field:module.quality.check,check_detail_ids:0
+msgid "Tests"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:50
+#, python-format
+msgid ""
+"\n"
+"This test checks the speed of the module. Note that at least 5 demo data is "
+"needed in order to run it.\n"
+"\n"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:71
+#, python-format
+msgid "Unable to parse the result. Check the details."
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:33
+#, python-format
+msgid ""
+"\n"
+"This test checks if the module satisfy tiny structure\n"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
+#, python-format
+msgid "Module Name"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:56
+#, python-format
+msgid "Error! Module is not properly loaded/installed"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:116
+#, python-format
+msgid "Error in Read method: %s"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:138
+#, python-format
+msgid "Score is below than minimal score(%s%%)"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N/2"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:57
+#: code:addons/base_module_quality/method_test/method_test.py:64
+#: code:addons/base_module_quality/method_test/method_test.py:71
+#, python-format
+msgid "Exception"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:100
+#, python-format
+msgid "Test Is Not Implemented"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "N"
+msgstr ""
+
+#. module: base_module_quality
+#: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
+msgid "Report Save"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
+#, python-format
+msgid "Feedback about structure of module"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:73
+#, python-format
+msgid ""
+"Given module has no objects.Speed test can work only when new objects are "
+"created in the module along with demo data"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:32
+#, python-format
+msgid ""
+"This test uses Pylint and checks if the module satisfies the coding standard "
+"of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
+" "
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
+#, python-format
+msgid "Feed back About Workflow of Module"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:129
+#, python-format
+msgid "No Workflow define"
+msgstr ""
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_module_quality
+#: wizard_button:quality_detail_save,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:32
+#, python-format
+msgid ""
+"\n"
+"PEP-8 Test , copyright of py files check, method can not call from loops\n"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.check,final_score:0
+msgid "Final Score (%)"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:61
+#, python-format
+msgid ""
+"Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:125
+#, python-format
+msgid "Efficient"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.check,name:0
+msgid "Rated Module"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:33
+#, python-format
+msgid "Workflow Test"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:36
+#, python-format
+msgid ""
+"\n"
+"This test checks the Unit Test(PyUnit) Cases of the module. Note that "
+"'unit_test/test.py' is needed in module.\n"
+"\n"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:32
+#, python-format
+msgid ""
+"\n"
+"This test checks if the module classes are raising exception when calling "
+"basic methods or not.\n"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,detail:0
+msgid "Details"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:119
+#, python-format
+msgid "Warning! Not enough demo data"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:31
+#, python-format
+msgid "Pylint Test"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:31
+#, python-format
+msgid "PEP-8 Test"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#, python-format
+msgid "Field name"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#, python-format
+msgid "1"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:132
+#, python-format
+msgid "Warning! Object has no demo data"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
+#, python-format
+msgid "Tag Name"
+msgstr ""
+
+#. module: base_module_quality
+#: wizard_field:quality_detail_save,init,name:0
+msgid "File name"
+msgstr ""
+
+#. module: base_module_quality
+#: model:ir.module.module,description:base_module_quality.module_meta_information
+msgid ""
+"\n"
+"The aim of this module is to check the quality of other modules.\n"
+"\n"
+"It defines a wizard on the list of modules in OpenERP, which allows you to\n"
+"evaluate them on different criteria such as: the respect of OpenERP coding\n"
+"standards, the speed efficiency...\n"
+"\n"
+"This module also provides generic framework to define your own quality "
+"test.\n"
+"For further info, coders may take a look into base_module_quality\\"
+"README.txt\n"
+"\n"
+"WARNING: This module can not work as a ZIP file, you must unzip it before\n"
+"using it, otherwise it may crash.\n"
+"    "
+msgstr ""
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_check
+msgid "module.quality.check"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
+#, python-format
+msgid "Result of views in %"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,score:0
+msgid "Score (%)"
+msgstr ""
+
+#. module: base_module_quality
+#: help:quality_detail_save,init,name:0
+msgid "Save report as .html format"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/base_module_quality.py:269
+#, python-format
+msgid "The module has to be installed before running this test."
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:123
+#, python-format
+msgid "O(1)"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#, python-format
+msgid "Result of fields in %"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
+#: view:module.quality.detail:0
+#: field:module.quality.detail,summary:0
+#, python-format
+msgid "Summary"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
+#, python-format
+msgid "File Name"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#, python-format
+msgid "Line number"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:32
+#, python-format
+msgid "Structure Test"
+msgstr ""
+
+#. module: base_module_quality
+#: field:module.quality.detail,quality_check_id:0
+msgid "Quality"
+msgstr ""
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
+#, python-format
+msgid "Feed back About terp file of Module"
+msgstr ""
diff --git a/addons/base_module_quality/i18n/pt.po b/addons/base_module_quality/i18n/pt.po
index 67eebfb18bb..cd1f263dc5d 100644
--- a/addons/base_module_quality/i18n/pt.po
+++ b/addons/base_module_quality/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-15 10:44+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-10 12:08+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:187
@@ -152,7 +152,7 @@ msgstr "Objecto de Teste"
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr "Gravar Relatório"
+msgstr "Guardar relatório"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/module_quality_check.py:46
diff --git a/addons/base_module_quality/security/ir.model.access.csv b/addons/base_module_quality/security/ir.model.access.csv
index 74b88054c40..b5e5d53addb 100644
--- a/addons/base_module_quality/security/ir.model.access.csv
+++ b/addons/base_module_quality/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_module_quality_check","module.quality.check","model_module_quality_check",1,1,1,1
-"access_module_quality_detail","module.quality.detail","model_module_quality_detail",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_module_quality_check,module.quality.check,model_module_quality_check,,1,1,1,1
+access_module_quality_detail,module.quality.detail,model_module_quality_detail,,1,1,1,1
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index fdb576e0ddd..b2a93258d5d 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Module Record',
+    'name': 'Record and Create Modules',
     'version': '1.0',
     'category': 'Tools',
     'description': """
diff --git a/addons/base_module_record/i18n/fa.po b/addons/base_module_record/i18n/fa.po
new file mode 100644
index 00000000000..20498d89345
--- /dev/null
+++ b/addons/base_module_record/i18n/fa.po
@@ -0,0 +1,295 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Information"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid ""
+"If you think your module could interest others people, we'd like you to "
+"publish it on OpenERP.com, in the 'Modules' section. You can do it through "
+"the website or using features of the 'base_module_publish' module."
+msgstr ""
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,info,end:0
+#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
+msgid "End"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,init:0
+#: wizard_view:base_module_record.module_record_objects,init:0
+msgid "Choose objects to record"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,author:0
+msgid "Author"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
+msgid "Directory Name"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
+#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Records only"
+msgstr ""
+
+#. module: base_module_record
+#: model:ir.model,name:base_module_record.model_ir_module_record
+msgid "ir.module.record"
+msgstr ""
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_objects,info,data_kind:0
+msgid "Demo Data"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
+msgid "Filename"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,version:0
+msgid "Version"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,info:0
+#: wizard_view:base_module_record.module_record_data,init:0
+#: wizard_view:base_module_record.module_record_data,save_yaml:0
+#: wizard_view:base_module_record.module_record_objects,init:0
+msgid "Objects Recording"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,check_date:0
+#: wizard_field:base_module_record.module_record_objects,init,check_date:0
+msgid "Record from Date"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,end:0
+#: wizard_view:base_module_record.module_record_objects,end:0
+#: wizard_view:base_module_record.module_record_objects,info:0
+#: wizard_view:base_module_record.module_record_objects,save:0
+#: wizard_view:base_module_record.module_record_objects,save_yaml:0
+msgid "Module Recording"
+msgstr ""
+
+#. module: base_module_record
+#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
+msgid "Export Customizations As a Module"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Thanks in advance for your contribution."
+msgstr ""
+
+#. module: base_module_record
+#: help:base_module_record.module_record_data,init,objects:0
+#: help:base_module_record.module_record_objects,init,objects:0
+msgid "List of objects to be recorded"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,description:0
+msgid "Full Description"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,name:0
+msgid "Module Name"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,objects:0
+#: wizard_field:base_module_record.module_record_objects,init,objects:0
+msgid "Objects"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,save,module_file:0
+#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
+msgid "Module .zip File"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save:0
+msgid "Module successfully created !"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,save_yaml:0
+msgid "YAML file successfully created !"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,info:0
+#: wizard_view:base_module_record.module_record_data,save_yaml:0
+msgid "Result, paste this to your module's xml"
+msgstr ""
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Created"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_data,end:0
+#: wizard_view:base_module_record.module_record_objects,end:0
+msgid "Thanks For using Module Recorder"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,website:0
+msgid "Documentation URL"
+msgstr ""
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Modified"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,init,record:0
+#: wizard_button:base_module_record.module_record_objects,init,record:0
+msgid "Record"
+msgstr ""
+
+#. module: base_module_record
+#: model:ir.module.module,shortdesc:base_module_record.module_meta_information
+msgid "Module Record"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_objects,info,save:0
+msgid "Continue"
+msgstr ""
+
+#. module: base_module_record
+#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
+msgid "Export Customizations As Data File"
+msgstr ""
+
+#. module: base_module_record
+#: code:addons/base_module_record/wizard/base_module_save.py:129
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_objects,info,data_kind:0
+msgid "Normal Data"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,end,end:0
+#: wizard_button:base_module_record.module_record_objects,end,end:0
+msgid "OK"
+msgstr ""
+
+#. module: base_module_record
+#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
+msgid "Module Creation"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
+msgid "Type of Data"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_view:base_module_record.module_record_objects,info:0
+msgid "Module Information"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
+#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
+msgid "YAML"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_field:base_module_record.module_record_data,info,res_text:0
+#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
+msgid "Result"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_data,init,end:0
+#: wizard_button:base_module_record.module_record_objects,info,end:0
+#: wizard_button:base_module_record.module_record_objects,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_module_record
+#: wizard_button:base_module_record.module_record_objects,save,end:0
+#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
+msgid "Close"
+msgstr ""
+
+#. module: base_module_record
+#: selection:base_module_record.module_record_data,init,filter_cond:0
+#: selection:base_module_record.module_record_objects,init,filter_cond:0
+msgid "Created & Modified"
+msgstr ""
+
+#. module: base_module_record
+#: model:ir.module.module,description:base_module_record.module_meta_information
+msgid ""
+"\n"
+"This module allows you to create a new module without any development.\n"
+"It records all operations on objects during the recording session and\n"
+"produce a .ZIP module. So you can create your own module directly from\n"
+"the OpenERP client.\n"
+"\n"
+"This version works for creating and updating existing records. It "
+"recomputes\n"
+"dependencies and links for all types of widgets (many2one, many2many, ...).\n"
+"It also support workflows and demo/update data.\n"
+"\n"
+"This should help you to easily create reusable and publishable modules\n"
+"for custom configurations and demo/testing data.\n"
+"\n"
+"How to use it:\n"
+"Run Administration/Customization/Module Creation/Export Customizations As a "
+"Module wizard.\n"
+"Select datetime criteria of recording and objects to be recorded and Record "
+"module.\n"
+"    "
+msgstr ""
diff --git a/addons/base_module_record/i18n/hr.po b/addons/base_module_record/i18n/hr.po
index e3f34e9003d..2c57641484d 100644
--- a/addons/base_module_record/i18n/hr.po
+++ b/addons/base_module_record/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-08-03 02:00+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-19 14:10+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 "Language: hr\n"
 
 #. module: base_module_record
@@ -34,12 +34,18 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
+"If you think your module could interest others people, we'd like you to "
+"publish it on OpenERP.com, in the 'Modules' section. You can do it through "
+"the website or using features of the 'base_module_publish' module.\r\n"
+"Ako mislite da bi vaš modul mogao zanimati druge ljude, voljeli bi smo da ga "
+"objavite na OpenERp.com, u sekciji 'Moduli'. Možete to učiniti kroz web "
+"stranicu ili koristeći modul 'base-module_publish'."
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_data,info,end:0
 #: wizard_button:base_module_record.module_record_data,save_yaml,end:0
 msgid "End"
-msgstr ""
+msgstr "Kraj"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,init:0
@@ -242,13 +248,13 @@ msgstr "Informacija o Modulu"
 #: wizard_field:base_module_record.module_record_data,init,info_yaml:0
 #: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
 msgid "YAML"
-msgstr ""
+msgstr "YAML"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,info,res_text:0
 #: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
 msgid "Result"
-msgstr ""
+msgstr "Rezultat"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_data,init,end:0
@@ -293,6 +299,27 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul omogućuje vam kreiranje novih modula bez programiranja.\n"
+"Bilježi sve operacije na objektima za vrijeme sesije snimanja i kreira .ZIP "
+"modul,\n"
+"Tako da možete kreirati vlastiti modul direktno iz OpenERP klijenta.\n"
+"\n"
+"Ova verzija funkcionira za kreiranje i ažuriranje postojećih zapisa. "
+"Preračunava ovisnosti i povezuje \n"
+"sve tipove widgetas (many2one, many2many, ...).\n"
+"Također podržava dijagrame tijekova i demo podatke.\n"
+"\n"
+"ovo bi vam trebalo pomoći da lako kreirate module za prilagođene "
+"konfiguracije i demo podatke \n"
+"ili podatke za uvoz.\n"
+"\n"
+"Kako koristiti:\n"
+"Pokreni Administracija/Postava/Kreiranje modula/Izvezi prilagodbu kako "
+"asistent modula.\n"
+"Izaberi kriterij datuma i vremena i objekte koji se trebaju bilježiti i "
+"modul.\n"
+"    "
 
 #~ msgid "Recording Stopped"
 #~ msgstr "Snimanje zaustavljeno"
diff --git a/addons/base_module_record/security/ir.model.access.csv b/addons/base_module_record/security/ir.model.access.csv
index fa68571a916..894312eae88 100644
--- a/addons/base_module_record/security/ir.model.access.csv
+++ b/addons/base_module_record/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_ir_module_record,ir.module.record,model_ir_module_record,base.group_system,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ir_module_record,ir.module.record,model_ir_module_record,base.group_system,1,1,1,1
diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index 5e8bed72d03..632d1d306f6 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Query Builder',
     'version': '1.0',
-    'category': 'Advanced Reporting',
+    'category': 'Reporting',
     'complexity': "expert",
     'description': """
 This module allows you to create any statistic report on several objects.
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 75bd149186a..ff26ad81572 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -201,18 +201,15 @@ class report_result(osv.osv):
                 else:
                     fields['column_count'] = (False, 'Count')
             newargs = []
-            newargs2 = []
             for a in args:
                 if fields[a[0]][0]:
-                    res = self.pool.get(fields[a[0]][0])._where_calc(cr, user, [[fields[a[0]][1], a[1], a[2]]], active_test = False, context = context)
-                    newargs += res[0]
-                    newargs2 += res[1]
-                else:
-                    newargs += [("count(*) " + a[1] +" " + str(a[2]))]
+                    model = self.pool.get(fields[a[0]][0])
+                    newargs.append(str(model._table+"."+fields[a[0]][1] + " " +a[1] + " '" + a[2])+"'")
             ctx = context or {}
             ctx['getid'] = True
-            sql_query = report.sql_query
-            cr.execute(sql_query) # TODO: FILTER
+            report_pool = self.pool.get('base_report_creator.report')
+            reports = report_pool._sql_query_get(cr, user, [context_id], 'sql_query', None, ctx, where_plus=newargs, limit=limit, offset=offset)
+            cr.execute(reports[context_id])
             result = cr.fetchall()
             return map(lambda x: x[0], result)
 
diff --git a/addons/base_report_creator/i18n/fa.po b/addons/base_report_creator/i18n/fa.po
new file mode 100644
index 00000000000..b5f9809bd68
--- /dev/null
+++ b/addons/base_report_creator/i18n/fa.po
@@ -0,0 +1,518 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_report_creator
+#: help:base_report_creator.report.filter,expression:0
+msgid ""
+"Provide an expression for the field based on which you want to filter the "
+"records.\n"
+" e.g. res_partner.id=3"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_report_menu_create
+msgid "Menu Create"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_type:0
+msgid "Graph Type"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Used View"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Filter Values"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,graph_mode:0
+msgid "Graph Mode"
+msgstr ""
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:310
+#, python-format
+msgid ""
+"These is/are model(s) (%s) in selection which is/are not related to any "
+"other model"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Legend"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Graph View"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,expression:0
+msgid "Value"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
+msgid "Set Filter Fields"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
+msgid "Report Filters"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,sql_query:0
+msgid "SQL Query"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: view:report.menu.create:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Minimum"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
+msgid "Operator"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "OR"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.base_report_creator_action
+msgid "Custom Reports"
+msgstr ""
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:310
+#, python-format
+msgid "No Related Models!!"
+msgstr ""
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Menu Information"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Sum"
+msgstr ""
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,model_ids:0
+msgid "Reported Objects"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Field List"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,type:0
+msgid "Report Type"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Add filter"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.action_report_menu_create
+msgid "Create Menu for Report"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Form"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+#: selection:base_report_creator.report.fields,calendar_mode:0
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "/"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report.fields,report_id:0
+#: field:base_report_creator.report.filter,report_id:0
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_result
+msgid "Report"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,group_ids:0
+msgid "Authorized Groups"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Tree"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_orientation:0
+msgid "Graph Orientation"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Authorized Groups (empty for all)"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Security"
+msgstr ""
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "AND"
+msgstr ""
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,calendar_mode:0
+msgid "Calendar Mode"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
+msgid "Display Fields"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "Y Axis"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Calendar"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Graph"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
+msgid "Field Name"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Set Filter Values"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Vertical"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,type:0
+msgid "Rows And Columns Report"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "General Configuration"
+msgstr ""
+
+#. module: base_report_creator
+#: help:base_report_creator.report.fields,sequence:0
+msgid "Gives the sequence order when displaying a list of fields."
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,init:0
+msgid "Select Field to filter"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Horizontal"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,group_method:0
+msgid "Grouping Method"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,condition:0
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Count"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "X Axis"
+msgstr ""
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
+msgid "Confirm Filter"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,name:0
+msgid "Filter Name"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Open Report"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Grouped"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
+msgid "Report Creator"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,end:0
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
+#: view:report.menu.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,menu_id:0
+msgid "Menu"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type1:0
+msgid "First View"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Delay"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,field_id:0
+msgid "Field"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Unique Colors"
+msgstr ""
+
+#. module: base_report_creator
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Pie Chart"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type3:0
+msgid "Third View"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,name:0
+msgid "Report Name"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Fields"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Average"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Use %(uid)s to filter by the connected user"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Maximum"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
+msgid "Continue"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
+msgid "Values"
+msgstr ""
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Bar Chart"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type2:0
+msgid "Second View"
+msgstr ""
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Create Menu For This Report"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "View parameters"
+msgstr ""
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
+msgid "Filter Field"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,field_ids:0
+msgid "Fields to Display"
+msgstr ""
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,filter_ids:0
+msgid "Filters"
+msgstr ""
+
+#. module: base_report_creator
+#: model:ir.module.module,description:base_report_creator.module_meta_information
+msgid ""
+"This module allows you to create any statistic\n"
+"report on several objects. It's a SQL query builder and browser\n"
+"for and users.\n"
+"\n"
+"After installing the module, it adds a menu to define custom report in\n"
+"the \"Dashboard\" menu.\n"
+msgstr ""
diff --git a/addons/base_report_creator/security/ir.model.access.csv b/addons/base_report_creator/security/ir.model.access.csv
index c9e78315b67..a096efd3b18 100644
--- a/addons/base_report_creator/security/ir.model.access.csv
+++ b/addons/base_report_creator/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_base_report_creator_report","base_report_creator.report","model_base_report_creator_report","base.group_system",1,1,1,1
-"access_base_report_creator_report_fields","base_report_creator.report.fields","model_base_report_creator_report_fields","base.group_system",1,1,1,1
-"access_base_report_creator_report_filter","base_report_creator.report.filter","model_base_report_creator_report_filter","base.group_system",1,1,1,1
-"access_base_report_creator_report_result","base_report_creator.report.result","model_base_report_creator_report_result","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_base_report_creator_report,base_report_creator.report,model_base_report_creator_report,base.group_system,1,1,1,1
+access_base_report_creator_report_fields,base_report_creator.report.fields,model_base_report_creator_report_fields,base.group_system,1,1,1,1
+access_base_report_creator_report_filter,base_report_creator.report.filter,model_base_report_creator_report_filter,base.group_system,1,1,1,1
+access_base_report_creator_report_result,base_report_creator.report.result,model_base_report_creator_report_result,base.group_system,1,1,1,1
diff --git a/addons/base_report_creator/wizard/wiz_set_filter_fields.py b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
index 0903f968eea..4129845d400 100644
--- a/addons/base_report_creator/wizard/wiz_set_filter_fields.py
+++ b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
@@ -150,7 +150,7 @@ def _set_filter_value(self, cr, uid, data, context):
 def _set_form_value(self, cr, uid, data, context):
     field_id = data['form']['field_id']
     field_data = pooler.get_pool(cr.dbname).get('ir.model.fields').read(cr,uid,[field_id])[0]
-    fields_dict = pooler.get_pool(cr.dbname).get(field_data.get('model')).fields_get(cr,uid,fields=[field_data.get('name')])
+    fields_dict = pooler.get_pool(cr.dbname).get(field_data.get('model')).fields_get(cr,uid,allfields=[field_data.get('name')])
     value_field = set_value_fields.get('value')
     for k,v in value_field.items():
         if k in ('size','relation','type'):
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index a95235d8017..0f3d5f72263 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'OpenOffice Report Designer',
     'version': '0.1',
-    'category': 'Advanced Reporting',
+    'category': 'Reporting',
     'complexity': "normal",
     'description': """
 This module is used along with OpenERP OpenOffice Plugin.
diff --git a/addons/base_report_designer/i18n/fa.po b/addons/base_report_designer/i18n/fa.po
new file mode 100644
index 00000000000..290617f419a
--- /dev/null
+++ b/addons/base_report_designer/i18n/fa.po
@@ -0,0 +1,220 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_sxw
+msgid "base.report.sxw"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "OpenERP Report Designer Configuration"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
+msgid "Report designer interface module"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid ""
+"This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
+"Writer."
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.module.module,description:base_report_designer.module_meta_information
+msgid ""
+"\n"
+"This module is used along with OpenERP OpenOffice plugin.\n"
+"You have to first install the plugin which is available at\n"
+"http://www.openerp.com\n"
+"\n"
+"This module adds wizards to Import/Export .sxw report that\n"
+"you can modify in OpenOffice.Once you have modified it you can\n"
+"upload the report using the same wizard.\n"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "The .SXW report"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_designer_installer
+msgid "base_report_designer.installer"
+msgstr ""
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,description:0
+msgid "Description"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "_Close"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "The RML report"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,report_id:0
+#: field:base.report.sxw,report_id:0
+msgid "Report"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_rml_save
+msgid "base.report.rml.save"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
+msgid "Report Designer"
+msgstr ""
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,name:0
+msgid "File name"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.sxw:0
+msgid "Get a report"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
+msgid "OpenERP Report Designer"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Continue"
+msgstr ""
+
+#. module: base_report_designer
+#: field:base.report.rml.save,file_rml:0
+msgid "Save As"
+msgstr ""
+
+#. module: base_report_designer
+#: help:base_report_designer.installer,plugin_file:0
+msgid ""
+"OpenObject Report Designer plug-in file. Save as this file and install this "
+"plug-in in OpenOffice."
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "Save RML FIle"
+msgstr ""
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,file_sxw:0
+#: field:base.report.file.sxw,file_sxw_upload:0
+msgid "Your .SXW file"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Installation and Configuration Steps"
+msgstr ""
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Skip"
+msgstr ""
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
+msgid "Base Report sxw"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_file_sxw
+msgid "base.report.file.sxw"
+msgstr ""
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,plugin_file:0
+msgid "OpenObject Report Designer Plug-in"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
+msgid "OpenERP Report Designer Installation"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.rml.save:0
+#: view:base.report.sxw:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Select your report"
+msgstr ""
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index bd62a097934..24d665a2cf6 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Initial Setup Tools',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'complexity': "easy",
     'description': """
 This module helps to configure the system at the installation of a new database.
diff --git a/addons/base_setup/security/ir.model.access.csv b/addons/base_setup/security/ir.model.access.csv
index 97dd8b917b8..4a08a4aa60d 100644
--- a/addons/base_setup/security/ir.model.access.csv
+++ b/addons/base_setup/security/ir.model.access.csv
@@ -1 +1 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/base_synchro/i18n/fa.po b/addons/base_synchro/i18n/fa.po
new file mode 100644
index 00000000000..8958c6f606c
--- /dev/null
+++ b/addons/base_synchro/i18n/fa.po
@@ -0,0 +1,289 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Servers to be synchronized"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+#: model:ir.ui.menu,name:base_synchro.synch_config
+msgid "Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr ""
diff --git a/addons/base_synchro/i18n/hr.po b/addons/base_synchro/i18n/hr.po
new file mode 100644
index 00000000000..12339595cfa
--- /dev/null
+++ b/addons/base_synchro/i18n/hr.po
@@ -0,0 +1,289 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 16:16+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr "Naziv polja"
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr "Zadnja sinkronizacija"
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr "Pošalji rezultate na"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr "Polja koja se NE sinkronizacija"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr "_Zatvori"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr "Prijenos podataka na poslužitelja"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr "Registriraj klasu"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr "Modeli"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr "Grupiraj po"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr "Učitaj s računala"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr "Lozinka"
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr "Oboje"
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr "Polja"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr "Smjer sinkronizacije"
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr "Poslužitelj"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr "Aktivan"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Servers to be synchronized"
+msgstr "Poslužitelji za sinkronizaciju"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr "Detalji transfera"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr "Povijest"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+#: model:ir.ui.menu,name:base_synchro.synch_config
+msgid "Synchronization"
+msgstr "Sinkronizacija"
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr "Domena"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr "U redu"
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr "Ime poslužitelja"
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr "Port"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr "Filtri"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr "Preuzimanje"
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr "URL poslužitelja"
diff --git a/addons/base_synchro/security/ir.model.access.csv b/addons/base_synchro/security/ir.model.access.csv
index fa0f00e8ccd..bf69c931523 100644
--- a/addons/base_synchro/security/ir.model.access.csv
+++ b/addons/base_synchro/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"base_synchro_server","base.synchro.server","model_base_synchro_server","base.group_system",1,1,1,1
-" base_synchro_obj"," base.synchro.obj","model_base_synchro_obj","base.group_system",1,1,1,1
-"base_synchro_obj_avoid","base.synchro.obj.avoid","model_base_synchro_obj_avoid","base.group_system",1,1,1,1
-"base_synchro_obj_line","base.synchro.obj.line","model_base_synchro_obj_line","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+base_synchro_server,base.synchro.server,model_base_synchro_server,base.group_system,1,1,1,1
+ base_synchro_obj, base.synchro.obj,model_base_synchro_obj,base.group_system,1,1,1,1
+base_synchro_obj_avoid,base.synchro.obj.avoid,model_base_synchro_obj_avoid,base.group_system,1,1,1,1
+base_synchro_obj_line,base.synchro.obj.line,model_base_synchro_obj_line,base.group_system,1,1,1,1
diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py
index d3c8a4716e0..d2cd2aad742 100644
--- a/addons/base_tools/__openerp__.py
+++ b/addons/base_tools/__openerp__.py
@@ -4,7 +4,7 @@
     "author": "OpenERP SA",
     "version": "1.0",
     "depends": ["base"],
-    "category" : "Tools",
+    "category" : "Hidden/Dependency",
     'complexity': "easy",
     'description': """
 Common base for tools modules.
diff --git a/addons/base_tools/i18n/fa.po b/addons/base_tools/i18n/fa.po
new file mode 100644
index 00000000000..09fe269540e
--- /dev/null
+++ b/addons/base_tools/i18n/fa.po
@@ -0,0 +1,30 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr ""
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
diff --git a/addons/base_tools/i18n/hr.po b/addons/base_tools/i18n/hr.po
new file mode 100644
index 00000000000..1b07abe2bd0
--- /dev/null
+++ b/addons/base_tools/i18n/hr.po
@@ -0,0 +1,32 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 11:40+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "Zajednička osnova za alatne module"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_tools/i18n/pt.po b/addons/base_tools/i18n/pt.po
index 69b6b9c4459..badfa6acc16 100644
--- a/addons/base_tools/i18n/pt.po
+++ b/addons/base_tools/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-05-17 12:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-10 12:08+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:56+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index 858b5c2c070..f7d9c572447 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'VAT Number Validation',
     'version': '1.0',
-    "category": 'Accounting & Finance',
+    "category": 'Hidden/Dependency',
     'complexity': "easy",
     'description': """
 VAT validation for Partners' VAT numbers
diff --git a/addons/base_vat/i18n/fa.po b/addons/base_vat/i18n/fa.po
new file mode 100644
index 00000000000..632fe6af01f
--- /dev/null
+++ b/addons/base_vat/i18n/fa.po
@@ -0,0 +1,73 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:87
+#, python-format
+msgid ""
+"The Vat does not seems to be correct. You should have entered something like "
+"this %s"
+msgstr ""
+
+#. module: base_vat
+#: model:ir.module.module,description:base_vat.module_meta_information
+msgid ""
+"\n"
+"    Enable the VAT Number for the partner. Check the validity of that VAT "
+"Number.\n"
+"\n"
+"    This module follows the methods stated at http://sima-pc.com/nif.php "
+"for\n"
+"    checking the validity of VAT Number assigned to partners in European "
+"countries.\n"
+"    "
+msgstr ""
+
+#. module: base_vat
+#: model:ir.module.module,shortdesc:base_vat.module_meta_information
+msgid "Base VAT - To check VAT number validity"
+msgstr ""
+
+#. module: base_vat
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:88
+#, python-format
+msgid "The VAT is invalid, It should begin with the country code"
+msgstr ""
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+msgid ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement."
+msgstr ""
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: base_vat
+#: field:res.partner,vat_subjected:0
+msgid "VAT Legal Statement"
+msgstr ""
diff --git a/addons/base_vat/i18n/hr.po b/addons/base_vat/i18n/hr.po
index d9c4bb205ec..113243a59c0 100644
--- a/addons/base_vat/i18n/hr.po
+++ b/addons/base_vat/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2009-11-17 08:50+0000\n"
-"Last-Translator: dzuvela <drazen@radez.hr>\n"
+"PO-Revision-Date: 2011-12-19 12:33+0000\n"
+"Last-Translator: Milan Tribuson <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:05+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
@@ -37,6 +37,12 @@ msgid ""
 "countries.\n"
 "    "
 msgstr ""
+"\n"
+"    Dodavanje OIB-a u partnere. Provjera ispravnosti OIB-a.\n"
+"\n"
+"    Ovaj modul prati metode navedene na http://sima-pc.com/nif.php koje\n"
+"    služe za provjeru ispravnosti OIB-a dodijeljenog partnerima u Europi.\n"
+"    "
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
@@ -46,13 +52,14 @@ msgstr "OIB - provjera valjanosti OIB-a"
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivno pridružene članove."
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:88
 #, python-format
 msgid "The VAT is invalid, It should begin with the country code"
 msgstr ""
+"OIB je neispravan, broj treba sadržavati šifru države (2 slova) na početku"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -60,16 +67,17 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
+"Označite ako partner podliježe PDV-u. Koristiti će se u PDV zakonskoj izjavi."
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr "Partner"
+msgstr ""
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr "PDV zakonska izjava"
+msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neispravan XML za arhitekturu prikaza!"
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index afb8cc42a95..e0f554bb1ec 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Dashboards',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'complexity': "normal",
     'description': """
 Lets the user create a custom dashboard.
diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index c43b2cd9602..c5a51795425 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -139,7 +139,6 @@
                     <board style="2-1">
                         <column>
                             <action name="%(board_config_overview)d" string="Configuration Overview"/>
-                            <action name="%(action_latest_activities_tree)d" string="Latest Activities" />
                         </column>
                         <column>
                             <action name="%(action_user_connection_tree)d" string="Users" />
diff --git a/addons/board/i18n/fa.po b/addons/board/i18n/fa.po
new file mode 100644
index 00000000000..6dd55178bb2
--- /dev/null
+++ b/addons/board/i18n/fa.po
@@ -0,0 +1,393 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note.type,name:0
+#: model:ir.model,name:board.model_board_note_type
+msgid "Note Type"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr ""
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr ""
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr ""
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+#: model:ir.ui.menu,name:board.menu_board_admin
+msgid "Administration Dashboard"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+#: model:ir.model,name:board.model_board_note
+msgid "Note"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr ""
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr ""
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr ""
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr ""
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,date:0
+msgid "Date"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr ""
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.admin_menu_dasboard
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr ""
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr ""
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr ""
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr ""
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,name:0
+msgid "Subject"
+msgstr ""
diff --git a/addons/board/i18n/hr.po b/addons/board/i18n/hr.po
index 2c7dc9b837c..412635b7f52 100644
--- a/addons/board/i18n/hr.po
+++ b/addons/board/i18n/hr.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-10-30 13:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-19 16:03+0000\n"
+"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Godina  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Kreiraj izbornik"
 
 #. module: board
 #: view:board.note:0
@@ -47,7 +47,7 @@ msgstr "Modul nadzorne ploče"
 #. module: board
 #: view:res.users:0
 msgid "Latest Connections"
-msgstr ""
+msgstr "Zadnje prijave"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:45
@@ -60,7 +60,7 @@ msgstr "Greška korisnika!"
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 #: model:ir.ui.menu,name:board.menu_board_admin
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Administration Dashboard"
 
 #. module: board
 #: view:board.note:0
@@ -73,19 +73,19 @@ msgstr "Bilješka"
 #: view:board.note:0
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "Board"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "Weekly Global Activity"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -95,13 +95,13 @@ msgstr "Naslov"
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "# Stavaka"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
@@ -113,12 +113,12 @@ msgstr "Otvori nadzornu ploču"
 #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
 #: view:res.log.report:0
 msgid "Monthly Activity per Document"
-msgstr ""
+msgstr "Monthly Activity per Document"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "Analiza logova"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
@@ -129,23 +129,23 @@ msgstr "Definicija nadzorne ploče"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "User Connections"
 
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
@@ -161,7 +161,7 @@ msgstr "Informacije o izborniku"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: board
 #: field:board.note,type:0
@@ -176,7 +176,7 @@ msgstr "Akcijski pogledi"
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "Log Report"
 
 #. module: board
 #: view:board.note:0
@@ -187,7 +187,7 @@ msgstr "Datum"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: board
 #: view:res.log.report:0
@@ -198,7 +198,7 @@ msgstr ""
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: board
 #: view:board.menu.create:0
@@ -208,17 +208,17 @@ msgstr "Kreiraj izbornik za nadzornu ploču"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr ""
+msgstr "Board Line"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
@@ -228,12 +228,12 @@ msgstr "Nadređeni izbornik"
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mjesec-1    "
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: board
 #: view:board.note:0
@@ -243,7 +243,7 @@ msgstr "Bilješke"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: board
 #: help:board.board.line,sequence:0
@@ -251,11 +251,13 @@ msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
 msgstr ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: board
 #: view:board.board:0
@@ -264,7 +266,7 @@ msgstr ""
 #: model:ir.ui.menu,name:board.admin_menu_dasboard
 #: model:ir.ui.menu,name:board.menu_dasboard
 msgid "Dashboard"
-msgstr "Nadzorna ploča"
+msgstr "Kokpit"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
@@ -274,7 +276,7 @@ msgstr "Temeljni modul za sve nadzorne ploče."
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Akcija"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -284,7 +286,7 @@ msgstr "Pozicija"
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
@@ -295,7 +297,7 @@ msgstr "Naziv izbornika"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Zadnje aktivnosti"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -320,7 +322,7 @@ msgstr "Širina"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mjesec   "
 
 #. module: board
 #: field:board.board.line,sequence:0
@@ -330,18 +332,18 @@ msgstr "Sekvenca"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: board
 #: view:board.board:0
 #: view:board.menu.create:0
 msgid "Create Menu"
-msgstr "Kreiraj izbornik"
+msgstr "Stvori izbornik"
 
 #. module: board
 #: field:board.board.line,height:0
@@ -356,23 +358,23 @@ msgstr "Kreiraj izbornik ploče"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Object"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Cancel"
-msgstr "Poništi"
+msgstr "Odustani"
 
 #. module: board
 #: view:board.board:0
@@ -403,9 +405,6 @@ msgstr "Predmet"
 #~ msgid "board.note.type"
 #~ msgstr "board.note.type"
 
-#~ msgid "Dashboards"
-#~ msgstr "Nadzorne ploče"
-
 #~ msgid "board.board.line"
 #~ msgstr "board.board.line"
 
@@ -419,3 +418,6 @@ msgstr "Predmet"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
+
+#~ msgid "Dashboards"
+#~ msgstr "Dashboards"
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index 34bc2169016..2275cc7d47d 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_board_board all","board.board","model_board_board",,1,0,0,0
-"access_board_board_line all","board.board.line","model_board_board_line",,1,0,0,0
-"access_board_board system","board.board system","model_board_board",base.group_system,1,1,1,1
-"access_board_board_line system","board.board.line system","model_board_board_line",base.group_system,1,1,1,1
-"access_res_log_report all","res.log.report","model_res_log_report",,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_board_board all,board.board,model_board_board,,1,0,0,0
+access_board_board_line all,board.board.line,model_board_board_line,,1,0,0,0
+access_board_board system,board.board system,model_board_board,base.group_system,1,1,1,1
+access_board_board_line system,board.board.line system,model_board_board_line,base.group_system,1,1,1,1
+access_res_log_report all,res.log.report,model_res_log_report,,1,0,0,0
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index edf852e4d5e..ef691e39564 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -49,7 +49,7 @@ To access OpenERP Calendar using WebCal to remote site use the URL like:
         DATABASE_NAME: Name of database on which OpenERP Calendar is created
         CALENDAR_NAME: Name of calendar to access
 """, 
-    'category': 'Tools', 
+    'category': 'Hidden/Dependency', 
     "author" : "OpenERP SA",
     'website': 'http://www.openerp.com',
     "init_xml" : ["caldav_data.xml"],
diff --git a/addons/caldav/i18n/fa.po b/addons/caldav/i18n/fa.po
new file mode 100644
index 00000000000..0fac63e59a8
--- /dev/null
+++ b/addons/caldav/i18n/fa.po
@@ -0,0 +1,818 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,url:0
+msgid "Url of the caldav server, use for synchronization"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:787
+#: code:addons/caldav/calendar.py:877
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_user_preference
+msgid "User preference Form"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,service:0
+msgid "Services"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Evolution"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:877
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr ""
+
+#. module: caldav
+#: field:caldav.browse,url:0
+msgid "Caldav Server"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,caldav_doc_file:0
+msgid "download full caldav Documentation."
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "iPhone"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:32
+#, python-format
+msgid ""
+"\n"
+"  * Webdav server that provides remote access to calendar\n"
+"  * Synchronisation of calendar using WebDAV\n"
+"  * Customize calendar event and todo attribute with any of OpenERP model\n"
+"  * Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:147
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"If you are using thunderbird, first you need to install the lightning "
+"module\n"
+"http://www.mozilla.org/projects/calendar/lightning/\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Go to Calendar View\n"
+"\n"
+"2. File -> New Calendar\n"
+"\n"
+"3. Chosse \"On the Network\"\n"
+"\n"
+"4. for format choose CalDav\n"
+"   and as location the url given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"   \n"
+"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
+"\"alarm\"\n"
+"\n"
+"6. Then put your openerp login and password (to give the password only check "
+"the box \"Use password Manager to remember this password\"\n"
+"\n"
+"7. Then Finish, your meetings should appear now in your calendar view\n"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:787
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+#: view:user.preference:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+#: field:user.preference,collection:0
+msgid "Calendar Collection"
+msgstr ""
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "_Open"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1291
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:128
+#, python-format
+msgid ""
+"\n"
+"    1. Go to Calendar View\n"
+"\n"
+"    2. File -> New -> Calendar\n"
+"\n"
+"    3. Fill the form \n"
+"        - type : CalDav\n"
+"        - name : Whaterver you want (ie : Meeting)\n"
+"        - url : "
+"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
+"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
+"given on the top of this window\n"
+"        - uncheck \"User SSL\"\n"
+"        - Username : Your username (ie : Demo)\n"
+"        - Refresh : everytime you want that evolution synchronize the data "
+"with the server\n"
+"\n"
+"    4. Click ok and give your openerp password\n"
+"\n"
+"    5. A new calendar named with the name you gave should appear on the left "
+"side.     \n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,description:caldav.module_meta_information
+msgid ""
+"\n"
+"    This module Contains basic functionality for caldav system like:  \n"
+"  - Webdav server that provides remote access to calendar\n"
+"  - Synchronisation of calendar using WebDAV\n"
+"  - Customize calendar event and todo attribute with any of OpenERP model\n"
+"  - Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Android based device"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "_Ok"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+#: field:user.preference,calendar:0
+msgid "Calendar"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,service:0
+msgid "CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Other"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr ""
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:813
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:104
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"There is no buit-in way to synchronize calendar with caldav.\n"
+"So you need to install a third part software : Calendar (CalDav) \n"
+"for now it's the only one\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Open Calendar Sync\n"
+"   I'll get an interface with 2 tabs\n"
+"   Stay on the first one\n"
+"   \n"
+"2. CaDAV Calendar URL : put the URL given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"3. Put your openerp username and password\n"
+"\n"
+"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
+"\n"
+"5. Then you can synchronize manually or custom the settings to synchronize "
+"every x minutes.\n"
+"    \n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:53
+#, python-format
+msgid ""
+"\n"
+"    For SSL specific configuration see the documentation below\n"
+"\n"
+"Now, to setup the calendars, you need to:\n"
+"\n"
+"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
+"page.\n"
+"2. Go to \"Add account...\"\n"
+"3. Click on \"Other\"\n"
+"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
+"\n"
+"5. Enter the host's name \n"
+"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
+"openerp.com is the host)\n"
+"\n"
+"6. Fill Username and password with your openerp login and password\n"
+"\n"
+"7. As a description, you can either leave the server's name or\n"
+"   something like \"OpenERP calendars\".\n"
+"\n"
+"9. If you are not using a SSL server, you'll get an error, do not worry and "
+"push \"Continue\"\n"
+"\n"
+"10. Then click to \"Advanced Settings\" to specify the right\n"
+"    ports and paths. \n"
+"    \n"
+"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
+"\n"
+"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
+"    the url given by the wizard (ie : "
+"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
+"\n"
+"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
+"    and verify it can use the account.\n"
+"\n"
+"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
+"    Your OpenERP calendars will be visible inside the selection of the\n"
+"    \"Calendars\" button.\n"
+"    Note that when creating a new calendar entry, you will have to specify\n"
+"    which calendar it should be saved at.\n"
+"\n"
+"\n"
+"\n"
+"IF you need SSL (and your certificate is not a verified one, as usual),\n"
+"then you first will need to let the iPhone trust that. Follow these\n"
+"steps:\n"
+"\n"
+"    s1. Open Safari and enter the https location of the OpenERP server:\n"
+"      https://my.server.ip:8071/\n"
+"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
+"      is the default 8071)\n"
+"    s2. Safari will try to connect and issue a warning about the "
+"certificate\n"
+"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
+"      now trusts it.   \n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "User Preference"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:caldav.browse,caldav_doc_file:0
+msgid "Caldav Document"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "Browse caldav"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,device:0
+msgid "Software/Devices"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,description:0
+#: view:caldav.browse:0
+#: field:caldav.browse,description:0
+msgid "Description"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1291
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Sunbird/Thunderbird"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr ""
diff --git a/addons/caldav/i18n/hr.po b/addons/caldav/i18n/hr.po
new file mode 100644
index 00000000000..51a2765c2d1
--- /dev/null
+++ b/addons/caldav/i18n/hr.po
@@ -0,0 +1,818 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#    * caldav
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 14:06+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr "Mapiranje vrijednosti"
+
+#. module: caldav
+#: help:caldav.browse,url:0
+msgid "Url of the caldav server, use for synchronization"
+msgstr "Url of the caldav server, use for synchronization"
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr "Datoteka"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr "Event Export"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr "Provide path for Remote Calendar"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr "Import .ics File"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr "_Zatvori"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr "Attendee"
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr "Can not map a field more than once"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:787
+#: code:addons/caldav/calendar.py:877
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr "Object"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr "Za obaviti"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_user_preference
+msgid "User preference Form"
+msgstr "Povlašteni obrazac korisnika"
+
+#. module: caldav
+#: field:user.preference,service:0
+msgid "Services"
+msgstr "Services"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr "Expression as constant"
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Evolution"
+msgstr "Evolution"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr "U redu"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:877
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr "Ime datoteke"
+
+#. module: caldav
+#: field:caldav.browse,url:0
+msgid "Caldav Server"
+msgstr "Caldav Server"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,caldav_doc_file:0
+msgid "download full caldav Documentation."
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "iPhone"
+msgstr "iPhone"
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:32
+#, python-format
+msgid ""
+"\n"
+"  * Webdav server that provides remote access to calendar\n"
+"  * Synchronisation of calendar using WebDAV\n"
+"  * Customize calendar event and todo attribute with any of OpenERP model\n"
+"  * Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:147
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"If you are using thunderbird, first you need to install the lightning "
+"module\n"
+"http://www.mozilla.org/projects/calendar/lightning/\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Go to Calendar View\n"
+"\n"
+"2. File -> New Calendar\n"
+"\n"
+"3. Chosse \"On the Network\"\n"
+"\n"
+"4. for format choose CalDav\n"
+"   and as location the url given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"   \n"
+"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
+"\"alarm\"\n"
+"\n"
+"6. Then put your openerp login and password (to give the password only check "
+"the box \"Use password Manager to remember this password\"\n"
+"\n"
+"7. Then Finish, your meetings should appear now in your calendar view\n"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr "Za napraviti"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr "Export ICS"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr "Use the field"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:787
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr "Calendar Lines"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr "Pretplata na događaje"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr "Uvezi ICS"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+#: view:user.preference:0
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr "basic.calendar.event"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr "Događaj"
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+#: field:user.preference,collection:0
+msgid "Calendar Collection"
+msgstr "Kalendar Kolekcija"
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Pogreška! Ne možete stvarati rekurzivne mape."
+
+#. module: caldav
+#: view:user.preference:0
+msgid "_Open"
+msgstr "_Otvori"
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr "Save in .ics format"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1291
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:128
+#, python-format
+msgid ""
+"\n"
+"    1. Go to Calendar View\n"
+"\n"
+"    2. File -> New -> Calendar\n"
+"\n"
+"    3. Fill the form \n"
+"        - type : CalDav\n"
+"        - name : Whaterver you want (ie : Meeting)\n"
+"        - url : "
+"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
+"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
+"given on the top of this window\n"
+"        - uncheck \"User SSL\"\n"
+"        - Username : Your username (ie : Demo)\n"
+"        - Refresh : everytime you want that evolution synchronize the data "
+"with the server\n"
+"\n"
+"    4. Click ok and give your openerp password\n"
+"\n"
+"    5. A new calendar named with the name you gave should appear on the left "
+"side.     \n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr "Calendar attributes"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_caldav_browse
+msgid "Caldav Browse"
+msgstr "Caldav Browse"
+
+#. module: caldav
+#: model:ir.module.module,description:caldav.module_meta_information
+msgid ""
+"\n"
+"    This module Contains basic functionality for caldav system like:  \n"
+"  - Webdav server that provides remote access to calendar\n"
+"  - Synchronisation of calendar using WebDAV\n"
+"  - Customize calendar event and todo attribute with any of OpenERP model\n"
+"  - Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Android based device"
+msgstr "Android based device"
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr "Datum kreiranja"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr "Mapiranje Atributa"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr "Mapa"
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr "Provide path for remote calendar"
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "_Ok"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr "Domena"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr "_Pretplati"
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr "Vlasnik"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+#: field:user.preference,calendar:0
+msgid "Calendar"
+msgstr "Kalendar"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,service:0
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr "OpenObject Field"
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr "Res. ID"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr "Message..."
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Other"
+msgstr "Ostale"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr "WebCal"
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr "Calendar Collections"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:813
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr "The same filename cannot apply to two records!"
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "Mapa ne može biti sama sebi nadređena!"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr "Calendars"
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr "Zbirka"
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Write Date"
+msgstr "Write Date"
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:104
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"There is no buit-in way to synchronize calendar with caldav.\n"
+"So you need to install a third part software : Calendar (CalDav) \n"
+"for now it's the only one\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Open Calendar Sync\n"
+"   I'll get an interface with 2 tabs\n"
+"   Stay on the first one\n"
+"   \n"
+"2. CaDAV Calendar URL : put the URL given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"3. Put your openerp username and password\n"
+"\n"
+"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
+"\n"
+"5. Then you can synchronize manually or custom the settings to synchronize "
+"every x minutes.\n"
+"    \n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:53
+#, python-format
+msgid ""
+"\n"
+"    For SSL specific configuration see the documentation below\n"
+"\n"
+"Now, to setup the calendars, you need to:\n"
+"\n"
+"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
+"page.\n"
+"2. Go to \"Add account...\"\n"
+"3. Click on \"Other\"\n"
+"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
+"\n"
+"5. Enter the host's name \n"
+"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
+"openerp.com is the host)\n"
+"\n"
+"6. Fill Username and password with your openerp login and password\n"
+"\n"
+"7. As a description, you can either leave the server's name or\n"
+"   something like \"OpenERP calendars\".\n"
+"\n"
+"9. If you are not using a SSL server, you'll get an error, do not worry and "
+"push \"Continue\"\n"
+"\n"
+"10. Then click to \"Advanced Settings\" to specify the right\n"
+"    ports and paths. \n"
+"    \n"
+"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
+"\n"
+"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
+"    the url given by the wizard (ie : "
+"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
+"\n"
+"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
+"    and verify it can use the account.\n"
+"\n"
+"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
+"    Your OpenERP calendars will be visible inside the selection of the\n"
+"    \"Calendars\" button.\n"
+"    Note that when creating a new calendar entry, you will have to specify\n"
+"    which calendar it should be saved at.\n"
+"\n"
+"\n"
+"\n"
+"IF you need SSL (and your certificate is not a verified one, as usual),\n"
+"then you first will need to let the iPhone trust that. Follow these\n"
+"steps:\n"
+"\n"
+"    s1. Open Safari and enter the https location of the OpenERP server:\n"
+"      https://my.server.ip:8071/\n"
+"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
+"      is the default 8071)\n"
+"    s2. Safari will try to connect and issue a warning about the "
+"certificate\n"
+"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
+"      now trusts it.   \n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "The directory name must be unique !"
+
+#. module: caldav
+#: view:user.preference:0
+msgid "User Preference"
+msgstr "User Preference"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr "basic.calendar.timezone"
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr "Expression"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr "basic.calendar.attendee"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr "basic.calendar.alias"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr "Select ICS file"
+
+#. module: caldav
+#: field:caldav.browse,caldav_doc_file:0
+msgid "Caldav Document"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr "Mapiranje polja"
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "Browse caldav"
+msgstr "Browse caldav"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr "basic.calendar"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr "Ostale informacije"
+
+#. module: caldav
+#: field:user.preference,device:0
+msgid "Software/Devices"
+msgstr "Software/Uređaji"
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+"akođer izvoz <name>. ICS ulazak uz mapu Kalendar, s WebCal sadržajem."
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr "Funkcija"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,description:0
+#: view:caldav.browse:0
+#: field:caldav.browse,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr "Kalendar/redak na koji se primjenjije ovo mapiranje"
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr "Mapiranje"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr "_Uvezi"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr "Event Import"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr "Interval u satima"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr "Pretplata na drugi udaljeni kalendar"
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr "For supporting clients, the color of the calendar entries"
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr "Alarm"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr "basic.calendar.alarm"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1291
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr "Export .ics File"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr "Save ICS file"
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Sunbird/Thunderbird"
+msgstr "Sunbird/Thunderbird"
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr "Order"
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr "Share Calendar using CalDAV"
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr "Color"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr "MY"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr "Calendar fields"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr "Uvezi poruku"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr "Subscribe"
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "Mapa mora imati roditelja ili pohranu (storage)"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr "osnovno.kalendar.za napraviti"
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr "For supporting clients, the order of this folder among the calendars"
diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
index ce3f3c90e32..34fbdcc0b02 100644
--- a/addons/caldav/security/ir.model.access.csv
+++ b/addons/caldav/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_basic_calendar_lines","basic.calendar.lines","model_basic_calendar_lines","base.group_user",1,1,1,1
-"access_basic_calendar_attributes","basic.calendar.attributes","model_basic_calendar_attributes","base.group_user",1,1,1,1
-"access_basic_calendar_fields","basic.calendar.fields","model_basic_calendar_fields","base.group_user",1,1,1,1
-"access_basic_calendar","basic.calendar","model_basic_calendar","base.group_user",1,1,1,1
-"access_basic_calendar_alias","basic.calendar.alias","model_basic_calendar_alias","base.group_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_basic_calendar_lines,basic.calendar.lines,model_basic_calendar_lines,base.group_user,1,1,1,1
+access_basic_calendar_attributes,basic.calendar.attributes,model_basic_calendar_attributes,base.group_user,1,1,1,1
+access_basic_calendar_fields,basic.calendar.fields,model_basic_calendar_fields,base.group_user,1,1,1,1
+access_basic_calendar,basic.calendar,model_basic_calendar,base.group_user,1,1,1,1
+access_basic_calendar_alias,basic.calendar.alias,model_basic_calendar_alias,base.group_user,1,1,1,1
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 178da7d1913..023b5fd5700 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -18,10 +18,10 @@
 #
 ##############################################################################
 {
-    "name" : "Claim from Delivery",
+    "name" : "Claim on Deliveries",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    'category': 'Sales Management',
+    "category" : "Warehouse Management",
     "depends" : ["base", "crm_claim", "stock"],
     "init_xml" : [],
     "demo_xml" : [],
diff --git a/addons/claim_from_delivery/i18n/fa.po b/addons/claim_from_delivery/i18n/fa.po
new file mode 100644
index 00000000000..9510e504936
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/fa.po
@@ -0,0 +1,33 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 09:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr ""
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr ""
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr ""
diff --git a/addons/claim_from_delivery/i18n/hr.po b/addons/claim_from_delivery/i18n/hr.po
new file mode 100644
index 00000000000..e48611c71cb
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/hr.po
@@ -0,0 +1,33 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-12-19 12:53+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Zahtjev"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr "Kreiraj zahtjev iz naloga za dostavu\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "Zahtjev iz dostavnice"
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 29a1f6107b3..23f84606c29 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Customer Relationship Management',
+    'name': 'CRM',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'complexity': "easy",
@@ -123,6 +123,7 @@ Creates a dashboard for CRM that includes:
             'test/process/lead2opportunity2win.yml',
             'test/process/merge_opportunity.yml',
             'test/process/cancel_lead.yml',
+            'test/process/action_rule.yml',
             'test/process/segmentation.yml',
             'test/ui/crm_demo.yml',
             'test/ui/duplicate_lead.yml',
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 3418dc99423..5d64bf20093 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -83,54 +83,30 @@
             <field name="act_window_id" ref="act_my_oppor"/>
         </record>
 
-          <record model="ir.actions.act_window" id="act_my_meetings">
-               <field name="name">My Meetings</field>
-               <field name="res_model">crm.meeting</field>
-               <field name="view_type">form</field>
-               <field name="view_mode">tree,form</field>
-               <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
-               <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
-               <field name="context">{'default_user_id': uid}</field>
-          </record>
-
           <record model="ir.actions.act_window" id="act_my_oppor_stage">
                <field name="name">Planned Revenue By Stage</field>
                <field name="res_model">crm.lead.report</field>
                <field name="view_type">form</field>
                <field name="view_mode">graph,tree,form</field>
                <field name="view_id" ref="view_report_crm_oppor_graph"/>
-               <field name="domain">['&amp;', '&amp;', ('user_id','=',uid), ('type', '=', 'opportunity'), '!' , '&amp;', ('state', '=', 'done'),  ('date_closed','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
+               <field name="domain">[('user_id','=',uid), ('type', '=', 'opportunity'), ('state','in',('draft','open','done','pending')), '!', '&amp;', ('state', '=', 'done'), ('date_closed','&gt;=',datetime.date.today().strftime('%Y-%m-01'))]</field>
                <field name="context">{'search_default_Stage':1}</field>
           </record>
 
-          <record model="ir.actions.act_window" id="act_sales_pipeline">
-               <field name="name">My Win/Lost Ratio for The Last Year</field>
-               <field name="res_model">crm.lead.report</field>
-               <field name="view_type">form</field>
-               <field name="view_mode">graph,tree,form</field>
-               <field name="view_id" ref="view_crm_opportunity_user_graph1"/>
-               <field name="domain">['&amp;', ('user_id', '=', uid),'&amp;', ('state', '=', 'done') , '&amp;', ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%Y-%m-%d')), ('type', '=', 'opportunity')]</field>
-          </record>
-
           <record model="ir.ui.view" id="board_crm_form">
                <field name="name">Sales Dashboard Form</field>
                <field name="model">board.board</field>
                <field name="type">form</field>
                <field name="arch" type="xml">
                     <form string="Sales Dashboard">
-                         <board style="1-1">
+                         <board style="2-1">
                             <column>
-                                <action string="My Open Opportunities"
+                                <action string="My Opportunities"
                                     name="%(act_my_oppor)d" creatable="true"/>
-                                <action
-                                    string="My Meetings"
-                                    name="%(act_my_meetings)d" creatable="true"/>
                             </column>
                             <column>
                                 <action string="My Planned Revenues by Stage"
                                     name="%(act_my_oppor_stage)d"/>
-                                <action string="My Win/Lost Ratio"
-                                    name="%(act_sales_pipeline)d"/>
                             </column>
                     </board>
                 </form>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index bee1e48ada2..03cdb31832d 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -468,12 +468,10 @@ class crm_case(crm_base):
         self._action(cr, uid, cases, state)
         return True
 
-    #DEAD Code
     def remind_partner(self, cr, uid, ids, context=None, attach=False):
         return self.remind_user(cr, uid, ids, context, attach,
                 destination=False)
 
-    #DEAD Code
     def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
         mail_message = self.pool.get('mail.message')
         for case in self.browse(cr, uid, ids, context=context):
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 49272c97576..de527f96d80 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -170,7 +170,7 @@ class crm_lead(crm_case, osv.osv):
             domain="['|',('section_id','=',section_id),('section_id','=',False)]", help="From which campaign (seminar, marketing campaign, mass mailing, ...) did this contact come from?"),
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"),
         'contact_name': fields.char('Contact Name', size=64),
-        'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the into opportunity', select=1),
+        'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the lead into opportunity', select=1),
         'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
         'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
         'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
@@ -748,10 +748,11 @@ class crm_lead(crm_case, osv.osv):
         self.write(cr, uid, [res_id], vals, context)
         return res_id
 
-    def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
+    def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
         if isinstance(ids, (str, int, long)):
             ids = [ids]
-
+        if vals == None:
+            vals = {}
         super(crm_lead, self).message_update(cr, uid, ids, msg, context=context)
 
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index d0197fd82cd..2ec2db18509 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -31,7 +31,6 @@
         parent="base.menu_base_partner" sequence="1" />
 
     <menuitem parent="base.menu_sales" name="Leads"
-        groups="base.group_extended"
         id="menu_crm_case_categ0_act_leads"
         action="crm_case_category_act_leads_all" sequence="1" />
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e9c77b3bdc6..b508b7d17a5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -450,7 +450,8 @@
                     <field name="user_id"/>
 
                     <button string="Schedule/Log Call"
-                    name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action"/>
+                        name="%(opportunity2phonecall_act)d" icon="terp-call-start"
+                        type="action"/>
 
                     <field name="planned_revenue"/>
                     <field name="probability"/>
@@ -648,8 +649,8 @@
                     name="pending"
                     domain="[('state','=','pending')]"/>
                 <separator orientation="vertical"/>
-                <field name="name" string="Opportunity / Customer" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <field name="partner_id" string="Customer / Email" filter_domain="['|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]"/>
+                <field name="name" string="Opportunity / Customer"
+                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                 <field name="user_id">
                     <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 19ca9266332..338579af88f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -51,7 +51,7 @@
         <field name="res_model">crm.meeting</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id, 'virtual_id' : True}</field>
+        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
         <field name="help">The meeting calendar is shared between the sales teams and fully integrated with other applications such as the employee holidays or the business opportunities. You can also synchronize meetings with your mobile phone using the caldav interface.
         </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index ad2c31f7b12..c04e00e5fcc 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -45,7 +45,6 @@
                         widget="selection" />
                     <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
                            <field name="recurrency"/>
-                           <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}" />
                     </group>
                 </group>
                 <notebook colspan="4">
@@ -67,7 +66,7 @@
                             <field name="email_from"/>
                         </group><group col="2" colspan="2">
                             <separator colspan="2" string="Visibility"/>
-                            <field name="class" string="Privacy"/>
+                            <field name="class" string="Privacy" groups="base.group_extended"/>
                             <field name="show_as" string="Show time as" groups="base.group_extended"/>
                             <field name="rrule" invisible="1" readonly="1"/>
                             <field name="recurrent_id" invisible="1"/>
@@ -231,24 +230,11 @@
             <tree string="Meetings"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="name" string="Subject" />
-                <field name="date" string="Start Date" />
+                <field name="user_id"/>
+                <field name="date"/>
                 <field name="duration" />
                 <field name="partner_id" string="Partner" />
                 <field name="location" />
-                <field name="categ_id" string="Meeting Type"/>
-                <field name="class" string="Privacy"/>
-                <field name="state" groups="base.group_extended"/>
-                <field name="user_id" invisible="1"/>
-                <field name="show_as" invisible="1" string="Show time as"/>
-                <button name="case_reset" string="Reset to Unconfirmed"
-                   states="open,done" type="object"
-                   icon="gtk-convert" />
-                <button name="case_open" string="Confirm"
-                   states="draft" type="object"
-                   icon="gtk-go-forward" />
-                <button name="case_close" string="Done"
-                            states="open" type="object"
-                            icon="gtk-jump-to" />
             </tree>
         </field>
     </record>
@@ -295,7 +281,7 @@
                 <search string="Search Meetings">
                        <group>
                            <field name="name" string="Meeting / Partner"
-                                domain="[('name','ilike',self), ('partner_id','ilike', self)]"/>
+                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
                            <field name="user_id" groups="base.group_extended">
                                <filter icon="terp-personal" groups="base.group_extended"
                                    domain="[('user_id','=',uid)]"
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index b9bb6d359b1..4246fa43a98 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -118,7 +118,7 @@ class crm_phonecall(crm_base, osv.osv):
         """Resets case as Todo
         """
         res = super(crm_phonecall, self).case_reset(cr, uid, ids, args, 'crm.phonecall')
-        self.write(cr, uid, ids, {'duration': 0.0})
+        self.write(cr, uid, ids, {'duration': 0.0, 'state':'open'})
         return res
 
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 23f871d1581..34ef2612623 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -31,7 +31,7 @@
                 <field name="partner_contact"/>
                 <field name="partner_phone"/>
                 <field name="user_id"/>
-                <field name="categ_id"/>
+                <field name="categ_id" invisible="1"/>
                 <field name="create_date" invisible="1"/>
                 <field name="opportunity_id" invisible="1"/>
                 <button string="Convert to Opportunity"
@@ -107,7 +107,7 @@
                 <field name="description" nolabel="1" colspan="4" />
                 <separator colspan="4" />
                 <group col="8" colspan="4">
-                	<field name="state" widget="statusbar" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
+                    <field name="state" widget="statusbar" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
                     <button name="case_cancel" string="Cancel"
                         states="open,pending" type="object"
                         icon="gtk-cancel" />
@@ -141,13 +141,17 @@
                     on_change="onchange_partner_id(partner_id)"
                     string="Partner" />
                 <field name="partner_address_id"
-                        on_change="onchange_partner_address_id(partner_address_id)" />
-                <field name="partner_phone"/>
-                <field name="user_id"/>
+                        on_change="onchange_partner_address_id(partner_address_id)"
+                        invisible="1"/>
+                <field name="partner_phone"
+                    invisible="1"/>
+                <field name="user_id" groups="base.group_extended"/>
                 <field name="categ_id" widget="selection"
-                    domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                    domain="[('object_id.model', '=', 'crm.phonecall')]"
+                    invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="create_date" invisible="1"/>
+                <field name="opportunity_id" invisible="1"/>
                 <button string="Schedule Other Call"
                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
@@ -155,6 +159,11 @@
                 <button string="Meeting"
                      icon="gtk-redo"
                      name="action_make_meeting" type="object" />
+                <button string="Convert to Opportunity"
+                    name="%(phonecall2opportunity_act)d"
+                    states="open,pending"
+                    icon="gtk-index"
+                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
             </tree>
         </field>
     </record>
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index b438be0d404..52f6877d1be 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-21 21:20+0000\n"
+"PO-Revision-Date: 2011-12-19 16:03+0000\n"
 "Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:03+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 "Language: hr\n"
 
 #. module: crm
@@ -27,7 +27,7 @@ msgstr "# Tragova"
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr "Prodajni trag"
+msgstr "Pot. kontakt"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -57,7 +57,7 @@ msgstr "Vidljivost"
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "Titula"
+msgstr "Naslov"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
@@ -79,7 +79,7 @@ msgstr "Danas"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr "Odaberi prilike"
+msgstr "Odaberite prilike"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -93,7 +93,7 @@ msgstr " "
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Delay to close"
 
 #. module: crm
 #: view:crm.lead:0
@@ -122,7 +122,7 @@ msgstr "Dan"
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr "Šifra prodajnog tima nora biti jedinstvena!"
+msgstr "Šifra prodajnog tima mora biti jedinstvena!"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
@@ -239,7 +239,7 @@ msgstr "Zakaži drugi poziv"
 #. module: crm
 #: help:crm.meeting,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr "Uređivanje svih pojava ponavljajućeg sastanka."
+msgstr "Uredite sve instance ponavljajućih sastanka."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
@@ -271,6 +271,10 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
 
 #. module: crm
 #: view:crm.lead:0
@@ -295,7 +299,7 @@ msgstr "Sekcije"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
-msgstr "Spoji"
+msgstr "_Spoji"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -315,7 +319,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr "Javno"
+msgstr "Javni"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -341,6 +345,8 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Ako opt-out je provjeren, kontakt je odbio primiti e-poštu ili je otkazao "
+"pretplatu na kampanju."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -350,7 +356,7 @@ msgstr "Izgledni Partner"
 #. module: crm
 #: field:crm.lead,contact_name:0
 msgid "Contact Name"
-msgstr "Ime osobe"
+msgstr "Contact Name"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -364,7 +370,7 @@ msgstr "Poveznica s postojećim partnerom"
 #: view:crm.meeting:0
 #: field:crm.phonecall,partner_contact:0
 msgid "Contact"
-msgstr "Osoba"
+msgstr "Contact"
 
 #. module: crm
 #: view:crm.installer:0
@@ -396,7 +402,7 @@ msgstr "Sastanak s prilikom"
 #: help:crm.lead.report,delay_close:0
 #: help:crm.phonecall.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr "Rješavanje slučaja u danima"
+msgstr "Broj dana za zatvaranje slučaja"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
@@ -422,7 +428,7 @@ msgstr "_Pošalji"
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication"
-msgstr "Komunikacija"
+msgstr "Veza"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
@@ -452,13 +458,13 @@ msgstr "Pretvori/spoji priliku"
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr "Datum izmjene"
+msgstr "Datum ažuriranja"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: field:crm.lead2opportunity.action,name:0
 msgid "Select Action"
-msgstr "Odaberite akciju"
+msgstr "Select Action"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0
@@ -471,7 +477,7 @@ msgstr "Odaberite akciju"
 #: field:crm.phonecall.report,categ_id:0
 #: field:crm.phonecall2phonecall,categ_id:0
 msgid "Category"
-msgstr "Kategorija"
+msgstr "Grupa"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -526,12 +532,12 @@ msgstr ""
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr "Sastanak ili telefonski razgovor, vezan uz Prodajnu priliku"
+msgstr "Sastanak ili tel. poziv, u vezi prodajne prilike"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr "Inicijalni kontakt s novim prodajnim tragom"
+msgstr "Inicijalni kontakt s novim potencijalnim kontaktom"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
@@ -614,7 +620,7 @@ msgstr "Uključeni odgovori:"
 #: help:crm.meeting,email_from:0
 #: help:crm.phonecall,email_from:0
 msgid "These people will receive email."
-msgstr "Ove osobe ce primiti e-mail."
+msgstr "Ove će osobe primiti email."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -659,12 +665,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr "Do datuma"
+msgstr "Datum završetka"
 
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Error: The mail is not well formated"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -682,8 +688,8 @@ msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
 msgstr ""
-"Kategorija partnera koja će biti dodana partnerima koji se - po izračunu - "
-"podudaraju s kriterijima segmentacije."
+"Kategorija partnera koja će biti dodana partnerima koji se podudaraju s "
+"kriterijima segmentacije."
 
 #. module: crm
 #: view:crm.lead:0
@@ -721,6 +727,8 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
 msgstr ""
+"E-mail adresa u 'Reply-To' svih e-mailova koje program šalje o slučajevima "
+"ovog prodajnog tima"
 
 #. module: crm
 #: view:res.users:0
@@ -733,22 +741,24 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr "Slijedovi Segmentacije Partnera"
+msgstr "Stavke segmentacije partnera"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.meeting:0
 msgid "Details"
-msgstr ""
+msgstr "Detalji"
 
 #. module: crm
 #: help:crm.installer,crm_caldav:0
@@ -772,18 +782,18 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr "Obrazac Kontakta"
+msgstr "Kartica potencijalnog kontakta"
 
 #. module: crm
 #: view:crm.segmentation:0
 #: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "Segmentacija Partnera"
+msgstr "Segmentacija partnera"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Očekivani Prihod"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -799,13 +809,13 @@ msgstr "Vjerojatnost (%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "Generiranje potencijalnih kontakata"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "Kokpit statistike"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
@@ -840,14 +850,14 @@ msgstr "Zaustavi proces"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr "Pretraži Telefonske pozive"
+msgstr "Traži telefonske pozive"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2partner:0
 #: view:crm.phonecall2partner:0
 msgid "Continue"
-msgstr "Nastavi"
+msgstr "Continue"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -857,18 +867,18 @@ msgstr "Dani po Periodu"
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Po danu"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr ""
+msgstr "Postavi tim"
 
 #. module: crm
 #: view:calendar.attendee:0
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "Vrsta događaja"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_installer
@@ -889,7 +899,7 @@ msgstr ""
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Set an alarm at this time, before the event occurs"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -930,23 +940,23 @@ msgstr ""
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Kreiraj datum"
 
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr "Referenca 2"
+msgstr "Poveznica 2"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Sales Purchase"
-msgstr "Kupnja po Prodaji"
+msgstr "Prodaje Nabave"
 
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Uvjeti"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -954,11 +964,13 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Ovo svojstvo određuje listu iznimki datuma/vremena za ponavljajuću "
+"komponentu kalendara"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr ""
+msgstr "Pretvori u priliku "
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -977,18 +989,18 @@ msgstr "Prilike"
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr "Kategorija Partnera"
+msgstr "Kategorija partnera"
 
 #. module: crm
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr ""
+msgstr "Dodaj zabilješku"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavljač"
 
 #. module: crm
 #: help:crm.send.mail,reply_to:0
@@ -998,17 +1010,17 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Označi kao dobiven"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr "Iznos kupnje"
+msgstr "Iznos nabave"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Označi kao izgubljen"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1026,19 +1038,19 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dana za otvaranje"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show time as"
-msgstr ""
+msgstr "Prikaži vrijeme kao"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:264
 #: view:crm.phonecall2partner:0
 #, python-format
 msgid "Create Partner"
-msgstr "Krairaj Partnera"
+msgstr "Krairaj partnera"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1049,7 +1061,7 @@ msgstr "<"
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr "Mobitel"
+msgstr "Mobilni"
 
 #. module: crm
 #: field:crm.meeting,end_type:0
@@ -1066,7 +1078,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "Slijedeća faza"
 
 #. module: crm
 #: view:board.board:0
@@ -1076,12 +1088,12 @@ msgstr "Moji sastanci"
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
-msgstr "Referenca"
+msgstr "Vezna oznaka"
 
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "Želi poštu i obavijesti"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
@@ -1102,7 +1114,7 @@ msgstr "Sastanci"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "Choose day where repeat the meeting"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0
@@ -1110,17 +1122,17 @@ msgstr ""
 #: field:crm.meeting,date_action_next:0
 #: field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr "Siljedeća Radnja"
+msgstr "Siljedeća akcija"
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Ponavljaj dok"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr "Rok"
+msgstr "Krajnji rok"
 
 #. module: crm
 #: help:crm.meeting,active:0
@@ -1128,6 +1140,8 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
+"If the active field is set to          true, it will allow you to hide the "
+"event alarm information without removing it."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
@@ -1152,46 +1166,46 @@ msgstr "Odgovoran"
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Previous"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistike"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.send.mail,email_from:0
 msgid "From"
-msgstr ""
+msgstr "Od"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Next"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr ""
+msgstr "Faza:"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 #: model:crm.case.stage,name:crm.stage_opportunity5
 #: view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "Won"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Prekoračen rok"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "Odjel prodaje"
 
 #. module: crm
 #: field:crm.send.mail,html:0
@@ -1207,7 +1221,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Type"
-msgstr "Tip"
+msgstr "Vrsta"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1244,17 +1258,17 @@ msgstr "Kolovoz"
 #: field:crm.phonecall,create_date:0
 #: field:crm.phonecall.report,creation_date:0
 msgid "Creation Date"
-msgstr "Datum stvaranja"
+msgstr "Datum kreiranja"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "Need a Website Design"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "Ponavljajući ID"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1267,7 +1281,7 @@ msgstr "Predmet"
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Uto"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:300
@@ -1283,37 +1297,37 @@ msgstr "Stupanj"
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "Povijest"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "Mail to Partner"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "e-pošta"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Označi kao"
 
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Repeat"
-msgstr ""
+msgstr "Ponovi"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "Neka se događaj automatski ponavlja u intervalima"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr ""
+msgstr "Condition Case Fields"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1325,7 +1339,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_opportunity_stage_act
 msgid "Stages"
-msgstr "Stupnjevi"
+msgstr "Faze"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -1341,6 +1355,7 @@ msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
 msgstr ""
+"Kreirajte specifične kategorije tel. poziva za potrebe izvještavanja."
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1352,24 +1367,24 @@ msgstr "Rujan"
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr "Max Partner ID processed"
+msgstr "Max Partner ID procesiran"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr ""
+msgstr "Analiza tel. poziva"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Datum otvaranja"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "Trajanje u minutama"
 
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
@@ -1387,6 +1402,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
 msgstr ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1397,27 +1414,27 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,edit_all:0
 msgid "Edit All"
-msgstr ""
+msgstr "Uredi sve"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Pet"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "crm.lead"
 
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Write Date"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of recurrency"
-msgstr ""
+msgstr "End of recurrency"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1442,7 +1459,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 #: view:res.partner:0
 msgid "Create a Partner"
-msgstr ""
+msgstr "Kreiraj partnera"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1452,19 +1469,19 @@ msgstr "Status izvršenja"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Ponedjeljak"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dana za zatvaranje"
 
 #. module: crm
 #: field:crm.add.note,attachment_ids:0
 #: field:crm.case.section,complete_name:0
 #: field:crm.send.mail,attachment_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "nepoznato"
 
 #. module: crm
 #: field:crm.lead,id:0
@@ -1476,7 +1493,7 @@ msgstr "ID"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "Partnera u priliku"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1495,7 +1512,7 @@ msgstr "Datum"
 #: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Prošireni filtri..."
 
 #. module: crm
 #: field:crm.phonecall2opportunity,name:0
@@ -1505,22 +1522,22 @@ msgstr "Sažetak prilike"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "Search"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr ""
+msgstr "Prilike po kategorijama"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "Choose day in the month where repeat the meeting"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
-msgstr "Opis Segmentacije"
+msgstr "Opis segmentacije"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1535,16 +1552,19 @@ msgid ""
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
 msgstr ""
+"Create specific partner categories which you can assign to your partners to "
+"better manage your interactions with them. The segmentation tool is able to "
+"assign categories to partners according to criteria you set."
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "Podređeni Timovi"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1557,7 +1577,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "State"
-msgstr "Država"
+msgstr "Stanje"
 
 #. module: crm
 #: field:crm.meeting,freq:0
@@ -1586,12 +1606,12 @@ msgstr "Odustani"
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr ""
+msgstr "Spoji dvije prilike"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -1608,7 +1628,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr "Pravilo Iznimke"
+msgstr "Pravilo iznimke"
 
 #. module: crm
 #: help:base.action.rule,act_mail_to_partner:0
@@ -1618,22 +1638,22 @@ msgstr "Označite želite li postaviti pravilo slanja e-maila partneru."
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "Kategorije tel.poziva"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "Pozovi"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivne prodajne timove."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr "Pretraži Sastanke"
+msgstr "Pretraži sastanke"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1654,7 +1674,7 @@ msgstr "="
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Nepotvrđen"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1665,6 +1685,11 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1673,7 +1698,7 @@ msgstr ""
 #: field:crm.segmentation,name:0
 #: field:crm.send.mail.attachment,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0
@@ -1688,22 +1713,25 @@ msgid ""
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
 msgstr ""
+"Add specific stages to leads and opportunities allowing your sales to better "
+"organise their sales pipeline. Stages will allow them to easily track how a "
+"specific lead or opportunity is positioned in the sales cycle."
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "My Case(s)"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "Datum rođenja"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "The"
 
 #. module: crm
 #: field:crm.send.mail.attachment,wizard_id:0
@@ -1721,7 +1749,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "Kreiranje"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1739,7 +1767,7 @@ msgstr "Pretv u Izglenog Partnera pa u Poslovnog Partnera"
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "_Convert"
-msgstr ""
+msgstr "_Pretvori"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -1748,16 +1776,19 @@ msgid ""
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
 msgstr ""
+"Sa  Pozivnice možete stvoriti i upravljati sastanak pozivnice su poslane / "
+"biti poslana na svoje kolege / partnera. Vi ne samo da može pozvati OpenERP "
+"korisnika, ali i vanjskim stranama, kao što je kupac."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Subota"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Peti"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
@@ -1767,17 +1798,17 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Delay to Close"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Sri"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "Potencijalan Prodavač"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1791,32 +1822,33 @@ msgstr "Planirani prihod"
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
 msgstr ""
+"Opcionalni vezani partner, obično nakon konverzije potencijalnoga kontakta"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr ""
+msgstr "Detalji poziva"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Parent Team"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Datum slijedeće akcije"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr "U tijeku"
+msgstr "Izvodi se"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -1826,7 +1858,7 @@ msgstr "Sati"
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "Poštanski br."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:213
@@ -1852,12 +1884,14 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
+"Ovo je postotak uobičajene/prosječne vjerojatnosti uspjeha slučaja koji je u "
+"ovoj fazi"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "Telefonski pozivi"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1867,7 +1901,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "Slobodno"
 
 #. module: crm
 #: view:crm.installer:0
@@ -1882,7 +1916,7 @@ msgstr "Dopusti Brisanje"
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Pon"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1904,14 +1938,14 @@ msgstr ""
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "Ponavljajući sastanak"
 
 #. module: crm
 #: view:crm.case.section:0
 #: view:crm.lead:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -1921,19 +1955,19 @@ msgstr "Dani"
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
 msgid "Value"
-msgstr "Vrijednost"
+msgstr "Value"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr ""
+msgstr "Prilike po kategorijama"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr ""
+msgstr "Naziv kupca"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -1947,27 +1981,27 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "Tel.poziv u priliku"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr "Odgovor-na"
+msgstr "Reply-To"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select stages for this Sales Team"
-msgstr ""
+msgstr "Faze za ovaj prodajni tim"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Prilike po fazama"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "Opcija ponavljanja"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -1993,39 +2027,39 @@ msgstr "Održan"
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Reset to Draft"
-msgstr "Vrati na Nacrt"
+msgstr "Vrati u nacrt"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatni podaci"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr ""
+msgstr "Spoji prilike"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr ""
+msgstr "Google Adwords"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "crm.phonecall"
-msgstr ""
+msgstr "crm.phonecall"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr ""
+msgstr "Mail Campaign 2"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "Stvori"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2052,12 +2086,12 @@ msgstr "Prioritet"
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
 msgid "Use The Sales Purchase Rules"
-msgstr "Koristi Pravila vezana uz Kupoprodaju"
+msgstr "Koristi pravila prodaje/nabave"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "Potencijalni kontakt u partnera prilike"
 
 #. module: crm
 #: field:crm.meeting,location:0
@@ -2067,7 +2101,7 @@ msgstr "Lokacija"
 #. module: crm
 #: view:crm.lead:0
 msgid "Reply"
-msgstr ""
+msgstr "Odgovor"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -2091,11 +2125,13 @@ msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
 msgstr ""
+"Kreirajte različite katagorije sastanaka kako bi bolje organizirali i "
+"kategorizirali Vaše sastanke."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
 msgid "Segmentation line"
-msgstr "Segmentacijski niz"
+msgstr "Redak segmentacije"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
@@ -2106,28 +2142,28 @@ msgstr "Planiran datum"
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr "Caldav URL"
+msgstr "CalDAV URL"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Očekivani prihod"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Google Adwords 2"
-msgstr ""
+msgstr "Google Adwords 2"
 
 #. module: crm
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "Tip se koristi za razlikovanje potencijalnih kontakta i prilika."
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
+msgstr "Želite li kreirati partnera temeljem ovog tel. poziva ?"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -2145,23 +2181,27 @@ msgid ""
 "The opportunities and sales order displayed, will automatically be filtered "
 "according to his team."
 msgstr ""
+"Definirajte prodajne timove kako bi organizirali vaše prodavače i/ili odjele "
+"prodaje u posebne grupe. Svaki tim radi sa zasebnim popisom prilika, "
+"prodajnih naloga itd.. Prikazi prodajnih prilika i naloga se automatski "
+"filtriraju po prodajnim timovima."
 
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "Repeat x times"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr ""
+msgstr "Prodajni timovi"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "Pot. kontakt u partnera"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2173,7 +2213,7 @@ msgstr "Segmentacija"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Team"
 
 #. module: crm
 #: field:crm.installer,outlook:0
@@ -2190,7 +2230,7 @@ msgstr "Nije održano"
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Probability"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2207,7 +2247,7 @@ msgstr "Mjesec"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr "Kontakti"
+msgstr "Potencijalni kontakti"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2222,6 +2262,15 @@ msgid ""
 "email gateway: new emails may create leads, each of them automatically gets "
 "the history of the conversation with the prospect."
 msgstr ""
+"Leads allow you to manage and keep track of all initial contacts with a "
+"prospect or partner showing interest in your products or services. A lead is "
+"usually the first step in your sales cycle. Once qualified, a lead may be "
+"converted into a business opportunity, while creating the related partner "
+"for further detailed tracking of any linked activities. You can import a "
+"database of prospects, keep track of your business cards or integrate your "
+"website's contact form with the OpenERP Leads. Leads can be connected to the "
+"email gateway: new emails may create leads, each of them automatically gets "
+"the history of the conversation with the prospect."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -2234,28 +2283,28 @@ msgstr "Stvori novog partnera"
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
 msgid "Todo"
-msgstr ""
+msgstr "Za obaviti"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegiraj"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
-msgstr ""
+msgstr "If opt-in is checked, this contact has accepted to receive emails."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2273,6 +2322,7 @@ msgstr "Bilješka"
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Odabrana organizacija nije među dozvoljenim organizacijama za ovog korisnika"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -2280,7 +2330,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Low"
-msgstr "Nizak"
+msgstr "Niski"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2319,18 +2369,18 @@ msgstr "Interni sastanak"
 #: selection:crm.send.mail,state:0
 #, python-format
 msgid "Pending"
-msgstr "U tijeku"
+msgstr "Na čekanju"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr "sastanak sa Strankom"
+msgstr "Sastanak s partnerom"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "Global CC"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2344,7 +2394,7 @@ msgstr "Telefonski pozivi"
 #: help:crm.lead.report,delay_open:0
 #: help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Number of Days to open the case"
 
 #. module: crm
 #: field:crm.lead,phone:0
@@ -2386,7 +2436,7 @@ msgstr ">"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Nesigurno"
 
 #. module: crm
 #: field:crm.send.mail,email_cc:0
@@ -2421,7 +2471,7 @@ msgstr ""
 #: field:crm.lead2partner,action:0
 #: field:crm.phonecall2partner,action:0
 msgid "Action"
-msgstr "Radnja"
+msgstr "Akcija"
 
 #. module: crm
 #: field:crm.installer,crm_claim:0
@@ -2443,7 +2493,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Tjedno"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_send_email.py:72
@@ -2456,25 +2506,25 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "Ostalo"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
 msgid "Other"
-msgstr "Drugi"
+msgstr "Ostale"
 
 #. module: crm
 #: view:crm.meeting:0
 #: selection:crm.meeting,state:0
 #: selection:crm.phonecall,state:0
 msgid "Done"
-msgstr "Gotovo"
+msgstr "Izvršeno"
 
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Repeat every (Days/Week/Month/Year)"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2499,27 +2549,27 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Open"
-msgstr "Otvori"
+msgstr "Otvoreno"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Utorak"
 
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "Grad"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr ""
+msgstr "Zauzet"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "Repeat every"
 
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
@@ -2529,7 +2579,7 @@ msgstr "Helpdesk"
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "Ponavljajući"
 
 #. module: crm
 #: code:addons/crm/crm.py:397
@@ -2551,7 +2601,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "Moje otvorene prilike"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
@@ -2587,7 +2637,7 @@ msgstr ""
 #: view:crm.meeting:0
 #: field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Vrsta sastanka"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
@@ -2616,12 +2666,12 @@ msgstr ""
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Treći"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2645,34 +2695,34 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "# Email-ova"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr "Pretraži Kontaktove"
+msgstr "Traži potencijalne kontakte"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Delay to open"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "Period ponavljanja"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Dan u tjednu"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "Referrer"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
@@ -2682,12 +2732,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Detalji sudionika"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr "Segmentacijski test"
+msgstr "Test segmentacije"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2702,14 +2752,14 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Tel.poziv u partnera"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
 msgid ""
 "The name of the future partner that will be created while converting the "
 "into opportunity"
-msgstr ""
+msgstr "Naziv budućeg partnera koji će se kreirati kod pretvaranja u priliku"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2721,14 +2771,14 @@ msgstr "Dodijeli"
 #: field:crm.add.note,state:0
 #: field:crm.send.mail,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Set New State To"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
 #: field:crm.meeting,date_action_last:0
 #: field:crm.phonecall,date_action_last:0
 msgid "Last Action"
-msgstr "Posljednja radnja"
+msgstr "Posljednja akcija"
 
 #. module: crm
 #: field:crm.meeting,duration:0
@@ -2747,7 +2797,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.open_board_crm
 #: model:ir.ui.menu,name:crm.menu_board_crm
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Kokpit prodaje"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:56
@@ -2759,23 +2809,23 @@ msgstr "Partner je već određen ovim Kontaktom"
 #: field:crm.lead.report,nbr:0
 #: field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr "# SLučaja"
+msgstr "# Slučaja"
 
 #. module: crm
 #: help:crm.meeting,section_id:0
 #: help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Sales team to which Case belongs to."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "Nedjelja"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Četvrti"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2788,12 +2838,12 @@ msgstr "Nepromijenjen"
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr ""
+msgstr "Segmentacija partnera"
 
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2810,11 +2860,22 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
+"With opportunities you can manage and keep track of your sales pipeline by "
+"creating specific customer- or prospect-related sales documents to follow up "
+"potential sales. Information such as expected revenue, opportunity stage, "
+"expected closing date, communication history and much more can be stored. "
+"Opportunities can be connected to the email gateway: new emails may create "
+"opportunities, each of them automatically gets the history of the "
+"conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "Dodjela"
 
 #. module: crm
 #: field:crm.lead,company_id:0
@@ -2824,17 +2885,17 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,company_id:0
 msgid "Company"
-msgstr "Tvrtka"
+msgstr "Organizacija"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Petak"
 
 #. module: crm
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Cijeli dan"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -2845,28 +2906,28 @@ msgstr "Obavezan / Opcijski"
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr ""
+msgstr "Pozivnice na sastanak"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "Naziv objekta"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "E-mail address of the contact"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "Referred By"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Dodaj internu bilješku"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:304
@@ -2877,14 +2938,14 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Posljednji"
 
 #. module: crm
 #: field:crm.lead,message_ids:0
 #: field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Messages"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
@@ -2904,7 +2965,7 @@ msgstr "Greška !"
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "Sažetak poziva"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2916,23 +2977,23 @@ msgstr ""
 #: selection:crm.phonecall.report,state:0
 #: selection:crm.send.mail,state:0
 msgid "Cancelled"
-msgstr "Otkazan"
+msgstr "Otkazani"
 
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "Note Body"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Moji planirani prihodi po fazama"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Datum zatvaranja"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2943,7 +3004,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Links"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2953,6 +3014,10 @@ msgid ""
 "instance reflect your product structure or the different types of sales you "
 "do."
 msgstr ""
+"Kreirajte posebne grupe koje će najbolje odražavati aktivnosti vaše "
+"organizacije kako bi lakše klasificirali (segmentirali) i analizirali vaše "
+"potencijalne kontakte i prilike. Grupe mogu odražavati strukturu vašeg "
+"prodajnog asortimana ili različite kanale prodaje i sl.."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -2960,6 +3025,8 @@ msgid ""
 "If the partner has not purchased (or bought) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
 msgstr ""
+"If the partner has not purchased (or bought) during a period, decrease the "
+"state of mind by this factor. It's a multiplication"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2969,6 +3036,10 @@ msgid ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 msgstr ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
 
 #. module: crm
 #: view:crm.case.section:0
@@ -2983,7 +3054,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "# Pisama"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
@@ -3005,12 +3076,12 @@ msgstr "Operator"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "Tel.poziv u tel.poziv"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "Zakaži/Log Poziv"
 
 #. module: crm
 #: field:crm.installer,fetchmail:0
@@ -3020,7 +3091,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr "Potvrđen"
+msgstr "Potvrđeno"
 
 #. module: crm
 #: help:crm.send.mail,email_cc:0
@@ -3032,12 +3103,12 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Ned"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -3047,7 +3118,7 @@ msgstr "Grupa"
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "Ukupni planirani prihod"
 
 #. module: crm
 #: code:addons/crm/crm.py:375
@@ -3065,7 +3136,7 @@ msgstr "Opcijski Izraz"
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Dan mjeseca"
 
 #. module: crm
 #: field:crm.lead2opportunity,probability:0
@@ -3076,7 +3147,7 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_lead1
 #: model:crm.case.stage,name:crm.stage_opportunity1
 msgid "New"
-msgstr "Novi"
+msgstr "New"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3089,7 +3160,7 @@ msgstr ""
 #: field:crm.meeting,email_from:0
 #: field:crm.phonecall,email_from:0
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3098,7 +3169,7 @@ msgstr "Email"
 #: field:crm.lead.report,channel_id:0
 #: field:crm.phonecall,canal_id:0
 msgid "Channel"
-msgstr "Kanal"
+msgstr "Channel"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
@@ -3115,7 +3186,7 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "Profiling"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -3125,33 +3196,37 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Check if the category is limited to partners that match the segmentation "
+"criterions.                        \n"
+"If checked, remove the category from partners that doesn't match "
+"segmentation criterions"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr "Datum/Vrijeme Iznimke"
+msgstr "Datum/vrijeme iznimke"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "Povjerljivo"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
 msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
-msgstr ""
+msgstr "Rok izvršenja se autoamtski računa od datuma početka plus trajanja."
 
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Država/Pokrajina/Županija"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr "Kreiranje poslovnih prilika iz Kontakata"
+msgstr "Kreiranje poslovnih prilika iz pot. kontakata"
 
 #. module: crm
 #: help:crm.send.mail,html:0
@@ -3161,7 +3236,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+msgstr "Treba informacije"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
@@ -3177,17 +3252,17 @@ msgstr ""
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Postavi kategoriju na"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Configuration"
-msgstr "Konfiguracija"
+msgstr "Postava"
 
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr ""
+msgstr "Čet"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -3198,7 +3273,7 @@ msgstr ""
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid "_Cancel"
-msgstr "_Odustani"
+msgstr "_Cancel"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3214,13 +3289,13 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "Dnevno"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 #: model:crm.case.stage,name:crm.stage_opportunity2
 msgid "Qualification"
-msgstr ""
+msgstr "Qualification"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -3230,7 +3305,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "First"
-msgstr ""
+msgstr "Prvi"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3260,6 +3335,13 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"A period is the average number of days between two cycle of sale or purchase "
+"for this segmentation.                 \n"
+"It's mainly used to detect if a partner has not purchased or buy for a too "
+"long time,                  \n"
+"so we suppose that his state of mind has decreased because he probably "
+"bought goods to another supplier.                  \n"
+"Use this functionality for recurring businesses."
 
 #. module: crm
 #: view:crm.send.mail:0
@@ -3269,7 +3351,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Vremenska zona"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,msg:0
@@ -3281,7 +3363,7 @@ msgstr "Poruka"
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Sub"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3294,12 +3376,12 @@ msgstr "Prodavač"
 #. module: crm
 #: field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "Očekivano zatvaranje"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "Priliku u tel.poziv"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -3314,7 +3396,7 @@ msgstr "Dogovori Sastanak"
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr ""
+msgstr "Naziv partnera"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3327,13 +3409,13 @@ msgstr "Izlazni"
 #: field:crm.lead,date_open:0
 #: field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "Otvoren"
 
 #. module: crm
 #: view:crm.case.section:0
 #: field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "Team Members"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3342,22 +3424,22 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contacts"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Interes za računala"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Detalji poziva"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr "Default (0=None)"
+msgstr "Uobičajeno (0=Ništa)"
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -3366,6 +3448,8 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Ove adrese e-pošte će biti dodane u CC polja svih ulaznih i izlaznih e-"
+"poruka ovog zapisa prije slanja. Više adresa odvojite zarezom."
 
 #. module: crm
 #: constraint:res.partner:0
@@ -3394,7 +3478,7 @@ msgstr "Nacrt"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Cases by Sales Team"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
@@ -3413,23 +3497,23 @@ msgstr "Sastanak"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Kategorija slučaja"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 Dana"
 
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "Planirani prihod po fazama i korisniku"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Komunikacija i povijest"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -3447,18 +3531,18 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Normal"
-msgstr "Običan"
+msgstr "Normalan"
 
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Ulica2"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr ""
+msgstr "Kategorije sastanaka"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -3470,7 +3554,7 @@ msgstr "Trebate provjeriti postoji li već ovaj Partner!"
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Delay to Open"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0
@@ -3494,7 +3578,7 @@ msgstr "Nema e-mail ID-a za adresu Vaše Tvrtke"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "Prilike po fazama"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
@@ -3525,7 +3609,7 @@ msgstr "Ugovor"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "Twitter Ads"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:26
@@ -3539,17 +3623,17 @@ msgstr "Greška"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Planned Revenues"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "Potrebno savjetovanje"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivne profile."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:232
@@ -3562,17 +3646,17 @@ msgstr ""
 #: field:crm.meeting,partner_address_id:0
 #: field:crm.phonecall,partner_address_id:0
 msgid "Partner Contact"
-msgstr "Osoba Partner"
+msgstr "Osoba kod partnera"
 
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Ponavljajući ID datuma"
 
 #. module: crm
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Ne možete imati dva korisnika sa istim korisničkim imenom !"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:100
@@ -3593,48 +3677,48 @@ msgstr "Zatvori"
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Categorization"
-msgstr ""
+msgstr "Kategorizacija"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Action Rules"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Ponavljanje"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "Tel.poziv"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Četvrtak"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.send.mail,email_to:0
 msgid "To"
-msgstr "Za"
+msgstr "Do"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "Privatno"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "Funkcija"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "_Add"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -3670,7 +3754,7 @@ msgstr "Opis"
 #: field:res.partner,section_id:0
 #: field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Prodajni tim"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3682,7 +3766,7 @@ msgstr "Svibanj"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "Interest in Accessories"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:211
@@ -3693,28 +3777,28 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "# Emails"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "Ulica"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "Prilike po korisniku i timu"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Radno vrijeme(od-do)"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "Kupac"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3735,14 +3819,14 @@ msgstr "Dogovori Sastanak"
 #: model:crm.case.stage,name:crm.stage_opportunity6
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "Lost"
 
 #. module: crm
 #: field:crm.lead,country_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Država"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3750,12 +3834,12 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr "Pretvori u Priliku"
+msgstr "Pretvori u priliku"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Srijeda"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3767,39 +3851,39 @@ msgstr "Travanj"
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Naziv kampanje"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "Tel. pozivi po korisniku i odabiru"
 
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
 msgid "Merge with existing Opportunity"
-msgstr ""
+msgstr "Spoji s postojećom prilikom"
 
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Opcija"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 #: model:crm.case.stage,name:crm.stage_opportunity4
 msgid "Negotiation"
-msgstr ""
+msgstr "Negotiation"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "Oček.zatvaranje"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
 #: field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr "Slijed"
+msgstr "Sekvenca"
 
 #. module: crm
 #: field:crm.send.mail,body:0
@@ -3809,7 +3893,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "Prihvati"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3819,18 +3903,18 @@ msgstr "Kontrolna varijabla"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Drugi"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 #: model:crm.case.stage,name:crm.stage_opportunity3
 msgid "Proposition"
-msgstr ""
+msgstr "Proposition"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Tel. pozivi"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3843,7 +3927,7 @@ msgstr "Godina"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr "Newsletter"
+msgstr "Bilten"
 
 #~ msgid "All Cases"
 #~ msgstr "Svi slučajevi"
@@ -4150,9 +4234,6 @@ msgstr "Newsletter"
 #~ msgid "Fields to Change"
 #~ msgstr "Polja za promijeniti"
 
-#~ msgid "Telesales"
-#~ msgstr "Teleprodaja"
-
 #~ msgid "Created"
 #~ msgstr "Kreiran"
 
@@ -4296,3 +4377,9 @@ msgstr "Newsletter"
 
 #~ msgid "Cases by section"
 #~ msgstr "Sučajevi po grupi"
+
+#~ msgid "Telesales"
+#~ msgstr "Telesales"
+
+#~ msgid "Mail Campaign 1"
+#~ msgstr "Mail Campaign 1"
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 8ac32086cfd..ed3d86bf9b8 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -3,16 +3,19 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User - Own Leads Only</field>
+        <field name="name">User - Own Leads Only</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">Sales / User - All Leads</field>
+        <field name="name">User - All Leads</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
@@ -40,6 +43,13 @@
     <record model="ir.ui.menu" id="base.menu_base_config">
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
-    
+
+    <record id="crm_meeting_global" model="ir.rule">
+        <field name="name">Hide Private Meetings</field>
+        <field ref="model_crm_meeting" name="model_id"/>
+        <field eval="1" name="global"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('show_as','=','busy')]</field>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 4ea07252276..a3725b5a070 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -1,48 +1,45 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_segmentation_user","crm.segmentation user","model_crm_segmentation","base.group_sale_salesman",1,0,0,0
-"access_crm_segmentation_line_user","crm.segmentation.line user","model_crm_segmentation_line","base.group_sale_salesman",1,0,0,0
-"access_crm_segmentation","crm.segmentation","model_crm_segmentation","base.group_sale_manager",1,1,1,1
-"access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","base.group_sale_manager",1,1,1,1
-"access_crm_case_channel_user","crm.case.channel user","model_crm_case_channel","base.group_sale_salesman",1,0,0,0
-"access_crm_case_channel_manager","crm.case.channel manager","model_crm_case_channel","base.group_sale_manager",1,1,1,1
-"access_crm_case_section","crm.case.section","model_crm_case_section","base.group_sale_salesman",1,1,1,0
-"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0
-"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,1,1,1
-"access_crm_lead_manager","crm.lead.manager","model_crm_lead","base.group_sale_manager",1,1,1,1
-"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","base.group_sale_manager",1,1,1,1
-"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
-"access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,1,1,0
-"access_crm_meeting_all","crm.meeting_allll","model_crm_meeting","base.group_user",1,0,0,0
-"access_crm_lead","crm.lead","model_crm_lead","base.group_sale_salesman",1,1,1,0
-"access_crm_lead.all","crm.lead.all","model_crm_lead","base.group_user",1,0,0,0
-"access_crm_phonecall","crm.phonecall","model_crm_phonecall","base.group_sale_salesman",1,1,1,0
-"access_crm_phonecall.all","crm.phonecall.all","model_crm_phonecall","base.group_user",1,0,0,0
-"access_crm_case_section_user","crm.case.section.user","model_crm_case_section","base.group_sale_salesman",1,1,1,0
-"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","base.group_sale_manager",1,1,1,1
-"access_crm_case_stage","crm.case.stage","model_crm_case_stage","base.group_user",1,0,0,0
-"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","base.group_sale_manager",1,1,1,1
-"access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","base.group_sale_salesman",1,1,1,0
-"access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","base.group_sale_manager",1,1,1,1
-"access_crm_phonecall_report_user","crm.phonecall.report.user","model_crm_phonecall_report","base.group_sale_salesman",1,0,0,0
-"access_crm_lead_report_manager","crm.lead.report","model_crm_lead_report","base.group_sale_manager",1,1,1,1
-"access_crm_phonecall_report_manager","crm.phonecall.report","model_crm_phonecall_report","base.group_sale_manager",1,1,1,1
-"access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","base.group_sale_manager",1,0,0,0
-"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","base.group_sale_manager",1,0,0,0
-"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","base.group_sale_manager",1,0,0,0
-"mail_mail_message_manager","mail.message.manager","mail.model_mail_message","base.group_sale_manager",1,0,0,0
-"mail_thread_manager","mail.thread.manager","mail.model_mail_thread","base.group_sale_manager",1,1,1,1
-"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","base.group_sale_salesman",1,1,1,0
-"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","base.group_sale_manager",1,1,1,1
-"access_res_partner","res.partner.crm.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
-"access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
-"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
-"mail_mailgate_thread","mail.thread","mail.model_mail_thread","base.group_sale_salesman",1,1,1,1
-"mail_gateway_mail_message_user","mail.message.user","mail.model_mail_message","base.group_sale_salesman",1,1,1,1
-"access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,1
-"access_base_action_rule_manager","base.action.rule manager","model_base_action_rule","base.group_sale_manager",1,1,1,1
-"access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1
-"access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
-"access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
-"access_crm_lead_partner_manager","crm.lead.partner.manager","model_crm_lead","base.group_partner_manager",1,0,0,0
-"access_crm_phonecall_partner_manager","crm.phonecall.partner.manager","model_crm_phonecall","base.group_partner_manager",1,1,1,1
-"access_crm_meeting_partner_manager","crm.meeting.partner.manager","model_crm_meeting","base.group_partner_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_segmentation_user,crm.segmentation user,model_crm_segmentation,base.group_sale_salesman,1,0,0,0
+access_crm_segmentation_line_user,crm.segmentation.line user,model_crm_segmentation_line,base.group_sale_salesman,1,0,0,0
+access_crm_segmentation,crm.segmentation,model_crm_segmentation,base.group_sale_manager,1,1,1,1
+access_crm_segmentation_line,crm.segmentation.line,model_crm_segmentation_line,base.group_sale_manager,1,1,1,1
+access_crm_case_channel_user,crm.case.channel user,model_crm_case_channel,base.group_sale_salesman,1,0,0,0
+access_crm_case_channel_manager,crm.case.channel manager,model_crm_case_channel,base.group_sale_manager,1,1,1,1
+access_crm_case_section,crm.case.section,model_crm_case_section,base.group_sale_salesman,1,1,1,0
+access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_sale_salesman,1,1,1,0
+access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale_manager,1,1,1,1
+access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1
+access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1
+access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0
+access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0
+access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0
+access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
+access_crm_lead_all,crm.lead.all,model_crm_lead,base.group_user,1,0,0,0
+access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
+access_crm_phonecall_all,crm.phonecall.all,model_crm_phonecall,base.group_user,1,0,0,0
+access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,1,1,0
+access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
+access_crm_case_stage,crm.case.stage,model_crm_case_stage,base.group_user,1,0,0,0
+access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1
+access_crm_case_resource_type_user,crm_case_resource_type user,model_crm_case_resource_type,base.group_sale_salesman,1,1,1,0
+access_crm_case_resource_type_manager,crm_case_resource_type manager,model_crm_case_resource_type,base.group_sale_manager,1,1,1,1
+access_crm_phonecall_report_user,crm.phonecall.report.user,model_crm_phonecall_report,base.group_sale_salesman,1,0,0,0
+access_crm_phonecall_report_manager,crm.phonecall.report,model_crm_phonecall_report,base.group_sale_manager,1,1,1,1
+access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,base.group_sale_manager,1,0,0,0
+access_res_partner_address_manager,res.partner.address.crm.user.manager,base.model_res_partner_address,base.group_sale_manager,1,0,0,0
+access_res_partner_category_manager,res.partner.category.crm.manager,base.model_res_partner_category,base.group_sale_manager,1,0,0,0
+mail_mail_message_manager,mail.message.manager,mail.model_mail_message,base.group_sale_manager,1,0,0,0
+access_calendar_attendee_crm_user,calendar.attendee.crm.user,model_calendar_attendee,base.group_sale_salesman,1,1,1,0
+access_calendar_attendee_crm_manager,calendar.attendee.crm.manager,model_calendar_attendee,base.group_sale_manager,1,1,1,1
+access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_salesman,1,1,1,0
+access_res_partner_address,res.partner.address.crm.user,base.model_res_partner_address,base.group_sale_salesman,1,1,1,0
+access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0
+mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1
+mail_gateway_mail_message_user,mail.message.user,mail.model_mail_message,base.group_sale_salesman,1,1,1,1
+access_crm_case_categ_manager,crm.case.categ manager,model_crm_case_categ,base.group_sale_manager,1,1,1,1
+access_base_action_rule_manager,base.action.rule manager,model_base_action_rule,base.group_sale_manager,1,1,1,1
+access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.group_sale_salesman,1,1,1,1
+access_res_partner_bank_type_crm_user,res.partner.bank.type.crm.user,base.model_res_partner_bank_type,base.group_sale_salesman,1,0,0,0
+access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0
+access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1
+access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1
diff --git a/addons/crm/static/src/img/icon.png b/addons/crm/static/src/img/icon.png
new file mode 100644
index 00000000000..b577375d54b
Binary files /dev/null and b/addons/crm/static/src/img/icon.png differ
diff --git a/addons/crm/test/process/action_rule.yml b/addons/crm/test/process/action_rule.yml
new file mode 100644
index 00000000000..f96c1eb7391
--- /dev/null
+++ b/addons/crm/test/process/action_rule.yml
@@ -0,0 +1,22 @@
+-
+  I create a record rule.
+-
+  !python {model: base.action.rule}: |
+    modle_id = self.pool.get("ir.model").search(cr, uid, [('name', '=', 'crm.lead')])
+    from datetime import datetime
+    new_id = self.create(cr, uid, {'name': 'New Rule', 'model_id': modle_id[0],  'trg_user_id': ref('base.user_root'), 'trg_partner_id': ref('base.res_partner_asus'), 'act_user_id': ref('base.user_demo') })
+    lead_obj = self.pool.get("crm.lead")
+    self._check(cr, uid)
+-
+  I create new lead to check record rule.
+-
+  !record {model: crm.lead, id: crm_lead_test_rules_id}:
+    name: 'Test lead rules'
+    user_id: base.user_root
+    partner_id: base.res_partner_asus
+-
+  I check record rule is apply and responsible is changed.
+-
+  !python {model: crm.lead}: |
+    lead_user = self.browse(cr, uid, ref('crm_lead_test_rules_id'))
+    assert lead_user.user_id.id == ref('base.user_demo'), "Responsible of lead is not changed." 
diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index a5f85a14058..ca5f7d0174a 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -29,12 +29,12 @@
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in pending state}:
     - state == "pending"
 -
-  I Escalate the Lead to Parent Team.
+  I escalate the lead to parent team.
 -
   !python {model: crm.lead}: |
     self.case_escalate(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
 -
-  I check lead escalate to Parent Team.
+  I check lead escalate to parent team.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Escalate lead to parent team}:
     - section_id.name == "Sales Department"
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index 92e711ce016..83d2ce915ac 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -1,5 +1,5 @@
 -
-  Customer interested in our product. so He send request by email to get more details.
+  Customer interested in our product. so he send request by email to get more details.
 -
   Mail script will be fetched him request from mail server. so I process that mail after read EML file 
 -
@@ -41,10 +41,12 @@
     partner_ids = self.message_partner_by_email(cr, uid, 'Mr. John Right <info@customer.com>')
     assert partner_ids.get('partner_id'), "Customer is not found in regular customer list."
 -
-  I convert one phonecall request as a customer and put into regular customer list.
+  I convert one phonecall request as a customer and put into regular customer list. 
 -
-  !python {model: crm.phonecall}: |
-    self.convert_partner(cr, uid, [ref('crm.crm_case_phone06')], context=context)
+  !python {model: crm.phonecall2partner}: |
+    context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_case_phone06")], 'active_id': ref("crm.crm_case_phone06")})
+    new_id = self.create(cr, uid, {}, context=context)
+    self.make_partner(cr, uid, [new_id],  context=context)
 -
   I check converted phonecall to partner.
 -
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index dbc04abae19..a5b6c421dbb 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -6,10 +6,18 @@
    !python {model: crm.lead}: |
      self.case_open(cr, uid, [ref("crm_case_qrecorp0")])
 - 
-  I check lead state is "Open".
+  I check lead state is "Open". 
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in open state}:
      - state == "open"
+-
+  I create partner from lead. 
+-
+  !record {model: crm.lead2partner, id: crm_lead2partner_id1, context: '{"active_model": "crm.lead", "active_ids": [ref("crm_case_qrecorp0")]}'}:
+-
+   !python {model: crm.lead2partner}: |
+     context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_qrecorp0')], 'active_id': ref('crm_case_qrecorp0')})
+     self.make_partner(cr, uid ,[ref("crm_lead2partner_id1")], context=context)
 -
   I convert lead into opportunity for exiting customer.
 -
@@ -39,13 +47,13 @@
     ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_qrecorp0'))])
     assert len(ids), 'phonecall is not scheduled'
 -
-  Now I schedule Meeting with Customer.
+  Now I schedule meeting with customer.
 -
   !python {model: crm.lead}: |
     self.action_makeMeeting(cr, uid, [ref('crm_case_qrecorp0')])
 
 -
-  After communicated  with customer, I put some notes with Contract details.
+  After communicated  with customer, I put some notes with contract details.
 -
   !python {model: crm.add.note}: |
     context.update({'active_model': 'crm.lead', 'active_id': ref('crm_case_qrecorp0')})
@@ -57,7 +65,7 @@
   !python {model: crm.lead}: |
     self.case_mark_won(cr, uid, [ref("crm_case_qrecorp0")])
 -
-  I check details of the opportunity After won the opportunity.
+  I check details of the opportunity after won the opportunity.
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
@@ -72,7 +80,7 @@
     id = self.create(cr, uid, {'user_ids': [ref('base.user_root')], 'section_id': ref('crm.section_sales_department')}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
-  Now I check First lead converted on opportunity.
+  Now I check first lead converted on opportunity.
 -
   !python {model: crm.lead}: |
     opp = self.browse(cr, uid, ref('crm_case_employee0'))
@@ -81,10 +89,22 @@
     assert opp.partner_id.name == "Agrolait", 'Partner missmatch!'
     assert opp.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
 -
-  Then check for Second lead converted on opportunity.
+  Then check for second lead converted on opportunity.
 -
   !python {model: crm.lead}: |
     opp = self.browse(cr, uid, ref('crm_case_electonicgoodsdealer0'))
     assert opp.name == "Interest in Your New Product", "Opportunity name not correct"
     assert opp.type == 'opportunity', 'Lead is not converted to opportunity!'
-    assert opp.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
\ No newline at end of file
+    assert opp.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
+-
+  I confirm review needs meeting.
+-
+  !python {model: crm.meeting}: |
+    context.update({'active_model': 'crm.meeting'}) 
+    self.case_open(cr, uid, [ref('crm.crm_case_reviewneeds0')])
+-
+  I invite a user for meeting.
+-
+  !python {model: calendar.attendee}: |
+    meeting_id = self.create(cr, uid, {'user_id': ref('base.user_root'), 'email': 'user@meeting.com' })
+    self.do_accept(cr, uid, [meeting_id])
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index 463e330fc10..c4e939f194e 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -1,5 +1,5 @@
 -
-  I make direct opportunity for Customer.
+  I make direct opportunity for customer.
 -
   !python {model: crm.partner2opportunity}: |
     context.update({'active_model': 'res.partner', 'active_ids': [ref("base.res_partner_9")]})
@@ -13,13 +13,18 @@
     res_id = self.create(cr, uid, {'name': "Quoi de prix de votre autre service?", 'partner_id': ref("base.res_partner_9")}, context=context)
     self.make_opportunity(cr, uid, [res_id], context=context)
 -
- Now I merge all opportunities of customer.
+  Now I merge all opportunities of customer.
 -
   !python {model: crm.lead}: |
     opportunity_ids = self.search(cr, uid, [('partner_id','=', ref("base.res_partner_9"))])
-    self.merge_opportunity(cr, uid, opportunity_ids, context=context)
+    context.update({'active_model': 'crm.lead', 'active_ids': opportunity_ids, 'active_id': opportunity_ids[0]})
 -
-  I check for merged opportunities for customer.
+  !record {model: crm.merge.opportunity, id: opportunity_merge_id }:
+-
+  !python {model: crm.merge.opportunity}: |
+    self.action_merge(cr, uid, [ref("opportunity_merge_id")], context=context)
+-
+  I check for merged opportunities for customer. 
 -
   !python {model: crm.lead}: |
     merge_id = self.search(cr, uid, [('partner_id','=', ref("base.res_partner_9"))])
@@ -31,21 +36,51 @@
   Now I schedule another phonecall to customer after merged.
 -
   !python {model: crm.phonecall2phonecall}: |
-    context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_case_phone06")]})
+    context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_case_phone06")], 'active_id': ref("crm.crm_case_phone06")})
     res_id = self.create(cr, uid, {'name': "vos chances sont fusionnés en un seul"}, context=context)
     self.action_schedule(cr, uid, [res_id], context=context)
 - 
-  I schedule Meeting on this phonecall.
+  I schedule meeting on this phonecall.
 -
   !python {model: crm.phonecall}: |
     self.action_make_meeting(cr, uid, [ref("crm.crm_case_phone06")])
 -
-  I setting Phone call to Held (Done).
+  I set phone call to not held.
+-
+  !python {model: crm.phonecall}: |
+    self.case_pending(cr, uid, [ref("crm.crm_case_phone06")])
+-
+  I check that the phone call is in 'Not Held' state. 
+-
+  !assert {model: crm.phonecall, id: crm.crm_case_phone06, string: Phone call held.}:
+    - state == "pending"
+-
+  I cancelled the phone call. 
+-
+  !python {model: crm.phonecall}: |
+    self.case_cancel(cr, uid, [ref("crm.crm_case_phone06")])
+-
+  I check that the phone call is in 'Cancelled' state.
+-
+  !assert {model: crm.phonecall, id: crm.crm_case_phone06, string: Phone call is not cancelled.}:
+    - state == "cancel"
+-
+  I reset the phone call. 
+-
+  !python {model: crm.phonecall}: |
+    self.case_reset(cr, uid, [ref("crm.crm_case_phone06")])
+-
+  I check that the phone call is reset or not.
+-
+  !assert {model: crm.phonecall, id: crm.crm_case_phone06, string: Phone call is not reset.}:
+    - state == "open"
+-
+  I set phone call to held (done).
 -
   !python {model: crm.phonecall}: |
     self.case_close(cr, uid, [ref("crm.crm_case_phone06")])
 -
   I check that the phone call is in 'Held' state.
 -
-  !assert {model: crm.phonecall, id: crm.crm_case_phone06, string: Phone call Helded}:
+  !assert {model: crm.phonecall, id: crm.crm_case_phone06, string: Phone call is not held.}:
     - state == "done"
diff --git a/addons/crm/test/process/segmentation.yml b/addons/crm/test/process/segmentation.yml
index 74500049290..f3801b80ec6 100644
--- a/addons/crm/test/process/segmentation.yml
+++ b/addons/crm/test/process/segmentation.yml
@@ -8,7 +8,7 @@
     #Todo: Need to check after segmentation started
 
 -
-  I create rule Segmentation line record for partner .
+  I create rule segmentation line record for partner .
 -
   !python {model: crm.segmentation.line}: |
     id = self.create(cr, uid, {'name': "OpenERP partners",'expr_value': 25})
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index a45c87b1a6f..630f9a7e889 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -21,8 +21,6 @@
 
 from osv import osv, fields
 from tools.translate import _
-import pprint
-pp = pprint.PrettyPrinter(indent=4)
 
 import time
 
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index 8f1812862c5..0cbf6e172cd 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -22,7 +22,7 @@
 
 
 {
-    'name': 'Calendar Synchronizing',
+    'name': 'Meetings Synchronization',
     'version': '1.1',
     'category': 'Customer Relationship Management',
     'complexity': "normal",
diff --git a/addons/crm_caldav/i18n/hr.po b/addons/crm_caldav/i18n/hr.po
new file mode 100644
index 00000000000..6ed39f173f5
--- /dev/null
+++ b/addons/crm_caldav/i18n/hr.po
@@ -0,0 +1,46 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 16:40+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "Sastanak"
+
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extended Module to Add CalDav feature on Meeting"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.module.module,description:crm_caldav.module_meta_information
+msgid ""
+"\n"
+"    New Features in Meeting:\n"
+"        *  Share meeting with other calendar clients like sunbird\n"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronyze this calendar"
+msgstr "Sinkroniziraj ovaj kalendar"
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 8c21fee5de0..7949ea48376 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Claims',
+    'name': 'Claims Management',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'complexity': "easy",
@@ -52,7 +52,6 @@ automatically new claims based on incoming emails.
              'test/ui/claim_demo.yml'
              ],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate' : '00612027414703404749',
     'images': ['images/claim_categories.jpeg','images/claim_stages.jpeg','images/claims.jpeg'],
diff --git a/addons/crm_claim/security/ir.model.access.csv b/addons/crm_claim/security/ir.model.access.csv
index b23ef97b7fd..5a05fbd4d87 100644
--- a/addons/crm_claim/security/ir.model.access.csv
+++ b/addons/crm_claim/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_claim_manager","crm.claim.manager","model_crm_claim","base.group_sale_manager",1,1,1,1
-"access_crm_claim_user","crm.claim.user","model_crm_claim","base.group_sale_salesman",1,1,1,0
-"access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","base.group_sale_manager",1,1,1,1
-"access_crm_claim_partner_manager","crm.claim.partner.manager","model_crm_claim","base.group_partner_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_claim_manager,crm.claim.manager,model_crm_claim,base.group_sale_manager,1,1,1,1
+access_crm_claim_user,crm.claim.user,model_crm_claim,base.group_sale_salesman,1,1,1,0
+access_crm_claim_report_manager,crm.claim.report.manager,model_crm_claim_report,base.group_sale_manager,1,1,1,1
+access_crm_claim_partner_manager,crm.claim.partner.manager,model_crm_claim,base.group_partner_manager,1,0,0,0
diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py
index d5f97c26647..993b3dc6434 100644
--- a/addons/crm_fundraising/__openerp__.py
+++ b/addons/crm_fundraising/__openerp__.py
@@ -53,7 +53,6 @@ fund status.
     ],
     'test': ['test/process/fund-rising.yml'],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate' : '00871545204231528989',
     'images': ['images/fundraising_analysis.jpeg','images/fundraising_categories.jpeg','images/funds.jpeg'],
diff --git a/addons/crm_fundraising/i18n/hr.po b/addons/crm_fundraising/i18n/hr.po
new file mode 100644
index 00000000000..04d7523f5da
--- /dev/null
+++ b/addons/crm_fundraising/i18n/hr.po
@@ -0,0 +1,764 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 16:49+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Planirani prihod"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,nbr:0
+msgid "# of Cases"
+msgstr "# Slučaja"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,probability:0
+msgid "Avg. Probability"
+msgstr "Prosječna vjerojatnost"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "March"
+msgstr "Ožujak"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,delay_close:0
+msgid "Delay to close"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,company_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
+msgid "Fundraising Categories"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_cc:0
+msgid "Watchers Emails"
+msgstr "Emailovi posmatrača"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Cases"
+msgstr "Slučajevi"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Highest"
+msgstr "Najviši"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,day:0
+msgid "Day"
+msgstr "Dan"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Add Internal Note"
+msgstr "Dodaj internu bilješku"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_mobile:0
+msgid "Mobile"
+msgstr "Mobilni"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund4
+msgid "Arts And Culture"
+msgstr "Umjetnost i kultura"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue:0
+msgid "Est.Revenue"
+msgstr "Procijenjeni prihod"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Osoba kod partnera"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "   Month   "
+msgstr "   Mjesec   "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,type_id:0
+msgid "Campaign"
+msgstr "Kampanja"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_next:0
+msgid "Next Action"
+msgstr "Siljedeća akcija"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reset to Draft"
+msgstr "Vrati u nacrt"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Extra Info"
+msgstr "Dodatni podaci"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
+msgid "Fund Raising"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,partner_id:0
+#: field:crm.fundraising.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
+msgid "Fundraising Analysis"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
+msgid "CRM Fundraising"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Misc"
+msgstr "Ostalo"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,priority:0
+msgid "Priority"
+msgstr "Prioritet"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Send New Email"
+msgstr "Pošalji novi e-mail"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund1
+msgid "Social Rehabilitation And Rural Upliftment"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Payment Mode"
+msgstr "Način plaćanja"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reply"
+msgstr "Odgovori"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_from:0
+msgid "Email"
+msgstr "E-pošta"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,canal_id:0
+msgid "Channel"
+msgstr "Kanal"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Lowest"
+msgstr "Najniži"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,create_date:0
+msgid "Creation Date"
+msgstr "Datum kreiranja"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name2:0
+msgid "Employee Email"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund2
+msgid "Learning And Education"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Contact"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Form"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Fund Description"
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "References"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: model:ir.module.module,description:crm_fundraising.module_meta_information
+msgid "Fundraising"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
+msgid ""
+"Have a general overview of all fund raising activities by sorting them with "
+"specific criteria such as the estimated revenue, average success probability "
+"and delay to close."
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Tree"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund3
+msgid "Credit Card"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
+msgid "Fundraising Stages"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Salesman"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,categ_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_cost:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_closed:0
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
+msgid "Stages"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
+msgid "Funds"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "#Fundraising"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund2
+msgid "Cheque"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fund_categ_action
+msgid ""
+"Manage and define the fund raising categories you want to be maintained in "
+"the system."
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date:0
+msgid "Date"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund3
+msgid "Healthcare"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Attachments"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_case_stage
+msgid "Stage of case"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Estimates"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
+msgid ""
+"If you need to collect money for your organization or a campaign, Fund "
+"Raising allows you to track all your fund raising activities. In the search "
+"list, filter by funds description, email, history and probability of success."
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Current"
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,section_id:0
+msgid ""
+"Sales team to which Case belongs to. Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Details"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
+msgid "CRM Fundraising Report"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,type_id:0
+msgid "Fundraising Type"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue_prob:0
+msgid "Est. Rev*Prob."
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act
+msgid ""
+"Create and manage fund raising activity categories you want to be maintained "
+"in the system."
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund1
+msgid "Cash"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds by Categories"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund4
+msgid "Demand Draft"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Search Funds"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,section_id:0
+#: view:crm.fundraising.report:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,duration:0
+msgid "Duration"
+msgstr ""
diff --git a/addons/crm_fundraising/security/ir.model.access.csv b/addons/crm_fundraising/security/ir.model.access.csv
index 703c899c096..00913e326c4 100644
--- a/addons/crm_fundraising/security/ir.model.access.csv
+++ b/addons/crm_fundraising/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_fundraising_manager","crm.fundraising.manager","model_crm_fundraising","base.group_sale_manager",1,1,1,1
-"access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","base.group_sale_salesman",1,1,1,0
-"access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","base.group_sale_salesman",1,0,0,0
-"access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_fundraising_manager,crm.fundraising.manager,model_crm_fundraising,base.group_sale_manager,1,1,1,1
+access_crm_fundraising_user,crm.fundraising.user,model_crm_fundraising,base.group_sale_salesman,1,1,1,0
+access_crm_fundraising_report_user,crm.fundraising.report.user,model_crm_fundraising_report,base.group_sale_salesman,1,0,0,0
+access_crm_fundraising_report_manager,crm.fundraising.report.manager,model_crm_fundraising_report,base.group_sale_manager,1,1,1,1
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index 01abdef2147..2adf7d26dcc 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -51,7 +51,6 @@ and categorize your interventions with a channel and a priority level.
     ],
     'test': ['test/process/help-desk.yml'],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate' : '00830691522781519309',
     'images': ['images/helpdesk_analysis.jpeg','images/helpdesk_categories.jpeg','images/helpdesk_requests.jpeg'],
diff --git a/addons/crm_helpdesk/i18n/hr.po b/addons/crm_helpdesk/i18n/hr.po
new file mode 100644
index 00000000000..bb8b2bcb617
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/hr.po
@@ -0,0 +1,695 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 16:38+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "# Slučaja"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "Danas"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "Ožujak"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "Emailovi posmatrača"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "Najviši"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "Dan"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "Dodaj internu bilješku"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Osoba kod partnera"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "Datum zatvaranja"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "   Month   "
+msgstr "   Mjesec   "
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "Veza"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "Siljedeća akcija"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "Procjene"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "Grupa"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr "Prioritet"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "Pošalji novi e-mail"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Won"
+msgstr "Dobiven"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Prekoračen rok"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "E-pošta"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,canal_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,canal_id:0
+msgid "Channel"
+msgstr "Kanal"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "Najniži"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "# Pisama"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "Datum kreiranja"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "Vrati u nacrt"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "Na čekanju"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "Krajnji rok"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "Srpanj"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "Kategorije korisničke podrške"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "Kategorije"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "Povijest"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "Datumi"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "    Month-1    "
+msgstr "    Mjesec-1    "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "Rujan"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "Komunikacija"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "Eskaliraj"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "Datum izmjene"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "Upit"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "Prodavač"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "Poveznica 2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "  Year  "
+msgstr "  Godina  "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Planirani troškovi"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,description:crm_helpdesk.module_meta_information
+msgid "Helpdesk Management"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "Niski"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "Zatvoren"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7 Dana"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "Komunikacija i povijest"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "Kolovoz"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "Normalan"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "Globalni CC"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "Lipanj"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Planirani prihod"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "Aktivan"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
+msgid "CRM Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "Prošireni filtri..."
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "Traži"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "Listopad"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "Siječanj"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "Ove će osobe primiti e-poštu."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "Studeni"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "Povijest"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Attachments"
+msgstr "Privici"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "Ostalo"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "Podaci"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "Pošalji podsjetnik"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "Izvršeno"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "Prosinac"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "Zatvori"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "Otvoreno"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "Kategorizacija"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr "Helpdesk"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "Odgovoran"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Current"
+msgstr "Trenutno"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Details"
+msgstr "Detalji"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "Odgovori"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "Svibanj"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "Vjerojatnost (%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "# epošti"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"Stanje je postavljeno na 'Nacrt', kada se stvara slučaj.\n"
+"Ako je slučaj je u tijeku stanje je postavljeno na 'Otvoren'.\n"
+"Kada se slučaj završi, stanje je postavljen na \"Gotovo\".\n"
+"Ako slučaj treba biti pregledan, stanje je postavljeno na 'U tijeku'."
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "Veljača"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Lost"
+msgstr "Izgubljen"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "Helpdesk i podrška"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "Travanj"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "Moji slučajevi"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "Visoki"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "Prodajni tim"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "Posljednja akcija"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "Godina"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr ""
diff --git a/addons/crm_helpdesk/security/ir.model.access.csv b/addons/crm_helpdesk/security/ir.model.access.csv
index 2a0d8785122..1897f2a6ac9 100644
--- a/addons/crm_helpdesk/security/ir.model.access.csv
+++ b/addons/crm_helpdesk/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","base.group_sale_manager",1,1,1,1
-"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","base.group_sale_salesman",1,1,1,0
-"access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_helpdesk_manager,crm.helpdesk.manager,model_crm_helpdesk,base.group_sale_manager,1,1,1,1
+access_crm_helpdesk_user,crm.helpdesk.user,model_crm_helpdesk,base.group_sale_salesman,1,1,1,0
+access_report_crm_helpdesk_manager,report.crm.helpdesk.manager,model_crm_helpdesk_report,base.group_sale_manager,1,1,1,1
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 60a51c1a0b9..94f2f622a64 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Partner Geo-Localization',
+    'name': 'Partners Geo-Localization',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Customer Relationship Management',
     'complexity': "normal",
     'description': """
 This is the module used by OpenERP SA to redirect customers to its partners, based on geolocalization.
diff --git a/addons/crm_partner_assign/i18n/hr.po b/addons/crm_partner_assign/i18n/hr.po
new file mode 100644
index 00000000000..1c6c04d35aa
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/hr.po
@@ -0,0 +1,710 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 16:43+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,name:0
+msgid "Send to"
+msgstr "Pošalji"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Planirani prihod"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "# Slučaja"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+#: view:crm.lead.forward.to.partner:0
+msgid "Forward"
+msgstr "Proslijedi"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "Ožujak"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "Cijela priča"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:41
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_date:0
+msgid "Partner Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "Najviši"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "Dan"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "Datum zatvaranja"
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.module.module,description:crm_partner_assign.module_meta_information
+msgid ""
+"\n"
+"This is the module used by OpenERP SA to redirect customers to his "
+"partners,\n"
+"based on geolocalization.\n"
+"    "
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "Na čekanju"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,partner_id:0
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "Prethodni"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:40
+#, python-format
+msgid "Network error"
+msgstr "Greška mreže"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid ""
+"These addresses will receive a copy of this email. To modify the permanent "
+"CC list, edit the global CC field of this case"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: field:res.partner,grade_id:0
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Section"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,html:0
+msgid "HTML formatting?"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
+#, python-format
+msgid "Fwd"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+msgid "Grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Salesman"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply To"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
+msgid "Partner Geo-Localisation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "CC"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+msgid "Unchanged"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Send new email"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+msgid "Email Address"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body:0
+msgid "Message Body"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,state:0
+msgid "Set New State To"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,name:0
+msgid "Year"
+msgstr ""
diff --git a/addons/crm_partner_assign/security/ir.model.access.csv b/addons/crm_partner_assign/security/ir.model.access.csv
index b5bb64ad3dd..e4067a69aed 100644
--- a/addons/crm_partner_assign/security/ir.model.access.csv
+++ b/addons/crm_partner_assign/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ crm_lead_report_assign","crm.lead.report.assign","model_crm_lead_report_assign","base.group_sale_salesman",1,1,1,0
-"access_ crm_lead_report_assign_all","crm.lead.report.assign.all","model_crm_lead_report_assign","base.group_user",1,0,0,0
-"access_crm_partner_report","crm.partner.report.assign.all","model_crm_partner_report_assign","base.group_sale_salesman",1,0,0,0
-"access_res_partner_grade","res.partner.grade","model_res_partner_grade","base.group_sale_salesman",1,1,1,0
-"access_res_partner_grade_manager","res.partner.grade.manager","model_res_partner_grade","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ crm_lead_report_assign,crm.lead.report.assign,model_crm_lead_report_assign,base.group_sale_salesman,1,1,1,0
+access_ crm_lead_report_assign_all,crm.lead.report.assign.all,model_crm_lead_report_assign,base.group_user,1,0,0,0
+access_crm_partner_report,crm.partner.report.assign.all,model_crm_partner_report_assign,base.group_sale_salesman,1,0,0,0
+access_res_partner_grade,res.partner.grade,model_res_partner_grade,base.group_sale_salesman,1,1,1,0
+access_res_partner_grade_manager,res.partner.grade.manager,model_res_partner_grade,base.group_sale_manager,1,1,1,1
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 1d8f9f7ee79..fdc85ba3d4d 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Profiling Tools',
+    'name': 'Customer Profiling',
     'version': '1.3',
     'category': 'Marketing',
     'complexity': "easy",
@@ -39,7 +39,7 @@ It also has been merged with the earlier CRM & SRM segmentation tool because the
     'website': 'http://www.openerp.com',
     'depends': ['base', 'crm'],
     'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'crm_profiling_view.xml'],
+    'update_xml': ['security/ir.model.access.csv', 'wizard/open_questionnaire_view.xml', 'crm_profiling_view.xml'],
     'demo_xml': ['crm_profiling_demo.xml'],
     'test': [
         #'test/process/profiling.yml', #TODO:It's not debuging because problem to write data for open.questionnaire from partner section.
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 59137966da0..587ddbe0b52 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -159,30 +159,6 @@ class questionnaire(osv.osv):
     _name="crm_profiling.questionnaire"
     _description= "Questionnaire"
 
-    def build_form(self, cr, uid, data, context=None):
-        """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param data: Get Data
-            @param context: A standard dictionary for contextual values """
-        
-        query = """
-        select name, id
-        from crm_profiling_question
-        where id in ( select question from profile_questionnaire_quest_rel where questionnaire = %s)"""
-        res = cr.execute(query, (data['form']['questionnaire_name'],))
-        result = cr.fetchall()
-        quest_fields={}
-        quest_form='''<?xml version="1.0"?>
-            <form string="%s">''' % _('Questionnaire')
-        for name, oid in result:
-            quest_form = quest_form + '<field name="quest_form%d"/><newline/>' % (oid,)
-            quest_fields['quest_form%d' % (oid,)] = {'string': name, 'type': 'many2one', \
-                        'relation': 'crm_profiling.answer', 'domain': [('question_id','=',oid)] }
-        quest_form = quest_form + '''</form>'''
-        return quest_form, quest_fields
-
     _columns = {
         'name': fields.char("Questionnaire",size=128, required=True),
         'description':fields.text("Description", required=True),
@@ -210,25 +186,19 @@ class partner(osv.osv):
                                 "partner","answer","Answers"),
         }
 
-    def _questionnaire_compute(self, cr, uid, data, context=None):
+    def _questionnaire_compute(self, cr, uid, answers, context=None):
         """
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param data: Get Data
             @param context: A standard dictionary for contextual values """
-
-        temp = []
-        for x in data['form']:
-            if x.startswith("quest_form") and data['form'][x] != 0 :
-                temp.append(data['form'][x])
-
+        partner_id = context.get('active_id')
         query = "select answer from partner_question_rel where partner=%s"
-        cr.execute(query, (data['id'],))
+        cr.execute(query, (partner_id,))
         for x in cr.fetchall():
-            temp.append(x[0])
-
-        self.write(cr, uid, [data['id']], {'answers_ids':[[6, 0, temp]]}, context=context)
+            answers.append(x[0])
+        self.write(cr, uid, [partner_id], {'answers_ids': [[6, 0, answers]]}, context=context)
         return {}
 
 
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 258de2e4e2d..a54d3d4b0a9 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -2,13 +2,6 @@
 <openerp>
     <data>
 
-        <wizard
-            string="Using a questionnaire"
-            model="crm_profiling.questionnaire"
-            name="open_questionnaire"
-            menu="False"
-            id="wizard_open_questionnaire"/>
-
         <record model="ir.actions.act_window" id="open_questionnaires">
           <field name="name">Questionnaires</field>
           <field name="res_model">crm_profiling.questionnaire</field>
@@ -140,7 +133,7 @@
             <notebook position="inside">
                 <page string="Profiling">
                   <button string="Use a questionnaire"
-                      name="%(wizard_open_questionnaire)d" type="action" colspan="1"
+                      name="%(action_open_questionnaire)d" type="action" colspan="1"
                       icon="gtk-justify-fill" />
                   <newline/>
                   <field name="answers_ids" colspan="4" nolabel="1"/>
diff --git a/addons/crm_profiling/crm_profiling_wizard.xml b/addons/crm_profiling/crm_profiling_wizard.xml
deleted file mode 100644
index 39d436a6bd9..00000000000
--- a/addons/crm_profiling/crm_profiling_wizard.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-	</data>
-</openerp>
diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv
index 43e1528fddb..24fd7009c6a 100644
--- a/addons/crm_profiling/security/ir.model.access.csv
+++ b/addons/crm_profiling/security/ir.model.access.csv
@@ -1,7 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_profiling_answer_salesman","crm_profiling.answer.salesman","model_crm_profiling_answer","base.group_sale_salesman",1,1,1,0
-"access_crm_profiling_answer_manager","crm_profiling.answer.manager","model_crm_profiling_answer","base.group_sale_manager",1,1,1,1
-"access_crm_profiling_question_salesman","crm_profiling.question.salesman","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0
-"access_crm_profiling_question_manager","crm_profiling.question.manager","model_crm_profiling_question","base.group_sale_manager",1,1,1,1
-"access_crm_profiling_questionnarie_salesman","crm_profiling.questionnarie.salesman","model_crm_profiling_questionnaire","base.group_sale_salesman",1,1,1,0
-"access_crm_profiling_questionnarie_manager","crm_profiling.questionnarie.manager","model_crm_profiling_questionnaire","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_profiling_answer_salesman,crm_profiling.answer.salesman,model_crm_profiling_answer,base.group_sale_salesman,1,1,1,0
+access_crm_profiling_answer_manager,crm_profiling.answer.manager,model_crm_profiling_answer,base.group_sale_manager,1,1,1,1
+access_crm_profiling_question_salesman,crm_profiling.question.salesman,model_crm_profiling_question,base.group_sale_salesman,1,1,1,0
+access_crm_profiling_question_manager,crm_profiling.question.manager,model_crm_profiling_question,base.group_sale_manager,1,1,1,1
+access_crm_profiling_questionnarie_salesman,crm_profiling.questionnarie.salesman,model_crm_profiling_questionnaire,base.group_sale_salesman,1,1,1,0
+access_crm_profiling_questionnarie_manager,crm_profiling.questionnarie.manager,model_crm_profiling_questionnaire,base.group_sale_manager,1,1,1,1
diff --git a/addons/crm_profiling/test/process/profiling.yml b/addons/crm_profiling/test/process/profiling.yml
index 91c48410f8d..99fe2da1733 100644
--- a/addons/crm_profiling/test/process/profiling.yml
+++ b/addons/crm_profiling/test/process/profiling.yml
@@ -1,10 +1,69 @@
+- |
+  I check segmentation which allows users to perform segmentation within partners.
 -
-  I check segmentation which allows users to perform segmentation within partners
-  and set the category according to question, so first compute questions(answers) 
-  scenario with parther and check that category set according to questions. 
+  I create a crm profiling question record.
+-
+  !record {model: crm_profiling.question, id: crm_profiling_question_openerppartner0}:
+    answers_ids:
+      - name: 'no'
+    name: OpenERP partner?
+-
+  I create a crm profiling answer record.
+-
+  !record {model: crm_profiling.answer, id: crm_profiling_answer_openerppartner0}:
+    name: 'yes'
+    question_id: crm_profiling_question_openerppartner0
+-
+  I create Partner category Customers.
+-
+  !record {model: res.partner.category, id: res_partner_category_customers0}:
+    name: Customers
+- |
+  I'm creating new partner "John" with his email "info@mycustomer.com".
+-
+  !record {model: res.partner, id: res_partner_john0}:
+    address:
+      - city: Bruxelles
+        country_id: base.be
+        street: Rue des Palais 51, bte 33
+        type: default
+        zip: '1000'
+        email: 'info@mycustomer.com'
+    name: John
+    category_id:
+      - res_partner_category_customers0
+
+-
+  Define the answers and category to partner.
 -
   !python {model: res.partner}: |
-    data ={'form': {'quest_form3': ref("partner_quality3"), 'quest_form2': ref("nb_employees2"),'quest_form1': ref("sector1"),'questionnaire_name': ref('questionnaire1')}, 'ids': [ref('base.res_partner_ericdubois0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('base.res_partner_ericdubois0')}
-    data = self._questionnaire_compute(cr, uid, data, context)
-    partner = self.browse(cr, uid, ref('base.res_partner_ericdubois0'))
-    assert partner.category_id[0].id == ref("base.res_partner_category_17"), "Category not assign properly" 
+    data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
+    context['active_id'] = ref('res_partner_john0')
+    self._questionnaire_compute(cr, uid, [ref('crm_profiling_answer_openerppartner0')], context)
+- |
+  I start by creating new Questionnaire.
+-
+  !record {model: crm_profiling.questionnaire, id: crm_profiling_questionnaire_basequestionnaire0}:
+    description: First questionnaire.
+    name: Base questionnaire
+    questions_ids:
+      - crm_profiling.activity_sector
+      - crm_profiling.nb_employees
+      - crm_profiling.partner_level
+-
+  I create a segmentation record.
+-
+  !record {model: crm.segmentation, id: crm_segmentation_test1}:
+    answer_yes:
+      - crm_profiling_answer_openerppartner0
+    categ_id: res_partner_category_customers0
+    name: test
+    parent_id: crm_profiling.crm_segmentation0
+    profiling_active: true
+    som_interval: 0.0
+- |
+  I continue the process of segmentation.
+-
+  !python {model: crm.segmentation}: |
+    self.process_continue(cr, uid, [ref('crm_segmentation_test1')], start=False)
+
diff --git a/addons/crm_profiling/wizard/open_questionnaire.py b/addons/crm_profiling/wizard/open_questionnaire.py
index 91b82a02d1a..b13c67640fc 100644
--- a/addons/crm_profiling/wizard/open_questionnaire.py
+++ b/addons/crm_profiling/wizard/open_questionnaire.py
@@ -18,50 +18,72 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import pooler
-import wizard
-from tools import UpdateableStr, UpdateableDict
 
-_QUEST_FORM = UpdateableStr()
-_QUEST_FIELDS=UpdateableDict()
+from osv import osv, fields
+from tools.translate import _
 
-class open_questionnaire(wizard.interface):
-
-    def _questionnaire_compute(self, cr, uid, data, context):
-        pooler.get_pool(cr.dbname).get(data['model'])._questionnaire_compute(cr, uid, data, context)
-        return {}
-
-
-    def build_form(self, cr, uid, data, context):
-        quest_form, quest_fields = pooler.get_pool(cr.dbname).get('crm_profiling.questionnaire').build_form(cr, uid, data, context)
-        _QUEST_FORM. __init__(quest_form)
-        _QUEST_FIELDS.__init__(quest_fields)
-        return{}
-
-    _questionnaire_choice_arch = '''<?xml version="1.0"?>
-    <form string="Questionnaire">
-        <field name="questionnaire_name"/>
-    </form>'''
-
-    _questionnaire_choice_fields = {
-            'questionnaire_name': {'string': 'Questionnaire name', 'type': 'many2one', 'relation': 'crm_profiling.questionnaire', 'required': True },
+class open_questionnaire_line(osv.osv_memory):
+    _name = 'open.questionnaire.line'
+    _rec_name = 'question_id'
+    _columns = {
+        'question_id': fields.many2one('crm_profiling.question','Question', required=True),
+        'answer_id': fields.many2one('crm_profiling.answer', 'Answer'),
+        'wizard_id': fields.many2one('open.questionnaire', 'Questionnaire'),
     }
 
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': _questionnaire_choice_arch, 'fields': _questionnaire_choice_fields, 'state':[('end', 'Cancel','gtk-cancel'), ('open', 'Open Questionnaire','terp-camera_test')]}
-        },
-        'open': {
-            'actions': [build_form],
-            'result': {'type': 'form', 'arch':_QUEST_FORM, 'fields': _QUEST_FIELDS, 'state':[('end', 'Cancel','gtk-cancel'), ('compute', 'Save Data','terp-stock_format-scientific')]}
-        },
-        'compute': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _questionnaire_compute, 'state':'end'}
+open_questionnaire_line()
+
+class open_questionnaire(osv.osv_memory):
+    _name = 'open.questionnaire'
+    _columns = {
+        'questionnaire_id': fields.many2one('crm_profiling.questionnaire', 'Questionnaire name'),
+        'question_ans_ids': fields.one2many('open.questionnaire.line', 'wizard_id', 'Question / Answers'),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None: context = {}
+        res = super(open_questionnaire, self).default_get(cr, uid, fields, context=context)
+        questionnaire_id = context.get('questionnaire_id', False)
+        if questionnaire_id and 'question_ans_ids' in fields:
+            query = """
+                select question as question_id from profile_questionnaire_quest_rel where questionnaire = %s"""
+            cr.execute(query, (questionnaire_id,))
+            result = cr.dictfetchall()
+            res.update(question_ans_ids=result)
+        return res
+
+    def questionnaire_compute(self, cr, uid, ids, context=None):
+        """ Adds selected answers in partner form """
+        model = context.get('active_model')
+        answers = []
+        if model == 'res.partner':
+            data = self.browse(cr, uid, ids[0], context=context)
+            for d in data.question_ans_ids:
+                 if d.answer_id:
+                     answers.append(d.answer_id.id)
+            self.pool.get(model)._questionnaire_compute(cr, uid, answers, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+
+    def build_form(self, cr, uid, ids, context=None):
+        """ Dynamically generates form according to selected questionnaire """
+        models_data = self.pool.get('ir.model.data')
+        result = models_data._get_id(cr, uid, 'crm_profiling', 'open_questionnaire_form')
+        res_id = models_data.browse(cr, uid, result, context=context).res_id
+        datas = self.browse(cr, uid, ids[0], context=context)
+        context.update({'questionnaire_id': datas.questionnaire_id.id})
+
+        return {
+            'name': _('Questionnaire'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'open.questionnaire',
+            'type': 'ir.actions.act_window',
+            'views': [(res_id,'form')],
+            'target': 'new',
+            'context': context
         }
-    }
 
-open_questionnaire('open_questionnaire')
+open_questionnaire()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
new file mode 100644
index 00000000000..88955f43af4
--- /dev/null
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record id="view_open_questionnaire_form" model="ir.ui.view">
+            <field name="name">Open Questionnaires</field>
+            <field name="model">open.questionnaire</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Questionnaires">
+                    <field name="questionnaire_id" required="1"/>
+                    <newline/>
+                    <separator string="" colspan="4"/>
+                    <group col="4" colspan="4">
+                        <group col="2" colspan="2"/>
+                        <button special="cancel" icon="gtk-cancel" string="Cancel"/>
+                        <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_open_questionnaire">
+            <field name="name">Open Questionnaire</field>
+            <field name="res_model">open.questionnaire</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_open_questionnaire_form"/>
+            <field name="target">new</field>
+        </record>
+
+        <record id="open_questionnaire_form" model="ir.ui.view">
+            <field name="name">open.questionnaire.form</field>
+            <field name="model">open.questionnaire</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+                    <separator colspan="4" string="Questionnaire"/>
+                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2"/>
+                    <group col="2" colspan="2">
+                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+                        <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_open_questionnaire_line_tree" model="ir.ui.view">
+            <field name="name">open.questionnaire.line.list</field>
+            <field name="model">open.questionnaire.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom" string="Questionnaire">
+                    <field name="question_id"/>
+                    <field name="answer_id" domain="[('question_id', '=', question_id)]"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_open_questionnaire_line_form" model="ir.ui.view">
+            <field name="name">open.questionnaire.line.form</field>
+            <field name="model">open.questionnaire.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Questionnaire">
+                    <field name="question_id"/>
+                    <field name="answer_id" domain="[('question_id', '=', question_id)]"/>
+                </form>
+            </field>
+        </record>
+
+        <!-- Questionnaire form view -->
+        <!--<act_window
+            context="{}"
+            id="act_open_questionnaire"
+            name="Using a Questionnaire"
+            res_model="open.questionnaire"
+            src_model="crm_profiling.questionnaire"
+            view_id="view_open_questionnaire_form"
+            target="new"
+            view_mode="form"/>-->
+
+    </data>
+</openerp>
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
index 01f66160b0b..d3d205ec9c0 100644
--- a/addons/crm_todo/__openerp__.py
+++ b/addons/crm_todo/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'CRM Todo Lists',
+    'name': 'Tasks on CRM',
     'version': '1.0',
-    "category": 'Hidden/Link',
+    "category": 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 Todo list for CRM leads and opportunities.
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 303d42558b3..0aafef9fe1f 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -30,7 +30,7 @@ The decimal precision is configured per company.
     "author": "OpenERP SA",
     "version": "0.1",
     "depends": ["base"],
-    "category" : "Tools",
+    "category" : "Hidden/Dependency",
     'complexity': "easy",
     "init_xml": [],
     "update_xml": [
diff --git a/addons/decimal_precision/i18n/hr.po b/addons/decimal_precision/i18n/hr.po
index c3cebb8276b..68fa0c51207 100644
--- a/addons/decimal_precision/i18n/hr.po
+++ b/addons/decimal_precision/i18n/hr.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-05-19 04:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-19 16:50+0000\n"
+"Last-Translator: Domagoj Crljenko <crljenko@riteh.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
 msgid "Digits"
-msgstr ""
+msgstr "Znamenki"
 
 #. module: decimal_precision
 #: view:decimal.precision:0
 msgid "Decimal Precision"
-msgstr ""
+msgstr "Decimalna preciznost"
 
 #. module: decimal_precision
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
@@ -47,17 +47,17 @@ msgstr ""
 #. module: decimal_precision
 #: field:decimal.precision,name:0
 msgid "Usage"
-msgstr ""
+msgstr "Upotreba"
 
 #. module: decimal_precision
 #: sql_constraint:decimal.precision:0
 msgid "Only one value can be defined for each given usage!"
-msgstr ""
+msgstr "Samo jedna vrijednost može biti definirana za svaku upotrebu"
 
 #. module: decimal_precision
 #: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
 msgid "Decimal Precision Configuration"
-msgstr ""
+msgstr "Konfiguracija preciznosti decimala"
 
 #. module: decimal_precision
 #: model:ir.model,name:decimal_precision.model_decimal_precision
diff --git a/addons/decimal_precision/security/ir.model.access.csv b/addons/decimal_precision/security/ir.model.access.csv
index d53a5fef141..aa203eae141 100644
--- a/addons/decimal_precision/security/ir.model.access.csv
+++ b/addons/decimal_precision/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_decimal_precision_config","decimal.precision configuration","model_decimal_precision",base.group_system,1,1,1,1
-"access_decimal_precision_all","decimal.precision","model_decimal_precision",,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_decimal_precision_config,decimal.precision configuration,model_decimal_precision,base.group_system,1,1,1,1
+access_decimal_precision_all,decimal.precision,model_decimal_precision,,1,0,0,0
diff --git a/addons/delivery/security/ir.model.access.csv b/addons/delivery/security/ir.model.access.csv
index 52e60995519..7403b55f618 100644
--- a/addons/delivery/security/ir.model.access.csv
+++ b/addons/delivery/security/ir.model.access.csv
@@ -1,8 +1,8 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_delivery_carrier","delivery.carrier","model_delivery_carrier","base.group_sale_salesman",1,0,0,0
-"access_delivery_grid","delivery.grid","model_delivery_grid","base.group_sale_salesman",1,0,0,0
-"access_delivery_grid_line","delivery.grid.line","model_delivery_grid_line","base.group_sale_salesman",1,0,0,0
-"access_delivery_carrier_manager","delivery.carrier","model_delivery_carrier","base.group_sale_manager",1,1,1,1
-"access_delivery_grid_manager","delivery.grid","model_delivery_grid","base.group_sale_manager",1,1,1,1
-"access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","base.group_sale_manager",1,1,1,1
-"access_delivery_carrier_partner_manager","delivery.carrier partner_manager","model_delivery_carrier","base.group_partner_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_delivery_carrier,delivery.carrier,model_delivery_carrier,base.group_sale_salesman,1,0,0,0
+access_delivery_grid,delivery.grid,model_delivery_grid,base.group_sale_salesman,1,0,0,0
+access_delivery_grid_line,delivery.grid.line,model_delivery_grid_line,base.group_sale_salesman,1,0,0,0
+access_delivery_carrier_manager,delivery.carrier,model_delivery_carrier,base.group_sale_manager,1,1,1,1
+access_delivery_grid_manager,delivery.grid,model_delivery_grid,base.group_sale_manager,1,1,1,1
+access_delivery_grid_line_manager,delivery.grid.line,model_delivery_grid_line,base.group_sale_manager,1,1,1,1
+access_delivery_carrier_partner_manager,delivery.carrier partner_manager,model_delivery_carrier,base.group_partner_manager,1,0,0,0
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 6b9cbd21f48..0a403dcaa35 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Integrated Document Management System',
+    'name': 'Document Management System',
     'version': '2.1',
     'category': 'Knowledge Management',
     'complexity': "normal",
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 471b2966be5..e3b1b4c9c64 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -7,22 +7,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Document board">
-                     <board style="1-1" >
+                     <board style="2-1" >
                         <column>
                             <action string="New Files"
                                 name="%(document.action_view_all_document_tree1)d"
                                 view_mode="tree,form"/>
-                            <action string="File Size by Month"
-                                name="%(document.action_view_size_month)d"
-                                view_mode="graph,tree"/>
                         </column>
                         <column>
-                            <action string="Files by Resource Type"
-                                name="%(document.action_view_document_by_resourcetype_graph)d"
-                                view_mode="graph,tree"/>
-
-                            <action string="Files by Partner"
-                                name="%(document.action_view_files_by_partner)d"
+                            <action string="File Size by Month"
+                                name="%(document.action_view_size_month)d"
                                 view_mode="graph,tree"/>
                         </column>
                      </board>
@@ -65,7 +58,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Document board">
-                     <board style="1-1">
+                     <board style="2-1">
                         <column>
                             <action string="Wall of Shame"
                                 name="%(document.action_view_wall)d"
diff --git a/addons/document/document.py b/addons/document/document.py
index 36b10b34e4b..9ea7f97a321 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -132,7 +132,7 @@ class document_file(osv.osv):
         # fields used for file storage
         'store_fname': fields.char('Stored Filename', size=200),
     }
-    _order = "create_date desc"
+    _order = "id desc"
 
     def __get_def_directory(self, cr, uid, context=None):
         dirobj = self.pool.get('document.directory')
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index e7fa4efb5be..e6e1847cd56 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -120,14 +120,6 @@
         </record>
 
 
-        <record model="ir.actions.act_window" id="action_view_document_by_resourcetype_graph">
-            <field name="name">Files by Resource Type</field>
-            <field name="res_model">report.document.user</field>
-            <field name="view_id" ref="view_document_by_resourcetype_graph"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-
 <!--***************************************************************************************-->
 
     <record model="ir.ui.view" id="view_size_month">
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index bc0281e388c..74f3426fc50 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -3,7 +3,8 @@
 <data noupdate="0">
 
     <record id="base.group_document_user" model="res.groups">
-        <field name="name">Knowledge / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
     </record>
 
 <!--    <record id="group_document_manager" model="res.groups">-->
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index d840055e89a..36f0aa86dff 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -1,25 +1,25 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_document_directory_all","document.directory all","model_document_directory",,1,0,0,0
-"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","base.group_system",1,1,1,1
-"access_document_directory_group_knowledge","document.directory modify","model_document_directory","base.group_document_user",1,1,1,1
-"access_document_directory_content_all","document.directory.content all","model_document_directory_content",,1,0,0,0
-"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","base.group_system",1,1,1,1
-"access_document_directory_content_type_group_document_manager","document.directory.content.type document manager","model_document_directory_content_type","base.group_system",1,1,1,1
-"access_document_directory_content_type_group_system","document.directory.content.type group system","model_document_directory_content_type","base.group_user",1,0,0,0
-"access_document_storage_group_document_manager","document.storage document manager","model_document_storage","base.group_system",1,1,1,1
-"access_document_storage_group_system","document.storage group system","model_document_storage","base.group_user",1,0,0,0
-"access_document_storage_group_user","document.storage group user","model_document_storage","base.group_document_user",1,1,1,1
-"access_ir_attachment_group_user","ir.attachment user","base.model_ir_attachment","base.group_document_user",1,1,1,1
-"access_ir_attachment_group_system","ir.attachment system","base.model_ir_attachment","base.group_system",1,0,0,0
-"access_res_partner_group_user","res.partner user","base.model_res_partner","base.group_document_user",1,1,1,0
-"access_document_directory_dctx_all","document.directory.dctx all","model_document_directory_dctx",,1,0,0,0
-"access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","base.group_system",1,1,1,1
-"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","base.group_system",1,0,0,0
-"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","base.group_system",1,0,0,0
-"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","base.group_system",1,0,0,0
-"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","base.group_system",1,0,0,0
-"access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
-"access_report_files_partner_group_document","report.files.partner document manager","model_report_files_partner","base.group_document_user",1,0,0,0
-"access_report_document_file_group_document","report.document.file document manager","model_report_document_file","base.group_document_user",1,0,0,0
-"access_report_document_wall_group_document","report.document.wall document manager","model_report_document_wall","base.group_document_user",1,0,0,0
-"access_report_document_user_knowledgeuser","report.document.user knowledgeuser","document.model_report_document_user","base.group_document_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_document_directory_all,document.directory all,model_document_directory,,1,0,0,0
+access_document_directory_group_document_manager,document.directory document manager,model_document_directory,base.group_system,1,1,1,1
+access_document_directory_group_knowledge,document.directory modify,model_document_directory,base.group_document_user,1,1,1,1
+access_document_directory_content_all,document.directory.content all,model_document_directory_content,,1,0,0,0
+access_document_directory_content_group_document_manager,document.directory.content document manager,model_document_directory_content,base.group_system,1,1,1,1
+access_document_directory_content_type_group_document_manager,document.directory.content.type document manager,model_document_directory_content_type,base.group_system,1,1,1,1
+access_document_directory_content_type_group_system,document.directory.content.type group system,model_document_directory_content_type,base.group_user,1,0,0,0
+access_document_storage_group_document_manager,document.storage document manager,model_document_storage,base.group_system,1,1,1,1
+access_document_storage_group_system,document.storage group system,model_document_storage,base.group_user,1,0,0,0
+access_document_storage_group_user,document.storage group user,model_document_storage,base.group_document_user,1,1,1,1
+access_ir_attachment_group_user,ir.attachment user,base.model_ir_attachment,base.group_document_user,1,1,1,1
+access_ir_attachment_group_system,ir.attachment system,base.model_ir_attachment,base.group_system,1,0,0,0
+access_res_partner_group_user,res.partner user,base.model_res_partner,base.group_document_user,1,1,1,0
+access_document_directory_dctx_all,document.directory.dctx all,model_document_directory_dctx,,1,0,0,0
+access_document_directory_dctx_group_document_manager,document.directory.dctx document manager,model_document_directory_dctx,base.group_system,1,1,1,1
+access_report_document_user_group_document_manager,report.document.user document manager,model_report_document_user,base.group_system,1,0,0,0
+access_report_files_partner_group_document_manager,report.files.partner document manager,model_report_files_partner,base.group_system,1,0,0,0
+access_report_document_file_group_document_manager,report.document.file document manager,model_report_document_file,base.group_system,1,0,0,0
+access_report_document_wall_group_document_manager,report.document.wall document manager,model_report_document_wall,base.group_system,1,0,0,0
+access_report_document_wall_group_system,report.document.wall group system,model_report_document_wall,base.group_system,1,0,0,0
+access_report_files_partner_group_document,report.files.partner document manager,model_report_files_partner,base.group_document_user,1,0,0,0
+access_report_document_file_group_document,report.document.file document manager,model_report_document_file,base.group_document_user,1,0,0,0
+access_report_document_wall_group_document,report.document.wall document manager,model_report_document_wall,base.group_document_user,1,0,0,0
+access_report_document_user_knowledgeuser,report.document.user knowledgeuser,document.model_report_document_user,base.group_document_user,1,0,0,0
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index fe42cfb1795..e153d018bf0 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -24,6 +24,7 @@ from subprocess import Popen, PIPE
 import StringIO
 import odt2txt
 import sys, zipfile, xml.dom.minidom
+import logging
 
 def _to_unicode(s):
     try:
@@ -95,9 +96,15 @@ class DocIndex(indexer):
         return ['.doc']
 
     def _doIndexFile(self,fname):
-        pop = Popen(['antiword', fname], shell=False, stdout=PIPE)
-        (data, _) = pop.communicate()
-        return _to_unicode(data)
+        try:
+            pop = Popen(['antiword', fname], shell=False, stdout=PIPE)
+            (data, _) = pop.communicate()
+            return _to_unicode(data)
+        except OSError:
+            logger = logging.getLogger('document.DocIndex')
+            logger.warn("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
+            logger.debug("Trace of the failed file indexing attempt: ", exc_info=True)
+            return False
     
 cntIndex.register(DocIndex())
 
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index a7b5a65e227..499a928c077 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -49,7 +49,6 @@ FTP client.
     ],
     'installable': True,
     'active': False,
-    'application': True,
     'certificate': '00934787762705016005',
     'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'],
     'post_load': 'post_load',
diff --git a/addons/document_ftp/security/ir.model.access.csv b/addons/document_ftp/security/ir.model.access.csv
index 0a6c192eb56..4a08a4aa60d 100644
--- a/addons/document_ftp/security/ir.model.access.csv
+++ b/addons/document_ftp/security/ir.model.access.csv
@@ -1,2 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py
index 679a6adabb6..115f5250cde 100644
--- a/addons/document_ics/__openerp__.py
+++ b/addons/document_ics/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'iCal Support',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "normal",
     'description': """
 Allows to synchronise calendars with others applications.
diff --git a/addons/document_ics/security/ir.model.access.csv b/addons/document_ics/security/ir.model.access.csv
index a89c5b296a7..73da3a1aaac 100644
--- a/addons/document_ics/security/ir.model.access.csv
+++ b/addons/document_ics/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_document_directory_ics_fields_all","document.directory.ics.fields all","model_document_directory_ics_fields",,1,0,0,0
-"access_document_directory_ics_fields_manager","document.directory.ics.fields group system","model_document_directory_ics_fields","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_document_directory_ics_fields_all,document.directory.ics.fields all,model_document_directory_ics_fields,,1,0,0,0
+access_document_directory_ics_fields_manager,document.directory.ics.fields group system,model_document_directory_ics_fields,base.group_system,1,1,1,1
diff --git a/addons/document_webdav/security/ir.model.access.csv b/addons/document_webdav/security/ir.model.access.csv
index 987f7a4f90a..fa81bcee2e2 100644
--- a/addons/document_webdav/security/ir.model.access.csv
+++ b/addons/document_webdav/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_webdav_dir_property_all","webdav.dir.property all","model_document_webdav_dir_property",,1,0,0,0
-"access_webdav_dir_property_group_doc_manager","webdav.dir.property document manager","model_document_webdav_dir_property","base.group_system",1,1,1,1
-"access_webdav_dir_property_group_system","webdav.dir.property group system","model_document_webdav_dir_property","base.group_system",1,1,1,1
-"access_webdav_file_property_all","webdav.file.property all","model_document_webdav_file_property",,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_webdav_dir_property_all,webdav.dir.property all,model_document_webdav_dir_property,,1,0,0,0
+access_webdav_dir_property_group_doc_manager,webdav.dir.property document manager,model_document_webdav_dir_property,base.group_system,1,1,1,1
+access_webdav_dir_property_group_system,webdav.dir.property group system,model_document_webdav_dir_property,base.group_system,1,1,1,1
+access_webdav_file_property_all,webdav.file.property all,model_document_webdav_file_property,,1,1,1,1
diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index 4d96780b10c..07b189e501d 100644
--- a/addons/edi/__openerp__.py
+++ b/addons/edi/__openerp__.py
@@ -37,6 +37,7 @@ technical OpenERP documentation at http://doc.openerp.com
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'email_template'],
+    'icon': '/edi/static/src/img/knowledge.png',
     'data': [
         'security/ir.model.access.csv',
     ],
diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py
index b8fc8699ca2..c573115618e 100644
--- a/addons/edi/models/edi.py
+++ b/addons/edi/models/edi.py
@@ -601,7 +601,8 @@ class EDIMixin(object):
                           self._name, external_id, value)
             # also need_new_ext_id here, but already been set above
             model = self.pool.get(model)
-            res_id, name = model.name_create(cr, uid, value, context=context)
+            # should use name_create() but e.g. res.partner won't allow it at the moment 
+            res_id = model.create(cr, uid, {model._rec_name: value}, context=context)
             target = model.browse(cr, uid, res_id, context=context)
         if need_new_ext_id:
             ext_id_members = split_external_id(external_id)
diff --git a/addons/edi/security/ir.model.access.csv b/addons/edi/security/ir.model.access.csv
index f1942397ac5..b1f470d80ae 100644
--- a/addons/edi/security/ir.model.access.csv
+++ b/addons/edi/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ir_edi_all_read","access_ir_edi_all_read","model_edi_document",,1,0,0,0
-"access_ir_edi_employee_create","access_ir_edi_employee_create","model_edi_document","base.group_user",1,0,1,0
\ No newline at end of file
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ir_edi_all_read,access_ir_edi_all_read,model_edi_document,,1,0,0,0
+access_ir_edi_employee_create,access_ir_edi_employee_create,model_edi_document,base.group_user,1,0,1,0
diff --git a/addons/edi/static/src/img/knowledge.png b/addons/edi/static/src/img/knowledge.png
new file mode 100644
index 00000000000..35c8d5706fd
Binary files /dev/null and b/addons/edi/static/src/img/knowledge.png differ
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index 9397c1cf280..ea7f55f1a82 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -9,15 +9,16 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
         this._super();
         this.db = db;
         this.token = token;
-        this.session = new openerp.web.Connection();
+        this.session = openerp.connection;
         this.template = "EdiEmpty";
         this.content = "";
         this.sidebar = "";
     },
     start: function() {
         this._super();
+        var self = this;
         var param = {"db": this.db, "token": this.token};
-        this.rpc('/edi/get_edi_document', param, this.on_document_loaded, this.on_document_failed);
+        this.session.bind().then(self.rpc('/edi/get_edi_document', param, this.on_document_loaded, this.on_document_failed));
     },
     on_document_loaded: function(docs){
         this.doc = docs[0];
@@ -116,17 +117,18 @@ openerp.edi.EdiImport = openerp.web.Widget.extend({
         var params = {};
 
         this.template = "EdiImport";
-        this.session = new openerp.web.Connection();
+        this.session = openerp.connection;
         this.login = new openerp.web.Login(this);
         this.header = new openerp.web.Header(this);
         this.header.on_logout.add(this.login.on_logout);
     },
     start: function() {
-        this.session.on_session_invalid.add_last(this.do_ask_login)
-        this.session.on_session_valid.add_last(this.do_import);
-        this.header.appendTo($("#oe_header"));
-        this.session.start();
-        this.login.appendTo($('#oe_login'));
+        this.session.bind().then(function() {
+            this.session.on_session_invalid.add_last(this.do_ask_login)
+            this.header.appendTo($("#oe_header"));
+            this.login.appendTo($('#oe_login'));
+            this.do_import();
+        });
     },
     do_ask_login: function() {
         this.login.do_ask_login(this.do_import);
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index 2ab7f194d18..9aca39f56e8 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -21,9 +21,9 @@
 ##############################################################################
 
 {
-    "name" : "Automated E-Mails",
+    "name" : "E-Mail Templates",
     "version" : "1.1",
-    "author" : "Openlabs",
+    "author" : "OpenERP,OpenLabs",
     "website" : "http://openerp.com",
     "category" : "Marketing",
     'complexity': "expert",
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 507dae3cd25..1f3b9aef949 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -110,6 +110,7 @@
             <field name="arch" type="xml">
                 <tree string="Templates">
                     <field name="model_id"/>
+                    <field name="mail_server_id" invisible="1"/>
                     <field name="name"/>
                     <field name="subject"/>
                     <field name="email_from"/>
@@ -138,7 +139,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group by...">
-                        <filter string="SMTP Server" domain="[]" context="{'group_by':'smtp_server_id'}" icon="terp-folder-orange"/>
+                        <filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}" icon="terp-folder-orange"/>
                         <separator orientation="vertical"/>
                         <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/>
                     </group>
diff --git a/addons/email_template/i18n/hr.po b/addons/email_template/i18n/hr.po
new file mode 100644
index 00000000000..eec21dba9b1
--- /dev/null
+++ b/addons/email_template/i18n/hr.po
@@ -0,0 +1,1280 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 17:08+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: email_template
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content  "
+msgstr "Sadržaj e-pošte  "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr "Sadržaj"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Deletion of Record failed"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr "Pošalji odmah"
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr "nije primjenjivo"
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr "Korisnički računi e-pošte"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr "Pošalji svu e-poštu"
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr "Odobreno"
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Pošalji mail"
+
+#. module: email_template
+#: help:email_template.account,name:0
+msgid ""
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@doe.com>"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr "Odgovor-na"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr "U redu"
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Warning"
+msgstr "Upozorenje"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr "Korisnički računi"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_subject:0
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:256
+#, python-format
+msgid "Reason: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:367
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:255
+#, python-format
+msgid "Out going connection test failed"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:371
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:449
+#, python-format
+msgid " (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:235
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:427
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:362
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
+#, python-format
+msgid "Email Template"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:284
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:319
+#, python-format
+msgid "Copy of template %s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:48
+#, python-format
+msgid "Error sending mail: %s"
+msgstr ""
+
+#. module: email_template
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:104
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid "Missing mail account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:250
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:236
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#, python-format
+msgid "email-template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
+#, python-format
+msgid "No Description"
+msgstr ""
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index 3903a95f9ce..d2d6adf3bf3 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_email_template","email.template","model_email_template",,1,0,0,0
-"access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
-"access_email_template_manager","email.template","model_email_template",,1,1,1,1
-"access_email_template_preview_system","email.template.preview system","model_email_template_preview","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_email_template,email.template,model_email_template,,1,0,0,0
+access_email_template_system,email.template system,model_email_template,base.group_system,1,1,1,1
+access_email_template_manager,email.template,model_email_template,,1,1,1,1
+access_email_template_preview_system,email.template.preview system,model_email_template_preview,base.group_system,1,1,1,1
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index abd3f6393b5..131f6d40b0a 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -39,10 +39,9 @@ Note that:
         Association / Configuration / Types of Events
 """,
     'author': 'OpenERP SA',
-    'depends': ['crm', 'base_contact', 'account', 'marketing', 'mail'],
+    'depends': ['crm', 'account', 'marketing', 'mail'],
     'init_xml': [],
     'update_xml': [
-        'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_registration_view.xml',
         'wizard/event_confirm_view.xml',
@@ -54,9 +53,12 @@ Note that:
         'res_partner_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
-    'test': ['test/test_event.yml'],
+    'test': ['test/process/event_confirm2done.yml',
+             'test/process/event_draft2cancel.yml',
+             'test/process/partner_register2invoice.yml',
+             'test/ui/duplicate_event.yml',
+             'test/ui/demo_data.yml'],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate': '0083059161581',
     'images': ['images/1_event_type_list.jpeg','images/2_events.jpeg','images/3_registrations.jpeg'],
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 47c5e65f196..02d45f03dc1 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -40,7 +40,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Association Dashboard">
-                    <board style="1-1">
+                    <board style="2-1">
                         <column>
                             <action string="Next Events"
                                 name="%(act_event_view)d"
diff --git a/addons/event/event.py b/addons/event/event.py
index ab575408c63..752c7089582 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -303,7 +303,7 @@ class event_registration(osv.osv):
         'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
         "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}),
-        "contact_id": fields.many2one('res.partner.contact', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id
+        "contact_id": fields.many2one('res.partner.address', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id
         "unit_price": fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute=dp.get_precision('Sale Price'), store=True),
         "badge_ids": fields.one2many('event.registration.badge', 'registration_id', 'Badges', readonly=False, states={'done': [('readonly', True)]}),
@@ -382,7 +382,7 @@ class event_registration(osv.osv):
         inv_lines_pool = self.pool.get('account.invoice.line')
         inv_pool = self.pool.get('account.invoice')
         product_pool = self.pool.get('product.product')
-        contact_pool = self.pool.get('res.partner.contact')
+        contact_pool = self.pool.get('res.partner.address')
         if context is None:
             context = {}
         # If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
@@ -578,13 +578,7 @@ class event_registration(osv.osv):
         if not contact:
             return data
         addr_obj = self.pool.get('res.partner.address')
-        job_obj = self.pool.get('res.partner.job')
-
-        if partner:
-            partner_addresses = addr_obj.search(cr, uid, [('partner_id', '=', partner)])
-            job_ids = job_obj.search(cr, uid, [('contact_id', '=', contact), ('address_id', 'in', partner_addresses)])
-            if job_ids:
-                data['email_from'] = job_obj.browse(cr, uid, job_ids[0]).email
+        data['email_from'] = addr_obj.browse(cr, uid, contact).email
         return {'value': data}
 
     def onchange_event(self, cr, uid, ids, event_id, partner_invoice_id):
@@ -636,7 +630,6 @@ class event_registration(osv.osv):
         @param event_id: Event ID
         @param partner_invoice_id: Partner Invoice ID
         """
-        job_obj = self.pool.get('res.partner.job')
         res_obj = self.pool.get('res.partner')
 
         data = {}
@@ -648,14 +641,10 @@ class event_registration(osv.osv):
         d = self.onchange_partner_invoice_id(cr, uid, ids, event_id, part)
         # this updates the dictionary
         data.update(d['value'])
-        addr = res_obj.address_get(cr, uid, [part])
+        addr = res_obj.address_get(cr, uid, [part]).get('default', False)
         if addr:
-            if addr.has_key('default'):
-                job_ids = job_obj.search(cr, uid, [('address_id', '=', addr['default'])])
-                if job_ids:
-                    data['contact_id'] = job_obj.browse(cr, uid, job_ids[0]).contact_id.id
-                    d = self.onchange_contact_id(cr, uid, ids, data['contact_id'], part)
-                    data.update(d['value'])
+            d = self.onchange_contact_id(cr, uid, ids, addr, part)
+            data.update(d['value'])
         return {'value': data}
 
     def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id):
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 8e8764ca1a7..4f86f620e6f 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -61,6 +61,8 @@
         <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
 		<field name="product_id" ref="event_product_0"/>
 		<field name="unit_price">68.00</field>
+		<field name="mail_auto_registr">True</field>
+		<field name="mail_auto_confirm">True</field>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="register_max">500</field>
 		<field name="type" ref="event_type_1"/>
@@ -74,9 +76,9 @@
 		<field name="unit_price">24.00</field>
 		<field name="type" ref="event_type_1"/>
 		<field name="user_id" ref="base.user_root"/>
+		<field name="register_min">50</field>
 		<field name="register_max">350</field>
 	</record>
-    <function model="event.event" name="button_confirm" eval="[ref('event_1')]"/>
 	<record id="event_2" model="event.event">
 		<field name="name">Conference on ERP Buisness</field>
         <field eval="time.strftime('%Y-%m-05 14:00:00')" name="date_begin"/>
@@ -92,7 +94,7 @@
 		<field name="mail_confirm">Thanks for registration. The conference will begin at 2 PM and will be given by Mr. Pinckaers.</field>
 	</record>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-    <function model="event.event" name="button_done" eval="[ref('event_2')]"/>
+    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
 
 <!-- Demo data for Event Registration-->
 	<record id="reg_1_1" model="event.registration">
@@ -126,5 +128,16 @@
 
 	 <function model="event.registration" name="check_confirm" eval="[ref('reg_0_1')]"/> 
 
+    <record id="reg_0_2" model="event.registration">
+        <field name="event_id" ref="event_2"/>
+        <field name="partner_id" ref="base.res_partner_c2c"/>
+        <field name="partner_invoice_id" ref="base.res_partner_c2c"/>
+        <field name="nb_register">5</field>
+        <field name="event_product">Ticket for Conference</field>
+        <field name="unit_price">20</field>
+    </record>
+    
+    <function model="event.registration" name="check_confirm" eval="[ref('reg_0_2')]"/>
+    
 	</data>
 </openerp>
diff --git a/addons/event/i18n/hr.po b/addons/event/i18n/hr.po
index 64f34cf313e..3ba8e52da06 100644
--- a/addons/event/i18n/hr.po
+++ b/addons/event/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-12-19 17:09+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:58+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 
 #. module: event
 #: view:event.event:0
@@ -41,12 +41,12 @@ msgstr ""
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr ""
+msgstr "Min. registracija"
 
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
@@ -56,7 +56,7 @@ msgstr ""
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr ""
+msgstr "Naslov"
 
 #. module: event
 #: field:event.event,mail_registr:0
@@ -66,7 +66,7 @@ msgstr ""
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr ""
+msgstr "Kreiraj fakture"
 
 #. module: event
 #: view:event.event:0
@@ -82,7 +82,7 @@ msgstr ""
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr ""
+msgstr "_Zatvori"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -100,7 +100,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: event
 #: field:event.event,mail_confirm:0
@@ -119,12 +119,12 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Organizacija"
 
 #. module: event
 #: field:event.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Datum računa"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:93
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
deleted file mode 100644
index c3c70c94d93..00000000000
--- a/addons/event/security/event_security.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data>
-
-    <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">Marketing / User</field>
-    </record>
-
-    <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Marketing / Manager</field>
-        <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-  </data>
-</openerp>
-
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 59651dfa007..f79d141f148 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,16 +1,15 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_event_type","event.type","model_event_type","marketing.group_marketing_user",1,0,0,0
-"access_event_type_manager","event.type manager","model_event_type","marketing.group_marketing_manager",1,1,1,1
-"access_event_event","event.event","model_event_event","marketing.group_marketing_user",1,1,1,0
-"access_event_registration","event.registration","model_event_registration","marketing.group_marketing_user",1,1,1,0
-"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_user",1,1,1,1
-"access_event_event_manager","event.event manager","model_event_event","marketing.group_marketing_manager",1,0,0,0
-"access_event_registration_manager","event.registration manager","model_event_registration","marketing.group_marketing_manager",1,0,0,0
-"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","marketing.group_marketing_manager",1,1,1,1
-"access_product_product","product.product.product manager","product.model_product_product","marketing.group_marketing_manager",1,1,1,1
-"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_manager",1,1,1,1
-"access_event_registration_badge_manager","event.registration.badge manager","model_event_registration_badge","marketing.group_marketing_manager",1,1,1,1
-"access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0
-"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","marketing.group_marketing_manager",1,0,0,0
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","marketing.group_marketing_user",1,0,0,0
-"access_event_registration_sale_user","event.registration.sale.user","model_event_registration","base.group_sale_salesman",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event_type,event.type,model_event_type,marketing.group_marketing_user,1,0,0,0
+access_event_type_manager,event.type manager,model_event_type,marketing.group_marketing_manager,1,1,1,1
+access_event_event,event.event,model_event_event,marketing.group_marketing_user,1,1,1,0
+access_event_registration,event.registration,model_event_registration,marketing.group_marketing_user,1,1,1,0
+access_report_event_registration,report.event.registration,model_report_event_registration,marketing.group_marketing_user,1,1,1,1
+access_event_event_manager,event.event manager,model_event_event,marketing.group_marketing_manager,1,0,0,0
+access_event_registration_manager,event.registration manager,model_event_registration,marketing.group_marketing_manager,1,0,0,0
+access_crm_case_section_manager,crm.case.section manager,crm.model_crm_case_section,marketing.group_marketing_manager,1,1,1,1
+access_product_product,product.product.product manager,product.model_product_product,marketing.group_marketing_manager,1,1,1,1
+access_event_registration_badge_manager,event.registration.badge manager,model_event_registration_badge,marketing.group_marketing_manager,1,1,1,1
+access_event_event_sale_salesman,event.event.sale,model_event_event,base.group_sale_salesman,1,0,0,0
+access_account_account_invoice_manager,account.account.invoice,account.model_account_invoice,marketing.group_marketing_manager,1,0,0,0
+access_event_registration_badge,event.registration.badge,model_event_registration_badge,marketing.group_marketing_user,1,0,0,0
+access_event_registration_sale_user,event.registration.sale.user,model_event_registration,base.group_sale_salesman,1,0,0,0
diff --git a/addons/event/test/process/event_confirm2done.yml b/addons/event/test/process/event_confirm2done.yml
new file mode 100644
index 00000000000..4d5542896f7
--- /dev/null
+++ b/addons/event/test/process/event_confirm2done.yml
@@ -0,0 +1,22 @@
+-
+  I want to organize one conference event on "OpenERP Business", Customer subscribe/join 
+  into "Conference on OpenERP Business" with 6 tickets, first I confim this event. 
+-
+  !python {model: event.event}: |
+    self.button_confirm(cr, uid, [ref("event_0")])
+-
+  I Check that Event is "confirmed", and Its automatically sending mail to registered 
+  partner which joined to this event.
+-
+  !assert {model: event.event, id: event_0}:
+    - state == 'confirm', "Event should be confirmed."
+-
+  After completed event, I close this event.
+-
+  !python {model: event.event}: |
+    self.button_done(cr, uid, [ref("event_0")])
+-
+  Check that conference is in "close" state. 
+-
+  !assert {model: event.event, id: event_0}:
+    - state == 'done', "Event should be Closed."
diff --git a/addons/event/test/process/event_draft2cancel.yml b/addons/event/test/process/event_draft2cancel.yml
new file mode 100644
index 00000000000..48cb102f3e8
--- /dev/null
+++ b/addons/event/test/process/event_draft2cancel.yml
@@ -0,0 +1,22 @@
+-
+  I want to organize event and its need Minimum 50 Registrations to confirm/start 
+  this Event, but Only 10 registration confirm for this event, I confirm this event. 
+-
+  !python {model: event.event}: |
+    self.button_confirm(cr, uid, [ref("event_1")])
+-
+  Now I cheked for event and It should not be confirm because registrations for 
+  this event is below limit.
+-
+  !assert {model: event.event, id: event_1}:
+    - state == 'confirm', "Event should be confirm."
+-
+  So I cancel this Event
+-
+  !python {model: event.event}: |
+    self.button_cancel(cr, uid, [ref("event_1")])
+-
+  I check event should be cancel.
+-
+  !assert {model: event.event, id: event_1}:
+    - state == 'cancel', "Event should be cancel"
diff --git a/addons/event/test/process/partner_register2invoice.yml b/addons/event/test/process/partner_register2invoice.yml
new file mode 100644
index 00000000000..f8748afee2f
--- /dev/null
+++ b/addons/event/test/process/partner_register2invoice.yml
@@ -0,0 +1,62 @@
+-
+  I want to organize one conference event, First I registered partner for event 
+  with 5 tickets.
+-
+  !python {model: partner.event.registration}: |
+    context.update({'active_model': 'res.partner', 'active_ids': [ref("base.res_partner_ericdubois0")], 'active_id': ref("base.res_partner_ericdubois0")})
+    register = self.create(cr, uid, {'event_id': ref('event_1'),'nb_register': 5}, context=context)
+    self.open_registration(cr, uid, [register], context=context)
+-
+  Now I check for registration created base on partner.
+-
+  !python {model: event.registration}: |
+    ids = self.search(cr, uid, [('partner_id','=',ref("base.res_partner_ericdubois0")), ('event_id', '=', ref('event_1'))])
+    assert ids, "Registration should be create here."
+-
+  I confirm registration process.
+-
+  !python {model: event.registration}: |
+    self.check_confirm(cr, uid, [ref("reg_1_1")])
+-
+  I Check that Registration is confirm.
+- 
+  !assert {model: event.registration, id: reg_1_1}: 
+     - state == 'open', "Registration should be open here."
+-
+  After confirmation of partner, I create invoice base on costing of event. 
+-
+  !python {model: event.registration}: |
+    self.action_invoice_create(cr, uid, [ref("reg_1_1")])
+-
+  Now I Check for Invoice is created and Registration should be closed after invoice generated.
+- 
+  !python {model: event.registration}: |
+    record = self.browse(cr, uid, [ref("reg_1_1")])[0]
+    assert record.invoice_id, "Invoice should be generated"
+    assert record.invoice_id.state == "draft", "Invoice state should be draft"
+    assert record.invoice_id.partner_id == record.partner_id, "Customer is not correspond with registration"
+    assert record.invoice_id.type == 'out_invoice', "Invoice type is not correct"
+    assert record.invoice_id.origin == record.event_product, "Invoice origin is not correct"
+    assert record.invoice_id.amount_total == record.price_subtotal, "Invoice amount is not correct"
+    assert record.state == "done", "Registration should be closed after invoice generated"
+-
+  Now I check for same partner registration for two diffrent event and I create group invoices for same partner. 
+-
+  !python {model: event.make.invoice}: |
+    context.update({'active_model': 'event.make.invoice', 'active_ids': [ref("reg_0_1"), ref("reg_0_2")], 'active_id': ref("reg_0_1")})
+    invoice = self.create(cr, uid, {'grouped': True}, context=context)
+    self.make_invoice(cr, uid, [invoice], context=context)
+-
+  Now I Check for group Invoice is created with total amount of both registration
+  and Registration should be closed after invoice generated.
+- 
+  !python {model: event.registration}: |
+    reg_data_1 = self.browse(cr, uid, [ref("reg_0_1")])[0]
+    reg_data_2 = self.browse(cr, uid, [ref("reg_0_2")])[0]
+    assert reg_data_1.invoice_id, "Invoice should be generated"
+    assert reg_data_1.invoice_id.state == "draft", "Invoice state should be draft"
+    assert reg_data_1.invoice_id.partner_id == reg_data_1.partner_id, "Customer is not correspond with registration"
+    assert reg_data_1.invoice_id.type == 'out_invoice', "Invoice type is not correct"
+    assert reg_data_1.invoice_id.origin == reg_data_1.event_product, "Invoice origin is not correct"
+    assert reg_data_1.invoice_id.amount_total == (reg_data_1.price_subtotal + reg_data_2.price_subtotal), "Invoice total amount is not correct"
+    assert reg_data_1.state == "done", "Registration should be closed after invoice generated"
diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml
deleted file mode 100644
index 5e35d79cab2..00000000000
--- a/addons/event/test/test_event.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-- |
-  In order to test the "Event Organisation" in Association system.  
-- |
-  I want to organize one conference event on "OpenERP Business".
-- |
-  I'm creating new product "Conference Ticket" to specify registration Cost of conference.
-- 
-  !record {model: product.product, id: product_product_ticketforconcert0}:
-    categ_id: product.cat1
-    list_price: 68.0
-    name: Conference Ticket  
-- |
-  I'm creating Event type "Conference".
--   
-  !record {model: event.type, id: event_type_conference0}:
-     name: Conferences
-- |
-  I'm creating one Event "Conference on OpenERP Business" which will last from 1st of this month to 10th of this month.
--
-  !record {model: event.event, id: event_event_conference0}:
-    date_begin: !eval time.strftime('%Y-%m-01')
-    date_end: !eval time.strftime('%Y-%m-10')
-    name: Conference on OpenERP Business.
-    product_id: 'product_product_ticketforconcert0'
-    type: 'event_type_conference0'
-    reply_to: 'info@customer.com'
-- |
-  Check that the new conference event is "Draft" or not.
-- 
-  !assert {model: event.event, id: event_event_conference0}:
-     - state == 'draft', "Event should be in draft by default when first time created"
-- |
-  Need Minimum 10 Registrations to confirm/start this Conference Event and does not allowed more than 100 Registrations.
-- |
-  So I set Minimum and Maximum Registrations limit.
--   
-  !python {model: event.event}: |
-    self.write(cr, uid, [ref('event_event_conference0')], {'register_max': 100, 'register_min': 10})
-- |
-  I'm doing to confirm that conference event.
--  
-  !python {model: event.event}: |
-    self.button_confirm(cr, uid, [ref("event_event_conference0")])
-- |
-  But this conference event need minimum 10 Confirmed Registrations. so Check that Event is not "confirmed". 
--   
-  !assert {model: event.event, id: event_event_conference0}:
-     - state != 'confirm', "Event should not confirmed if minimum registrations does not reached"
-- |
-  "Mark Johnson" want to subscribe/join into "Conference on OpenERP Business" with 10 tickets.
-- | 
-  I'm creating new partner "Mark Johnson" with his email "info@mycustomer.com".
-- 
-  !record {model: res.partner, id: res_partner_markjohnson0}:
-    address:
-      - city: Bruxelles
-        country_id: base.be
-        job_ids:
-          - contact_id: base_contact.res_partner_contact_jacot0
-            function: CTO
-            name: base.res_partner_maxtor
-            sequence_partner: 0.0
-            state: current
-        street: Rue des Palais 51, bte 33
-        type: default
-        zip: '1000'
-        email: 'info@mycustomer.com'
-    name: Mark Johnson
-    
-- |
-  I'm creating Registration for "Mark Johnson" on "Conference on OpenERP Business" with 10 tickets. 
-- 
-  !record {model: event.registration, id: event_registration_registrationjacot0}:
-    contact_id: base_contact.res_partner_contact_jacot0
-    event_id: event.event_event_conference0
-    partner_id: event.res_partner_markjohnson0
-    partner_invoice_id: event.res_partner_markjohnson0
-    event_product: Conference Ticket
-    unit_price: 68.0
-    nb_register: 10
-- |
-  I'm going to Open that Registration.     
-- 
-  !python {model: event.registration}: |
-    self.check_confirm(cr, uid, [ref("event_registration_registrationjacot0")])
-- |
-  Check that Registration is in "Open" state or not.
-- 
-  !assert {model: event.registration, id: event_registration_registrationjacot0}: 
-     - state == 'open', "Registration should be open here."
-
-- |
-  I'm again trying to confirm that conference event.
--  
-  !python {model: event.event}: |
-    self.button_confirm(cr, uid, [ref("event_event_conference0")])
-    
-- |
-  Now Minimum requirement of Registration is fulfil. so Check that Event is "confirmed" or not. 
--   
-  !assert {model: event.event, id: event_event_conference0}:
-     - state == 'confirm', "Event should be confirmed here."
-  
-- |
-  I'm creating invoice of Registration of "Mark Johnson" on "Conference on OpenERP Business".
--
-  !python {model: event.registration}: |
-    self.action_invoice_create(cr, uid, [ref("event_registration_registrationjacot0")])
-
-- |
-  Check Invoice of Registration of "Mark Johnson" is created or not.     
-- 
-  !assert {model: event.registration, id: event_registration_registrationjacot0}:
-     - invoice_id != False, "Invoice should be generated"
-
-- |
-  Check Registration of "Mark Johnson" is closed or not after invoice generated.     
-- 
-  !assert {model: event.registration, id: event_registration_registrationjacot0}:
-     - state != 'done',  "Registration should be closed after invoice generated"
-  
-- |
-  Now "Mark Johnson" want to another registration on "Conference on OpenERP Business" with 120 tickets.
-- |
-  I'm creating new registration for "Mark Johnson" with 100 tickets.
-- 
-  !record {model: event.registration, id: event_registration_registrationzen0}:
-    event_id: event.event_event_conference0
-    partner_id: event.res_partner_markjohnson0
-    partner_invoice_id: event.res_partner_markjohnson0
-    event_product: Conference Ticket
-    unit_price: 68.0
-    nb_register: 100
-    
-- |
-  I'm going to open "Mark Johnson" registration.     
-- 
-  !python {model: event.registration}: |
-    self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")])
-
-- |
-  But conference event does not allow more than 100 Registrations. so Check that registration is not in "open" state. 
--   
-  !assert {model: event.registration, id: event_registration_registrationzen0}:
-     - state == 'draft', "Registration should be in draft by default."
-- |
-  Now I'm modifying number of tickets of "Mark Johnson"'s registration with 90 tickets. 
-- 
-  !python {model: event.registration}: |
-    self.write(cr, uid, [ref("event_registration_registrationzen0")], {'nb_register': 90})
-- |
-  I'm again try to open "Mark Johnson" registration.     
-- 
-  !python {model: event.registration}: |
-    self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")])
-
-- |
-  Check that registration "open" or not. 
--   
-  !assert {model: event.registration, id: event_registration_registrationzen0}:
-     - state == 'open', "Registration should be open here."
-- |
-  I'm closing "Conference on OpenERP Business" Conference event
-- 
-  !python {model: event.event}: |
-    self.button_done(cr, uid, [ref("event_event_conference0")])
-- |
-  Check that conference is in "close" state or not. 
--   
-  !assert {model: event.event, id: event_event_conference0}:
-     - state == 'done', "Registration should be Closed here."
-  
diff --git a/addons/event/test/ui/demo_data.yml b/addons/event/test/ui/demo_data.yml
new file mode 100644
index 00000000000..2f48cf1a90b
--- /dev/null
+++ b/addons/event/test/ui/demo_data.yml
@@ -0,0 +1,32 @@
+-
+  I create event registation record to call event onchange and partner onchange.
+-
+  !record {model: event.registration, id: reg_0_1}:
+    event_id: event_0
+    partner_id: base.res_partner_asus
+    name: 'Ticket for Concert'
+-
+  I create event record to call product onchange and team onchange.
+-
+  !record {model: event.event, id: event_2}:
+    product_id: event_product_2
+    section_id: crm.section_sales_department
+    name: 'Conference on ERP Buisness'
+-
+  I call onchange event from event registration wizard. 
+-
+  !python {model: partner.event.registration}: |
+    context.update({'active_id': ref("base.res_partner_ericdubois0")})
+    self.onchange_event_id(cr, uid, 1, ref("event_1"), context=context)
+-
+  I confirm event from wizard.
+-
+  !python {model: event.confirm}: |
+    context.update({'event_ids': [ref("event_2")]})
+    id = self.create(cr, uid , {})
+    self.confirm(cr, uid, [id], context=context)
+-
+  I call close registration process.
+-
+  !python {model: event.registration}: |
+    self.button_reg_close(cr, uid, [ref("reg_0_2")])
diff --git a/addons/event/test/ui/duplicate_event.yml b/addons/event/test/ui/duplicate_event.yml
new file mode 100644
index 00000000000..c1287353c67
--- /dev/null
+++ b/addons/event/test/ui/duplicate_event.yml
@@ -0,0 +1,16 @@
+-
+  Copy of event.
+-
+  !python {model: event.event}: |
+    try:
+      self.copy(cr, uid, ref("event_2"))
+    except:
+      pass
+-
+  Copy of event registarion.
+-
+  !python {model: event.registration}: |
+    try:
+      self.copy(cr, uid, ref("reg_1_1"))
+    except:
+      pass
\ No newline at end of file
diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py
index b8521e404e2..f788f49ebdb 100644
--- a/addons/event/wizard/partner_event_registration.py
+++ b/addons/event/wizard/partner_event_registration.py
@@ -34,8 +34,8 @@ class partner_event_registration(osv.osv_memory):
         'event_id': fields.many2one('event.event', 'Event'),
         'event_type': fields.many2one('event.type', 'Type', readonly=True),
         'unit_price': fields.float('Registration Cost', digits_compute=dp.get_precision('Sale Price')),
-        'start_date': fields.datetime('Start date', required=True, help="Beginning Date of Event", readonly=True),
-        'end_date': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True),
+        'start_date': fields.datetime('Start date', help="Beginning Date of Event", readonly=True),
+        'end_date': fields.datetime('Closing date', help="Closing Date of Event", readonly=True),
         'nb_register': fields.integer('Number of Registration'),
     }
     _defaults = {
@@ -48,21 +48,16 @@ class partner_event_registration(osv.osv_memory):
         """
         value = {}
         res_obj = self.pool.get('res.partner')
-        job_obj = self.pool.get('res.partner.job')
+        addr_obj = self.pool.get('res.partner.address')
         reg_obj = self.pool.get('event.registration')
         mod_obj = self.pool.get('ir.model.data')
 
         record_ids = context and context.get('active_ids', []) or []
         addr = res_obj.address_get(cr, uid, record_ids)
-        contact_id = False
         email = False
-        if addr.has_key('default'):
-                job_ids = job_obj.search(cr, uid, [('address_id', '=', addr['default'])], context=context)
-                if job_ids:
-                    contact = job_obj.browse(cr, uid, job_ids[0], context=context)
-                    if contact:
-                        contact_id = contact.contact_id.id
-                        email = contact.email
+        contact_id = addr.get('default', False)
+        if contact_id:
+            email = addr_obj.browse(cr, uid, contact_id, context=context).email
 
         result = mod_obj.get_object_reference(cr, uid, 'event', 'view_registration_search')
         res = result and result[1] or False
@@ -143,4 +138,4 @@ class partner_event_registration(osv.osv_memory):
 
 partner_event_registration()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event_project/i18n/hr.po b/addons/event_project/i18n/hr.po
index 479c316fdd2..124993edb35 100644
--- a/addons/event_project/i18n/hr.po
+++ b/addons/event_project/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-09-18 12:58+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-12-19 17:11+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -24,12 +24,12 @@ msgstr ""
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Datum završetka"
 
 #. module: event_project
 #: view:event.project:0
 msgid "Ok"
-msgstr ""
+msgstr "U redu"
 
 #. module: event_project
 #: model:ir.module.module,description:event_project.module_meta_information
@@ -62,18 +62,18 @@ msgstr ""
 #. module: event_project
 #: field:event.event,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: event_project
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event_project.act_event_task
 msgid "Tasks"
-msgstr ""
+msgstr "Zadaci"
 
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "Svi zadaci"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
@@ -98,12 +98,12 @@ msgstr ""
 #. module: event_project
 #: view:event.project:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: event_project
 #: field:event.project,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Datum početka"
 
 #. module: event_project
 #: view:event.event:0
@@ -113,12 +113,12 @@ msgstr ""
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_event
 msgid "Event"
-msgstr ""
+msgstr "Event"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Tasks management"
-msgstr ""
+msgstr "Upravljanje zadacima"
 
 #, python-format
 #~ msgid "Error !"
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index b50c33b2394..99e3e02a909 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -21,11 +21,11 @@
 ##############################################################################
 
 {
-    "name" : "Fetch Emails",
+    "name" : "Email Gateway",
     "version" : "1.0",
     "depends" : ["base", 'mail'],
     "author" : "OpenERP SA",
-    "category": 'Customer Relationship Management',
+    "category": 'Tools',
     "description": """
 Retrieve incoming email on POP / IMAP servers
 =============================================
diff --git a/addons/fetchmail/i18n/hr.po b/addons/fetchmail/i18n/hr.po
new file mode 100644
index 00000000000..8cba2911ee3
--- /dev/null
+++ b/addons/fetchmail/i18n/hr.po
@@ -0,0 +1,305 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 17:13+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Potvrdi"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "Nepotvrđeno"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Korisničko ime"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP Servers"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "# of emails"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Lozinka"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr ""
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr ""
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr ""
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr ""
diff --git a/addons/fetchmail/security/ir.model.access.csv b/addons/fetchmail/security/ir.model.access.csv
index bc5572de82d..7deea6eb9f4 100644
--- a/addons/fetchmail/security/ir.model.access.csv
+++ b/addons/fetchmail/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_fetchmail_server","fetchmail.server","model_fetchmail_server",,1,0,0,0
-"access_fetchmail_server","fetchmail.server","model_fetchmail_server","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_fetchmail_server,fetchmail.server,model_fetchmail_server,,1,0,0,0
+access_fetchmail_server,fetchmail.server,model_fetchmail_server,base.group_system,1,1,1,1
diff --git a/addons/fetchmail_crm/__openerp__.py b/addons/fetchmail_crm/__openerp__.py
index 24eddf235ab..5b02f4194ab 100644
--- a/addons/fetchmail_crm/__openerp__.py
+++ b/addons/fetchmail_crm/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "crm"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Hidden/Links',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_crm_claim/__openerp__.py b/addons/fetchmail_crm_claim/__openerp__.py
index 4fdd1671a28..d6d56ecf331 100644
--- a/addons/fetchmail_crm_claim/__openerp__.py
+++ b/addons/fetchmail_crm_claim/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "crm_claim"],
     "author" : "OpenERP SA",
-    'category': 'Sales Management',
+    'category': 'Hidden/Links',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_hr_recruitment/__openerp__.py b/addons/fetchmail_hr_recruitment/__openerp__.py
index 77d5cb93585..3ce76226888 100644
--- a/addons/fetchmail_hr_recruitment/__openerp__.py
+++ b/addons/fetchmail_hr_recruitment/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "hr_recruitment"],
     "author" : "OpenERP SA",
-    "category": "Human Resources",
+    "category": "Hidden/Links",
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_project_issue/__openerp__.py b/addons/fetchmail_project_issue/__openerp__.py
index 043a68def62..d4c4b4bbe70 100644
--- a/addons/fetchmail_project_issue/__openerp__.py
+++ b/addons/fetchmail_project_issue/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "project_issue"],
     "author" : "OpenERP SA",
-    "category": "Project Management",
+    "category": "Hidden/Links",
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index ed5700b3116..ec204f0f77c 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -36,6 +36,5 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index f8001c918c6..f2f9ff4e668 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Google Maps on Customers',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Customer Relationship Management',
     'description': """
 The module adds Google Map field in partner address.
 ====================================================
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 900c689dfbf..254bb2c28bf 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Human Resources",
+    "name": "Employee Address Book",
     "version": "1.1",
     "author": "OpenERP SA",
     "category": "Human Resources",
@@ -54,7 +54,10 @@ You can manage:
         'hr_demo.xml',
         'hr_department_demo.xml',
     ],
-    'test': ['test/test_hr.yml'],
+    'test': [
+             'test/open2recruit2close_job.yml',
+             'test/hr_demo.yml',
+             ],
     'installable': True,
     'active': False,
     'certificate': '0086710558965',
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 8e77830184b..e8d1edd3712 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -3,11 +3,13 @@
     <data noupdate="1">
 
     <record id="base.group_hr_user" model="res.groups">
-        <field name="name">Human Resources / HR Officer</field>
+        <field name="name">HR Officer</field>
+        <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
-        <field name="name">Human Resources / HR Manager</field>
+        <field name="name">HR Manager</field>
+        <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
     </record>
     <record id="hr_dept_comp_rule" model="ir.rule">
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 975ed7d4071..2911a49bf53 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,11 +1,11 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,1,1,1
-"access_hr_employee_category_emp","hr.employee.category.emp","model_hr_employee_category","base.group_user",1,0,0,0
-"access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
-"access_hr_employee_system_user","hr.employee system user","model_hr_employee","base.group_user",1,0,0,0
-"access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
-"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
-"access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0
-"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1
-"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
-"access_ir_property_hr_user","ir_property hr_user","base.model_ir_property","base.group_hr_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_employee_category_user,hr.employee.category.user,model_hr_employee_category,base.group_hr_user,1,1,1,1
+access_hr_employee_category_emp,hr.employee.category.emp,model_hr_employee_category,base.group_user,1,0,0,0
+access_hr_employee_user,hr.employee user,model_hr_employee,base.group_hr_user,1,1,1,1
+access_hr_employee_system_user,hr.employee system user,model_hr_employee,base.group_user,1,0,0,0
+access_hr_employee_resource_user,resource.resource.user,resource.model_resource_resource,base.group_hr_user,1,1,1,1
+access_hr_department_user,hr.department.user,model_hr_department,base.group_hr_user,1,1,1,1
+access_hr_department_employee,hr.department.employee,model_hr_department,base.group_user,1,0,0,0
+access_hr_job_user,hr.job user,model_hr_job,base.group_hr_user,1,1,1,1
+access_hr_res_partner_address,res.partner.address,base.model_res_partner_address,base.group_hr_manager,1,1,1,1
+access_ir_property_hr_user,ir_property hr_user,base.model_ir_property,base.group_hr_user,1,1,1,0
diff --git a/addons/hr/test/hr_demo.yml b/addons/hr/test/hr_demo.yml
new file mode 100644
index 00000000000..6dee06d5eb3
--- /dev/null
+++ b/addons/hr/test/hr_demo.yml
@@ -0,0 +1,10 @@
+-
+  !record {model: hr.job, id: job_jr_appli, view: False}:
+    no_of_employee: 0.0
+    no_of_recruitment: 5.0
+-
+  !record {model: hr.employee, id: employee1, view: False}:
+    address_id: base.main_address
+    company_id: base.main_company
+    department_id: dep_technical
+    user_id: base.user_demo
diff --git a/addons/hr/test/open2recruit2close_job.yml b/addons/hr/test/open2recruit2close_job.yml
new file mode 100644
index 00000000000..0e618f87a3d
--- /dev/null
+++ b/addons/hr/test/open2recruit2close_job.yml
@@ -0,0 +1,38 @@
+-
+  In order to test the process of Human Resource Management, I open Job Postion for "Jr. Application Engineer".
+- 
+  !python {model: hr.job}: |
+    self.job_open(cr, uid, [ref('job_jr_appli')])
+-
+  I check state of Job Position after opening it.
+-
+  !assert {model: hr.job, id: job_jr_appli, string: Job position is in 'open' state and no_of_recruitment = 0}:
+    - state == 'open'
+    - no_of_recruitment == 0
+-
+  Now, Recruitement is started so I start recruitement of Job Postion of "Jr. Application Engineer" Profile.
+-    
+  !python {model: hr.job}: |
+    self.job_recruitement(cr, uid, [ref('job_jr_appli')])
+-
+  I check 'state' and number of 'Expected in Recruitment' after initiating the recruitment
+-
+  !assert {model: hr.job, id: job_jr_appli, string: Job position is in 'recruit' state and no_of_recruitment = 1.0}:
+    - state == 'recruit'
+    - no_of_recruitment == 1.0
+-
+  I assign the job position to a newly hired employee
+-
+  !python {model: hr.employee}: |
+    self.write(cr, uid, [ref('employee1')], {'job_id':ref('job_jr_appli')})
+-
+  Now I don't want to recruit new employee for this position. so I mark it as Old.
+-
+  !python {model: hr.job}: |
+    self.job_old(cr, uid, [ref('job_jr_appli')])
+-
+  I check 'state' and number of 'Expected in Recruitment' after closing the Job position.
+-
+  !assert {model: hr.job, id: job_jr_appli, string: Job position is in 'old' state and no_of_recruitment = 0}:
+    - state == 'old'
+    - no_of_recruitment == 0
diff --git a/addons/hr/test/test_hr.yml b/addons/hr/test/test_hr.yml
deleted file mode 100644
index 0e5ae559416..00000000000
--- a/addons/hr/test/test_hr.yml
+++ /dev/null
@@ -1,140 +0,0 @@
--
-  In order to test hr module in OpenERP, I will create new Employee, Department and Job Position.
--
-  I create "RD Department" in Department form.
--
-  !record {model: hr.department, id: hr_department_rd0}:
-    manager_id: base.user_root
-    name: 'R & D'
--
-  Now, I create a new employee Mark Johnson, and select department as RD Department.
--
-  !record {model: hr.employee, id: hr_employee_mark}:
-    address_home_id: base.res_partner_address_1
-    company_id: base.main_company
-    gender: male
-    marital: 'single'
-    name: Mark Johnson
--
-  I change the company of the employee.
--
-  !python {model: hr.employee}: |
-    res = self.onchange_company(cr, uid, [ref('hr_employee_mark')], ref('base.main_company'), None)
-    values = dict([('company_id', ref('base.main_company'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_employee_mark')], values, None)
--
-  I assign department for employee Mark Johnson.
--
-  !python {model: hr.employee}: |
-    res = self.onchange_department_id(cr, uid, [ref('hr_employee_mark')], ref('hr_department_rd0'), None)
-    assert res['value']['parent_id']
-    values = dict([('department_id', ref('hr_department_rd0'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_employee_mark')], values, None)
--
-  Now I create a user for employee Mark Johnson.
--
-  !record {model: res.users, id: hr_users_markjohnson0}:
-    context_lang: en_US
-    groups_id:
-      - base.group_user
-    login: markjohnson
-    name: Mark Johnson
-    password: markjohnson
--
-  I assign user to employee Mark Johnson.
--
-  !python {model: hr.employee}: |
-    res = self.onchange_user(cr, uid, [ref('hr_employee_mark')], ref('hr_users_markjohnson0'), None)
-    values = dict([('user_id', ref('hr_users_markjohnson0'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_employee_mark')], values, None)
--
-  In order to check the wizard Employee Hierarchy , I will create new employee Phil Graves and select Mark Johnson as
-  Manager.
--
-  !record {model: hr.employee, id: hr_employee_phil}:
-    address_home_id: base.res_partner_address_3000
-    company_id: base.main_company
-    gender: male
-    name: Phil Graves
-    user_id: base.user_demo
-    parent_id: 'hr_employee_mark'
--
-  I fill the Working address for Employee.
--
-  !python {model: hr.employee}: |
-    res = self.onchange_address_id(cr, uid, ref('hr_employee_phil'), ref('base.res_partner_address_3000'), None)
-    assert res['value']
-    values = dict([('address_id', ref('base.res_partner_address_3000'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_employee_phil')], values, None)
--
-  I will open up form view of  Mark Johnson and test the wizard Employee Hierarchy so it display the employee
-  hierarchy starting from Mark Johnson.
-
--
-  I will create new Job Position. I will check successful creation of new Job Position by adding the information.
--
-  !record {model: hr.job, id: hr_job_jea0}:
-    department_id: 'hr_department_rd0'
-    description: 'Position of Junior Application Engineer'
-    expected_employees: 5
-    name: 'JAE'
--
-  I check that Employee form is in "Open" state.
--
-  !assert {model: hr.job, id: hr_job_jea0}:
-    - state == 'open'
--
-  I create Employee for job position.
--
-  !record {model: hr.job, id: hr_job_jea0}:
-    employee_ids:
-      - address_home_id: base.res_partner_address_1
-        name: Manuel Lehba
-        department_id: 'hr_department_rd0'
-        gender: male
-        parent_id: 'hr_employee_mark'
--
-  I check that "Number of Employees" field have some value.
--
-  !assert {model: hr.job, id: hr_job_jea0}:
-    - no_of_employee != False
--
-  As more requirements on the said job position are come, I increase the number of expected employees.
--
-  !python {model: hr.job}: |
-    res = self.on_change_expected_employee(cr, uid, [ref('hr_job_jea0')], 6, 3, None)
-    assert res['value']['expected_employees']
-    values = dict([('expected_employees', ref('hr_job_jea0'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_job_jea0')], values, None)
--
-  I open the job position for recruitment.
--
-  !python {model: hr.job}: |
-    self.job_recruitement(cr, uid, [ref('hr_job_jea0')])
--
-  I assign the job position to employee and mark the position.
--
-  !python {model: hr.job}: |
-    self.job_open(cr, uid, [ref('hr_job_jea0')])
--
-  Now the process is over so I don't want to use this position. I mark it as Old.
--
-  !python {model: hr.job}: |
-    self.job_old(cr, uid, [ref('hr_job_jea0')])
--
-  I create a parent category for the new recruited employees who are Freshers.
--
-  !record {model: hr.employee.category, id: hr_employee_category_fresher0}:
-    name: Fresher
--
-  I create another category for Junior Level freshers.
--
-  !record {model: hr.employee.category, id: hr_employee_category_juniorlevel0}:
-    name: Junior Level
-    parent_id: hr_employee_category_fresher0
--
-  I open the tree view of Categories and see the categories in a hierarchical manner.
--
-  !python {model: hr.employee.category}: |
-    res = self.name_get(cr, uid, [ref('hr_employee_category_juniorlevel0')], None)
-    assert res
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 5f0054c3634..3d945910144 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Attendance',
+    'name': 'Attendances',
     'version': '1.1',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 51d5e87145c..ceb8acfe49e 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
-"access_hr_action_reason_employee","hr.action.reason.employee","model_hr_action_reason","base.group_user",1,1,1,1
-"access_hr_attendance_user","hr.attendance.user","model_hr_attendance","base.group_hr_user",1,1,1,1
-"access_hr_attendance_system_user","hr.attendance.system.user","model_hr_attendance","base.group_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_action_reason_user,hr.action.reason.user,model_hr_action_reason,base.group_hr_user,1,1,1,1
+access_hr_action_reason_employee,hr.action.reason.employee,model_hr_action_reason,base.group_user,1,1,1,1
+access_hr_attendance_user,hr.attendance.user,model_hr_attendance,base.group_hr_user,1,1,1,1
+access_hr_attendance_system_user,hr.attendance.system.user,model_hr_attendance,base.group_user,1,1,1,1
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 41ffa72f937..5e35e147230 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
-"access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
-"access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
-"access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_resource_manager,hr.employee.resource.manager,resource.model_resource_resource,base.group_hr_manager,1,1,1,1
+access_hr_resource_calendar_user,hr.employee.resource.calendar.user,resource.model_resource_calendar,base.group_hr_user,1,1,1,1
+access_hr_contract_type_manager,hr.contract.type.manager,model_hr_contract_type,base.group_hr_manager,1,1,1,1
+access_hr_contract_manager,hr.contract.manager,model_hr_contract,base.group_hr_manager,1,1,1,1
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 4c1b32e1395..c172cf474c2 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "HR Periodic Appraisals",
+    "name" : "Employee Appraisals",
     "version": "0.1",
     "author": "OpenERP SA",
     "category": "Human Resources",
@@ -50,7 +50,10 @@ in the form of pdf file. Implements a dashboard for My Current Evaluations
         'hr_evaluation_data.xml',
         'hr_evaluation_installer.xml',
     ],
-    "test": ["test/test_hr_evaluation.yml"],
+    "test": [
+        "test/test_hr_evaluation.yml",
+        "test/hr_evalution_demo.yml",
+    ],
     "active": False,
     "installable": True,
     "certificate" : "00883207679172998429",
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index 3e437833c2d..f25c669a973 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="act_hr_evaluation_tree" model="ir.actions.act_window">
-            <field name="name">My Appraisal Remaining</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr_evaluation.evaluation</field>
+        <record model="ir.actions.act_window" id="action_hr_evaluation_interview_board">
+            <field name="name">Interview Requests</field>
+            <field name="res_model">hr.evaluation.interview</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="domain">[('state','in',('wait', 'progress')),('create_uid','=',uid)]</field>
-            <field name="search_view_id" ref="hr_evaluation.view_hr_evaluation_tree"/>
+            <field name="domain">[('is_evaluation' ,'=', True), ('user_id', '=', uid),('state','=','waiting_answer')]</field>
+            <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
         </record>
 
         <record id="board_hr_evaluation_form" model="ir.ui.view">
@@ -18,7 +17,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <xpath expr="/form/board/column[1]" position="inside">
-                <action name="%(act_hr_evaluation_tree)d" string="My Appraisal Remaining"/>
+                <action name="%(action_hr_evaluation_interview_board)d" string="Interview Requests"/>
             </xpath>
             </field>
         </record>
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index db096f13266..6fc31170396 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -14,5 +14,11 @@
             <field name="evaluation_plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
         </record>
 
+        <record id="hr_evaluation_evaluation_0" model="hr_evaluation.evaluation">
+            <field name="date">2011-12-24</field>
+            <field name="employee_id" ref="hr.employee1"/>
+            <field name="plan_id" ref="hr_evaluation.hr_evaluation_plan_managersevaluationplan0"/>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index d8dfa7e40ca..18f5bc1a023 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -365,7 +365,7 @@
         </record>
 
         <record id="view_evaluation_calendar" model="ir.ui.view">
-            <field name="name">Interview Request</field>
+            <field name="name">Interview Requests</field>
             <field name="model">hr.evaluation.interview</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
@@ -379,7 +379,7 @@
             <field name="name">Interview Requests</field>
             <field name="res_model">hr.evaluation.interview</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="view_hr_evaluation_interview_form"/>
+            <field name="view_id" eval="False"/>
             <field name="domain">[('is_evaluation' ,'=', True)]</field>
             <field name="context">{'default_is_evaluation': True, "search_default_todo":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
index 4c3f93cb07c..aef435f1d54 100644
--- a/addons/hr_evaluation/i18n/hr.po
+++ b/addons/hr_evaluation/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-06-06 23:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-19 17:14+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -33,7 +33,7 @@ msgstr ""
 #: view:hr.evaluation.report:0
 #: view:hr_evaluation.plan:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,request_id:0
@@ -45,7 +45,7 @@ msgstr ""
 #: field:hr.evaluation.report,progress_bar:0
 #: field:hr_evaluation.evaluation,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Napredak"
 
 #. module: hr_evaluation
 #: view:board.board:0
@@ -56,7 +56,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Legend"
-msgstr ""
+msgstr "Legenda"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:311
@@ -67,7 +67,7 @@ msgstr ""
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,delay_date:0
@@ -85,14 +85,14 @@ msgstr ""
 #: code:addons/hr_evaluation/hr_evaluation.py:311
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Upozorenje !"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,company_id:0
 #: field:hr_evaluation.plan.phase,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Organizacija"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
@@ -108,7 +108,7 @@ msgstr ""
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
@@ -130,7 +130,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr.employee:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -159,7 +159,7 @@ msgstr ""
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 377098a6fe6..4304f78708a 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,34 +1,33 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_evaluation_evaluation_user","hr_evaluation.evaluation.user","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_evaluation_employee","hr_evaluation.evaluation.employee","model_hr_evaluation_evaluation","base.group_user",1,0,0,0
-"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_interview_user","hr.evaluation.interview.user","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_interview_employee","hr.evaluation.interview.employee","model_hr_evaluation_interview","base.group_user",1,1,1,0
-"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,1,1,1
-"access_survey_type_hr_manager","survey.type","survey.model_survey_type","base.group_hr_manager",1,1,1,1
-"access_survey_hr_manager","survey.hr.manager","survey.model_survey","base.group_hr_manager",1,1,1,1
-"access_survey_history_manager","survey.history","survey.model_survey_history","base.group_hr_manager",1,1,1,1
-"access_survey_page_hr_manager","survey.page","survey.model_survey_page","base.group_hr_manager",1,1,1,1
-"access_survey_question_hr_manager","survey.question","survey.model_survey_question","base.group_hr_manager",1,1,1,1
-"access_survey_question_column_heading_hr_manager","survey.question.column.heading","survey.model_survey_question_column_heading","base.group_hr_manager",1,1,1,1
-"access_survey_answer_hr_manager","survey.answer","survey.model_survey_answer","base.group_hr_manager",1,1,1,1
-"access_survey_response_hr_manager","survey.response","survey.model_survey_response","base.group_hr_manager",1,1,1,1
-"access_survey_response_line_hr_manager","survey.response.line","survey.model_survey_response_line","base.group_hr_manager",1,1,1,1
-"access_survey_tbl_column_heading_hr_manager","survey.tbl.column.heading","survey.model_survey_tbl_column_heading","base.group_hr_manager",1,1,1,1
-"access_survey_response_answer_hr_manager","survey.response.answer","survey.model_survey_response_answer","base.group_hr_manager",1,1,1,1
-"access_survey_request_hr_manager","survey.request","survey.model_survey_request","base.group_hr_manager",1,1,1,1
-"access_survey_answer_hr_user","survey.answer.hr.user","survey.model_survey_answer","base.group_hr_user",1,1,1,0
-"access_survey_response_answer_hr_user","survey.response.answer.hr.user","survey.model_survey_response_answer","base.group_hr_user",1,1,1,0
-"access_survey_type_hr_user","survey.type.hr.user","survey.model_survey_type","base.group_hr_user",1,1,1,0
-"access_survey_question_hr_user","survey.question.hr.user","survey.model_survey_question","base.group_hr_user",1,1,1,0
-"access_survey_page_hr_user","survey.page.hr.user","survey.model_survey_page","base.group_hr_user",1,1,1,1
-"access_survey_response_hr_user","survey.response.hr.user","survey.model_survey_response","base.group_hr_user",1,1,1,0
-"access_survey_history_hr_user","survey.history.hr.user","survey.model_survey_history","base.group_hr_user",1,1,1,0
-"access_survey_request_hr_user","survey.request.hr.user","survey.model_survey_request","base.group_hr_user",1,1,1,0
-"access_survey_request_hr_employee","survey.request.hr.employee","survey.model_survey_request","base.group_user",1,1,1,0
-"access_survey_question_column_heading_hr_user","survey.question.column.heading.hr.user","survey.model_survey_question_column_heading","base.group_hr_user",1,0,0,0
-"access_survey_response_line_hr_user","survey.response.line.hr.user","survey.model_survey_response_line","base.group_hr_user",1,1,1,0
-"access_survey_tbl_column_heading_hr_user","survey.tbl.column.heading.hr.user","survey.model_survey_tbl_column_heading","base.group_hr_user",1,1,1,0
-"access_base_calendar_attendee_survey_user","base.calendar.calendar.attendee.survey.user","base_calendar.model_calendar_attendee","base.group_survey_user",1,1,1,0
-"access_base_calendar_attendee_tool_user","base.calendar.calendar.attendee.tool.user","base_calendar.model_calendar_attendee","base.group_tool_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_evaluation_evaluation_user,hr_evaluation.evaluation.user,model_hr_evaluation_evaluation,base.group_hr_user,1,1,1,1
+access_hr_evaluation_evaluation_employee,hr_evaluation.evaluation.employee,model_hr_evaluation_evaluation,base.group_user,1,0,0,0
+access_hr_evaluation_plan_user,hr_evaluation.plan.user,model_hr_evaluation_plan,base.group_hr_user,1,1,1,1
+access_hr_evaluation_plan_phase_user,hr_evaluation.plan.phase.user,model_hr_evaluation_plan_phase,base.group_hr_user,1,1,1,1
+access_hr_evaluation_interview_user,hr.evaluation.interview.user,model_hr_evaluation_interview,base.group_hr_user,1,1,1,1
+access_hr_evaluation_interview_employee,hr.evaluation.interview.employee,model_hr_evaluation_interview,base.group_user,1,1,1,0
+access_hr_evaluation_report,hr.evaluation.report,model_hr_evaluation_report,base.group_hr_manager,1,1,1,1
+access_survey_type_hr_manager,survey.type,survey.model_survey_type,base.group_hr_manager,1,1,1,1
+access_survey_hr_manager,survey.hr.manager,survey.model_survey,base.group_hr_manager,1,1,1,1
+access_survey_history_manager,survey.history,survey.model_survey_history,base.group_hr_manager,1,1,1,1
+access_survey_question_hr_manager,survey.question,survey.model_survey_question,base.group_hr_manager,1,1,1,1
+access_survey_question_column_heading_hr_manager,survey.question.column.heading,survey.model_survey_question_column_heading,base.group_hr_manager,1,1,1,1
+access_survey_answer_hr_manager,survey.answer,survey.model_survey_answer,base.group_hr_manager,1,1,1,1
+access_survey_response_hr_manager,survey.response,survey.model_survey_response,base.group_hr_manager,1,1,1,1
+access_survey_response_line_hr_manager,survey.response.line,survey.model_survey_response_line,base.group_hr_manager,1,1,1,1
+access_survey_tbl_column_heading_hr_manager,survey.tbl.column.heading,survey.model_survey_tbl_column_heading,base.group_hr_manager,1,1,1,1
+access_survey_response_answer_hr_manager,survey.response.answer,survey.model_survey_response_answer,base.group_hr_manager,1,1,1,1
+access_survey_request_hr_manager,survey.request,survey.model_survey_request,base.group_hr_manager,1,1,1,1
+access_survey_answer_hr_user,survey.answer.hr.user,survey.model_survey_answer,base.group_hr_user,1,1,1,0
+access_survey_response_answer_hr_user,survey.response.answer.hr.user,survey.model_survey_response_answer,base.group_hr_user,1,1,1,0
+access_survey_type_hr_user,survey.type.hr.user,survey.model_survey_type,base.group_hr_user,1,1,1,0
+access_survey_question_hr_user,survey.question.hr.user,survey.model_survey_question,base.group_hr_user,1,1,1,0
+access_survey_page_hr_user,survey.page.hr.user,survey.model_survey_page,base.group_hr_user,1,1,1,1
+access_survey_response_hr_user,survey.response.hr.user,survey.model_survey_response,base.group_hr_user,1,1,1,0
+access_survey_history_hr_user,survey.history.hr.user,survey.model_survey_history,base.group_hr_user,1,1,1,0
+access_survey_request_hr_user,survey.request.hr.user,survey.model_survey_request,base.group_hr_user,1,1,1,0
+access_survey_request_hr_employee,survey.request.hr.employee,survey.model_survey_request,base.group_user,1,1,1,0
+access_survey_question_column_heading_hr_user,survey.question.column.heading.hr.user,survey.model_survey_question_column_heading,base.group_hr_user,1,0,0,0
+access_survey_response_line_hr_user,survey.response.line.hr.user,survey.model_survey_response_line,base.group_hr_user,1,1,1,0
+access_survey_tbl_column_heading_hr_user,survey.tbl.column.heading.hr.user,survey.model_survey_tbl_column_heading,base.group_hr_user,1,1,1,0
+access_base_calendar_attendee_survey_user,base.calendar.calendar.attendee.survey.user,base_calendar.model_calendar_attendee,base.group_survey_user,1,1,1,0
+access_base_calendar_attendee_tool_user,base.calendar.calendar.attendee.tool.user,base_calendar.model_calendar_attendee,base.group_tool_user,1,1,1,0
diff --git a/addons/hr_evaluation/static/src/img/icon.png b/addons/hr_evaluation/static/src/img/icon.png
new file mode 100644
index 00000000000..8b5e3cbfcfc
Binary files /dev/null and b/addons/hr_evaluation/static/src/img/icon.png differ
diff --git a/addons/hr_evaluation/test/hr_evalution_demo.yml b/addons/hr_evaluation/test/hr_evalution_demo.yml
new file mode 100644
index 00000000000..817be623901
--- /dev/null
+++ b/addons/hr_evaluation/test/hr_evalution_demo.yml
@@ -0,0 +1,6 @@
+-
+  !record {model: hr.employee, id: hr.employee1, view: False}:
+    evaluation_plan_id: hr_evaluation_plan_managersevaluationplan0
+-
+  !record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0, view: False}:
+    plan_id: hr_evaluation.hr_evaluation_plan_managersevaluationplan0
\ No newline at end of file
diff --git a/addons/hr_evaluation/test/test_hr_evaluation.yml b/addons/hr_evaluation/test/test_hr_evaluation.yml
index 893f19d0a3e..8875a83120d 100644
--- a/addons/hr_evaluation/test/test_hr_evaluation.yml
+++ b/addons/hr_evaluation/test/test_hr_evaluation.yml
@@ -1,144 +1,73 @@
 -
-  In order to test hr_evaluation module for OpenERP, I will create plan then create evaluation under that plan.
--
-
-  I create new Department.
--
-  !record {model: hr.department, id: hr_department_rd0}:
-    manager_id: base.user_root
-    name: 'R & D'
--
-  I create a new employee.
--
-  !record {model: hr.employee, id: hr_employee_employee0}:
-    address_home_id: base.res_partner_address_1
-    company_id: base.main_company
-    gender: male
-    marital: single
-    name: Mark Johnson
-    user_id: base.user_root
-    department_id: 'hr_department_rd0'
--
-  I create another new employee and assign first one as it's Manager.
--
-  !record {model: hr.employee, id: hr_employee_employee1}:
-    address_home_id: base.res_partner_address_3000
-    company_id: base.main_company
-    gender: male
-    name: Phil Graves
-    user_id: base.user_demo
-    parent_id: 'hr_employee_employee0'
-
--
-  I Create an "Employee Evaluation" survey for Manager's Evaluation Plan.
--
-    !record {model: 'survey', id: survey_0}:
-        title: 'Employee Evaluation'
-        max_response_limit: 20
-        response_user: 2
--
-  I Create an "Employee Evaluation" page in "Employee Evaluation" survey.
--
-    !record {model: 'survey.page', id: survey_employee_page_0}:
-        title: 'Employee Evaluation'
-        survey_id: survey_0
--
-  I Create "What is your Name" question in "Employee Evaluation" survey page.
--
-    !record {model: 'survey.question', id: survey_p_question_0}:
-        question: 'What is your Name?'
-        type: 'single_textbox'
-        sequence: 1
-        page_id: survey_employee_page_0
--
-  I Create "What is your gender" Question in "Employee Evaluation" survey page.
--
-    !record {model: 'survey.question', id: survey_p_question_1}:
-        question: 'What is your gender?'
-        type: multiple_choice_only_one_ans
-        sequence: 2
-        is_require_answer: true
-        page_id: survey_employee_page_0
--
-  I Create "Male" answer in question "What is your gender?"
--
-    !record {model: 'survey.answer', id: survey_p_1_1}:
-        answer: 'Male'
-        sequence: 1
-        question_id : survey_p_question_1
--
-  I Create "Female" answer in question "What is your gender?"
--
-    !record {model: 'survey.answer', id: survey_p_1_2}:
-        answer: 'Female'
-        sequence: 2
-        question_id : survey_p_question_1
-
--
-  I set the survey in open state.
+  I set the "Employee Evaluation" survey in open state.
 -
   !python {model: survey}: |
-       self.survey_open(cr, uid, [ref("survey_0")], context)
-
+    self.survey_open(cr, uid, [ref("survey_2")], context)
 -
-  I create an Evaluation plan and select "Employee Evaluation" survey for "Send to Subordinates" and "Final interview with Manager" Phase.
+  I check that state of "Employee Evaluation" survey is Open.
 -
-  !record {model: hr_evaluation.plan, id: hr_evaluation_plan_managersplan0}:
-    company_id: base.main_company
-    month_first: 3
-    month_next: 6
-    name: Manager's  Plan
-    phase_ids:
-      - action: bottom-up
-        name: Send to Subordinates
-        survey_id: 'survey_0'
-      - action: top-down
-        name: Final Interview with manager
-        sequence: 2
-        survey_id: 'survey_0'
--
-  I assign the evaluation plan to the employee "Mark Johnson".
--
-  !python {model: hr.employee}: |
-    res = self.onchange_evaluation_plan_id(cr, uid, [ref('hr_employee_employee0')], ref('hr_evaluation_plan_managersplan0'), False, None)
-    values = dict([('evaluation_plan_id', ref('hr_evaluation_plan_managersplan0'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_employee_employee0')], values, None)
--
-  I create an Evaluation for employee under "Manager Evaluation Plan".
--
-  !record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
-    date: !eval time.strftime('%Y-%m-%d')
-    employee_id: 'hr_employee_employee1'
-    plan_id: 'hr_evaluation_plan_managersplan0'
-    progress: 0.0
-    state: draft
--
-  I change the employee on Evaluation.
--
-  !python {model: hr_evaluation.evaluation}: |
-    res = self.onchange_employee_id(cr, uid, [ref('hr_evaluation_evaluation_0')], ref('hr_employee_employee0'), None)
-    values = dict([('employee_id', ref('hr_employee_employee0'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_evaluation_evaluation_0')], values, None)
+  !assert {model: survey, id: survey_2, severity: error, string: Survey should be in OPen state}:
+    - state == 'open'
 -
   I start the evaluation process by click on "Start Evaluation" button.
 -
   !python {model: hr_evaluation.evaluation}: |
      self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
+-
+  I check that state is "Plan in progress".
+-
+  !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0, severity: error, string: Evaluation should be 'Plan in progress' state}:
+    - state == 'wait'
 -
   I find a mistake on evaluation form. So I cancel the evaluation and again start it.
 -
   !python {model: hr_evaluation.evaluation}: |
-     self.button_cancel(cr, uid, [ref('hr_evaluation_evaluation_0')])
-     self.button_draft(cr, uid, [ref('hr_evaluation_evaluation_0')])
-     self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
+    evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0') , context)
+    self.button_cancel(cr, uid, [ref('hr_evaluation_evaluation_0')])
+    assert evaluation.state == 'cancel', 'Evaluation should be in cancel state'
+    self.button_draft(cr, uid, [ref('hr_evaluation_evaluation_0')])
+    evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0') , context)
+    assert evaluation.state == 'draft', 'Evaluation should be in draft state'
+    self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
 -
-  I close this survey request by giving answer of survey question.
+  I check that state is "Plan in progress" and "Interview Request" record is created
 -
   !python {model: hr_evaluation.evaluation}: |
-    evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0'))
-    self.pool.get('hr.evaluation.interview').survey_req_done(cr, uid, [r.id for r in evaluation.survey_request_ids])
+    interview_obj = self.pool.get('hr.evaluation.interview')
+    evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0') , context)
+    assert evaluation.state == 'wait', "Evaluation should be 'Plan in progress' state"
+    interview_ids = interview_obj.search(cr, uid, [('evaluation_id','=', ref('hr_evaluation_evaluation_0'))])
+    assert len(interview_ids), "Interview evaluation survey not created"
 -
-  I print the survey.
+  Give answer of the first page in "Employee Evaluation" survey.
+-
+  !python {model: survey.question.wiz}: |
+    name_wiz_obj=self.pool.get('survey.name.wiz')
+    interview_obj = self.pool.get('hr.evaluation.interview')
+    interview_ids = interview_obj.search(cr, uid, [('evaluation_id','=', ref('hr_evaluation_evaluation_0'))])
+    assert len(interview_ids), "Interview evaluation survey not created"
+    ctx = {'active_model':'hr.evaluation.interview', 'active_id': interview_ids[0], 'active_ids': [interview_ids], 'survey_id': ref("survey_2")}
+    name_id = name_wiz_obj.create(cr, uid, {'survey_id': ref("survey_2")})
+    ctx ["sur_name_id"] = name_id
+    self.create(cr, uid, {str(ref("survey_question_2")) +"_" +str(ref("survey_answer_1")) + "_multi" :'tpa',
+               str(ref("survey_question_2")) +"_" +str(ref("survey_answer_10")) + "_multi" :'application eng',
+               str(ref("survey_question_2")) +"_" +str(ref("survey_answer_20")) + "_multi" :'3',
+               str(ref("survey_question_2")) +"_" +str(ref("survey_answer_25")) + "_multi" :'2011-12-02 16:42:00',
+               str(ref("survey_question_2")) +"_" +str(ref("survey_answer_43")) + "_multi" :'HR',
+               str(ref("survey_question_2")) +"_" +str(ref("survey_answer_98")) + "_multi" :'tpa review'
+               }, context = ctx)
+-
+  I close this Evaluation survey by giving answer of questions.
+-
+  !python {model: hr_evaluation.evaluation}: |
+    interview_obj = self.pool.get('hr.evaluation.interview')
+    evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0'))
+    interview_obj.survey_req_done(cr, uid, [r.id for r in evaluation.survey_request_ids])
+    for survey in evaluation.survey_request_ids:
+        interview = interview_obj.browse(cr, uid, survey.id, context)
+        assert interview.state == "done", 'survey must be in done state'
+-
+  I print the evaluation.
 -
   !python {model: hr_evaluation.evaluation}: |
     evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0'))
@@ -147,22 +76,33 @@
   I click on "Final Validation" button to finalise evaluation.
 -
   !python {model: hr_evaluation.evaluation}: |
-    self.button_final_validation(cr, uid, [ref("hr_evaluation.hr_evaluation_evaluation_0")],
-      {"active_ids": [ref("hr_evaluation.menu_open_view_hr_evaluation_tree")]})
-
+    self.button_final_validation(cr, uid, [ref("hr_evaluation_evaluation_0")])
 -
-  I check that state is "Final Validation".
+  I check that state is "Waiting Appreciation".
 -
   !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
       - state == 'progress'
 -
   Give Rating "Meet expectations" by selecting overall Rating.
 -
-  !record {model: hr_evaluation.evaluation, id: hr_evaluation.hr_evaluation_evaluation_0}:
+  !record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
     rating: '2'
-
 -
   I close this Evaluation by click on "Done" button of this wizard.
 -
   !python {model: hr_evaluation.evaluation}: |
-    self.button_done(cr, uid, [ref("hr_evaluation.hr_evaluation_evaluation_0")], {"active_ids": [ref("hr_evaluation.menu_open_view_hr_evaluation_tree")]})
+    self.button_done(cr, uid, [ref("hr_evaluation_evaluation_0")])
+-
+  I check that state of Evaluation is done.
+-
+  !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0, severity: error, string: Evaluation should be in done state}:
+      - state == 'done'
+-
+  Print Evaluations Statistics Report
+-
+  !python {model: hr.evaluation.report}: |
+    import netsvc, tools, os, time
+    ctx={}
+    data_dict={'state': 'done', 'rating': 2, 'employee_id': ref("hr.employee1")}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'hr_evaluation_evaluation_0',wiz_data=data_dict, context=ctx, our_module='hr_evaluation')
\ No newline at end of file
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index e0a8a002a6a..4e91155442b 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -62,8 +62,9 @@ re-invoice your customer's expenses if your work by project.
     'demo_xml': [
         'hr_expense_demo.xml',
         ],
-    'test': ['test/test_hr_expense.yml',
-             'test/hr_expense_report.yml',
+    'test': [
+             'test/expense_demo.yml',
+             'test/expense_process.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 478b8120935..17f48f855fb 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -57,6 +57,7 @@ class hr_expense_expense(osv.osv):
 
     _name = "hr.expense.expense"
     _description = "Expense"
+    _order = "id desc"
     _columns = {
         'name': fields.char('Description', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
@@ -87,6 +88,7 @@ class hr_expense_expense(osv.osv):
             \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
     }
     _defaults = {
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'state': 'draft',
         'employee_id': _employee_get,
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
index 9660dbb2543..0e940c74cc0 100644
--- a/addons/hr_expense/hr_expense_data.xml
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -8,18 +8,6 @@
             <field name="parent_id" ref="product.cat0"/>
             <field name="name">Expenses</field>
         </record>
-        
-        <record id="product_product_expense_car" model="product.product">
-            <field name="list_price">0.32</field>
-            <field name="standard_price">0.32</field>
-            <field name="uom_id" ref="product.product_uom_km"/>
-            <field name="uom_po_id" ref="product.product_uom_km"/>
-            <field name="type">consu</field>
-            <field name="name">Travel Expenses</field>
-            <field name="default_code">TRA</field>
-            <field name="categ_id" ref="hr_expense.cat_expense"/>
-            <field name="hr_expense_ok" eval="True" />
-        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 80c9cd66694..8912dfb09de 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -2,95 +2,88 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="product_product_expense_air" model="product.product">
-            <field name="list_price">1.0</field>
-            <field name="standard_price">1.0</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <record id="hr.employee4" model="hr.employee">
+            <field name="address_home_id" ref="base.res_partner_address_1"/>
+        </record>
+
+        <record id="car_travel" model="product.product">
+            <field name="list_price">0.32</field>
+            <field name="type">service</field>
+            <field name="name">Car Travel Expenses</field>
+            <field name="default_code">CarTRA</field>
+            <field name="categ_id" ref="hr_expense.cat_expense"/>
+            <field name="hr_expense_ok" eval="True" />
+        </record>
+
+        <record id="air_ticket" model="product.product">
+            <field name="list_price">700.0</field>
             <field name="type">service</field>
             <field name="name">Air Ticket</field>
             <field name="default_code">AT</field>
-            <field name="categ_id" ref="product.cat2"/>
+            <field name="categ_id" ref="hr_expense.cat_expense"/>
             <field name="hr_expense_ok" eval="True" />
         </record>
 
-        <record id="product_product_expense_hotel" model="product.product">
-            <field name="list_price">1.0</field>
-            <field name="standard_price">1.0</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <record id="hotel_rent" model="product.product">
+            <field name="list_price">400.0</field>
             <field name="type">service</field>
             <field name="name">Hotel Accommodation</field>
             <field name="default_code">HA0</field>
-            <field name="categ_id" ref="product.cat2"/>
+            <field name="categ_id" ref="hr_expense.cat_expense"/>
             <field name="hr_expense_ok" eval="True" />
         </record>
-
-        <record id="hr_expense_expense_septemberexpenses0" model="hr.expense.expense">
-            <field name="currency_id" ref="base.EUR"/>
-            <field name="employee_id" ref="hr.employee1"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="name">May Expenses</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="date" eval="time.strftime('%Y-%m-03')"/>
-            <field name="state">draft</field>
+        <record id="expenses0" model="hr.expense.expense">
+            <field name="name">Expenses</field>
+            <field name="date" eval="time.strftime('%Y-08-25')"/>
+        </record>
+        <record id="expenses_line0" model="hr.expense.line">
+            <field name="name">Travel Expenses</field>
+            <field name="date_value" eval="time.strftime('%Y-08-10')"/>
+            <field name="analytic_account" ref="account.analytic_consultancy"/>
+            <field name="expense_id" ref="expenses0"/>
+            <field eval="200.0" name="unit_amount"/>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field eval="1.0" name="unit_quantity"/>
         </record>
 
-        <record id="hr_expense_line_travelbycarcustomerseagatedouble0" model="hr.expense.line">
+        <record id="sep_expenses" model="hr.expense.expense">
+            <field name="employee_id" ref="hr.employee4"/>
+            <field name="name">September Expenses</field>
+            <field name="date" eval="time.strftime('%Y-09-28')"/>
+        </record>
+
+        <record id="travel_by_air_sep" model="hr.expense.line">
             <field name="name">Travel by Air</field>
-            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
+            <field name="date_value" eval="time.strftime('%Y-09-03')"/>
             <field name="analytic_account" ref="account.analytic_consultancy"/>
-            <field name="product_id" ref="product_product_expense_air"/>
-            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
+            <field name="product_id" ref="air_ticket"/>
+            <field name="expense_id" ref="sep_expenses"/>
             <field eval="700.0" name="unit_amount"/>
             <field name="uom_id" ref="product.product_uom_unit"/>
             <field eval="1.0" name="unit_quantity"/>
         </record>
 
-        <record id="hr_expense_line_basicpcserverforseagate0" model="hr.expense.line">
-            <field name="name">Basic PC - Server for Seagate</field>
-            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
-            <field name="analytic_account" ref="account.analytic_seagate_p2"/>
-            <field name="product_id" ref="product.product_product_pc4"/>
-            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
-            <field eval="1200.0" name="unit_amount"/>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field eval="1.0" name="unit_quantity"/>
-        </record>
-
-    </data>
-
-    <data noupdate="1">
-        <record id="hr_expense_expense_septemberexpenses1" model="hr.expense.expense">
-            <field name="currency_id" ref="base.EUR"/>
-            <field name="employee_id" ref="hr.employee1"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="name">Travel Expenses</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="date" eval="time.strftime('%Y-%m-20')"/>
-            <field name="state">draft</field>
-        </record>
-
-        <record id="hr_expense_line_hotelexpensesthymbra0" model="hr.expense.line">
+        <record id="hotel_bill_sep" model="hr.expense.line">
             <field name="name">Hotel Expenses - Thymbra</field>
-            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
+            <field name="date_value" eval="time.strftime('%Y-09-20')"/>
             <field name="analytic_account" ref="account.analytic_thymbra"/>
-            <field name="product_id" ref="product_product_expense_hotel"/>
-            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
+            <field name="product_id" ref="hotel_rent"/>
+            <field name="expense_id" ref="sep_expenses"/>
             <field eval="400.0" name="unit_amount"/>
             <field name="uom_id" ref="product.product_uom_unit"/>
             <field eval="5.0" name="unit_quantity"/>
         </record>
 
-        <record id="hr_expense_line_car_travel" model="hr.expense.line">
+        <record id="car_travel_sep" model="hr.expense.line">
                 <field name="name">Bruxelles - Paris</field>
-                <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
+                <field name="date_value" eval="time.strftime('%Y-09-15')"/>
                 <field name="analytic_account" ref="account.analytic_thymbra"/>
-                <field name="product_id" ref="product_product_expense_car"/>
-                <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
+                <field name="product_id" ref="car_travel"/>
+                <field name="expense_id" ref="sep_expenses"/>
                 <field eval="0.30" name="unit_amount"/>
                 <field name="uom_id" ref="product.product_uom_km"/>
                 <field eval="622.0" name="unit_quantity"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 786dc6beee2..4250ec40be0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -10,6 +10,7 @@
             <field name="model">hr.expense.line</field>
             <field name="arch" type="xml">
                 <tree string="Expense Lines">
+                    <field name="sequence" invisible="1"/>
                     <field name="date_value"/>
                     <field name="name"/>
                     <field name="ref"/>
@@ -30,9 +31,8 @@
                     <field name="employee_id"/>
                     <field name="date"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="department_id" groups="base.group_extended"/>
-                    <field name="ref"/>
                     <field name="name"/>
+                    <field name="currency_id"/>
                     <field name="amount"/>
                     <field name="state"/>
                     <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 674b06304d2..0455302319e 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,23 +1,23 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_expense_expense_user","hr.expense.expense.user","model_hr_expense_expense","base.group_hr_user",1,1,1,1
-"access_hr_expense_expense_employee","hr.expense.expense.employee","model_hr_expense_expense","base.group_user",1,1,1,1
-"access_hr_expense_line_user","hr.expense.line.user","model_hr_expense_line","base.group_hr_user",1,1,1,1
-"access_hr_expense_line_employee","hr.expense.line.employee","model_hr_expense_line","base.group_user",1,1,1,1
-"access_hr_expense_report_manager","hr.expense.report.manager","model_hr_expense_report","base.group_hr_manager",1,1,1,1
-"access_product_product_hr_expense_user","product.product.hr.expense.user","product.model_product_product","base.group_hr_user",1,1,1,1
-"access_product_template_hr_expense_user","product.template.hr.expense.user","product.model_product_template","base.group_hr_user",1,1,1,1
-"access_product_uom_hr_expense_user","product.uom.hr.expense.user","product.model_product_uom","base.group_hr_user",1,1,1,1
-"access_product_price_type_user","product.price.type.user","product.model_product_price_type","base.group_hr_user",1,1,1,1
-"access_account_journal_user","account.journal.user","account.model_account_journal","base.group_hr_user",1,1,1,1
-"access_account_invoice_user","account.invoice.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
-"access_account_invoice_line_user","account.invoice.line.user","account.model_account_invoice_line","base.group_hr_user",1,1,1,1
-"access_account_analytic_journal_user","account.ianalytic.journal.user","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
-"access_account_invoice_tax_user","account.invoice.tax.user","account.model_account_invoice_tax","base.group_hr_user",1,1,1,1
-"access_account_period_user","account.period.user","account.model_account_period","base.group_hr_user",1,1,1,1
-"access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
-"access_account_move_user","account.move.user","account.model_account_move","base.group_hr_user",1,1,1,1
-"access_account_move_line_user","account.move.line.user","account.model_account_move_line","base.group_hr_user",1,1,1,1
-"access_account_analytic_line_user","account.ianalytic.line.user","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
-"access_account_journal_period_manager","account.journal.period.manager","account.model_account_journal_period","base.group_hr_manager",1,1,1,1
-"hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
-"hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_expense_expense_user,hr.expense.expense.user,model_hr_expense_expense,base.group_hr_user,1,1,1,1
+access_hr_expense_expense_employee,hr.expense.expense.employee,model_hr_expense_expense,base.group_user,1,1,1,1
+access_hr_expense_line_user,hr.expense.line.user,model_hr_expense_line,base.group_hr_user,1,1,1,1
+access_hr_expense_line_employee,hr.expense.line.employee,model_hr_expense_line,base.group_user,1,1,1,1
+access_hr_expense_report_manager,hr.expense.report.manager,model_hr_expense_report,base.group_hr_manager,1,1,1,1
+access_product_product_hr_expense_user,product.product.hr.expense.user,product.model_product_product,base.group_hr_user,1,1,1,1
+access_product_template_hr_expense_user,product.template.hr.expense.user,product.model_product_template,base.group_hr_user,1,1,1,1
+access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,base.group_hr_user,1,1,1,1
+access_product_price_type_user,product.price.type.user,product.model_product_price_type,base.group_hr_user,1,1,1,1
+access_account_journal_user,account.journal.user,account.model_account_journal,base.group_hr_user,1,1,1,1
+access_account_invoice_user,account.invoice.user,account.model_account_invoice,base.group_hr_user,1,1,1,1
+access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,base.group_hr_user,1,1,1,1
+access_account_analytic_journal_user,account.ianalytic.journal.user,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1
+access_account_invoice_tax_user,account.invoice.tax.user,account.model_account_invoice_tax,base.group_hr_user,1,1,1,1
+access_account_period_user,account.period.user,account.model_account_period,base.group_hr_user,1,1,1,1
+access_account_fiscalyear_user,account.fiscalyear.user,account.model_account_fiscalyear,base.group_hr_user,1,1,1,1
+access_account_move_user,account.move.user,account.model_account_move,base.group_hr_user,1,1,1,1
+access_account_move_line_user,account.move.line.user,account.model_account_move_line,base.group_hr_user,1,1,1,1
+access_account_analytic_line_user,account.ianalytic.line.user,account.model_account_analytic_line,base.group_hr_user,1,1,1,1
+access_account_journal_period_manager,account.journal.period.manager,account.model_account_journal_period,base.group_hr_manager,1,1,1,1
+hr.access_account_journal_view_hruser,account.journal.view hruser,account.model_account_journal_view,base.group_hr_user,1,0,0,0
+hr.access_account_journal_column_hruser,account.journal.column hruser,account.model_account_journal_column,base.group_hr_user,1,0,0,0
diff --git a/addons/hr_expense/static/src/img/icon.png b/addons/hr_expense/static/src/img/icon.png
new file mode 100644
index 00000000000..9724b4d9473
Binary files /dev/null and b/addons/hr_expense/static/src/img/icon.png differ
diff --git a/addons/hr_expense/test/expense_demo.yml b/addons/hr_expense/test/expense_demo.yml
new file mode 100644
index 00000000000..5b3cb0893d0
--- /dev/null
+++ b/addons/hr_expense/test/expense_demo.yml
@@ -0,0 +1,11 @@
+-
+  !record {model: hr.expense.expense, id: sep_expenses}:
+    employee_id: hr.employee4
+    name : 'John Smith'
+-
+  !record {model: product.product, id: car_travel}:
+    hr_expense_ok: 'True'
+-
+  !record {model: hr.expense.line, id: expense_line}:
+    product_id: car_travel
+    name: 'Car Travel Expenses'
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
new file mode 100644
index 00000000000..5c8a9d53f7c
--- /dev/null
+++ b/addons/hr_expense/test/expense_process.yml
@@ -0,0 +1,60 @@
+-
+  In order to test the process of "Employee Expenses" by processing the expenses, I confirm Expense Bill of an employee for September month. 
+-
+  !workflow {model: hr.expense.expense, action: confirm, ref: sep_expenses}
+-
+  I check that state is 'Confirm'.
+-
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Confirm state}:
+    - state == 'confirm'
+-
+  I approve the September expenses.
+-
+  !workflow {model: hr.expense.expense, action: validate, ref: sep_expenses}
+-
+  I check that state is 'Approved'
+-
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Approved state}:
+    - state == 'accepted'
+-
+  I make Invoice for the expense.
+-
+  !python {model: hr.expense.expense}: |
+    self.invoice(cr, uid, [ref('sep_expenses')])
+-
+  I check invoice details.
+-
+  !python {model: hr.expense.expense}: |
+    sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
+    assert sep_expenses.state == 'invoiced', "Expense should be in 'Invoiced' state."
+    assert sep_expenses.invoice_id, "Expense should have link of Invoice."
+    assert sep_expenses.invoice_id.currency_id == sep_expenses.currency_id,"Invoice currency is not correspond with supplier invoice currency"
+    assert sep_expenses.invoice_id.origin == sep_expenses.name,"Invoice origin is not correspond with supplier invoice"
+    assert sep_expenses.invoice_id.type == 'in_invoice', "Invoice type is not supplier invoice"
+    assert sep_expenses.invoice_id.amount_total == sep_expenses.amount,"Invoice total amount is not correspond with supplier invoice total"
+    assert len(sep_expenses.invoice_id.invoice_line) == len(sep_expenses.line_ids),"Lines of Invoice and supplier invoice Line are not correspond"
+    #TODO: check invoice line details with Expenses lines
+-
+  I pay the expenses.
+-
+  !python {model: hr.expense.expense}: |
+    self.expense_paid(cr, uid, [ref('sep_expenses')])
+-
+  I check that state of expenses is 'Paid'.
+-
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Paid state}:
+    - state == 'paid'
+-
+  I duplicate the expenses and cancel duplicated.
+-
+  !python {model: hr.expense.expense}: |
+    duplicate_id = self.copy(cr, uid, ref('sep_expenses'), context=context)
+    self.expense_canceled(cr, uid, [duplicate_id])
+-
+  I print a report of the expenses.
+- 
+  !python {model: hr.expense.expense}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.hr.expense').create(cr, uid, [ref('hr_expense.sep_expenses')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'hr_expense-report.'+format), 'wb+').write(data)
diff --git a/addons/hr_expense/test/hr_expense_report.yml b/addons/hr_expense/test/hr_expense_report.yml
deleted file mode 100644
index 4c81ceb5976..00000000000
--- a/addons/hr_expense/test/hr_expense_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a HR Expense, we will print a HR Expense
-- 
-  !python {model: hr.expense.expense}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.hr.expense').create(cr, uid, [ref('hr_expense.hr_expense_expense_septemberexpenses0'),ref('hr_expense.hr_expense_expense_septemberexpenses1')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'hr_expense-report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_expense/test/test_hr_expense.yml b/addons/hr_expense/test/test_hr_expense.yml
deleted file mode 100644
index bd13529d645..00000000000
--- a/addons/hr_expense/test/test_hr_expense.yml
+++ /dev/null
@@ -1,121 +0,0 @@
--
-  In order to test hr_expenses for OpenERP, I create expenses for employee and manage employee's expenses.
--
-  I create an unit of measure category "Working Time".
--
-  !record {model: product.uom.categ, id: product_uom_categ_workingtime0}:
-    name: Working Time.
-
--
-  I create a new employee.
--
-  !record {model: hr.employee, id: hr.employee}:
-    address_home_id: base.res_partner_address_1
-    address_id: base.main_address
--
-  I assign home address to employee.
--
-  !record {model: hr.employee, id: hr.employee1}:
-    address_home_id: base.res_partner_address_1
-    address_id: base.main_address
--
-  I create product unit of measure "Hour".
--
-  !record {model: product.uom, id: product_uom_hour0}:
-    category_id: 'product_uom_categ_workingtime0'
-    factor: 8.0
-    name: Hour
-    rounding: 0.01
--
-   I Create a product "travel".
--
-  !record {model: product.product, id: product_product_travel0}:
-    categ_id: product.product_category_services
-    cost_method: standard
-    list_price: 800.0
-    mes_type: fixed
-    name: Travel
-    procure_method: make_to_stock
-    standard_price: 700.0
-    supply_method: buy
-    type: product
-    uom_id: 'product_uom_hour0'
-    uom_po_id: 'product_uom_hour0'
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
--
-  I mark this product for expenses.
--
-  !python {model: product.product}: |
-    self.on_change_hr_expense_ok(cr, uid, [ref('product_product_travel0')], True)
--
-  I create an expense.
--
-  !record {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    company_id: base.main_company
-    date: !eval "'%s-05-05' %(datetime.now().year)"
-    name: September Expenses
-    line_ids:
-      - date_value: !eval "'%s-05-27' %(datetime.now().year)"
-        name: Travel
-        product_id: 'product_product_travel0'
-        sequence: 0.0
-        uom_id: product.product_uom_unit
-        unit_amount: 700.0
-    user_id: base.user_root
--
-  I check that expense is in "Draft" state.
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    - state == 'draft'
--
-  I change the employee on expense form.
--
-  !python {model: hr.expense.expense}: |
-    res = self.onchange_employee_id(cr, uid, [ref('hr_expense_expense_september0')], ref('hr.employee1'), None)
-    values = dict([('employee_id', ref('hr.employee1'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_expense_expense_september0')], values, None)
--
-  Now I change the related product on expense line.
--
-  !python {model: hr.expense.expense}: |
-    exp_line_obj = self.pool.get('hr.expense.line')
-    exp_obj = self.browse(cr, uid, ref('hr_expense_expense_september0'), None)
-    line_ids = [line.id for line in exp_obj.line_ids]
-    res = exp_line_obj.onchange_product_id(cr, uid, line_ids, ref('product_product_expense_air'), False, ref('hr.employee1'), None)
-    values = dict([('product_id', ref('product_product_expense_air'))] + res['value'].items())
-    exp_line_obj.write(cr, uid, line_ids, values, None)
--
-  I confirm this expenses by click on "Confirm" button.
--
-  !workflow {model: hr.expense.expense, action: confirm, ref: hr_expense_expense_september0}
-
--
-  I check that state is "Waiting Confirmation".
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    - state == 'confirm'
--
-  I accept this expense by click on "Accept" button.
--
-  !workflow {model: hr.expense.expense, action: validate, ref: hr_expense_expense_september0}
-
--
-  I invoiced this expense by click on "Invoice" button.
--
-  !python {model: hr.expense.expense}: |
-    self.invoice(cr, uid, [ref('hr_expense_expense_september0')], None)
--
-  I check that state is "Invoiced".
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    - state == 'invoiced'
--
-  I check that Invoice is created for the expense.
--
-  !python {model: hr.expense.expense}: |
-    exp = self.browse(cr, uid, [ref('hr_expense_expense_september0')])[0]
-    assert exp.invoice_id, "Invoice should be created"
-
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 8af2392f6e4..a989ea50222 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -397,7 +397,6 @@
                     <field name="max_leaves"/>
                     <field name="leaves_taken"/>
                     <field name="remaining_leaves"/>
-                    <field name="limit"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 940b0f06447..d2e6c27cded 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,7 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,1,1,1
-"access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,1
-"access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,1,1,1
-"access_hr_holydays_status_employee","hr.holidays.status employee","model_hr_holidays_status","base.group_user",1,0,0,0
-"access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,1,1,1
-"access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_holydays_status_user,hr.holidays.status user,model_hr_holidays_status,base.group_hr_user,1,1,1,1
+access_hr_holidays_user,hr.holidays.user,model_hr_holidays,base.group_hr_user,1,1,1,1
+access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_user,1,1,1,1
+access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,0
+access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,base.group_hr_user,1,1,1,1
+access_resource_calendar_leaves_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_manager,1,1,1,1
diff --git a/addons/hr_holidays/static/src/img/icon.png b/addons/hr_holidays/static/src/img/icon.png
new file mode 100644
index 00000000000..d68f245b188
Binary files /dev/null and b/addons/hr_holidays/static/src/img/icon.png differ
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index 4d2afff54c3..24ca631c4d8 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -1,16 +1,11 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,1,1,1
-"access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,1,1,1
-"access_hr_salary_rule_category","hr.salary.rule.category","model_hr_salary_rule_category","base.group_hr_user",1,1,1,1
-"access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,1,1,1
-"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,1,1,1
-"access_hr_payslip_input_user","hr.payslip.input.user","model_hr_payslip_input","base.group_hr_user",1,1,1,1
-"access_hr_payslip_manager","hr.payslip.manager","model_hr_payslip","base.group_hr_manager",1,1,1,1
-"access_hr_payslip_line_manager","hr.payslip.line.manager","model_hr_payslip_line","base.group_hr_manager",1,1,1,1
-"access_hr_payroll_structure_manager","hr.payroll.structure.manager","model_hr_payroll_structure","base.group_hr_manager",1,1,1,1
-"access_hr_payslip_worked_days ","hr.payslip.worked_days","model_hr_payslip_worked_days","base.group_hr_manager",1,1,1,1
-"access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_manager",1,1,1,1
-"access_hr_payslip_run","hr.payslip.run","model_hr_payslip_run","base.group_hr_manager",1,1,1,1
-"access_hr_payslip_input","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1
-"access_hr_rule_input","hr.rule.input","model_hr_rule_input","base.group_hr_manager",1,1,1,1
-"access_hr_salary_rule_user","hr.salary.rule.user","model_hr_salary_rule","base.group_hr_user",1,1,1,1
\ No newline at end of file
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_payroll_structure,hr.payroll.structure,model_hr_payroll_structure,base.group_hr_user,1,1,1,1
+access_hr_contribution_register,hr.contribution.register,model_hr_contribution_register,base.group_hr_user,1,1,1,1
+access_hr_salary_rule_category,hr.salary.rule.category,model_hr_salary_rule_category,base.group_hr_user,1,1,1,1
+access_hr_payslip,hr.payslip,model_hr_payslip,base.group_hr_user,1,1,1,1
+access_hr_payslip_line,hr.payslip.line,model_hr_payslip_line,base.group_hr_user,1,1,1,1
+access_hr_payslip_input_user,hr.payslip.input.user,model_hr_payslip_input,base.group_hr_user,1,1,1,1
+access_hr_payslip_worked_days ,hr.payslip.worked_days,model_hr_payslip_worked_days,base.group_hr_manager,1,1,1,1
+access_hr_payslip_run,hr.payslip.run,model_hr_payslip_run,base.group_hr_manager,1,1,1,1
+access_hr_rule_input,hr.rule.input,model_hr_rule_input,base.group_hr_manager,1,1,1,1
+access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,base.group_hr_user,1,1,1,1
diff --git a/addons/hr_payroll/static/src/img/icon.png b/addons/hr_payroll/static/src/img/icon.png
new file mode 100644
index 00000000000..33279078b37
Binary files /dev/null and b/addons/hr_payroll/static/src/img/icon.png differ
diff --git a/addons/hr_payroll_account/hr_payroll_account_demo.xml b/addons/hr_payroll_account/hr_payroll_account_demo.xml
index 6372dabc723..ed6371a6f4d 100644
--- a/addons/hr_payroll_account/hr_payroll_account_demo.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_demo.xml
@@ -81,7 +81,7 @@
             <field name="name">Bank Current Account</field>
             <field ref="account.cas" name="parent_id"/>
             <field name="type">liquidity</field>
-            <field name="user_type" ref="account.account_type_asset"/>
+            <field name="user_type" ref="account.data_account_type_asset"/>
         </record>
 
         <record id="a_salary_expense" model="account.account">
@@ -89,7 +89,7 @@
             <field name="name">Salary Expenses</field>
             <field ref="account.ovr" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account.account_type_expense"/>
+            <field name="user_type" ref="account.data_account_type_expense"/>
         </record>
 
         <record id="a_creditors" model="account.account">
@@ -98,7 +98,7 @@
             <field ref="account.cli" name="parent_id"/>
             <field name="type">payable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account.account_type_payable"/>
+            <field name="user_type" ref="account.data_account_type_payable"/>
         </record>
 
 
diff --git a/addons/hr_payroll_account/i18n/hr.po b/addons/hr_payroll_account/i18n/hr.po
new file mode 100644
index 00000000000..5b4aeed556b
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/hr.po
@@ -0,0 +1,331 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 17:18+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr "Dnevnik banke"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr "Analitički konto za analize plaće"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr "Period"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr "Zaposlenik"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr "Stavke plaćanja"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr "Obračunski list"
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Pogreška ! Ne možete kreirati rekurzivnu hijerarhiju zaposlenika."
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr "Konto"
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr "Bankovni račun"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr "Redak obračunskog  lista"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:270
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:297
+#: code:addons/hr_payroll_account/hr_payroll_account.py:331
+#: code:addons/hr_payroll_account/hr_payroll_account.py:445
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#: code:addons/hr_payroll_account/hr_payroll_account.py:469
+#: code:addons/hr_payroll_account/hr_payroll_account.py:492
+#, python-format
+msgid "Warning !"
+msgstr "Upozorenje !"
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr "Konto glavne knjige"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "Forsiraj period"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:277
+#: code:addons/hr_payroll_account/hr_payroll_account.py:452
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analitički konto"
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:557
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr "Godina"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:455
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:540
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
+#, python-format
+msgid "Integrity Error !"
+msgstr "Greška integriteta !"
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 637bd45abd1..0ce5ff66c0f 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -56,7 +56,9 @@ system to store and search in your CV base.
     'demo_xml': [
         'hr_recruitment_demo.yml',
     ],
-    'test':['test/test_hr_recruitment.yml'],
+    'test':[
+            'test/recruitment_process.yml',
+            ],
     'installable': True,
     'active': False,
     'certificate' : '001073437025460275621',
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index dbf0930c6bd..c07ec8188b8 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -184,10 +184,6 @@ class hr_applicant(crm.crm_case, osv.osv):
         'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
     }
 
-    def _get_stage(self, cr, uid, context=None):
-        ids = self.pool.get('hr.recruitment.stage').search(cr, uid, [], context=context)
-        return ids and ids[0] or False
-
     _defaults = {
         'active': lambda *a: 1,
         'user_id':  lambda self, cr, uid, context: uid,
@@ -365,10 +361,11 @@ class hr_applicant(crm.crm_case, osv.osv):
         self.write(cr, uid, [res_id], vals, context)
         return res_id
 
-    def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None):
+    def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
         if isinstance(ids, (str, int, long)):
             ids = [ids]
-
+        if vals is None:
+            vals = {}
         msg_from = msg['from']
         vals.update({
             'description': msg['body_text']
@@ -412,14 +409,6 @@ class hr_applicant(crm.crm_case, osv.osv):
         return res
 
     def case_close(self, cr, uid, ids, *args):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
-        """
-        employee_obj = self.pool.get('hr.employee')
         res = super(hr_applicant, self).case_close(cr, uid, ids, *args)
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("Applicant '%s' is being hired.") % name
@@ -427,40 +416,32 @@ class hr_applicant(crm.crm_case, osv.osv):
         return res
 
     def case_close_with_emp(self, cr, uid, ids, *args):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
-        """
-        employee_obj = self.pool.get('hr.employee')
-        partner_obj = self.pool.get('res.partner')
-        address_id = False
-        applicant = self.browse(cr, uid, ids)[0]
-        if applicant.partner_id:
-            address_id = partner_obj.address_get(cr, uid, [applicant.partner_id.id], ['contact'])['contact']
-        if applicant.job_id:
-            self.pool.get('hr.job').write(cr, uid, [applicant.job_id.id], {'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
-            emp_id = employee_obj.create(cr,uid,{'name': applicant.partner_name or applicant.name,
-                                                 'job_id': applicant.job_id.id,
-                                                 'address_home_id': address_id,
-                                                 'department_id': applicant.department_id.id
-                                                 })
-        else:
-            raise osv.except_osv(_('Warning!'),_('You must define Applied Job for Applicant !'))
-        self.case_close(cr, uid, ids, *args)
+        hr_employee = self.pool.get('hr.employee')
+        model_data = self.pool.get('ir.model.data')
+        act_window = self.pool.get('ir.actions.act_window')
+        emp_id = False
+        for applicant in self.browse(cr, uid, ids):
+            address_id = False
+            if applicant.partner_id:
+                address_id = applicant.partner_id.address_get(['contact'])['contact']
+            if applicant.job_id:
+                applicant.job_id.write({'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
+                emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or applicant.name,
+                                                     'job_id': applicant.job_id.id,
+                                                     'address_home_id': address_id,
+                                                     'department_id': applicant.department_id.id
+                                                     })
+                self.case_close(cr, uid, [applicant.id], *args)
+            else:
+                raise osv.except_osv(_('Warning!'),_('You must define Applied Job for Applicant !'))
 
-        mod_obj = self.pool.get('ir.model.data')
-        act = mod_obj.get_object_reference(cr, uid, 'hr', 'open_view_employee_list')
-
-        act_obj = self.pool.get('ir.actions.act_window')
-        act_win = act_obj.read(cr, uid, act[1], [])
-
-        act_win['domain'] = [('id','=',emp_id)]
-        act_win['view_mode'] = 'form,tree'
-        act_win['res_id'] = emp_id
-        return act_win
+        
+        action_model, action_id = model_data.get_object_reference(cr, uid, 'hr', 'open_view_employee_list')
+        dict_act_window = act_window.read(cr, uid, action_id, [])
+        if emp_id:
+            dict_act_window['res_id'] = emp_id
+        dict_act_window['view_mode'] = 'form,tree'
+        return dict_act_window
 
     def case_reset(self, cr, uid, ids, *args):
         """Resets case as draft
diff --git a/addons/hr_recruitment/i18n/hr.po b/addons/hr_recruitment/i18n/hr.po
new file mode 100644
index 00000000000..c9fe54a3d3e
--- /dev/null
+++ b/addons/hr_recruitment/i18n/hr.po
@@ -0,0 +1,957 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 17:21+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr "Preduvjeti"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Cases"
+msgstr "# slučajeva"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+#: field:hr.recruitment.stage,department_id:0
+msgid "Department"
+msgstr "Odjel"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr "Datum slijedeće akcije"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr "Poslovi"
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr "Emailovi posmatrača"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr "Dana za otvaranje"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr "Ciljevi"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,partner_address_id:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Partner"
+msgstr "Kreiraj partnera"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr "Dan"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr "Podatci o ugovoru"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Add Internal Note"
+msgstr "Dodaj internu bilješku"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr "Mobilni"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr "Mlađi razvojni programer"
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Jobs Demand"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Osoba kod partnera"
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:board.board:0
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Previous"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:107
+#: view:hr.applicant:0
+#, python-format
+msgid "Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
+#, python-format
+msgid "A partner is already defined on this job request."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,availability:0
+msgid "Availability (Days)"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act
+msgid ""
+"Define here your stages of the recruitment process, for example: "
+"qualification call, first interview, second interview, refused, hired."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid " > Bac +5"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reset to New"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Meeting"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Applicant Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
+msgid "Refused by Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Licenced"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
+msgid "Schedule Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+msgid "Phone Call Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a partner based on this job request ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
+msgid ""
+"From this menu you can track applicants in the recruitment process and "
+"manage all operations: meetings, interviews, phone calls, etc. If you setup "
+"the email gateway, applicants and their attached CV are created "
+"automatically when an email is sent to jobs@yourcompany.com. If you install "
+"the document management modules, all documents (CV and motivation letters) "
+"are indexed automatically, so that you can easily search through their "
+"content."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
+msgid "Applicant Categories"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
+#, python-format
+msgid "A partner is already existing with the same name."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Current"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.module.module,description:hr_recruitment.module_meta_information
+msgid ""
+"\n"
+"Manages job positions and the recruitement process. It's integrated with "
+"the\n"
+"survey module to allow you to define interview for different jobs.\n"
+"\n"
+"This module is integrated with the mail gateway to automatically tracks "
+"email\n"
+"sent to jobs@YOURCOMPANY.com. It's also integrated with the document "
+"management\n"
+"system to store and search in your CV base.\n"
+"    "
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Details"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:412
+#, python-format
+msgid "Applicant '%s' is being hired."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.section,name:hr_recruitment.section_hr_department
+msgid "HR Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:396
+#, python-format
+msgid "The job request '%s' has been set 'in progress'."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+#: help:hr.recruitment.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+#: field:hr.job,survey_id:0
+msgid "Survey"
+msgstr ""
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 96baaf9e278..6449cc60fda 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -1,13 +1,13 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_applicant_user","hr.applicant.user","model_hr_applicant","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","base.group_hr_manager",1,1,1,1
-"access_hr_recruitment_stage_user","hr.recruitment.stage.user","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","base.group_hr_user",1,1,1,1
-"access_mail_message_user","mail.message.user","mail.model_mail_message","base.group_hr_user",1,1,1,1
-"access_res_partner_hr_user","res.partner.user","base.model_res_partner","base.group_hr_user",1,1,1,1
-"access_res_partner_address_hr_user","res.partner.address.user","base.model_res_partner_address","base.group_hr_user",1,1,1,1
-"access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
-"access_crm_phonecall_hruser","crm.phonecall hruser","crm.model_crm_phonecall","base.group_hr_user",1,1,1,1
-"access_crm_meeting_hruser","crm.meeting.hruser","crm.model_crm_meeting","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_source_hr_officer","hr.recruitment.source","model_hr_recruitment_source","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_source_all","hr.recruitment.source","model_hr_recruitment_source",,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_applicant_user,hr.applicant.user,model_hr_applicant,base.group_hr_user,1,1,1,1
+access_hr_recruitment_report,hr.recruitment.report,model_hr_recruitment_report,base.group_hr_manager,1,1,1,1
+access_hr_recruitment_stage_user,hr.recruitment.stage.user,model_hr_recruitment_stage,base.group_hr_user,1,1,1,1
+access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,base.group_hr_user,1,1,1,1
+access_mail_message_user,mail.message.user,mail.model_mail_message,base.group_hr_user,1,1,1,1
+access_res_partner_hr_user,res.partner.user,base.model_res_partner,base.group_hr_user,1,1,1,1
+access_res_partner_address_hr_user,res.partner.address.user,base.model_res_partner_address,base.group_hr_user,1,1,1,1
+access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,1,0
+access_crm_phonecall_hruser,crm.phonecall hruser,crm.model_crm_phonecall,base.group_hr_user,1,1,1,1
+access_crm_meeting_hruser,crm.meeting.hruser,crm.model_crm_meeting,base.group_hr_user,1,1,1,1
+access_hr_recruitment_source_hr_officer,hr.recruitment.source,model_hr_recruitment_source,base.group_hr_user,1,1,1,1
+access_hr_recruitment_source_all,hr.recruitment.source,model_hr_recruitment_source,,1,0,0,0
diff --git a/addons/hr_recruitment/static/src/img/icon.png b/addons/hr_recruitment/static/src/img/icon.png
new file mode 100644
index 00000000000..288d35e3149
Binary files /dev/null and b/addons/hr_recruitment/static/src/img/icon.png differ
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
new file mode 100644
index 00000000000..c1ef5022209
--- /dev/null
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -0,0 +1,120 @@
+-
+  In Order to test process of Recruitment,
+-
+  Applicant interested in job position. so He send resume by email.
+-
+  !python {model: mail.thread}: |
+    import addons
+    request_file = open(addons.get_module_resource('hr_recruitment','test', 'resume.eml'),'rb')
+    request_message = request_file.read()
+    self.message_process(cr, uid, 'hr.applicant', request_message)
+-
+  After getting the mail, I check details of new applicant.
+-
+  !python {model: hr.applicant}: |
+    applicant_ids = self.search(cr, uid, [('email_from','=', 'Mr. Richard Anderson <Richard_Anderson@yahoo.com>')])
+    assert applicant_ids, "Applicant is not created after getting the mail"
+    applicant = self.browse(cr, uid, applicant_ids[0], context=context)
+    resume_ids = self.pool.get('ir.attachment').search(cr, uid, [('datas_fname','=','resume.doc'),('res_model','=',self._name),('res_id','=',applicant.id)])
+    assert applicant.name == "Application for the post of Jr.application Programmer.", "Subject does not match"
+    assert applicant.state == "draft"
+    assert len(resume_ids), "Resume does not attached."
+-
+  I refuse applicant for the Recruitment.
+-
+  !python {model: hr.applicant}: |
+    self.case_close(cr, uid, [ref("hr_case_programmer")])
+-
+  I open applicant for the Recruitment. 
+-
+  !python {model: hr.applicant}: |
+    self.case_reset(cr, uid, [ref("hr_case_programmer")])
+    self.case_open(cr, uid, [ref("hr_case_programmer")])
+-
+  I assign the Job position to the applicant
+-
+  !python {model: hr.applicant}: |
+    self.write(cr, uid, [ref('hr_case_programmer')], {'job_id':ref('hr.job_jr_appli')})
+-
+  I start communication with applicant, first schedule phonecall.
+-
+  !python {model: hr.recruitment.job2phonecall}: |
+     context.update({'active_model': 'hr.applicant', 'active_id': ref("hr_case_programmer"), 'active_ids': [ref("hr_case_programmer")], 'survey_id': ref("survey_job_0")})
+     id = self.create(cr, uid, {}, context=context)
+     self.make_phonecall(cr, uid, [id], context=context)
+-
+  I schedule meeting with applicant for interview.
+-
+  !python {model: hr.applicant}: |
+     self.action_makeMeeting(cr, uid, [ref('hr_case_programmer')])
+-
+  I check Initial Qualification of applicant.
+-
+  !python {model: hr.applicant}: |
+     self.stage_next(cr, uid, [ref('hr_case_programmer')])
+-
+  I schedule First Interview of applicant.
+-
+  !python {model: hr.applicant}: |
+     self.stage_next(cr, uid, [ref('hr_case_programmer')])
+-
+  On a successful First Interview of applicant, I schedule Second Interview.
+-
+  !python {model: hr.applicant}: |
+     self.stage_next(cr, uid, [ref('hr_case_programmer')])
+-
+  Applicant fillup the answer of the interview quetion.
+-
+  !python {model: survey.question.wiz}: |
+    ctx = context.copy()
+    ctx.update({'active_model': 'hr.applicant', 'active_id': ref("hr_case_programmer"), 'active_ids': [ref("hr_case_programmer")], 'survey_id': ref("survey_job_0")})
+    self.fields_view_get(cr, uid, ref("survey.view_survey_question_message"),"form", context=ctx)
+    vals = self.default_get(cr, uid , [], context=ctx)
+    self.create(cr, uid, vals, context=ctx)
+    self.action_new_page(cr, uid, [ref("survey_job_0")], context=ctx)
+-
+  I print Applicant fill up the interview quetion
+-
+  !python {model: hr.applicant}: |
+    self.action_print_survey(cr, uid, [ref('hr_case_programmer')])
+-
+  On a successful Second Interview of applicant Contract is Proposed to applicant.
+-
+  !python {model: hr.applicant}: |
+     self.stage_next(cr, uid, [ref('hr_case_programmer')])
+     self.stage_previous(cr, uid, [ref('hr_case_programmer')])
+-
+  I Hired Applicant.
+-
+  !python {model: hr.applicant}: |
+     self.case_close_with_emp(cr, uid, [ref('hr_case_programmer')])
+-
+  I check that applicant is "Hired".
+-
+  !assert {model: hr.applicant, id: hr_case_programmer}:
+    - state == 'done'
+-
+  I do not give employment to the hired the applicant.
+-
+  !python {model: hired.employee}: |
+    context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
+    emp_id = self.create(cr, uid, {}, context=context)
+    self.case_close(cr, uid, [emp_id], context=context)
+-
+  Now I give employment to hired applicant .
+-
+  !python {model: hr.applicant}: |
+     hired_emp_obj = self.pool.get('hired.employee')
+     self.case_reset(cr, uid, [ref("hr_case_programmer")])
+     self.case_open(cr, uid, [ref("hr_case_programmer")])
+     context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
+     emp_hr_id = hired_emp_obj.create(cr, uid, {}, context=context)
+     hired_emp_obj.case_close_with_emp(cr, uid, [emp_hr_id], context=context)
+-
+  Now hired employee want to be a partner of company.
+-
+  !record {model: hr.recruitment.partner.create, id: hr_recruitment_partner_id1 }:
+-
+  !python {model: hr.recruitment.partner.create}: |
+    context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
+    self.make_order(cr, uid, [ref("hr_recruitment_partner_id1")], context=context)
diff --git a/addons/hr_recruitment/test/resume.eml b/addons/hr_recruitment/test/resume.eml
new file mode 100644
index 00000000000..00cc5620563
--- /dev/null
+++ b/addons/hr_recruitment/test/resume.eml
@@ -0,0 +1,839 @@
+Return-Path: <Richard_Anderson@yahoo.com>
+X-Original-To: hr@mycompany.com
+Delivered-To: hr@mycompany.com
+Received: by mail1.mycompany.com (Postfix, from userid 10002)
+	id 7047CBFC94; Fri, 18 Nov 2011 10:28:16 +0100 (CET)
+X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail1.mycompany.com
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
+	HTML_MESSAGE autolearn=ham version=3.3.1
+Received: from nm12-vm2.bullet.mail.ne1.yahoo.com (nm12-vm2.bullet.mail.ne1.yahoo.com [98.138.91.88])
+	by mail1.mycompany.com (Postfix) with SMTP id 0D04ABF53A
+	for <hr@mycompany.com>; Fri, 18 Nov 2011 10:27:50 +0100 (CET)
+Received: from [98.138.90.50] by nm12.bullet.mail.ne1.yahoo.com with NNFMP; 18 Nov 2011 09:26:49 -0000
+Received: from [98.138.226.126] by tm3.bullet.mail.ne1.yahoo.com with NNFMP; 18 Nov 2011 09:26:49 -0000
+Received: from [127.0.0.1] by smtp205.mail.ne1.yahoo.com with NNFMP; 18 Nov 2011 09:26:49 -0000
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.in; s=s1024; t=1321608409; bh=GGVn24b6ZH8Ojn91evBkrwuNFmAsLAPy4OeUvOqjgig=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type; b=DFCOdjskDmdbkzvuxTqFWJOUHsT0nITWiQe5782VeyTrhymhIzNhwzdRq4wfTrzLu03rJhHadZTX0uweNCf0Jpr4OpEQevZa3aVPw44NNmhFeT2tjs9m3kNWyPnz5Nk1Yv8tiTRFSdssPfZAhwz8UXLCBFowa8DRnY2ZFIsATRE=
+X-Yahoo-Newman-Id: 644435.12111.bm@smtp205.mail.ne1.yahoo.com
+X-Yahoo-Newman-Property: ymail-3
+X-YMail-OSG: 09Al2uQVM1n5JcQepgua6wQsww7jiatAHXaSsMjP5Qvk9Ba
+ c65j0.ETzyjVh0vpjphFK3XqPtX0n17z9cUCfUhUDDXLUmUSFoZ.NjoiJ_mQ
+ vwd4S7.I4ObFZm5jgA0ML0cfTRAy_0msUfO3NKsh9LgBdUXztbVOwrTGQhzD
+ nu2v3TskGG9ZtRTiqM_Iad2qmMqveFdqUz5xBnwYYgBuLWRR7EUmU1qyOgss
+ LL33J2t9EOCUn2Kc9XQbSkPBBR7BYlIatTF.AAxLdsuOW6ovTGO.HM5ap0qo
+ LLM1_BE.EOvXdW38ZC_hHcrM4xYaYSR7c0WaOQsR8EZeXk_Vhio7HHUrdxZl
+ 1oZz7YWK9Q04M023JJoM4v6IrThy3BNepluEFFcavkyOnCw--
+X-Yahoo-SMTP: oNtzSBqswBAqJIGYOgyGesyleENrhUEtEgBkQ053
+Received: from [192.168.1.30] (test@180.211.100.2 with plain)
+        by smtp205.mail.ne1.yahoo.com with SMTP; 18 Nov 2011 01:26:47 -0800 PST
+Message-ID: <4EC624C7.6020000@yahoo.in>
+Date: Fri, 18 Nov 2011 14:56:31 +0530
+From: Mr. Richard Anderson <Richard_Anderson@yahoo.com>
+User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110424 Thunderbird/3.1.10
+MIME-Version: 1.0
+To: hr@mycompany.com
+Subject: Application for the post of Jr.application Programmer.
+Content-Type: multipart/mixed;
+ boundary="------------010903010402010104090709"
+
+This is a multi-part message in MIME format.
+--------------010903010402010104090709
+Content-Type: multipart/alternative;
+ boundary="------------010004020303010906010104"
+
+
+--------------010004020303010906010104
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+Content-Transfer-Encoding: 7bit
+
+Hello Sir,
+
+  I am**Richard Anderson completed MCA from Mac Technological 
+university, i send my resume for the your company job position, i 
+attached my resume here
+
+Thank you
+Richard Anderson
+
+--------------010004020303010906010104
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+
+    <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+  </head>
+  <body text="#000000" bgcolor="#ffffff">
+    Hello Sir,<br>
+    <br>
+    &nbsp;I am<b> </b>Richard Anderson completed MCA from Mac Technological
+    university, i send my resume for the your company job position, i
+    attached my resume here<br>
+    <br>
+    Thank you<br>
+    Richard Anderson
+  </body>
+</html>
+
+--------------010004020303010906010104--
+
+--------------010903010402010104090709
+Content-Type: application/msword;
+ name="resume.doc"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment;
+ filename="resume.doc"
+
+0M8R4KGxGuEAAAAAAAAAAAAAAAAAAAAAOwADAP7/CQAGAAAAAAAAAAAAAAABAAAASwAAAAAA
+AAAAEAAAAgAAAAEAAAD+////AAAAAAAAAAD/////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+///////////////////////////////////9//////////7///9KAAAABQAAAAYAAAAHAAAA
+CAAAAAkAAAAKAAAACwAAAAwAAAANAAAADgAAAA8AAAAQAAAAEQAAABIAAAATAAAAFAAAABUA
+AAD+////FwAAABgAAAAZAAAAGgAAABsAAAAcAAAAHQAAAB4AAAAfAAAAIAAAACEAAAAiAAAA
+IwAAACQAAAAlAAAAJgAAACcAAAAoAAAA/v///yoAAAArAAAALAAAAC0AAAAuAAAALwAAADAA
+AAAxAAAAMgAAADMAAAA0AAAANQAAADYAAAA3AAAAOAAAADkAAAA6AAAAOwAAADwAAAA9AAAA
+PgAAAD8AAABAAAAAQQAAAEIAAABDAAAARAAAAEUAAABGAAAARwAAAEgAAABJAAAA/v////7/
+//9MAAAATQAAAP7/////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////1IA
+bwBvAHQAIABFAG4AdAByAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAWAAUA////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAA/v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////8AAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
+/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7///8AAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAA////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAA/v///wAAAAAAAAAAAQAAAP7////+////BAAAAAUAAAAGAAAABwAAAP7/
+//8JAAAA/v//////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////8BAP7/
+AwoAAP////8GCQIAAAAAAMAAAAAAAABGGAAAAE1pY3Jvc29mdCBXb3JkLURva3VtZW50AAoA
+AABNU1dvcmREb2MAEAAAAFdvcmQuRG9jdW1lbnQuOAD0ObJxAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAEAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/wAAAQACAAAAAAAAAAAAAAAAAAAAAAABAAAA
+4IWf8vlPaBCrkQgAKyez2TAAAADsAAAACgAAAAEAAABYAAAAAgAAAGAAAAAEAAAAeAAAAAcA
+AACUAAAACAAAAKQAAAAJAAAAsAAAAAoAAAC8AAAACwAAAMgAAAAMAAAA1AAAAA0AAADgAAAA
+AgAAAOn9AAAeAAAAEAAAAENhbmRpZGF0ZXMgTmFtZQAeAAAAFAAAAHNhZ2FyIHAgc3VyeWF3
+YW5zaGkAHgAAAAcAAABOb3JtYWwAAB4AAAAEAAAAc2FpAB4AAAAEAAAAMTY5AEAAAAAAyPid
+CgAAAEAAAAAAAAAAAAAAAEAAAAAAnpj/jovLAUAAAAAA1LJ/lhzMAQAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAABIAZwAKAAEAWwAPAAIAAAAAAAAAYAAAEPH/AgBgAAAA
+BgBOAG8AcgBtAGEAbAAAABEAAAADJABhJAAxJAEqJAFBJAAALwBCKgBPSgAAUUoAAENKFABt
+SAkEc0gJBFBKAABuSAQIXkoAAGFKFABfSAEEdEgBBABcAAEQAQACAFwAAAAJAEgAZQBhAGQA
+aQBuAGcAIAAxAAAAJwABAAMkA2EkAw3GBQABOAQAXoQAAF2EoAVghAAAE6RkABSkZAAGJAEA
+DwBPSgIAUUoCAENKEgA1CAEAPgACEAEAAgA+AAAACQBIAGUAYQBkAGkAbgBnACAAMgAAAA0A
+AgATpGQAFKRkAAYkAQAMAE9KAgBRSgIAQ0oSADoAAxABAAIAOgAAAAkASABlAGEAZABpAG4A
+ZwAgADMAAAAFAAMABiQBAA8AT0oCAFFKAgBDShIANQgBAFYABBABAAIAVgAAAAkASABlAGEA
+ZABpAG4AZwAgADQAAAAfAAQAEmRoAQEADcYFAAFoAQBehGgBXYQAAGCEmP4GJAEAEgBPSgIA
+UUoCAENKEgA1CAFcCAEyAAUQAQBiBTIAAAAJAEgAZQBhAGQAaQBuAGcAIAA1AAAACgAFABOk
+ZAAUpGQAAwA1CAEAUAAGEAEAAgBQAAAACQBIAGUAYQBkAGkAbgBnACAANgAAABkABgANxgUA
+ATgEAF6EAABdhKAFYIQAAAYkAQASAE9KAgBRSgIAQ0oSAD4qAVwIAWAABxABAAIAYAAAAAkA
+SABlAGEAZABpAG4AZwAgADcAAAAwAAcAQCYGCiYGC0YBAAomBgtGAQAxJAANxgUAARwBADck
+AF6EHAFdhAAAYITk/gYkAQwAT0oCAFFKAgBDShIASAAIEAEAAgBIAAAACQBIAGUAYQBkAGkA
+bgBnACAAOAAAABcACAAxJAA3JABehBwBXYQAAGCE5P4GJAEADABPSgIAUUoCAENKEgAAAEIA
+QUDy/6EAQgAAABkAQQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYA
+dABhAHIAdAAAAAAAAAAAAAAAAABCAP4f8v/xAEIAAAAZAEEAYgBzAGEAdAB6AC0AUwB0AGEA
+bgBkAGEAcgBkAHMAYwBoAHIAaQBmAHQAYQByAHQAAAAAAEgA/h/y/wEBSAAAABwAVwBXAC0A
+QQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYAdABhAHIAdAAAAAAA
+SgD+H/L/EQFKAAAAHQBXAFcALQBBAGIAcwBhAHQAegAtAFMAdABhAG4AZABhAHIAZABzAGMA
+aAByAGkAZgB0AGEAcgB0ADEAAAAAAEwA/h/y/yEBTAAAAB4AVwBXAC0AQQBiAHMAYQB0AHoA
+LQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYAdABhAHIAdAAxADEAAAAAAE4A/h/y/zEB
+TgAAAB8AVwBXAC0AQQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYA
+dABhAHIAdAAxADEAMQAAAAAAUAD+H/L/QQFQAAAAIABXAFcALQBBAGIAcwBhAHQAegAtAFMA
+dABhAG4AZABhAHIAZABzAGMAaAByAGkAZgB0AGEAcgB0ADEAMQAxADEAAAAAAFIA/h/y/1EB
+UgAAACEAVwBXAC0AQQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYA
+dABhAHIAdAAxADEAMQAxADEAAAAAAFQA/h/y/2EBVAAAACIAVwBXAC0AQQBiAHMAYQB0AHoA
+LQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYAdABhAHIAdAAxADEAMQAxADEAMQAAAAAA
+KgD+H/L/cQEqAAAACQBXAFcAOABOAHUAbQAyAHoAMAAAAAgAT0oBAFFKAQAuAP4f8v+BAS4A
+AAAJAFcAVwA4AE4AdQBtADIAegAxAAAADABPSgcAUUoHAF5KBwAqAP4f8v+RASoAAAAJAFcA
+VwA4AE4AdQBtADIAegAzAAAACABPSgEAUUoBADYA/h/y/6EBNgAAAAkAVwBXADgATgB1AG0A
+MwB6ADAAAAATAE9KAABRSgAANQgBUEoAAF5KAAAAKgD+H/L/sQEqAAAACQBXAFcAOABOAHUA
+bQAzAHoAMQAAAAgAT0oHAFFKBwAqAP4f8v/BASoAAAAJAFcAVwA4AE4AdQBtADMAegAyAAAA
+CABPSggAUUoIACoA/h/y/9EBKgAAAAkAVwBXADgATgB1AG0ANAB6ADAAAAAIAE9KCABRSggA
+LgD+H/L/4QEuAAAACQBXAFcAOABOAHUAbQA0AHoAMQAAAAwAT0oHAFFKBwBeSgcAKgD+H/L/
+8QEqAAAACQBXAFcAOABOAHUAbQA0AHoAMwAAAAgAT0oBAFFKAQA8AP4f8v8BAjwAAAAWAEQA
+ZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAAAAAACoA/h/y/xEC
+KgAAAAkAVwBXADgATgB1AG0AMQB6ADAAAAAIAE9KAABRSgAAKgD+H/L/IQIqAAAACQBXAFcA
+OABOAHUAbQAzAHoAMwAAAAgAT0oBAFFKAQAqAP4f8v8xAioAAAAJAFcAVwA4AE4AdQBtADUA
+egAwAAAACABPSgEAUUoBACoA/h/y/0ECKgAAAAkAVwBXADgATgB1AG0ANQB6ADEAAAAIAE9K
+BwBRSgcAKgD+H/L/UQIqAAAACQBXAFcAOABOAHUAbQA1AHoAMgAAAAgAT0oIAFFKCAAqAP4f
+8v9hAioAAAAJAFcAVwA4AE4AdQBtADcAegAwAAAACABPSgEAUUoBADwA/h/y/3ECPAAAAAkA
+VwBXADgATgB1AG0AOAB6ADAAAAAZAEIqBnBo/wAAAE9KCABRSggAUEoAAF5KAAAALgD+H/L/
+gQIuAAAACQBXAFcAOABOAHUAbQA4AHoAMQAAAAwAT0oHAFFKBwBeSgcAKgD+H/L/kQIqAAAA
+CQBXAFcAOABOAHUAbQA4AHoAMgAAAAgAT0oIAFFKCAAqAP4f8v+hAioAAAAJAFcAVwA4AE4A
+dQBtADgAegAzAAAACABPSgEAUUoBACoA/h/y/7ECKgAAAAkAVwBXADgATgB1AG0AOQB6ADAA
+AAAIAE9KAQBRSgEALAD+H/L/wQIsAAAACgBXAFcAOABOAHUAbQAxADAAegAwAAAACABPSgEA
+UUoBACwA/h/y/9ECLAAAAAoAVwBXADgATgB1AG0AMQAxAHoAMAAAAAgAT0oBAFFKAQAsAP4f
+8v/hAiwAAAAKAFcAVwA4AE4AdQBtADEAMgB6ADAAAAAIAE9KAQBRSgEALAD+H/L/8QIsAAAA
+CgBXAFcAOABOAHUAbQAxADIAegAxAAAACABPSgcAUUoHACwA/h/y/wEDLAAAAAoAVwBXADgA
+TgB1AG0AMQAyAHoAMgAAAAgAT0oIAFFKCAA2AP4f8v8RAzYAAAAKAFcAVwA4AE4AdQBtADEA
+MwB6ADAAAAARAEIqBnBo/wAAAE9KAQBRSgEAADAA/h/y/yEDMAAAAAoAVwBXADgATgB1AG0A
+MQAzAHoAMQAAAAwAT0oHAFFKBwBeSgcALAD+H/L/MQMsAAAACgBXAFcAOABOAHUAbQAxADMA
+egAyAAAACABPSggAUUoIACwA/h/y/0EDLAAAAAoAVwBXADgATgB1AG0AMQAzAHoAMwAAAAgA
+T0oBAFFKAQA+AP4f8v9RAz4AAAAKAFcAVwA4AE4AdQBtADEANAB6ADAAAAAZAEIqBnBo/wAA
+AE9KCABRSggAUEoAAF5KAAAAMAD+H/L/YQMwAAAACgBXAFcAOABOAHUAbQAxADQAegAxAAAA
+DABPSgcAUUoHAF5KBwAsAP4f8v9xAywAAAAKAFcAVwA4AE4AdQBtADEANAB6ADIAAAAIAE9K
+CABRSggALAD+H/L/gQMsAAAACgBXAFcAOABOAHUAbQAxADQAegAzAAAACABPSgEAUUoBACwA
+/h/y/5EDLAAAAAoAVwBXADgATgB1AG0AMQA2AHoAMAAAAAgAT0oBAFFKAQAwAP4f8v+hAzAA
+AAAKAFcAVwA4AE4AdQBtADEANgB6ADEAAAAMAE9KBwBRSgcAXkoHACwA/h/y/7EDLAAAAAoA
+VwBXADgATgB1AG0AMQA2AHoAMgAAAAgAT0oIAFFKCAAsAP4f8v/BAywAAAAKAFcAVwA4AE4A
+dQBtADEAOAB6ADAAAAAIAE9KAQBRSgEALAD+H/L/0QMsAAAACgBXAFcAOABOAHUAbQAxADkA
+egAwAAAACABPSgEAUUoBACwA/h/y/+EDLAAAAAoAVwBXADgATgB1AG0AMgAwAHoAMAAAAAgA
+T0oAAFFKAAAsAP4f8v/xAywAAAAKAFcAVwA4AE4AdQBtADIAMgB6ADAAAAAIAE9KAQBRSgEA
+LAD+H/L/AQQsAAAACgBXAFcAOABOAHUAbQAyADIAegAxAAAACABPSgcAUUoHACwA/h/y/xEE
+LAAAAAoAVwBXADgATgB1AG0AMgAyAHoAMgAAAAgAT0oIAFFKCAAsAP4f8v8hBCwAAAAKAFcA
+VwA4AE4AdQBtADIAMwB6ADAAAAAIAE9KAQBRSgEALAD+H/L/MQQsAAAACgBXAFcAOABOAHUA
+bQAyADQAegAwAAAACABPSgEAUUoBACwA/h/y/0EELAAAAAoAVwBXADgATgB1AG0AMgA0AHoA
+MQAAAAgAT0oHAFFKBwAsAP4f8v9RBCwAAAAKAFcAVwA4AE4AdQBtADIANAB6ADIAAAAIAE9K
+CABRSggALAD+H/L/YQQsAAAACgBXAFcAOABOAHUAbQAyADYAegAwAAAACABPSgEAUUoBADAA
+/h/y/3EEMAAAAAoAVwBXADgATgB1AG0AMgA2AHoAMQAAAAwAT0oIAFFKCABDShAALAD+H/L/
+gQQsAAAACgBXAFcAOABOAHUAbQAyADYAegAyAAAACABPSggAUUoIACwA/h/y/5EELAAAAAoA
+VwBXADgATgB1AG0AMgA2AHoANAAAAAgAT0oHAFFKBwA0AP4f8v+hBDQAAAAKAFcAVwA4AE4A
+dQBtADIANwB6ADAAAAAQAE9KAQBRSgEAUEoAAF5KAgAsAP4f8v+xBCwAAAAKAFcAVwA4AE4A
+dQBtADIANwB6ADEAAAAIAE9KBwBRSgcALAD+H/L/wQQsAAAACgBXAFcAOABOAHUAbQAyADcA
+egAyAAAACABPSggAUUoIACwA/h/y/9EELAAAAAoAVwBXADgATgB1AG0AMgA3AHoAMwAAAAgA
+T0oBAFFKAQAsAP4f8v/hBCwAAAAKAFcAVwA4AE4AdQBtADIAOAB6ADAAAAAIAE9KAQBRSgEA
+QgD+H/L/8QRCAAAAGQBXAFcALQBEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgA
+IABGAG8AbgB0AAAAAAA0AFcQ8v8BBTQAAAAPAFMAdAByAG8AbgBnACAARQBtAHAAaABhAHMA
+aQBzAAAABgA1CAFcCAEmAFgQ8v8RBSYAAAAIAEUAbQBwAGgAYQBzAGkAcwAAAAYANggBXQgB
+NgBVEPL/IQU2AAAADQBJAG4AdABlAHIAbgBlAHQAIABMAGkAbgBrAAAADABCKgJwaAAA/wA+
+KgFGAFYQ8v8xBUYAAAAVAFYAaQBzAGkAdABlAGQAIABJAG4AdABlAHIAbgBlAHQAIABMAGkA
+bgBrAAAADABCKgxwaIAAgAA+KgFCAP4fAgJBBUIAAAAKACAAQwBoAGEAcgAgAEMAaABhAHIA
+AAAeAENKGABtSAkEc0gJBDUIAWFKGABfSAEEdEgBBFwIAUYA/h8BAGIFRgAAAAcASABlAGEA
+ZABpAG4AZwAAAA0AVQATpPAAFKR4AAYkAQAYAE9KCQBRSgkAQ0ocAFBKCgBeSgoAYUocADIA
+QhABAGIFMgAAAAkAVABlAHgAdAAgAGIAbwBkAHkAAAAKAFYAE6RkABSkZAAEAENKGAAcAC8Q
+YQVyBRwAAAAEAEwAaQBzAHQAAAACAFcAAAA8AP4fAQCCBTwAAAAHAEMAYQBwAHQAaQBvAG4A
+AAANAFgAE6R4ABSkeAAMJAEADgBDShgANggBYUoYAF0IASIA/h8BAJIFIgAAAAUASQBuAGQA
+ZQB4AAAABQBZAAwkAQAAADgA/h8BAKIFOAAAAAwATgBvAHIAbQBhAGwAIAAoAFcAZQBiACkA
+AAAKAFoAE6RkABSkZAAEAENKGAA2AP4fAQCyBTYAAAALAEIAbwBkAHkAIABUAGUAeAB0ACAA
+MwAAAAoAWwATpGQAFKRkAAQAQ0oYAHwA/h8BAMIFfAAAABEASABUAE0ATAAgAFAAcgBlAGYA
+bwByAG0AYQB0AHQAZQBkAAAANwBcAA3GMgAQlAMoB7wKUA7kEXgVDBmgHDQgyCNcJ/AqhC4Y
+Mqw1QDkAAAAAAAAAAAAAAAAAAAAAABAAT0oHAFFKBwBQSgcAXkoHAEAAQxABANIFQAAAABAA
+VABlAHgAdAAgAGIAbwBkAHkAIABpAG4AZABlAG4AdAAAAA4AXQBehNACXYQAAGCEAAAAADgA
+ShABAGIFOAAAAAgAUwB1AGIAdABpAHQAbABlAAAACABeAAMkAmEkAg4AQ0oYADUIAWFKGABc
+CAE4AP4fAQDyBTgAAAAIAGMAbwBtAHAAbwBzAGUAZgAAAAoAXwATpGQAFKRkAAwAT0oHAFFK
+BwBQSgsASgD+HwEAAgZKAAAADABIAFQATQBMACAAQQBkAGQAcgBlAHMAcwAAAAIAYAAeAE9K
+CwBRSgsAQ0oYADYIAVBKCwBeSgsAYUoYAF0IAS4AIBABABIGLgAAAAYARgBvAG8AdABlAHIA
+AAAQAGEAMSQADcYIAALgEMAhAQIAADoA/h8BACIGOgAAAAsAQgBvAGQAeQAgAFQAZQB4AHQA
+IAAyAAAAAgBiABAAT0oCAFFKAgBDShIAXkoCACwAHxABADIGLAAAAAYASABlAGEAZABlAHIA
+AAANAGMADcYIAALgEMAhAQIAAAAwAP4fYQVCBjAAAAAOAEYAcgBhAG0AZQAgAGMAbwBuAHQA
+ZQBuAHQAcwAAAAIAZAAAADQA/h8BAFIGNAAAAA4AVABhAGIAbABlACAAQwBvAG4AdABlAG4A
+dABzAAAABQBlAAwkAQAAAD4A/h9RBmIGPgAAAA0AVABhAGIAbABlACAASABlAGEAZABpAG4A
+ZwAAAAsAZgADJAFhJAEMJAEABgA1CAFcCAEAAAAADAEAAA0BAAABAAAAAAAAAAAA/////wIE
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAQAADQEAAAAAAAAACAAAAAAAAAAA
+AACABgAABAAAQAAAAAD/////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAIAADCCwAARg8AAOASAAD+FAAACwAAAAwAAAANAAAADgAAAAAI
+AABQDAAAkgwAAP4MAABoDQAA1A0AAEIOAACuDgAAGA8AACIPAAAsDwAANg8AAEAPAAD2EAAA
+ahMAAO4TAACAFAAAABUAAA8AAAAQAAAAEQAAABIAAAATAAAAFAAAABUAAAAWAAAAFwAAABgA
+AAAZAAAAGgAAABsAAAAcAAAAHQAAAB4AAAAfAAAADwAA8GwAAAAAAAbwGAAAAAYEAAACAAAA
+BQAAAAEAAAABAAAABgAAAB8AAfAsAAAAYgAH8CQAAAAGBiP0F3wAAAAANiQDkRECABAAAGoB
+AAABAAAAMkAAAAAAAABAAB7xEAAAAAQAAAgBAAAIAgAACPcAABAADwAC8BwDAAAQAAjwCAAA
+AAUAAAAFBAAADwAD8K4CAAAPAATwKAAAAAEACfAQAAAAAAAAAAAAAAABgP//AYD//wIACvAI
+AAAAAAQAAAUAAAAPAATwqgAAAKIMCvAIAAAAAgQAAAAKAADTAAvwTgAAAIAAAAABAIEAAAAA
+AIIAAAAAAIMAAAAAAIQAAAAAAIgAAAAAAIEB////AIIBAAAAAIMBAAAAAL8BEAAQAP8BAAAI
+AIQDAAAAAIYDfL4BAEMAIvEYAAAAjwMAAAAAkAMAAAAAkQMAAAAAkgMCAAAAAAAQ8AQAAAAA
+AAAAAAAR8AQAAAABAAAAAAAN8AQAAAAAAAEADwAE8G4AAABCAQrwCAAAAAMEAAAACgAAkwAL
+8DYAAABEAQQAAAB/AQEQAAC/AQAAEADAAQAAAADCAf///wDLATBXAADWAQEAAAD/AQgACAA/
+AgAAAgBDACLxGAAAAI8DAAAAAJADAgAAAJEDAAAAAJIDAgAAAA8ABPBuAAAAQgEK8AgAAAAE
+BAAAAAoAAJMAC/A2AAAARAEEAAAAfwEBEAAAvwEAABAAwAEAAAAAwgH///8AywEwVwAA1gEB
+AAAA/wEIAAgAPwIAAAIAQwAi8RgAAACPAwAAAACQAwIAAACRAwAAAACSAwIAAAAPAATw2AAA
+ALIECvAIAAAABQQAAAAKAADzAAvwiAAAAIEAAAAAAIIAAAAAAIMAAAAAAIQAAAAAAARBAQAA
+AAYBAAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8BAAAIAIODLgAAAIQD98ABAIYD98AB
+AL8DIAAgAAUABQAIAIkGAACvDgAAiQYAAOM6AADCPgAA4zoAANVCAACvDgAAiQYAAK8OAABD
+ACLxGAAAAI8DAAAAAJADAgAAAJEDAAAAAJIDAgAAAAAAEPAEAAAAAAAAAAAAEfAEAAAAAQAA
+AA8ABPBOAAAAEgAK8AgAAAABBAAAAA4AAHMAC/AqAAAAgQH///8AgwEAAAAAvwEQABAAwAEB
+AAAIywEAAAAA/wEIAAgAAQICAAAIAAAR8AQAAAABAAAAHAAAAGwAAADcAQAAQQIAAIAGAAAE
+BAAAAAAAAAYAAACsJgAABgAAAHQAAAAAAAMEAAAAAAAAmgAAAKwmAACaAAAAdAAAAAAAAgQA
+AI////9iAAAAOCYAABkHAABUBgAAAAAFBAAAbAAAAPf///+dAQAAKAEAAJRAAAAAAP//AQAA
+AA8AXwBQAGkAYwB0AHUAcgBlAEIAdQBsAGwAZQB0AHMAcAUAAH8GAAAAAAAAcQUAAH8GAAAB
+AAEAAAABAAAA/w//D/8P/w//D/8P/w//D/8PAAACAAAAAQABAAAAAAAAAAAAAAAAAAAAAAAA
+EAAAXoTQAmCEMP0VxgUAAdACBgIAAAApAAEAAAD/AAAAAAAAAAAAAAIAAAAAAAAAAAAQAABe
+hEACYITA/RXGBQABAAAGAAABAAAA/wAAAAAAAAAAAAACAAAAAAAAAAAAEAAAXoTQAmCEMP0V
+xgUAAQAABgAAAQAAAP8AAAAAAAAAAAAAAgAAAAAAAAAAABAAAF6EYANghKD8FcYFAAEAAAYA
+AAEAAAD/AAAAAAAAAAAAAAIAAAAAAAAAAAAQAABehPADYIQQ/BXGBQABAAAGAAABAAAA/wAA
+AAAAAAAAAAACAAAAAAAAAAAAEAAAXoSABGCEgPsVxgUAAQAABgAAAQAAAAAAAQAAAAAAAAAA
+AAAAAAAAAAAAABAAAF6EQAtghJj+FcYFAAFACwYCAAYALgABAAAA/wAAAAAAAAAAAAACAAAA
+AAAAAAAAEAAAXoSgBWCEYPoVxgUAAQAABgAAAQAAAP8AAAAAAAAAAAAAAgAAAAAAAAAAABAA
+AF6EMAZghND5FcYFAAEAAAYAAAEAAAABAAAAAAAAAAAAAAAAAAAA////////AQAAAAAA/0AA
+AAAAgAYAAAAAAAACEAAAAAAAAACABgAAUAAACAAAAAAMAAAARxaQAQAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuAAAA
+NRaQAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFMAeQBtAGIAbwBsAAAA
+MyaQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEEAcgBpAGEAbAAAAEcW
+kAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABUAGkAbQBlAHMAIABOAGUA
+dwAgAFIAbwBtAGEAbgAAADUmkAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABUAGEAaABvAG0AYQAAAD8WkAECAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABXAGkAbgBnAGQAaQBuAGcAcwAgADIAAAA3JpABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAVgBlAHIAZABhAG4AYQAAAD80kAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABDAG8AdQByAGkAZQByACAATgBlAHcAAAA7BpABAgAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwBpAG4AZwBkAGkAbgBnAHMAAABTJpABgBAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATABpAGIAZQByAGEAdABpAG8AbgAgAFMA
+YQBuAHMAAABBAHIAaQBhAGwAAAA/BpABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAARABlAGoAYQBWAHUAIABTAGEAbgBzAAAASSaQAYAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAEEAcgBpAGEAbAAgAFUAbgBpAGMAbwBkAGUAIABNAFMAAABCAAQA
+AQiNGAAA0AIAAGgBAAAAAHPC62bU3fWmAAAAAAEAAAAAAMkAAAASBgAAAgA/AAAABACDkD8A
+AADJAAAAEgYAAAIAPwAAAD8AAAAAAAAAJwMA8BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAIAAAAAAAAAAAAAAAAAAPAQAN/f//0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+gAAAAAAAAAAAAAAA//8SAAAAAAAAAA8AQwBhAG4AZABpAGQAYQB0AGUAcwAgAE4AYQBtAGUA
+AAAAAAAAEwBzAGEAZwBhAHIAIABwACAAcwB1AHIAeQBhAHcAYQBuAHMAaABpAAMAcwBhAGkA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAJ4EAABEAGQA7gAjAQAAAAAAAAAAAAAAAAAAAACHAKUA6APoAwAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAADwAE8GYAAACyBArwCAAAAAEEAAAACgAAswAL8EIAAACBAAAA
+AACCAAAAAACDAAAAAACEAAAAAAAEQQEAAAAGAQAAAAA/AQAAAACBAf///wCDAQAAAAC/ARAA
+EAD/AQAACAAAABDwBAAAAAAAAIBiAAfw5AMAAAYGnRZ3tgAAAAB7OGUgEgIAEAAAwAMAAAEA
+AAAAAAAAAAAAAABuHvC4AwAAnRZ3tgAAAAB7OGUgEgIAEP+JUE5HDQoaCgAAAA1JSERSAAAA
+CQAAAAsIAwAAAJqHVykAAAMAUExURQAAAPf39///////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////88f9h0AAAADdFJOU///ANfKDUEA
+AAABYktHRACIBR1IAAAADGNtUFBKQ21wMDcxMgAAAANIAHO8AAAALklEQVQYV22MQQoAAAjC
+rP8/Ol10K8IJiuo7tbChbMtiRIMkMeT7m9B4e5RP2B4eJACOUomEagAAAABJRU5ErkJgggAA
+ngQAAEQAZADuACMBAAAAAAAAAAAAAAAAAAAAAIcApQDoA+gDAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAPAATwZgAAALIECvAIAAAAAQQAAAAKAACzAAvwQgAAAIEAAAAAAIIA
+AAAAAIMAAAAAAIQAAAAAAARBAQAAAAYBAAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8B
+AAAIAAAAEPAEAAAAAAAAgGIAB/DkAwAABgadFne2AAAAAHs4ZSASAgAQAADAAwAAAQAAAAAA
+AAAAAAAAAG4e8LgDAACdFne2AAAAAHs4ZSASAgAQ/4lQTkcNChoKAAAADUlIRFIAAAAJAAAA
+CwgDAAAAmodXKQAAAwBQTFRFAAAA9/f3////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////zx/2HQAAAAN0Uk5T//8A18oNQQAAAAFi
+S0dEAIgFHUgAAAAMY21QUEpDbXAwNzEyAAAAA0gAc7wAAAAuSURBVBhXbYxBCgAACMKs/z86
+XXQrwgmK6ju1sKFsy2JEgyQx5Pub0Hh7lE/YHh4kAI5SiYRqAAAAAElFTkSuQmCCAACeBAAA
+RABkAO4AIwEAAAAAAAAAAAAAAAAAAAAAhwClAOgD6AMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAA8ABPBmAAAAsgQK8AgAAAABBAAAAAoAALMAC/BCAAAAgQAAAAAAggAAAAAA
+gwAAAAAAhAAAAAAABEEBAAAABgEAAAAAPwEAAAAAgQH///8AgwEAAAAAvwEQABAA/wEAAAgA
+AAAQ8AQAAAAAAACAYgAH8OQDAAAGBp0Wd7YAAAAAezhlIBICABAAAMADAAABAAAAAAAAAAAA
+AAAAbh7wuAMAAJ0Wd7YAAAAAezhlIBICABD/iVBORw0KGgoAAAANSUhEUgAAAAkAAAALCAMA
+AACah1cpAAADAFBMVEUAAAD39/f/////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+///////////////////////////////////PH/YdAAAAA3RSTlP//wDXyg1BAAAAAWJLR0QA
+iAUdSAAAAAxjbVBQSkNtcDA3MTIAAAADSABzvAAAAC5JREFUGFdtjEEKAAAIwqz/PzpddCvC
+CYrqO7WwoWzLYkSDJDHk+5vQeHuUT9geHiQAjlKJhGoAAAAASUVORK5CYIIAAJ4EAABEAGQA
+7gAjAQAAAAAAAAAAAAAAAAAAAACHAKUA6APoAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAADwAE8GYAAACyBArwCAAAAAEEAAAACgAAswAL8EIAAACBAAAAAACCAAAAAACDAAAA
+AACEAAAAAAAEQQEAAAAGAQAAAAA/AQAAAACBAf///wCDAQAAAAC/ARAAEAD/AQAACAAAABDw
+BAAAAAAAAIBiAAfw5AMAAAYGnRZ3tgAAAAB7OGUgEgIAEAAAwAMAAAEAAAAAAAAAAAAAAABu
+HvC4AwAAnRZ3tgAAAAB7OGUgEgIAEP+JUE5HDQoaCgAAAA1JSERSAAAACQAAAAsIAwAAAJqH
+VykAAAMAUExURQAAAPf39///////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////88f9h0AAAADdFJOU///ANfKDUEAAAABYktHRACIBR1I
+AAAADGNtUFBKQ21wMDcxMgAAAANIAHO8AAAALklEQVQYV22MQQoAAAjCrP8/Ol10K8IJiuo7
+tbChbMtiRIMkMeT7m9B4e5RP2B4eJACOUomEagAAAABJRU5ErkJgggAAngQAAEQAZADuACMB
+AAAAAAAAAAAAAAAAAAAAAIcApQDoA+gDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAPAATwZgAAALIECvAIAAAAAQQAAAAKAACzAAvwQgAAAIEAAAAAAIIAAAAAAIMAAAAAAIQA
+AAAAAARBAQAAAAYBAAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8BAAAIAAAAEPAEAAAA
+AAAAgGIAB/DkAwAABgadFne2AAAAAHs4ZSASAgAQAADAAwAAAQAAAAAAAAAAAAAAAG4e8LgD
+AACdFne2AAAAAHs4ZSASAgAQ/4lQTkcNChoKAAAADUlIRFIAAAAJAAAACwgDAAAAmodXKQAA
+AwBQTFRFAAAA9/f3////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////zx/2HQAAAAN0Uk5T//8A18oNQQAAAAFiS0dEAIgFHUgAAAAM
+Y21QUEpDbXAwNzEyAAAAA0gAc7wAAAAuSURBVBhXbYxBCgAACMKs/z86XXQrwgmK6ju1sKFs
+y2JEgyQx5Pub0Hh7lE/YHh4kAI5SiYRqAAAAAElFTkSuQmCCAACeBAAARABkAO4AIwEAAAAA
+AAAAAAAAAAAAAAAAhwClAOgD6AMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8A
+BPBmAAAAsgQK8AgAAAABBAAAAAoAALMAC/BCAAAAgQAAAAAAggAAAAAAgwAAAAAAhAAAAAAA
+BEEBAAAABgEAAAAAPwEAAAAAgQH///8AgwEAAAAAvwEQABAA/wEAAAgAAAAQ8AQAAAAAAACA
+YgAH8OQDAAAGBp0Wd7YAAAAAezhlIBICABAAAMADAAABAAAAAAAAAAAAAAAAbh7wuAMAAJ0W
+d7YAAAAAezhlIBICABD/iVBORw0KGgoAAAANSUhEUgAAAAkAAAALCAMAAACah1cpAAADAFBM
+VEUAAAD39/f/////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+///////////////////PH/YdAAAAA3RSTlP//wDXyg1BAAAAAWJLR0QAiAUdSAAAAAxjbVBQ
+SkNtcDA3MTIAAAADSABzvAAAAC5JREFUGFdtjEEKAAAIwqz/PzpddCvCCYrqO7WwoWzLYkSD
+JDHk+5vQeHuUT9geHiQAjlKJhGoAAAAASUVORK5CYIIAAJ4EAABEAGQA7gAjAQAAAAAAAAAA
+AAAAAAAAAACHAKUA6APoAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAE8GYA
+AACyBArwCAAAAAEEAAAACgAAswAL8EIAAACBAAAAAACCAAAAAACDAAAAAACEAAAAAAAEQQEA
+AAAGAQAAAAA/AQAAAACBAf///wCDAQAAAAC/ARAAEAD/AQAACAAAABDwBAAAAAAAAIBiAAfw
+5AMAAAYGnRZ3tgAAAAB7OGUgEgIAEAAAwAMAAAEAAAAAAAAAAAAAAABuHvC4AwAAnRZ3tgAA
+AAB7OGUgEgIAEP+JUE5HDQoaCgAAAA1JSERSAAAACQAAAAsIAwAAAJqHVykAAAMAUExURQAA
+APf39///////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+/////////////88f9h0AAAADdFJOU///ANfKDUEAAAABYktHRACIBR1IAAAADGNtUFBKQ21w
+MDcxMgAAAANIAHO8AAAALklEQVQYV22MQQoAAAjCrP8/Ol10K8IJiuo7tbChbMtiRIMkMeT7
+m9B4e5RP2B4eJACOUomEagAAAABJRU5ErkJgggAAngQAAEQAZADuACMBAAAAAAAAAAAAAAAA
+AAAAAIcApQDoA+gDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAATwZgAAALIE
+CvAIAAAAAQQAAAAKAACzAAvwQgAAAIEAAAAAAIIAAAAAAIMAAAAAAIQAAAAAAARBAQAAAAYB
+AAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8BAAAIAAAAEPAEAAAAAAAAgGIAB/DkAwAA
+BgadFne2AAAAAHs4ZSASAgAQAADAAwAAAQAAAAAAAAAAAAAAAG4e8LgDAACdFne2AAAAAHs4
+ZSASAgAQ/4lQTkcNChoKAAAADUlIRFIAAAAJAAAACwgDAAAAmodXKQAAAwBQTFRFAAAA9/f3
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////zx/2HQAAAAN0Uk5T//8A18oNQQAAAAFiS0dEAIgFHUgAAAAMY21QUEpDbXAwNzEy
+AAAAA0gAc7wAAAAuSURBVBhXbYxBCgAACMKs/z86XXQrwgmK6ju1sKFsy2JEgyQx5Pub0Hh7
+lE/YHh4kAI5SiYRqAAAAAElFTkSuQmCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAA7KUBAU0gCQQAAAgSvwAAAAAAADAAAAAAAAgAAAAVAAAOAENhb2xhbjgw
+AAAAAAAAAAAAAAAAAAAAAAAACQQWAJxBAAAAAAAAAAAAAHIFAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAA0BAAAAAAAA//8PAAsAAAAEAAAA//8PAA8AAAARAAAA//8PAAAAAAAAAAAAAAAAAAAA
+AACIAAAAAACIFQAAAAAAAIgVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANgV
+AAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADsFQAANAAAACAWAAAkAAAA
+RBYAAIwAAAAAAAAAAAAAACYdAAAGAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAOUaAAAmAAAACxsAAAwAAAAXGwAACAAAAAMdAAACAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCAAAGICAACOIgAAdAAAABEd
+AAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+aRoAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQFgAAmQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAACIFQAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHxsAAB4A
+AADjHAAAGAAAAMAVAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+xwAAAgAAAAAAAAAAAAAAAUdAAAMAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAIA2QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAgACAAIAAgACAAIAAgACAAIAAgACAAQwBVAFIAUgBJAEMAVQBMAFUATQAgAFYA
+SQBUAEEARQANAAgADQBSAGkAYwBoAGEAcgBkACAAQQBuAGQAZQByAHMAbwBuACAACwAxADIA
+MwA0ACwAIABXAGUAcwB0ACAANgA3ACAAUwB0AHIAZQBlAHQALAAgAAsAQwBhAHIAbABpAHMA
+bABlACwAIABNAEEAIAAwADEANwA0ADEALAAgAAsAKAAxADIAMwApAC0ANAA1ADYAIAA3ADgA
+OQAwAC4ADQAIAAsAAQAgAEMAYQByAGUAZQByACAATwBiAGoAZQBjAHQAaQB2AGUADQANAEQA
+ZQBzAGkAcgBlACAAYQAgAGMAaABhAGwAbABlAG4AZwBpAG4AZwAgAHAAbwBzAGkAdABpAG8A
+bgAgAGkAbgAgAHQAaABlACAAYQByAGUAYQAgAG8AZgAgAFMAbwBmAHQAdwBhAHIAZQAgAGQA
+ZQB2AGUAbABvAHAAbQBlAG4AdAAsACAAdwBoAGkAYwBoACAAdwBpAGwAbAAgAHUAdABpAGwA
+aQB6AGUAIABtAHkAIABpAG4AdABlAHIAZABpAHMAYwBpAHAAbABpAG4AYQByAHkALAAgAHQA
+ZQBjAGgAbgBpAGMAYQBsACwAIABhAG4AZAAgAHMAbwBmAHQAdwBhAHIAZQAgAGQAZQB2AGUA
+bABvAHAAbQBlAG4AdAAgAGwAaQBmAGUAIABjAHkAYwBsAGUAIABzAGsAaQBsAGwAcwAgAGkA
+bgAgAGEAIABwAHIAbwBkAHUAYwB0AGkAdgBlACwAIABlAG4AdABoAHUAcwBpAGEAcwB0AGkA
+YwAgAGEAbgBkACAAaQBuACAAYQAgAHQAZQBhAG0ALQBvAHIAaQBlAG4AdABlAGQAIABlAG4A
+dgBpAHIAbwBuAG0AZQBuAHQALgANAA0AAQAgAEUAZAB1AGMAYQB0AGkAbwBuAGEAbAAgAFMA
+dQBtAG0AYQByAHkADQBQ8CAAQwBvAG0AcABsAGUAdABlAGQAIABNAGEAcwB0AGUAcgBzACAA
+aQBuACAAQwBvAG0AcAB1AHQAZQByACAAYQBwAHAAbABpAGMAYQB0AGkAbwBuACAAKABNAC4A
+QwAuAEEAKQAgAHcAaQB0AGgAIAA2ADMALgA3ADEAJQAgAA0AAQAgAFQAZQBjAGgAbgBpAGMA
+YQBsACAASwBuAG8AdwBsAGUAZABnAGUAIABTAHUAbQBtAGEAcgB5AA0ACAANAAEAIAAgAEQA
+ZQB0AGEAaQBsAGUAZAAgAEUAZAB1AGMAYQB0AGkAbwBuAGEAbAAgAEEAYwBhAGQAZQBtAGkA
+YwAgAEMAcgBlAGQAZQBuAHQAaQBhAGwAcwANAEUAeABhAG0AaQBuAGEAdABpAG8AbgAHAEIA
+bwBhAHIAZAAvAFUAbgBpAHYAZQByAHMAaQB0AHkABwBQAGEAcwBzAGkAbgBnACAAWQBlAGEA
+cgAHAFAAZQByAGMAZQBuAHQAYQBnAGUABwAHAAgATQAuAEMALgBBACAABwAHACAAIAAgACAA
+IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAAVgBJAAcAQwBhAHIAbABpAHMAbABlACAA
+VQBuAGkAdgBlAHIAcwBpAHQAeQAHADIAMAAxADEABwA2ADMALgA3ADEABwAHACAAIAAgACAA
+IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAAVgAHAEMAYQByAGwAaQBzAGwAZQAgAFUA
+bgBpAHYAZQByAHMAaQB0AHkABwAyADAAMQAwAAcANgA3AC4AMQA3AAcABwAgACAAIAAgACAA
+IAAgACAAIAAgAFMAZQBtAGUAcwB0AGUAcgAgAEkAVgAHAEMAYQByAGwAaQBzAGwAZQAgAFUA
+bgBpAHYAZQByAHMAaQB0AHkABwAyADAAMQAwAAcANgAyAC4AOAAwAAcABwAgACAAIAAgACAA
+IAAgACAAIAAgAFMAZQBtAGUAcwB0AGUAcgAgAEkASQBJAAcAQwBhAHIAbABpAHMAbABlACAA
+VQBuAGkAdgBlAHIAcwBpAHQAeQAHADIAMAAxADAABwA2ADIALgAyADUABwAHACAAIAAgACAA
+IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAASQBJAAcAQwBhAHIAbABpAHMAbABlACAA
+VQBuAGkAdgBlAHIAcwBpAHQAeQAHADIAMAAwADkABwA2ADUALgA3ADUABwAHACAAIAAgACAA
+IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAASQAHAEMAYQByAGwAaQBzAGwAZQAgAFUA
+bgBpAHYAZQByAHMAaQB0AHkABwAyADAAMAA5AAcANgAzAC4AMwAzAAcABwAHAAcABwAHAAcA
+BwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcAAQAgAFMAdQBiAGoAZQBjAHQAIAAgAEYA
+YQBtAGkAbABpAGEAcgBpAHQAeQA6AA0AUPAgAEQAYQB0AGEAYgBhAHMAZQAgAE0AYQBuAGEA
+ZwBlAG0AZQBuAHQAIABDAG8AbgBjAGUAcAB0AHMADQBQ8CAATwBiAGoAZQBjAHQAIABPAHIA
+aQBlAG4AdABlAGQAIABQAHIAbwBnAHIAYQBtAG0AaQBuAGcAIABDAG8AbgBjAGUAcAB0AA0A
+UPAgAFMAeQBzAHQAZQBtACAAQQBuAGEAbAB5AHMAaQBzACAAYQBuAGQAIABEAGUAcwBpAGcA
+bgANAFDwIABzAG8AZgB0AHcAYQByAGUAIABFAG4AZwBpAG4AZQBlAHIAaQBuAGcAIAANAFDw
+IABPAHAAZQByAGEAdABpAG4AZwAgAFMAeQBzAHQAZQBtACAAQwBvAG4AYwBlAHAAdAANAFDw
+IABVAG4AaQB4ACAAUwBoAGUAbABsACAAUAByAG8AZwByAGEAbQBtAGkAbgBnAA0AAQAgAEEA
+cgBlAGEAIABvAGYAIABJAG4AdABlAHIAZQBzAHQAOgANAFDwIABTAG8AZgB0AHcAYQByAGUA
+IABkAGUAdgBlAGwAbwBwAG0AZQBuAHQAIAAgAHUAcwBpAG4AZwAgAEoAYQB2AGEALwAuAE4A
+ZQB0ACAAdABlAGMAaABuAG8AbABvAGcAaQBlAHMADQBQ8CAATABlAGEAcgBuAGkAbgBnACAA
+bgBlAHcAIAB0AGUAYwBoAG4AbwBsAG8AZwBpAGUAcwAuAA0AAQAgAFAAZQByAHMAbwBuAGEA
+bAAgAEQAZQB0AGEAaQBsAHMADQBOAGEAbQBlADoAIAAgAAkACQBSAGkAYwBoAGEAcgBkACAA
+QQBuAGQAZQByAHMAbwBuAA0AQwB1AHIAcgBlAG4AdAAgAEEAZABkAHIAZQBzAHMACQAxADIA
+MwA0ACwAIABXAGUAcwB0ACAANgA3ACAAUwB0AHIAZQBlAHQALAAgAAsAQwBhAHIAbABpAHMA
+bABlACwAIABNAEEAIAAwADEANwA0ADEALAAgAAsAKAAxADIAMwApAC0ANAA1ADYAIAA3ADgA
+OQAwAC4ADQBEAGEAdABlACAAbwBmACAAQgBpAHIAdABoADoAIAAJADEAcwB0ACAAagB1AG4A
+ZQANAEcAZQBuAGQAZQByADoAIAAJAAkATQBhAGwAZQAJAA0ADQABAA0ATABhAG4AZwB1AGEA
+ZwBlAHMAIABLAG4AbwB3AG4AIAAHAEMALAAgAEMAKwArACwASgBBAFYAQQAsACAALgBOAEUA
+VAAgADMALgA1ACwAIABBAFMAUAAuAE4ARQBUACAAMwAuADUALABWAEIAIAAyADAAMAA4ACwA
+cAB5AHQAaABvAG4ABwAHAEQAQgBNAFMALwBSAEQAQgBNAFMAIAAHAE8AUgBBAEMATABFACwA
+TQBTACAAQQBjAGMAZQBzAHMALAAgAFMAUQBMACwAIABQAG8AcwB0AGcAcgBlAHMAcwAgAFMA
+UQBMAAcABwBXAGUAYgAgAFQAZQBjAGgAbgBvAGwAbwBnAHkABwBIAFQATQBMACwASgBBAFYA
+QQAgAFMAYwByAGkAcAB0AAcABwBPAHAAZQByAGEAdABpAG4AZwAgAFMAeQBzAHQAZQBtAAcA
+VwBpAG4AZABvAHcAcwAgACgAOQA4AC8AMgAwADAANwAvAFgAUAAgAC8AVgBJAFMAVABBACwA
+NwApACwAdQBiAHUAbgB0AHUABwAHAE8AdABoAGUAcgAHAE4AZQB0AHcAbwByAGsAIABQAHIA
+bwBnAHIAYQBtAG0AaQBuAGcAIABpAG4AIABKAGEAdgBhACwAIABVAG4AaQB4ACAAUwBoAGUA
+bABsACAAUAByAG8AZwByAGEAbQBtAGkAbgBnAAcABwAgAA0ADQANAA0AAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAWCAAAOAgAADoIAAA8CAAAXAgAANgI
+AADaCAAA3AgAAN4IAADgCAAAAgkAAAQJAADMCgAAzgoAANAKAADSCgAA+goAAPwKAAD+CgAA
+EgsAAGALAABiCwAAbAsAAHwLAAB+CwAAgAsAALgLAAC6CwAAvAsAAL4LAADACwAAwgsAAPn5
+9Ovh2PTMv7bMANisn7aVjoeHf3h4eGu2YfQAVLZhAAAAABlVCAEDauANAAAwSlAAXkoEAE9K
+BABRSgQAEj4qATUIAV5KBABPSgQAUUoEAAAZVQgBA2pACQAAMEpQAF5KBABPSgQAUUoEAAxe
+SgQAT0oEAFFKBAAADzUIAV5KBABPSgQAUUoEAAxDShIAT0oCAFFKAgAADENKEgBPSgUAUUoF
+AAATMEpQAD4qAV5KBABPSgQAUUoEABlVCAEDaqAEAAAwSlAAXkoEAE9KBABRSgQAEkNKEgA+
+KgE1CAFPSgIAUUoCAAAQMEpQAF5KBABPSgQAUUoEAAAZVQgBA2oAAAAAMEpQAF5KBABPSgQA
+UUoEABcwSlAAQ0oUAD4qAV5KBABPSgQAUUoEABBDShQAXkoEAE9KBABRSgQAABNDShQANQgB
+XkoEAE9KBABRSgQAEENKFABtSAAEc0gABG5IAAQACQNqAAAAAFUIAQxDShYAT0oCAFFKAgAg
+wgsAABYMAAAuDAAAUAwAAGoMAACADAAAggwAAIQMAACGDAAAkgwAAKgMAADADAAA0AwAAOgM
+AADyDAAA/gwAABQNAAAqDQAAOg0AAFINAABcDQAAaA0AAH4NAACWDQAApg0AAL4NAADIDQAA
+1A0AAOoNAAAEDgAAFA4AACwOAAA2DgAAQg4AAFgOAABwDgAAgA4AAJgOAACiDgAArg4AAMQO
+AADaDgAA6g4AAAIPAAAMDwAAGA8AABwPAAAeDwAAIA8AACIPAAAmDwAAKA8AACoPAAAsDwAA
+MA8AADIPAAA0DwAANg8AADoPAAA8DwAAPg8AAEAPAABCDwAARA8AAEYPAAD27Ozs7ADn39/Y
+2M/Y2NjY2M/Y2NjY2M/Y2MnY2M/Y2MnY2M/Y2MnY2M/Y2Mnf2NjYvdjY2N/Y2Njf2NjYALCn
+AAAAAAAAAAAAABAwSlAAXkoEAE9KBABRSgQAABlVCAEDaoASAAAwSlAAXkoEAE9KBABRSgQA
+FkNKEgA1CAFhShIAXAgBT0oGAFFKBgAAC1wIAU9KBgBRSgYAEENKFABeSgQAT0oEAFFKBAAA
+DF5KBABPSgQAUUoEAAAPNQgBXkoEAE9KBABRSgQACQNqAAAAAFUIARNDShIANQgBXkoEAE9K
+BABRSgQAEj4qATUIAV5KBABPSgQAUUoEAEBGDwAAbg8AAHIPAAB0DwAAdg8AALAPAACyDwAA
+tA8AAPwPAAD+DwAAABAAADYQAAA4EAAAOhAAAGYQAABoEAAAahAAAJwQAACeEAAAoBAAAM4Q
+AADQEAAA0hAAAPYQAAD4EAAA+hAAAGARAABiEQAAZBEAAJoRAACcEQAAnhEAAMARAADMEQAA
+0hEAAPQRAAASEgAAFBIAAIwSAACqEgAArhIAALISAAC+EgAA0hIAANoSAADeEgAA4BIAAPLm
+4dra4dra4dra4dra4dra4drazcS64dra4drarcS6pdqbpZaNpdqF2qXapQAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9IKgFeSgQAT0oEAFFKBAAQQ0oUAF5KBABPSgQAUUoE
+AAAIT0oGAFFKBgAAE0NKFAA1CAFeSgQAT0oEAFFKBAAPNQgBXkoEAE9KBABRSgQAGVUIAQNq
+wBsAADBKUABeSgQAT0oEAFFKBAASQ0oSAD4qATUIAU9KAgBRSgIAABAwSlAAXkoEAE9KBABR
+SgQAABlVCAEDaiAXAAAwSlAAXkoEAE9KBABRSgQADF5KBABPSgQAUUoEAAAIT0oFAFFKBQAA
+F0NKEgA1CAFeSgIAYUoSAE9KAgBRSgIAGkNKEgA+KgE1CAFeSgIAYUoSAE9KAgBRSgIALuAS
+AADiEgAAAhMAAAYTAABqEwAAhBMAAM4TAADuEwAAEBQAADQUAAB+FAAAjBQAAPQUAAD+FAAA
+8eri3erd193q3eLdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALXAgB
+T0oGAFFKBgAIT0oGAFFKBgAAD15KBABcCAFPSgQAUUoEAAxeSgQAT0oEAFFKBAAAHFUIAQNq
+YCAAADBKUABeSgQAPAgBT0oEAFFKBAANAAgAADgIAAA8CAAA2AgAAAIJAAAECQAAzAoAAM4K
+AAD6CgAAfAsAALgLAAC8CwAAFgwAAC4MAABQDAAA9wAAAAAAAAAAAAAAAPIAAAAAAAAAAAAA
+AADkAAAAAAAAAAAAAAAA1QAAAAAAAAAAAAAAAMYAAAAAAAAAAAAAAAC3AAAAAAAAAAAAAAAA
+sgAAAAAAAAAAAAAAAK0AAAAAAAAAAAAAAACoAAAAAAAAAAAAAAAAowAAAAAAAAAAAAAAAJ4A
+AAAAAAAAAAAAAACZAAAAAAAAAAAAAAAAiwAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAA
+AAAAAAANAAAWJAFJZgEAAAASZGgBAQADJAFhJAFHJAAADQAAFiQBSWYBAAAAEmRoAQEAAyQB
+YSQBRyQAAAQAABJkaAEBAAAEAAASZGgBAQAABAAAEmRoAQEAAAQAABJkaAEBAAAEAAASZGgB
+AQAABAAAEmRoAQEAAA5aAAMkA2EkA16EAABdhNACYIQAABOkAAAUpAAAAA5aAAMkA2EkA16E
+AABdhNACYIQAABOkAAAUpAAAAA5aAAMkA2EkA16EAABdhKAFYIQAABOkAAAUpAAADlYAAyQB
+YSQBDcYIAAJwCEALAAATpAAAFKQAAAAEXgADJANhJAMAB14AXoSAFl2EAABghNACAA5QDAAA
+agwAAIAMAACCDAAAkgwAAPEAAAAAAAAAAAAAAADjAAAAAAAAAAAAAAAAZgAAAAAAAAAAAAAA
+AFsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAA
+CNZcAARi/8ILeBlyH8IkgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAA
+AIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAJ1ggAAQABAAEAARLW
+KAAAAP/l5eUAAAAAAAD/5eXlAAAAAAAA/+Xl5QAAAAAAAP/l5eUAAABw1igAAAD/5eXlAAAA
+AAAA/+Xl5QAAAAAAAP/l5eUAAAAAAAD/5eXlAAAANNYGAAEBAwAANNYGAAECA2wANNYGAAEE
+AwAANNYGAAEIA2wAAzQAZjQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAANAAAWJAFJ
+ZgEAAAASZGgBAQADJAFhJAFHJAAABJIMAACUDAAAwAwAAOgMAADyDAAA/gwAAMQAAAAAAAAA
+AAAAAAC5AAAAAAAAAAAAAAAArgAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAACSAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAFiQBSWYB
+AAAAEmRoAQEAAyQBYSQBRyQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJ
+ZgEAAAASZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAADoAABYkARckAUlmAQAAAAjW
+GgABYv/CJIAAAAAEAQEABAEBAAQBAQAEAQEACdYCAAAS1goAAAD/AAAA/wAAcNYKAAAA/wAA
+AP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAF/gwAAAAN
+AAAqDQAAUg0AAFwNAABoDQAAggAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAABsAAAAAAAAAAAA
+AAAAXgAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAWJAFJ
+ZgEAAAASZGgBAQADJAFhJAFHJAAADQAAFiQBSWYBAAAAEmRoAQEAAyQBYSQBRyQAAAoAABYk
+AUlmAQAAABJkaAEBAEckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAA
+CNZcAARi/8IL0hlyH8IkgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAA
+AIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAJ1ggAAAAAAAAAABLW
+KAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AABw1igAAAD/AAAA/wAA
+AAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAANNYGAAEBAwAANNYGAAECA2wANNYGAAEE
+AwAANNYGAAEIA2wAAzQAZjQAAAVoDQAAag0AAJYNAAC+DQAAyA0AANQNAACCAAAAAAAAAAAA
+AAAAdwAAAAAAAAAAAAAAAGwAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAANAAAWJAFJ
+ZgEAAAASZGgBAQADJAFhJAFHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAAoAABYkAUlmAQAA
+ABJkaAEBAEckAAB8AAAWJAEXJAFJZgEAAAAI1lwABGL/wgvSGXIfwiSAAAAABAEBAAQBAQAE
+AQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEB
+AAQBAQAEAQEABAEBAAnWCAAAAAAAAAAAEtYoAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA
+/wAAAAAA/wAAAP8AAHDWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/
+AAA01gYAAQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAABdQNAADWDQAA
+BA4AACwOAAA2DgAAQg4AAIIAAAAAAAAAAAAAAAB3AAAAAAAAAAAAAAAAbAAAAAAAAAAAAAAA
+AF4AAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAFiQBSWYB
+AAAAEmRoAQEAAyQBYSQBRyQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJ
+ZgEAAAASZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAHwAABYkARckAUlmAQAAAAjW
+XAAEYv/CC9IZch/CJIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACA
+AAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAEAQEACdYIAAAAAAAAAAAS1igA
+AAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYoAAAA/wAAAP8AAAAA
+AP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMA
+ADTWBgABCANsAAM0AGY0AAAFQg4AAEQOAABwDgAAmA4AAKIOAACuDgAAggAAAAAAAAAAAAAA
+AHcAAAAAAAAAAAAAAABsAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAANAAAWJAFJZgEAAAASZGgBAQADJAFhJAFHJAAADQAAFiQBSWYB
+AAAAEmRoAQEAAyQBYSQBRyQAAAoAABYkAUlmAQAAABJkaAEBAEckAAAKAAAWJAFJZgEAAAAS
+ZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAACNZcAARi/8IL0hlyH8IkgAAAAAQBAQAEAQEABAEB
+AAAAAACAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAE
+AQEABAEBAAQBAQAJ1ggAAAAAAAAAABLWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8A
+AAAAAP8AAAD/AABw1igAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAA
+NNYGAAEBAwAANNYGAAECA2wANNYGAAEEAwAANNYGAAEIA2wAAzQAZjQAAAWuDgAAsA4AANoO
+AAACDwAADA8AABgPAACCAAAAAAAAAAAAAAAAdwAAAAAAAAAAAAAAAGwAAAAAAAAAAAAAAABe
+AAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AABYkAUlmAQAA
+ABJkaAEBAAMkAWEkAUckAAANAAAWJAFJZgEAAAASZGgBAQADJAFhJAFHJAAACgAAFiQBSWYB
+AAAAEmRoAQEARyQAAAoAABYkAUlmAQAAABJkaAEBAEckAAB8AAAWJAEXJAFJZgEAAAAI1lwA
+BGL/wgvSGXIfwiSAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAA
+AAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEABAEBAAnWCAAAAAAAAAAAEtYoAAAA
+/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAHDWKAAAAP8AAAD/AAAAAAD/
+AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAA01gYAAQEDAAA01gYAAQIDbAA01gYAAQQDAAA0
+1gYAAQgDbAADNABmNAAABRgPAAAaDwAAHA8AAB4PAAAgDwAAIg8AAIIAAAAAAAAAAAAAAAB3
+AAAAAAAAAAAAAAAAbAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAADQAAFiQBSWYBAAAAEmRoAQEAAyQBYSQBRyQAAA0AABYkAUlmAQAA
+ABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRo
+AQEARyQAAHwAABYkARckAUlmAQAAAAjWXAAEYv/CC9IZch/CJIAAAAAEAQEABAEBAAQBAQAA
+AAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEB
+AAQBAQAEAQEACdYIAAAAAAAAAAAS1igAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAA
+AAD/AAAA/wAAcNYoAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AADTW
+BgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAFIg8AACQPAAAmDwAA
+KA8AACoPAAAsDwAAggAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAABsAAAAAAAAAAAAAAAAXgAA
+AAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAWJAFJZgEAAAAS
+ZGgBAQADJAFhJAFHJAAADQAAFiQBSWYBAAAAEmRoAQEAAyQBYSQBRyQAAAoAABYkAUlmAQAA
+ABJkaAEBAEckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAACNZcAARi
+/8IL0hlyH7gkgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAE
+AQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAJ1ggAAAAAAAAAABLWKAAAAP8A
+AAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AABw1igAAAD/AAAA/wAAAAAA/wAA
+AP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAANNYGAAEBAwAANNYGAAECA2wANNYGAAEEAwAANNYG
+AAEIA2wAAzQAZjQAAAUsDwAALg8AADAPAAAyDwAANA8AADYPAACCAAAAAAAAAAAAAAAAdwAA
+AAAAAAAAAAAAAGwAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAANAAAWJAFJZgEAAAAS
+ZGgBAQADJAFhJAFHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAAoAABYkAUlmAQAAABJkaAEB
+AEckAAB8AAAWJAEXJAFJZgEAAAAI1lwABGL/wgvSGXIfuCSAAAAABAEBAAQBAQAEAQEAAAAA
+AIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAE
+AQEABAEBAAnWCAAAAAAAAAAAEtYoAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA
+/wAAAP8AAHDWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAA01gYA
+AQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAABTYPAAA4DwAAOg8AADwP
+AAA+DwAAQA8AAIIAAAAAAAAAAAAAAAB3AAAAAAAAAAAAAAAAbAAAAAAAAAAAAAAAAF4AAAAA
+AAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAFiQBSWYBAAAAEmRo
+AQEAAyQBYSQBRyQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJZgEAAAAS
+ZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAHwAABYkARckAUlmAQAAAAjWXAAEYv/C
+C9IZch+4JIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEB
+AAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAEAQEACdYIAAAAAAAAAAAS1igAAAD/AAAA
+/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYoAAAA/wAAAP8AAAAAAP8AAAD/
+AAAAAAD/AAAA/wAAAAAA/wAAAP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgAB
+CANsAAM0AGY0AAAFQA8AAEIPAAByDwAAsA8AAPwPAAA2EAAAZhAAAJwQAADOEAAA9hAAAIIA
+AAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAHMAAAAAAAAAAAAAAABuAAAA
+AAAAAAAAAAAAaQAAAAAAAAAAAAAAAGQAAAAAAAAAAAAAAABfAAAAAAAAAAAAAAAAWgAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAABJkaAEBAAAEAAASZGgBAQAABAAA
+EmRoAQEAAAQAABJkaAEBAAAEAAASZGgBAQAABAAAEmRoAQEAAAQAABJkaAEBAAAEAAASZGgB
+AQAAfAAAFiQBFyQBSWYBAAAACNZcAARi/8IL0hlyH7gkgAAAAAQBAQAEAQEABAEBAAAAAACA
+AAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEB
+AAQBAQAJ1ggAAAAAAAAAABLWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8A
+AAD/AABw1igAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAANNYGAAEB
+AwAANNYGAAECA2wANNYGAAEEAwAANNYGAAEIA2wAAzQAZjQAAAn2EAAAYBEAAJoRAADAEQAA
+9BEAAIwSAAC+EgAA3hIAAOASAADkEgAABhMAAGoTAAD6AAAAAAAAAAAAAAAA9QAAAAAAAAAA
+AAAAAPAAAAAAAAAAAAAAAADoAAAAAAAAAAAAAAAA3QAAAAAAAAAAAAAAANUAAAAAAAAAAAAA
+AADNAAAAAAAAAAAAAAAAxQAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAC1AAAAAAAAAAAAAAAA
+qgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAoAABYkAUlmAQAAABJkaAEBAEckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAABF4AAyQAYSQA
+AAcAABJkaAEBAAMkA2EkAwAHAAASZGgBAQADJANhJAMABwAAEmRoAQEAAyQDYSQDAAoAABJk
+aAEBAF6EcAhdhAAAYISQ9wAHAAASZGgBAQADJANhJAMABAAAEmRoAQEAAAQAABJkaAEBAAAE
+AAASZGgBAQAAC2oTAABsEwAAhBMAAM4TAADQEwAA7hMAAKwAAAAAAAAAAAAAAAChAAAAAAAA
+AAAAAAAAmQAAAAAAAAAAAAAAAEYAAAAAAAAAAAAAAAA7AAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAFIAABYkARckAUlm
+AQAAAAjWMAACAADeCgIngAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEABAEB
+AAeUSAEJ1gQAAAAAEtYUAAAA/wAAAP8AAAAAAP8AAAD/AABw1hQAAAD/AAAA/wAAAAAA/wAA
+AP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAHAAAWJAFJ
+ZgEAAABHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAFIAABYkARckAUlmAQAAAAjWMAACAADe
+CgIngAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEABAEBAAeUOwEJ1gQAAAAA
+EtYUAAAA/wAAAP8AAAAAAP8AAAD/AABw1hQAAAD/AAAA/wAAAAAA/wAAAP8AADTWBgABAQMA
+ADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAF7hMAABAUAAASFAAANBQAAH4U
+AACAFAAA9AAAAAAAAAAAAAAAAKEAAAAAAAAAAAAAAACWAAAAAAAAAAAAAAAAiwAAAAAAAAAA
+AAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABSAAAWJAEXJAFJZgEA
+AAAI1jAAAgAA3goCJ4AAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAH
+lFkBCdYEAAAAABLWFAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYUAAAA/wAAAP8AAAAAAP8AAAD/
+AAA01gYAAQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAACgAAFiQBSWYB
+AAAAEmRoAQEARyQAAAoAABYkAUlmAQAAABJkaAEBAEckAABSAAAWJAEXJAFJZgEAAAAI1jAA
+AgAA3goCJ4AAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAHlIEBCdYE
+AAAAABLWFAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYUAAAA/wAAAP8AAAAAAP8AAAD/AAA01gYA
+AQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAACgAAFiQBSWYBAAAAEmRo
+AQEARyQAAAWAFAAAjBQAAPQUAAD2FAAA+hQAAPwUAAD+FAAAABUAAPcAAAAAAAAAAAAAAADv
+AAAAAAAAAAAAAAAAnAAAAAAAAAAAAAAAAJoAAAAAAAAAAAAAAACYAAAAAAAAAAAAAAAAlgAA
+AAAAAAAAAAAAAJEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEXgADJABhJAAAAQAAAAEAAAABAAAAUgAA
+FiQBFyQBSWYBAAAACNYwAAIAAN4KAieAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEB
+AAQBAQAEAQEAB5RZAQnWBAAAAAAS1hQAAAD/AAAA/wAAAAAA/wAAAP8AAHDWFAAAAP8AAAD/
+AAAAAAD/AAAA/wAANNYGAAEBAwAANNYGAAECA2wANNYGAAEEAwAANNYGAAEIA2wAAzQAZjQA
+AAcAABYkAUlmAQAAAEckAAAHAAAWJAFJZgEAAABHJAAABzAAH7DQLyCw4D0hsKAFIrCgBSOQ
+0AIkkKAFMlAAADGQaAEwcAAAAAAzUAAAKDIADjAAAG4e8GIBAAAj9Bd8AAAAADYkA5ERAgAQ
+/4lQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAABaPTP9wAAAAlwSFlzAAALEgAACxIB0t1+
+/AAAAQNJREFUeJxjYYACFhDx/vXz/yxwke+f3//n5BVkBIv8BwIQzQgELDAGimZkgF3Lhw8v
+GN6/eI5QISgoidsMrGaCwPfv3//D2B/ePGeQlFViRFFw/8Yxhg+vPwBZP4CYA9MELUNnuL1Y
+rSDoBrwKqmdt/d+S6gUXrJm9jaE1zRvVkT9+/IAw/vzAYQVQAqTox4/v2BWcP70PovsPiCeA
+qgBkXytFvqAEoBiw9fC1/8eu38ep2EpTkcHbVgslRlAMAGlGDk9kAAqhlsX78LsAppCTkxND
+4b3b17AajGEAKKndu30OnKh+MMAiD5SqnxM2AOTHKduvY1UIk8drAHoAEQMojkYAJEdjeTsx
+JnYAAAAASUVORK5CYIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAA/v8AAAEAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAALVzdWcLhsQk5cIACss+a5EAAAA
+BdXN1ZwuGxCTlwgAKyz5rlwAAAAYAAAAAQAAAAEAAAAQAAAAAgAAAOn9AAAYAAAAAQAAAAEA
+AAAQAAAAAgAAAOn9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABSAG8AbwB0ACAARQBuAHQAcgB5AAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAFAP//////////
+AQAAAAYJAgAAAAAAwAAAAAAAAEYAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAACAAgAAAAAAAAEA
+QwBvAG0AcABPAGIAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAASAAIAAgAAAAUAAAD/////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAGoAAAAAAAAAAQBPAGwAZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAgD/////AwAAAP////8AAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAFAAAAAAAAAAxAFQAYQBiAGwAZQAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgACAAQA
+AAD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAACIwAA
+AAAAAEQAYQB0AGEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAKAAIA////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAFgAAAP4kAAAAAAAABQBTAHUAbQBtAGEAcgB5AEkAbgBmAG8AcgBtAGEA
+dABpAG8AbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAgAGAAAACAAAAP////8AAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAHAEAAAAAAABXAG8AcgBkAEQA
+bwBjAHUAbQBlAG4AdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+GgACAAcAAAD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACkA
+AACcQQAAAAAAAE8AYgBqAGUAYwB0AFAAbwBvAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAWAAEA////////////////AAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAA/v///wAAAAAAAAAABQBEAG8AYwB1AG0AZQBuAHQAUwB1AG0A
+bQBhAHIAeQBJAG4AZgBvAHIAbQBhAHQAaQBvAG4AAAAAAAAAAAAAADgAAgD/////////////
+//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAdAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAP///////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAP7///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////////AAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////
+//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+////AAAAAAAA
+AAA=
+--------------010903010402010104090709--
diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml
deleted file mode 100644
index b797353bde2..00000000000
--- a/addons/hr_recruitment/test/test_hr_recruitment.yml
+++ /dev/null
@@ -1,139 +0,0 @@
--
-  In order to test hr_recruitment module for OpenERP, I will create applicants form, Manages job positions and the recruitment process.
--
-
-  I create a department.
--
-  !record {model: hr.department, id: hr_department_rd0}:
-    manager_id: base.user_root
-    name: 'R & D '
-
--
-  I create new Job Position.
--
-  !record {model: hr.job, id: hr_job_jea0}:
-    department_id: 'hr_department_rd0'
-    description: 'Position of Jr. Application Engineer'
-    expected_employees: 5
-    name: 'JAE '
--
-  I create a recruitment stage "Initial Jobs Demand".
--
-  !record {model: hr.recruitment.stage, id: hr_recrutiment_stage_first0}:
-    name: 'Initial Jobs Demand'
-    sequence: 1
--
-  I create an applicant.
--
-  !record {model: hr.applicant, id: hr_applicant_fresher0}:
-    availability: 0.0
-    department_id: hr.dep_it
-    name: Fresher
-    partner_address_id: base.res_partner_address_tang
-    partner_id: base.res_partner_asus
-    partner_name: Marion Jones
-    partner_phone: '1111112223'
-    response: 0.0
-    job_id: hr.job_jr_developers
-    salary_expected: 0.0
-    salary_proposed: 0.0
-    stage_id: hr_recrutiment_stage_first0
-    type_id: hr_recruitment.degree_licenced
-
--
-  I check that applicant is on "draft" state.
--
-  !assert {model: hr.applicant, id:  hr_applicant_fresher0}:
-    - state == 'draft'
-
--
-  I change the state by click on "In Progress" button.
--
-  !python {model: hr.applicant}: |
-    self.case_open(cr, uid, [ref("hr_applicant_fresher0")], {"active_ids": [ref("hr_recruitment.menu_crm_case_categ0_act_job")],
-      })
--
-  I change the stages by clicking on stage next and stage previous buttons.
--
-  !python {model: hr.applicant}: |
-    self.stage_next(cr, uid, [ref('hr_applicant_fresher0')], None)
-    self.stage_previous(cr, uid, [ref('hr_applicant_fresher0')], None)
--
-  I create a new case category.
--
-  !record {model: crm.case.categ, id: crm_case_categ_employee0}:
-    name: 'Employee'
-
--
-  I schedule a phonecall for this applicant by click on "Schedule a Phone Call" button.
--
-  !record {model: hr.recruitment.job2phonecall, id: hr_recruitment_forinterview0}:
-    user_id: base.user_root
-    deadline: !eval time.strftime('%Y-%m-%d 11:51:00')
-    note: 'For interview.'
-    category_id: 'crm_case_categ_employee0'
-
--
-  I click on "Schedule phonecall" button of this wizard.
--
-  !python {model: hr.recruitment.job2phonecall}: |
-     self.make_phonecall(cr, uid, [ref('hr_recruitment_forinterview0')], {'active_ids': [ref('hr_applicant_fresher0')]})
-
--
-  I schedule meeting for interview of this applicant by click on "Schedule Meeting" button.
--
-  !python {model: hr.applicant}: |
-     self.action_makeMeeting(cr, uid, [ref('hr_recruitment_forinterview0')])
--
-  I create an entry for the meeting with the applicant.
--
-  !record {model: crm.meeting, id: crm_meeting_fresher0}:
-    alarm_id: base_calendar.alarm1
-    count: 0.0
-    date: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 00:00:00')" 
-    date_deadline: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 08:00:00')" 
-    day: 0.0
-    duration: 8.0
-    name: Fresher
-    opportunity_id: crm.crm_case_construstazunits0
-    partner_address_id: base.res_partner_address_tang
-    partner_id: base.res_partner_asus
-    recurrent_uid: 0.0
-    rrule_type: none
-    state: open
-    user_id: base.user_root
--
-  I print the survery filled up by the applicant.
--
-  !python {model: hr.applicant}: |
-     self.action_print_survey(cr, uid, [ref('hr_applicant_fresher0')], None)
--
-  I assign the position to the applicant and its relevant department.
--
-  !python {model: hr.applicant}: |
-     res = self.onchange_job(cr, uid, [ref('hr_applicant_fresher0')], ref('hr.job_jr_developers'), None)
-     values = dict([('job_id', ref('hr.job_jr_developers'))] + res['value'].items())
-     res1 = self.onchange_department_id(cr, uid, [ref('hr_applicant_fresher0')], ref('hr.dep_it'), None)
-     values.update(dict([('department_id', ref('hr.dep_it'))] + res1['value'].items()))
-     self.write(cr, uid, [ref('hr_applicant_fresher0')], values, None)
--
-  On a successful meeting with the applicant, I hired employee by click on "Hired" button.
--
-  !python {model: hired.employee}: |
-     self.case_close(cr, uid, [], context={'active_ids': [ref('hr_applicant_fresher0')]})
--
-  I check that applicant state is "Hired".
--
-  !assert {model: hr.applicant, id: hr_applicant_fresher0}:
-    - state == 'done'
--
-  I create partner for the hired applicant for accounting purpose.
--
-  !record {model: hr.recruitment.partner.create, id: hr_recruitment_partner_create0}:
-    close: False
--
-  I click on Create Partner button to create a partner for applicant.
--
-  !python {model: hr.recruitment.partner.create}: |
-     self.make_order(cr, uid, [ref('hr_recruitment_partner_create0')], context={'active_ids': [ref('hr_applicant_fresher0')]})
-
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index cd9cbea52f7..0f7d30b215a 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -88,7 +88,7 @@ class job2phonecall(osv.osv_memory):
             id2 = data_obj.browse(cr, uid, id2, context=context).res_id
         if id3:
             id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
+        new_phonecall_id = []
         for job in job_case_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             #TODO: Take other info from job
             new_phonecall_id = phonecall_case_obj.create(cr, uid, {
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index e572190610e..f276fa24757 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Human Resources (Timesheet encoding)',
+    'name': 'Timesheets',
     'version': '1.0',
     "category": "Human Resources",
     'complexity': "easy",
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 2b2064a89b4..d5f89098a69 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,14 +1,14 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_hr_user",1,1,1,1
-"access_hr_analytic_timesheet_employee","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_user",1,1,1,0
-"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
-"access_hr_account_analytic_line_employee","account.account.analytic.line employee","account.model_account_analytic_line","base.group_user",1,1,1,0
-"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
-"access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,1,1,1
-"access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,1,1,1
-"access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,1,1,1
-"access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
-"hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
-"hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
-"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","model_hr_analytic_timesheet","base.group_user",1,1,1,0
-"access_account_analytic_journal_user","account.account.analytic.journal.user","account.model_account_analytic_journal","base.group_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_analytic_timesheet,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_hr_user,1,1,1,1
+access_hr_analytic_timesheet_employee,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_user,1,1,1,0
+access_hr_account_analytic_line,account.account.analytic.line,account.model_account_analytic_line,base.group_hr_user,1,1,1,1
+access_hr_account_analytic_line_employee,account.account.analytic.line employee,account.model_account_analytic_line,base.group_user,1,1,1,0
+access_account_analytic_journal,account.account.analytic.journal,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1
+access_product_product_user,product.product user,product.model_product_product,base.group_hr_user,1,1,1,1
+access_product_template_hr_timesheet,product.template.hr.timesheet,product.model_product_template,base.group_hr_user,1,1,1,1
+access_product_uom_hr_timesheet,product.uom.hr.timesheet,product.model_product_uom,base.group_hr_user,1,1,1,1
+access_account_fiscalyear_hr_user,account.account.fiscalyear.user,account.model_account_fiscalyear,base.group_hr_user,1,1,1,1
+hr.access_account_journal_view_hruser,account.journal.view hruser,account.model_account_journal_view,base.group_hr_user,1,0,0,0
+hr.access_account_journal_column_hruser,account.journal.column hruser,account.model_account_journal_column,base.group_hr_user,1,0,0,0
+access_hr_analytic_timesheet_user,hr.analytic.timesheet.user,model_hr_analytic_timesheet,base.group_user,1,1,1,0
+access_account_analytic_journal_user,account.account.analytic.journal.user,account.model_account_analytic_journal,base.group_user,1,0,0,0
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index bd5c58fde1b..e731f9215ff 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Invoice on Analytic Lines',
+    'name': 'Invoice on Timesheets',
     'version': '1.0',
     'category': 'Sales Management',
     'description': """Generate your Invoices from Expenses, Timesheet Entries, ...
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 19d08f7faf3..b6646e70bff 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -65,7 +65,8 @@ class account_analytic_account(osv.osv):
     _columns = {
         'pricelist_id': fields.many2one('product.pricelist', 'Customer Pricelist',
             help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."),
-        'amount_max': fields.float('Max. Invoice Price'),
+        'amount_max': fields.float('Max. Invoice Price',
+            help="Keep empty if this contract is not limited to a total fixed price."),
         'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
             help="Total invoiced"),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoice on Timesheet & Costs',
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index 71c5be3cdfc..02d6175cd17 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -1,16 +1,16 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_hr_user",1,1,1,1
-"access_hr_timesheet_invoice_factor_employee","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_user",1,1,1,1
-"access_hr_timesheet_invoice_factor_acc_inv","hr_timesheet_invoice.factor.account.invoice","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1
-"access_report_analytic_account_close","report.analytic.account.close","model_report_analytic_account_close","account.group_account_manager",1,0,0,0
-"access_report_account_analytic_line_to_invoice","report.account.analytic.line.to.invoice","model_report_account_analytic_line_to_invoice","account.group_account_manager",1,0,0,0
-"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_hr_manager",1,1,1,1
-"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,1,1,1
-"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,1,1,1
-"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,1,1,1
-"access_report_analytic_account_close_manager","report.analytic.account.close.manager","model_report_analytic_account_close","base.group_hr_manager",1,1,1,1
-"access_report_account_analytic_line_to_invoice_manager","report.account.analytic.line.to.invoice.manager","model_report_account_analytic_line_to_invoice","base.group_hr_manager",1,1,1,1
-"access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
-"access_account_invoice_tax_hr_manager","account.invoice.tax.hr.manager","account.model_account_invoice_tax","base.group_hr_manager",1,1,1,1
-"access_report_timesheet_line_employee","report.timesheet.line.employee","model_report_timesheet_line","base.group_hr_user",1,1,1,1
-"access_report_timesheet_line_employee_user","report.timesheet.line","model_report_timesheet_line","base.group_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_timesheet_invoice_factor_hr_user,hr_timesheet_invoice.factor.hr.user,model_hr_timesheet_invoice_factor,base.group_hr_user,1,1,1,1
+access_hr_timesheet_invoice_factor_employee,hr_timesheet_invoice.factor.hr.user,model_hr_timesheet_invoice_factor,base.group_user,1,1,1,1
+access_hr_timesheet_invoice_factor_acc_inv,hr_timesheet_invoice.factor.account.invoice,model_hr_timesheet_invoice_factor,account.group_account_invoice,1,1,1,1
+access_report_analytic_account_close,report.analytic.account.close,model_report_analytic_account_close,account.group_account_manager,1,0,0,0
+access_report_account_analytic_line_to_invoice,report.account.analytic.line.to.invoice,model_report_account_analytic_line_to_invoice,account.group_account_manager,1,0,0,0
+access_report_timesheet_user,report_timesheet.user,model_report_timesheet_user,base.group_hr_manager,1,1,1,1
+access_report_timesheet_account,report_timesheet.account,model_report_timesheet_account,base.group_hr_manager,1,1,1,1
+access_report_timesheet_account_date,report_timesheet.account.date,model_report_timesheet_account_date,base.group_hr_manager,1,1,1,1
+access_report_timesheet_invoice,report_timesheet.invoice,model_report_timesheet_invoice,base.group_hr_manager,1,1,1,1
+access_report_analytic_account_close_manager,report.analytic.account.close.manager,model_report_analytic_account_close,base.group_hr_manager,1,1,1,1
+access_report_account_analytic_line_to_invoice_manager,report.account.analytic.line.to.invoice.manager,model_report_account_analytic_line_to_invoice,base.group_hr_manager,1,1,1,1
+access_account_invoice_hr_user,account.invoice.hr.user,account.model_account_invoice,base.group_hr_user,1,1,1,1
+access_account_invoice_tax_hr_manager,account.invoice.tax.hr.manager,account.model_account_invoice_tax,base.group_hr_manager,1,1,1,1
+access_report_timesheet_line_employee,report.timesheet.line.employee,model_report_timesheet_line,base.group_hr_user,1,1,1,1
+access_report_timesheet_line_employee_user,report.timesheet.line,model_report_timesheet_line,base.group_user,1,1,1,0
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 60b60e88550..4a2d1a5e536 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -18,7 +18,7 @@
                                 <field name="price" groups="base.group_extended"/>
                            </group>
                         <group col="2" colspan="4" groups="base.group_extended">
-                            <separator string="Force to use a specific product" colspan="4" />
+                            <separator string="Force to use a specific product" colspan="4"/>
                             <field name="product"/>
                         </group>
                     </page>
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 3421083a1cc..7299e283d6d 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Timesheets',
+    'name': 'Timesheets Validation',
     'version': '1.0',
     'category': 'Human Resources',
     'description': """
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 089ade7c618..75ca07861fb 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -294,7 +294,7 @@ class hr_timesheet_sheet(osv.osv):
         if r=='month':
             return time.strftime('%Y-%m-01')
         elif r=='week':
-            return (datetime.today() + relativedelta(weekday=0, weeks=-1)).strftime('%Y-%m-%d')
+            return (datetime.today() + relativedelta(weekday=0, days=-6)).strftime('%Y-%m-%d')
         elif r=='year':
             return time.strftime('%Y-01-01')
         return time.strftime('%Y-%m-%d')
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index b14c9133319..dea111e2150 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -186,7 +186,7 @@
             <field name="res_model">hr_timesheet_sheet.sheet</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_my_timesheet':1,'group_by_no_leaf':1}</field>
+            <field name="context">{'search_default_my_timesheet':1}</field>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
             <field name="help">Check your timesheets for a specific period. You can also encode time spent on a project (i.e. an analytic account) thus generating costs in the analytic account concerned.</field>
         </record>
diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po
index 5cae5ce212c..4775fdcc172 100644
--- a/addons/hr_timesheet_sheet/i18n/hr.po
+++ b/addons/hr_timesheet_sheet/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-12-19 17:23+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:24+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
@@ -36,7 +36,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+msgstr "Usluga"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
@@ -49,7 +49,7 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
@@ -63,7 +63,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Odjel"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
@@ -73,7 +73,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Today"
-msgstr ""
+msgstr "Danas"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
@@ -86,7 +86,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -95,7 +95,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Organizacija"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -106,12 +106,12 @@ msgstr ""
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
 #: view:timesheet.report:0
 msgid "Timesheet"
-msgstr ""
+msgstr "Evidencija rada"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi na nacrt"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0
@@ -127,7 +127,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
 msgid "Validate"
-msgstr ""
+msgstr "Potvrdi"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -136,24 +136,24 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Present"
-msgstr ""
+msgstr "Prisutan"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Ukupni trošak"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Korisnička greška"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -215,7 +215,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitički konto"
 
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 3e4b36380cc..8b9414d9b9d 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -1,9 +1,9 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_sheet_sheet_user","hr_timesheet_sheet.sheet.user","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,1
-"access_hr_timesheet_sheet_sheet_system_employee","hr_timesheet_sheet.sheet.system.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,0
-"access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
-"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
-"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
-"access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,1,1,0
-"access_timesheet_report","timesheet.report","model_timesheet_report","base.group_hr_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_timesheet_sheet_sheet_user,hr_timesheet_sheet.sheet.user,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,1
+access_hr_timesheet_sheet_sheet_system_employee,hr_timesheet_sheet.sheet.system.employee,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,0
+access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_hr_user,1,1,1,1
+access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_hr_user,1,1,1,1
+access_hr_timesheet_report,hr.timesheet.report,model_hr_timesheet_report,base.group_hr_manager,1,1,1,1
+access_hr_analytic_timesheet_system_user,hr.analytic.timesheet.system.user,model_hr_analytic_timesheet,base.group_user,1,0,0,0
+access_hr_timesheet_sheet_sheet_day,hr.timesheet.sheet.sheet.day.user,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,0
+access_timesheet_report,timesheet.report,model_timesheet_report,base.group_hr_manager,1,1,1,1
diff --git a/addons/hr_timesheet_sheet/static/src/img/icon.png b/addons/hr_timesheet_sheet/static/src/img/icon.png
new file mode 100644
index 00000000000..a87ec718557
Binary files /dev/null and b/addons/hr_timesheet_sheet/static/src/img/icon.png differ
diff --git a/addons/html_view/__openerp__.py b/addons/html_view/__openerp__.py
index c4a7f033993..eadff96babf 100644
--- a/addons/html_view/__openerp__.py
+++ b/addons/html_view/__openerp__.py
@@ -2,7 +2,7 @@
     "name" : "Html View",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden/Test",
     "depends" : ['base'],
     "init_xml" : ['html_view.xml'],
     "demo_xml" : [],
diff --git a/addons/html_view/security/ir.model.access.csv b/addons/html_view/security/ir.model.access.csv
index e79e65bb4b5..4370c07b57a 100644
--- a/addons/html_view/security/ir.model.access.csv
+++ b/addons/html_view/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_html_view","html.view","model_html_view","base.group_system",1,0,0,0
-"access_html_view_sale_user","html.view user","model_html_view","base.group_sale_salesman",1,1,1,0
-"access_html_view_sale_manager","html.view manager","model_html_view","base.group_sale_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_html_view,html.view,model_html_view,base.group_system,1,0,0,0
+access_html_view_sale_user,html.view user,model_html_view,base.group_sale_salesman,1,1,1,0
+access_html_view_sale_manager,html.view manager,model_html_view,base.group_sale_manager,1,0,0,0
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index e482aa18d3a..9fdb3e8fffe 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Ideas Box',
+    'name': 'Ideas',
     'version': '0.1',
-    'category': 'Human Resources',
+    'category': 'Tools',
     'complexity': "easy",
     'description': """
 This module allows your user to easily and efficiently participate in enterprise innovation.
@@ -53,7 +53,6 @@ Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
         'test/test_idea.yml'
     ],
     'installable': True,
-    'application': True,
     'certificate': '0071515601309',
     'images': ['images/1_ideas.jpeg','images/2_idea_categories.jpeg','images/3_vote_idea.jpeg'],
 }
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 344cbc64292..02a3cbdbdd8 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -3,10 +3,12 @@
 <data>
 
     <record model="res.groups" id="base.group_tool_user">
-        <field name="name">Tools / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_tools"/>
     </record>
     <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Tools / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
     </record>
 
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index b76cc9bd58a..989530277f6 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -1,8 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_idea_category_user","idea.category user","model_idea_category","base.group_tool_user",1,1,1,1
-"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_tool_user",1,1,1,1
-"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_tool_user",1,1,1,1
-"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,1,1,1
-"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_tool_user",1,1,1,1
-"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_tool_user",1,1,1,1
-"access_report_vote_manager","report.vote manager","model_report_vote","base.group_tool_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_idea_category_user,idea.category user,model_idea_category,base.group_tool_user,1,1,1,1
+access_idea_idea_user,idea.idea user,model_idea_idea,base.group_tool_user,1,1,1,1
+access_idea_vote_user,idea.vote user,model_idea_vote,base.group_tool_user,1,1,1,1
+access_idea_vote_stat_user,idea.vote.stat user,model_idea_vote_stat,base.group_tool_user,1,1,1,1
+access_idea_comment_user,idea.comment user,model_idea_comment,base.group_tool_user,1,1,1,1
+access_report_vote_manager,report.vote manager,model_report_vote,base.group_tool_manager,1,1,1,1
diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py
index 78988d00fec..742e16dfe80 100644
--- a/addons/import_base/__openerp__.py
+++ b/addons/import_base/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Framework for complex import',
     'version': '0.9',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'description': """
         This module provide a class import_framework to help importing 
         complex data from other software
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index a0a15756ec3..fe469c94504 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -42,6 +42,5 @@
     ],
     'installable': True,
     'active': False,
-    'certificate': '',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/security/ir.model.access.csv b/addons/import_google/security/ir.model.access.csv
index 50b689efa69..cb0a8946d46 100644
--- a/addons/import_google/security/ir.model.access.csv
+++ b/addons/import_google/security/ir.model.access.csv
@@ -1,5 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_res_users_partner_manager","google.res.partner.manager","base.model_ir_model_data","base.group_partner_manager",1,1,1,0
-"access_ir_model_data_partner_manager","ir.model.data.partner.manager","base.model_res_users","base.group_partner_manager",1,1,0,0
-"access_google_import_message_partner_manager","google.import.message.partner.manager","model_google_import_message","base.group_partner_manager",1,1,0,0
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_res_users_partner_manager,google.res.partner.manager,base.model_ir_model_data,base.group_partner_manager,1,1,1,0
+access_ir_model_data_partner_manager,ir.model.data.partner.manager,base.model_res_users,base.group_partner_manager,1,1,0,0
+access_google_import_message_partner_manager,google.import.message.partner.manager,model_google_import_message,base.group_partner_manager,1,1,0,0
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
index c0ad1ba250b..093331a1bbe 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Import Data from SugarCRM',
+    'name': 'SugarCRM Import',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", 
diff --git a/addons/import_sugarcrm/security/ir.model.access.csv b/addons/import_sugarcrm/security/ir.model.access.csv
index 20e93035b6c..5aadbf32950 100644
--- a/addons/import_sugarcrm/security/ir.model.access.csv
+++ b/addons/import_sugarcrm/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_import_sugarcrm_system","import.sugarcrm system","model_import_sugarcrm","base.group_system",1,1,1,1
-"access_import_message_system","import.message system","model_import_message","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_import_sugarcrm_system,import.sugarcrm system,model_import_sugarcrm,base.group_system,1,1,1,1
+access_import_message_system,import.message system,model_import_message,base.group_system,1,1,1,1
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index 27333f59c41..e37419ffcaf 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "depends" : ["base","base_setup"],
     "author" : "OpenERP SA",
-    'category': 'Knowledge Management',
+    'category': 'Hidden/Dependency',
     'complexity': "easy",
     "description": """
 Installer for knowledge-based Hidden.
diff --git a/addons/knowledge/security/ir.model.access.csv b/addons/knowledge/security/ir.model.access.csv
index 7a057fcfcbe..34255019afe 100644
--- a/addons/knowledge/security/ir.model.access.csv
+++ b/addons/knowledge/security/ir.model.access.csv
@@ -1,4 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ir_attachment_sale_manager","ir_attachment manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
-"access_ir_attachment_partner_manager","ir_attachment_partner manager","base.model_ir_attachment","base.group_partner_manager",1,1,1,1
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ir_attachment_sale_manager,ir_attachment manager,base.model_ir_attachment,base.group_sale_manager,1,1,1,1
+access_ir_attachment_partner_manager,ir_attachment_partner manager,base.model_ir_attachment,base.group_partner_manager,1,1,1,1
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index b4c7bb99c1b..560fdce0506 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data noupdate="0">
-            <record id="base.group_sale_manager" model="res.groups">
-                <field name="name">Sales / Manager</field>
-            </record>
 
-            <record id="base.group_document_user" model="res.groups">
-                <field name="name">Knowledge / User</field>
-            </record>
+    <record id="base.group_document_user" model="res.groups">
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/knowledge/static/src/img/icon.png b/addons/knowledge/static/src/img/icon.png
new file mode 100644
index 00000000000..cc38e1c0348
Binary files /dev/null and b/addons/knowledge/static/src/img/icon.png differ
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index 570841374d8..cd96d4ee9dc 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    "name" : "Austria - Chart of Accounts",
+    "name" : "Austria - Accounting",
     "version" : "1.0",
     "author" : "conexus.at",
-	"website" : "http://www.conexus.at",
+    "website" : "http://www.conexus.at",
     "category" : "Localization/Account Charts",
     "depends" : ["account_chart", 'base_vat'],
     "description": "This module provides the standard Accounting Chart for Austria which is based on the Template from BMF.gv.at. Please keep in mind that you should review and adapt it with your Accountant, before using it in a live Environment.",
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index d4300186660..c8f44493597 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{   'name': 'Belgium - Plan Comptable Minimum Normalise',
+{   'name': 'Belgium - Accounting',
     'version': '1.1',
     'category': 'Localization/Account Charts',
     'description': """
diff --git a/addons/l10n_be/security/ir.model.access.csv b/addons/l10n_be/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/l10n_be/security/ir.model.access.csv
+++ b/addons/l10n_be/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/l10n_be_hr_payroll/__openerp__.py b/addons/l10n_be_hr_payroll/__openerp__.py
index d667cdfa126..488345869b2 100644
--- a/addons/l10n_be_hr_payroll/__openerp__.py
+++ b/addons/l10n_be_hr_payroll/__openerp__.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 {
-    'name': 'Belgian Payroll Rules',
-    'category': 'Localization/Payroll',
+    'name': 'Belgium - Payroll',
+    'category': 'Localization',
     'author': 'OpenERP SA',
     'depends': ['hr_payroll'],
     'version': '1.0',
diff --git a/addons/l10n_be_invoice_bba/__openerp__.py b/addons/l10n_be_invoice_bba/__openerp__.py
index c18f49817b5..2fde058b4be 100644
--- a/addons/l10n_be_invoice_bba/__openerp__.py
+++ b/addons/l10n_be_invoice_bba/__openerp__.py
@@ -21,11 +21,11 @@
 ##############################################################################
 
 {
-    'name': 'Add support for Belgian structured communication to Invoices',
+    'name': 'Belgium - Structured Communication',
     'version': '1.2',
     'license': 'AGPL-3',
     'author': 'Noviat',
-    'category' : 'Localization/Accounting',
+    'category' : 'Localization',
     'description': """
     
 Belgian localisation for in- and outgoing invoices (prereq to account_coda):
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 86ff4cd4e83..909d4f53600 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -19,7 +19,7 @@
 #################################################################################
 
 {
-    'name': 'Brazilian Localization',
+    'name': 'Brazilian - Accounting',
     'category': 'Localization/Account Charts',
     'description': """
 Base module for the Brazilian localization
diff --git a/addons/l10n_br/security/ir.model.access.csv b/addons/l10n_br/security/ir.model.access.csv
index 2a1ecd6910f..9381bd449b3 100644
--- a/addons/l10n_br/security/ir.model.access.csv
+++ b/addons/l10n_br/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"l10n_br_account_cst","l10n_br_account.cst","model_l10n_br_account_cst","account.group_account_invoice",1,1,1,1
-"l10n_br_account_cst_template","l10n_br_account.cst.template","model_l10n_br_account_cst_template","account.group_account_invoice",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+l10n_br_account_cst,l10n_br_account.cst,model_l10n_br_account_cst,account.group_account_invoice,1,1,1,1
+l10n_br_account_cst_template,l10n_br_account.cst.template,model_l10n_br_account_cst_template,account.group_account_invoice,1,1,1,1
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index fbfadbf9755..800ca7937eb 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 {
-    "name" : "Canada - English and French - Canadian Chart of Accounts",
+    "name" : "Canada - Accounting",
     "version" : "1.0",
     "author" : "Savoir-faire Linux",
     "website" : "http://www.savoirfairelinux.com",
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index cde4d7d496d..b2363ca051b 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Switzerland - localization with 2011 taxes",
+    "name" : "Switzerland - Accounting",
     "description" :  """
 Swiss localisation :
  - DTA generation for a lot of payment types
diff --git a/addons/l10n_ch/security/ir.model.access.csv b/addons/l10n_ch/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/l10n_ch/security/ir.model.access.csv
+++ b/addons/l10n_ch/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 6a063505275..24823f96eb7 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -18,7 +18,7 @@
 #
 ##############################################################################
 {
-    "name" : "中国会计科目表",
+    "name" : "中国会计科目表 - Accounting",
     "version" : "1.0",
     "category": "Localization/Account Charts",
     "author" : "openerp-china.org",
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index 5fc4d80d7f7..6052115df3b 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -33,7 +33,7 @@
 ##############################################################################
 
 {
-    'name': 'Costa Rica - Chart of Accounts',
+    'name': 'Costa Rica - Accounting',
     'version': '0.1',
     'url': 'http://launchpad.net/openerp-costa-rica',
     'author': 'ClearCorp S.A.',
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 646836eba2a..232a1abb3ad 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -121,7 +121,7 @@
 
 
 {
-    "name" : "Deutschland - SKR03 and SKR04",
+    "name" : "Deutschland - Accounting",
     "version" : "1.0",
     "author" : "openbig.org",
     "website" : "http://www.openbig.org",
diff --git a/addons/l10n_de/account_chart_skr03.xml b/addons/l10n_de/account_chart_skr03.xml
index 7a7e1fb8ee0..91e7ced01d1 100644
--- a/addons/l10n_de/account_chart_skr03.xml
+++ b/addons/l10n_de/account_chart_skr03.xml
@@ -1,7 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data noupdate="1">
-			<record model="account.account.template" id="root_de">
+
+		<!--
+        Account Type
+        -->
+
+        <record id="account_type_asset_de" model="account.account.type">
+            <field name="name">Asset</field>
+            <field name="code">asset</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account_type_receivable_de" model="account.account.type">
+            <field name="name">Receivable</field>
+            <field name="code">receivable</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">unreconciled</field>
+        </record>
+        <record id="account_type_liability_de" model="account.account.type">
+            <field name="name">Liability</field>
+            <field name="code">liability</field>
+            <field name="report_type">liability</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account_type_payable_de" model="account.account.type">
+            <field name="name">Payable</field>
+            <field name="code">payable</field>
+            <field name="report_type">liability</field>
+            <field name="close_method">unreconciled</field>
+        </record>
+        <record id="account_type_income_de" model="account.account.type">
+            <field name="name">Income</field>
+            <field name="code">income</field>
+            <field name="report_type">income</field>
+            <field name="close_method">none</field>
+        </record>
+        <record id="account_type_expense_de" model="account.account.type">
+            <field name="name">Expense</field>
+            <field name="code">expense</field>
+            <field name="report_type">expense</field>
+            <field name="close_method">none</field>
+        </record>
+
+
+		<record model="account.account.template" id="root_de">
 			<field name="code">0</field>
 			<field name="name">Deutscher Kontenplan SKR03</field>
 			<field name="reconcile" eval="False"/>
@@ -964,7 +1007,7 @@
 			<field name="code">8339</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_3724">
@@ -972,7 +1015,7 @@
 			<field name="code">3724</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4300">
@@ -980,7 +1023,7 @@
 			<field name="code">4300</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0280">
@@ -988,7 +1031,7 @@
 			<field name="code">0280</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_8300">
@@ -996,7 +1039,7 @@
 			<field name="code">8300</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4370">
@@ -1004,7 +1047,7 @@
 			<field name="code">4370</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_4520">
@@ -1012,7 +1055,7 @@
 			<field name="code">4520</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_3710">
@@ -1020,7 +1063,7 @@
 			<field name="code">3710</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4149">
@@ -1028,7 +1071,7 @@
 			<field name="code">4149</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0939">
@@ -1036,7 +1079,7 @@
 			<field name="code">0939</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_3551">
@@ -1044,7 +1087,7 @@
 			<field name="code">3551</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3550">
@@ -1052,7 +1095,7 @@
 			<field name="code">3550</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4145">
@@ -1060,7 +1103,7 @@
 			<field name="code">4145</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1940">
@@ -1068,7 +1111,7 @@
 			<field name="code">1940</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_0930">
@@ -1076,7 +1119,7 @@
 			<field name="code">0930</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_0931">
@@ -1084,7 +1127,7 @@
 			<field name="code">0931</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_0932">
@@ -1092,7 +1135,7 @@
 			<field name="code">0932</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_3558">
@@ -1100,7 +1143,7 @@
 			<field name="code">3558</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2171">
@@ -1108,7 +1151,7 @@
 			<field name="code">2171</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_3850">
@@ -1116,7 +1159,7 @@
 			<field name="code">3850</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8905">
@@ -1124,7 +1167,7 @@
 			<field name="code">8905</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8800">
@@ -1132,7 +1175,7 @@
 			<field name="code">8800</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8906">
@@ -1140,7 +1183,7 @@
 			<field name="code">8906</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_4306">
@@ -1148,7 +1191,7 @@
 			<field name="code">4306</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_8900">
@@ -1156,7 +1199,7 @@
 			<field name="code">8900</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8726">
@@ -1164,7 +1207,7 @@
 			<field name="code">8726</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4969">
@@ -1172,7 +1215,7 @@
 			<field name="code">4969</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4175">
@@ -1180,7 +1223,7 @@
 			<field name="code">4175</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1793">
@@ -1188,7 +1231,7 @@
 			<field name="code">1793</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1792">
@@ -1196,7 +1239,7 @@
 			<field name="code">1792</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1791">
@@ -1204,7 +1247,7 @@
 			<field name="code">1791</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1790">
@@ -1212,7 +1255,7 @@
 			<field name="code">1790</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1795">
@@ -1220,7 +1263,7 @@
 			<field name="code">1795</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_1490">
@@ -1228,7 +1271,7 @@
 			<field name="code">1490</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account_type_receivable_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1491">
@@ -1236,7 +1279,7 @@
 			<field name="code">1491</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_7095">
@@ -1244,7 +1287,7 @@
 			<field name="code">7095</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1467"/>
 		</record>
 		<record model="account.account.template" id="account_1495">
@@ -1252,7 +1295,7 @@
 			<field name="code">1495</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_1498">
@@ -1260,7 +1303,7 @@
 			<field name="code">1498</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1499">
@@ -1268,7 +1311,7 @@
 			<field name="code">1499</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_0998">
@@ -1276,7 +1319,7 @@
 			<field name="code">0998</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1700">
@@ -1284,7 +1327,7 @@
 			<field name="code">1700</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0720">
@@ -1292,7 +1335,7 @@
 			<field name="code">0720</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2520"/>
 		</record>
 		<record model="account.account.template" id="account_1702">
@@ -1300,7 +1343,7 @@
 			<field name="code">1702</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 		<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1703">
@@ -1308,7 +1351,7 @@
 			<field name="code">1703</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_0725">
@@ -1316,7 +1359,7 @@
 			<field name="code">0725</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2520"/>
 		</record>
 		<record model="account.account.template" id="account_1705">
@@ -1324,7 +1367,7 @@
 			<field name="code">1705</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1706">
@@ -1332,7 +1375,7 @@
 			<field name="code">1706</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1707">
@@ -1340,7 +1383,7 @@
 			<field name="code">1707</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1708">
@@ -1348,7 +1391,7 @@
 			<field name="code">1708</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1709">
@@ -1356,7 +1399,7 @@
 			<field name="code">1709</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0680">
@@ -1364,7 +1407,7 @@
 			<field name="code">0680</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2470"/>
 		</record>
 		<record model="account.account.template" id="account_2315">
@@ -1372,7 +1415,7 @@
 			<field name="code">2315</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2312">
@@ -1380,7 +1423,7 @@
 			<field name="code">2312</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2313">
@@ -1388,7 +1431,7 @@
 			<field name="code">2313</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2310">
@@ -1396,7 +1439,7 @@
 			<field name="code">2310</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2311">
@@ -1404,7 +1447,7 @@
 			<field name="code">2311</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_4831">
@@ -1412,7 +1455,7 @@
 			<field name="code">4831</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4830">
@@ -1420,7 +1463,7 @@
 			<field name="code">4830</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4960">
@@ -1428,7 +1471,7 @@
 			<field name="code">4960</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1661">
@@ -1436,7 +1479,7 @@
 			<field name="code">1661</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2505"/>
 		</record>
 		<record model="account.account.template" id="account_1660">
@@ -1444,7 +1487,7 @@
 			<field name="code">1660</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2505"/>
 		</record>
 		<record model="account.account.template" id="account_0112">
@@ -1452,7 +1495,7 @@
 			<field name="code">0112</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0113">
@@ -1460,7 +1503,7 @@
 			<field name="code">0113</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0059">
@@ -1468,7 +1511,7 @@
 			<field name="code">0059</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0111">
@@ -1476,7 +1519,7 @@
 			<field name="code">0111</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0115">
@@ -1484,7 +1527,7 @@
 			<field name="code">0115</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1120">
@@ -1492,7 +1535,7 @@
 			<field name="code">1120</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4320">
@@ -1500,7 +1543,7 @@
 			<field name="code">4320</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_8600">
@@ -1508,7 +1551,7 @@
 			<field name="code">8600</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0050">
@@ -1516,7 +1559,7 @@
 			<field name="code">0050</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8605">
@@ -1524,7 +1567,7 @@
 			<field name="code">8605</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_3140">
@@ -1532,7 +1575,7 @@
 			<field name="code">3140</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4654">
@@ -1540,7 +1583,7 @@
 			<field name="code">4654</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4964">
@@ -1548,7 +1591,7 @@
 			<field name="code">4964</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4651">
@@ -1556,7 +1599,7 @@
 			<field name="code">4651</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_3145">
@@ -1564,7 +1607,7 @@
 			<field name="code">3145</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4653">
@@ -1572,7 +1615,7 @@
 			<field name="code">4653</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4652">
@@ -1580,7 +1623,7 @@
 			<field name="code">4652</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4137">
@@ -1588,7 +1631,7 @@
 			<field name="code">4137</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4550">
@@ -1596,7 +1639,7 @@
 			<field name="code">4550</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_8660">
@@ -1604,7 +1647,7 @@
 			<field name="code">8660</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_8749">
@@ -1612,7 +1655,7 @@
 			<field name="code">8749</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0750">
@@ -1620,7 +1663,7 @@
 			<field name="code">0750</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1455">
@@ -1628,7 +1671,7 @@
 			<field name="code">1455</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_3749">
@@ -1636,7 +1679,7 @@
 			<field name="code">3749</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3610">
@@ -1644,7 +1687,7 @@
 			<field name="code">3610</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2381">
@@ -1652,7 +1695,7 @@
 			<field name="code">2381</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2380">
@@ -1660,7 +1703,7 @@
 			<field name="code">2380</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2383">
@@ -1668,7 +1711,7 @@
 			<field name="code">2383</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2382">
@@ -1676,7 +1719,7 @@
 			<field name="code">2382</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2385">
@@ -1684,7 +1727,7 @@
 			<field name="code">2385</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2384">
@@ -1692,7 +1735,7 @@
 			<field name="code">2384</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_0200">
@@ -1700,7 +1743,7 @@
 			<field name="code">0200</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_2386">
@@ -1708,7 +1751,7 @@
 			<field name="code">2386</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_0615">
@@ -1716,7 +1759,7 @@
 			<field name="code">0615</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2465"/>
 		</record>
 		<record model="account.account.template" id="account_2388">
@@ -1724,7 +1767,7 @@
 			<field name="code">2388</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1401">
@@ -1732,7 +1775,7 @@
 			<field name="code">1401</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account_type_receivable_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1400">
@@ -1740,7 +1783,7 @@
 			<field name="code">1400</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account_type_receivable_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1010">
@@ -1748,7 +1791,7 @@
 			<field name="code">1010</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_0610">
@@ -1756,7 +1799,7 @@
 			<field name="code">0610</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2460"/>
 		</record>
 		<record model="account.account.template" id="account_8730">
@@ -1764,7 +1807,7 @@
 			<field name="code">8730</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1518">
@@ -1772,7 +1815,7 @@
 			<field name="code">1518</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1480"/>
 		</record>
 		<record model="account.account.template" id="account_4215">
@@ -1780,7 +1823,7 @@
 			<field name="code">4215</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_8514">
@@ -1788,7 +1831,7 @@
 			<field name="code">8514</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1130">
@@ -1796,7 +1839,7 @@
 			<field name="code">1130</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_1230">
@@ -1804,7 +1847,7 @@
 			<field name="code">1230</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4210">
@@ -1812,7 +1855,7 @@
 			<field name="code">4210</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4198">
@@ -1820,7 +1863,7 @@
 			<field name="code">4198</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1449">
@@ -1828,7 +1871,7 @@
 			<field name="code">1449</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_8750">
@@ -1836,7 +1879,7 @@
 			<field name="code">8750</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8828">
@@ -1844,7 +1887,7 @@
 			<field name="code">8828</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4219">
@@ -1852,7 +1895,7 @@
 			<field name="code">4219</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_1330">
@@ -1860,7 +1903,7 @@
 			<field name="code">1330</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4190">
@@ -1868,7 +1911,7 @@
 			<field name="code">4190</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0100">
@@ -1876,7 +1919,7 @@
 			<field name="code">0100</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0079">
@@ -1884,7 +1927,7 @@
 			<field name="code">0079</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0730">
@@ -1892,7 +1935,7 @@
 			<field name="code">0730</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_4355">
@@ -1900,7 +1943,7 @@
 			<field name="code">4355</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_8125">
@@ -1908,7 +1951,7 @@
 			<field name="code">8125</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4350">
@@ -1916,7 +1959,7 @@
 			<field name="code">4350</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_4260">
@@ -1924,7 +1967,7 @@
 			<field name="code">4260</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_2387">
@@ -1932,7 +1975,7 @@
 			<field name="code">2387</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1516">
@@ -1940,7 +1983,7 @@
 			<field name="code">1516</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1480"/>
 		</record>
 		<record model="account.account.template" id="account_1448">
@@ -1948,7 +1991,7 @@
 			<field name="code">1448</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_4815">
@@ -1956,7 +1999,7 @@
 			<field name="code">4815</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1511">
@@ -1964,7 +2007,7 @@
 			<field name="code">1511</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1480"/>
 		</record>
 		<record model="account.account.template" id="account_1840">
@@ -1972,7 +2015,7 @@
 			<field name="code">1840</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_1510">
@@ -1980,7 +2023,7 @@
 			<field name="code">1510</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1480"/>
 		</record>
 		<record model="account.account.template" id="account_1537">
@@ -1988,7 +2031,7 @@
 			<field name="code">1537</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_1240">
@@ -1996,7 +2039,7 @@
 			<field name="code">1240</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_3090">
@@ -2004,7 +2047,7 @@
 			<field name="code">3090</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1531">
@@ -2012,7 +2055,7 @@
 			<field name="code">1531</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1530">
@@ -2020,7 +2063,7 @@
 			<field name="code">1530</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4950">
@@ -2028,7 +2071,7 @@
 			<field name="code">4950</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2166">
@@ -2036,7 +2079,7 @@
 			<field name="code">2166</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4957">
@@ -2044,7 +2087,7 @@
 			<field name="code">4957</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1539">
@@ -2052,7 +2095,7 @@
 			<field name="code">1539</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_1538">
@@ -2060,7 +2103,7 @@
 			<field name="code">1538</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2617">
@@ -2068,7 +2111,7 @@
 			<field name="code">2617</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2616">
@@ -2076,7 +2119,7 @@
 			<field name="code">2616</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2615">
@@ -2084,7 +2127,7 @@
 			<field name="code">2615</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_4905">
@@ -2092,7 +2135,7 @@
 			<field name="code">4905</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_3800">
@@ -2100,7 +2143,7 @@
 			<field name="code">3800</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2619">
@@ -2108,7 +2151,7 @@
 			<field name="code">2619</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2618">
@@ -2116,7 +2159,7 @@
 			<field name="code">2618</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_0970">
@@ -2124,7 +2167,7 @@
 			<field name="code">0970</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0971">
@@ -2132,7 +2175,7 @@
 			<field name="code">0971</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0972">
@@ -2140,7 +2183,7 @@
 			<field name="code">0972</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0973">
@@ -2148,7 +2191,7 @@
 			<field name="code">0973</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0974">
@@ -2156,7 +2199,7 @@
 			<field name="code">0974</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_3559">
@@ -2164,7 +2207,7 @@
 			<field name="code">3559</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_0976">
@@ -2172,7 +2215,7 @@
 			<field name="code">0976</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0977">
@@ -2180,7 +2223,7 @@
 			<field name="code">0977</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0978">
@@ -2188,7 +2231,7 @@
 			<field name="code">0978</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0979">
@@ -2196,7 +2239,7 @@
 			<field name="code">0979</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_3125">
@@ -2204,7 +2247,7 @@
 			<field name="code">3125</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1900">
@@ -2212,7 +2255,7 @@
 			<field name="code">1900</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_8940">
@@ -2220,7 +2263,7 @@
 			<field name="code">8940</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8190">
@@ -2228,7 +2271,7 @@
 			<field name="code">8190</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8196">
@@ -2236,7 +2279,7 @@
 			<field name="code">8196</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8400">
@@ -2244,7 +2287,7 @@
 			<field name="code">8400</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8300">
@@ -2252,7 +2295,7 @@
 			<field name="code">8300</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8947">
@@ -2260,7 +2303,7 @@
 			<field name="code">8947</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8195">
@@ -2268,7 +2311,7 @@
 			<field name="code">8195</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8949">
@@ -2276,7 +2319,7 @@
 			<field name="code">8949</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0500">
@@ -2284,7 +2327,7 @@
 			<field name="code">0500</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1280"/>
 		</record>
 		<record model="account.account.template" id="account_8741">
@@ -2292,7 +2335,7 @@
 			<field name="code">8741</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0505">
@@ -2300,7 +2343,7 @@
 			<field name="code">0505</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1290"/>
 		</record>
 		<record model="account.account.template" id="account_0504">
@@ -2308,7 +2351,7 @@
 			<field name="code">0504</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1280"/>
 		</record>
 		<record model="account.account.template" id="account_1731">
@@ -2316,7 +2359,7 @@
 			<field name="code">1731</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_2688">
@@ -2324,7 +2367,7 @@
 			<field name="code">2688</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2689">
@@ -2332,7 +2375,7 @@
 			<field name="code">2689</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2680">
@@ -2340,7 +2383,7 @@
 			<field name="code">2680</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_1000">
@@ -2348,7 +2391,7 @@
 			<field name="code">1000</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_8922">
@@ -2356,7 +2399,7 @@
 			<field name="code">8922</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8120">
@@ -2364,7 +2407,7 @@
 			<field name="code">8120</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0147">
@@ -2372,7 +2415,7 @@
 			<field name="code">0147</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0480">
@@ -2380,7 +2423,7 @@
 			<field name="code">0480</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_0630">
@@ -2388,7 +2431,7 @@
 			<field name="code">0630</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2475"/>
 		</record>
 		<record model="account.account.template" id="account_0485">
@@ -2396,7 +2439,7 @@
 			<field name="code">0485</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1465">
@@ -2404,7 +2447,7 @@
 			<field name="code">1465</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_8955">
@@ -2412,7 +2455,7 @@
 			<field name="code">8955</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8650">
@@ -2420,7 +2463,7 @@
 			<field name="code">8650</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_7000">
@@ -2428,7 +2471,7 @@
 			<field name="code">7000</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1460"/>
 		</record>
 		<record model="account.account.template" id="account_1990">
@@ -2436,7 +2479,7 @@
 			<field name="code">1990</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4170">
@@ -2444,7 +2487,7 @@
 			<field name="code">4170</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1626">
@@ -2452,7 +2495,7 @@
 			<field name="code">1626</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2490"/>
 		</record>
 		<record model="account.account.template" id="account_1625">
@@ -2460,7 +2503,7 @@
 			<field name="code">1625</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1624">
@@ -2468,7 +2511,7 @@
 			<field name="code">1624</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_4946">
@@ -2476,7 +2519,7 @@
 			<field name="code">4946</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1628">
@@ -2484,7 +2527,7 @@
 			<field name="code">1628</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2490"/>
 		</record>
 		<record model="account.account.template" id="account_8935">
@@ -2492,7 +2535,7 @@
 			<field name="code">8935</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8839">
@@ -2500,7 +2543,7 @@
 			<field name="code">8839</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8838">
@@ -2508,7 +2551,7 @@
 			<field name="code">8838</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_3960">
@@ -2516,7 +2559,7 @@
 			<field name="code">3960</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8933">
@@ -2524,7 +2567,7 @@
 			<field name="code">8933</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8837">
@@ -2532,7 +2575,7 @@
 			<field name="code">8837</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4340">
@@ -2540,7 +2583,7 @@
 			<field name="code">4340</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_0570">
@@ -2548,7 +2591,7 @@
 			<field name="code">0570</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1328"/>
 		</record>
 		<record model="account.account.template" id="account_8939">
@@ -2556,7 +2599,7 @@
 			<field name="code">8939</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8851">
@@ -2564,7 +2607,7 @@
 			<field name="code">8851</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_7140">
@@ -2572,7 +2615,7 @@
 			<field name="code">7140</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1470"/>
 		</record>
 		<record model="account.account.template" id="account_8917">
@@ -2580,7 +2623,7 @@
 			<field name="code">8917</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0513">
@@ -2588,7 +2631,7 @@
 			<field name="code">0513</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_8400">
@@ -2596,7 +2639,7 @@
 			<field name="code">8400</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8850">
@@ -2604,7 +2647,7 @@
 			<field name="code">8850</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2345">
@@ -2612,7 +2655,7 @@
 			<field name="code">2345</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_0650">
@@ -2620,7 +2663,7 @@
 			<field name="code">0650</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2470"/>
 		</record>
 		<record model="account.account.template" id="account_2341">
@@ -2628,7 +2671,7 @@
 			<field name="code">2341</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2340">
@@ -2636,7 +2679,7 @@
 			<field name="code">2340</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2670">
@@ -2644,7 +2687,7 @@
 			<field name="code">2670</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_1190">
@@ -2652,7 +2695,7 @@
 			<field name="code">1190</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_2349">
@@ -2660,7 +2703,7 @@
 			<field name="code">2349</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2348">
@@ -2668,7 +2711,7 @@
 			<field name="code">2348</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_4880">
@@ -2676,7 +2719,7 @@
 			<field name="code">4880</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1690">
@@ -2684,7 +2727,7 @@
 			<field name="code">1690</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2500"/>
 		</record>
 		<record model="account.account.template" id="account_0890">
@@ -2692,7 +2735,7 @@
 			<field name="code">0890</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_0710">
@@ -2700,7 +2743,7 @@
 			<field name="code">0710</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2510"/>
 		</record>
 		<record model="account.account.template" id="account_1756">
@@ -2708,7 +2751,7 @@
 			<field name="code">1756</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1755">
@@ -2716,7 +2759,7 @@
 			<field name="code">1755</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1754">
@@ -2724,7 +2767,7 @@
 			<field name="code">1754</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1753">
@@ -2732,7 +2775,7 @@
 			<field name="code">1753</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_0715">
@@ -2740,7 +2783,7 @@
 			<field name="code">0715</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2525"/>
 		</record>
 		<record model="account.account.template" id="account_0716">
@@ -2748,7 +2791,7 @@
 			<field name="code">0716</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2525"/>
 		</record>
 		<record model="account.account.template" id="account_1750">
@@ -2756,7 +2799,7 @@
 			<field name="code">1750</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_0020">
@@ -2764,7 +2807,7 @@
 			<field name="code">0020</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_8160">
@@ -2772,7 +2815,7 @@
 			<field name="code">8160</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0027">
@@ -2780,7 +2823,7 @@
 			<field name="code">0027</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_0025">
@@ -2788,7 +2831,7 @@
 			<field name="code">0025</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4250">
@@ -2796,7 +2839,7 @@
 			<field name="code">4250</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4885">
@@ -2804,7 +2847,7 @@
 			<field name="code">4885</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_0660">
@@ -2812,7 +2855,7 @@
 			<field name="code">0660</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2475"/>
 		</record>
 		<record model="account.account.template" id="account_4500">
@@ -2820,7 +2863,7 @@
 			<field name="code">4500</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_0193">
@@ -2828,7 +2871,7 @@
 			<field name="code">0193</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8790">
@@ -2836,7 +2879,7 @@
 			<field name="code">8790</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_3700">
@@ -2844,7 +2887,7 @@
 			<field name="code">3700</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8736">
@@ -2852,7 +2895,7 @@
 			<field name="code">8736</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8794">
@@ -2860,7 +2903,7 @@
 			<field name="code">8794</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8723">
@@ -2868,7 +2911,7 @@
 			<field name="code">8723</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1880">
@@ -2876,7 +2919,7 @@
 			<field name="code">1880</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_2120">
@@ -2884,7 +2927,7 @@
 			<field name="code">2120</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2125">
@@ -2892,7 +2935,7 @@
 			<field name="code">2125</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2127">
@@ -2900,7 +2943,7 @@
 			<field name="code">2127</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2126">
@@ -2908,7 +2951,7 @@
 			<field name="code">2126</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2129">
@@ -2916,7 +2959,7 @@
 			<field name="code">2129</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2128">
@@ -2924,7 +2967,7 @@
 			<field name="code">2128</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_3115">
@@ -2932,7 +2975,7 @@
 			<field name="code">3115</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3565">
@@ -2940,7 +2983,7 @@
 			<field name="code">3565</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4660">
@@ -2948,7 +2991,7 @@
 			<field name="code">4660</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4662">
@@ -2956,7 +2999,7 @@
 			<field name="code">4662</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_3110">
@@ -2964,7 +3007,7 @@
 			<field name="code">3110</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_0625">
@@ -2972,7 +3015,7 @@
 			<field name="code">0625</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2465"/>
 		</record>
 		<record model="account.account.template" id="account_1579">
@@ -2980,7 +3023,7 @@
 			<field name="code">1579</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1578">
@@ -2988,7 +3031,7 @@
 			<field name="code">1578</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0620">
@@ -2996,7 +3039,7 @@
 			<field name="code">0620</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2465"/>
 		</record>
 		<record model="account.account.template" id="account_8727">
@@ -3004,7 +3047,7 @@
 			<field name="code">8727</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0150">
@@ -3012,7 +3055,7 @@
 			<field name="code">0150</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_1475">
@@ -3020,7 +3063,7 @@
 			<field name="code">1475</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1545"/>
 		</record>
 		<record model="account.account.template" id="account_1573">
@@ -3028,7 +3071,7 @@
 			<field name="code">1573</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1572">
@@ -3036,7 +3079,7 @@
 			<field name="code">1572</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1571">
@@ -3044,7 +3087,7 @@
 			<field name="code">1571</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1479">
@@ -3052,7 +3095,7 @@
 			<field name="code">1479</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1545"/>
 		</record>
 		<record model="account.account.template" id="account_1577">
@@ -3060,7 +3103,7 @@
 			<field name="code">1577</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1576">
@@ -3068,7 +3111,7 @@
 			<field name="code">1576</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1575">
@@ -3076,7 +3119,7 @@
 			<field name="code">1575</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0090">
@@ -3084,7 +3127,7 @@
 			<field name="code">0090</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2712">
@@ -3092,7 +3135,7 @@
 			<field name="code">2712</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1305">
@@ -3100,7 +3143,7 @@
 			<field name="code">1305</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_2659">
@@ -3108,7 +3151,7 @@
 			<field name="code">2659</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2658">
@@ -3116,7 +3159,7 @@
 			<field name="code">2658</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2716">
@@ -3124,7 +3167,7 @@
 			<field name="code">2716</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1301">
@@ -3132,7 +3175,7 @@
 			<field name="code">1301</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1302">
@@ -3140,7 +3183,7 @@
 			<field name="code">1302</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_2715">
@@ -3148,7 +3191,7 @@
 			<field name="code">2715</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2653">
@@ -3156,7 +3199,7 @@
 			<field name="code">2653</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_1450">
@@ -3164,7 +3207,7 @@
 			<field name="code">1450</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account_type_receivable_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_2650">
@@ -3172,7 +3215,7 @@
 			<field name="code">2650</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2657">
@@ -3180,7 +3223,7 @@
 			<field name="code">2657</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2656">
@@ -3188,7 +3231,7 @@
 			<field name="code">2656</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2655">
@@ -3196,7 +3239,7 @@
 			<field name="code">2655</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2654">
@@ -3204,7 +3247,7 @@
 			<field name="code">2654</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_4228">
@@ -3212,7 +3255,7 @@
 			<field name="code">4228</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4229">
@@ -3220,7 +3263,7 @@
 			<field name="code">4229</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4220">
@@ -3228,7 +3271,7 @@
 			<field name="code">4220</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_8540">
@@ -3236,7 +3279,7 @@
 			<field name="code">8540</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8919">
@@ -3244,7 +3287,7 @@
 			<field name="code">8919</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1830">
@@ -3252,7 +3295,7 @@
 			<field name="code">1830</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_8610">
@@ -3260,7 +3303,7 @@
 			<field name="code">8610</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_3794">
@@ -3268,7 +3311,7 @@
 			<field name="code">3794</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4380">
@@ -3276,7 +3319,7 @@
 			<field name="code">4380</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_3790">
@@ -3284,7 +3327,7 @@
 			<field name="code">3790</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2406">
@@ -3292,7 +3335,7 @@
 			<field name="code">2406</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2407">
@@ -3300,7 +3343,7 @@
 			<field name="code">2407</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2404">
@@ -3308,7 +3351,7 @@
 			<field name="code">2404</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1372">
@@ -3316,7 +3359,7 @@
 			<field name="code">1372</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2402">
@@ -3324,7 +3367,7 @@
 			<field name="code">2402</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2403">
@@ -3332,7 +3375,7 @@
 			<field name="code">2403</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2400">
@@ -3340,7 +3383,7 @@
 			<field name="code">2400</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2401">
@@ -3348,7 +3391,7 @@
 			<field name="code">2401</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4862">
@@ -3356,7 +3399,7 @@
 			<field name="code">4862</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4860">
@@ -3364,7 +3407,7 @@
 			<field name="code">4860</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4230">
@@ -3372,7 +3415,7 @@
 			<field name="code">4230</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_2010">
@@ -3380,7 +3423,7 @@
 			<field name="code">2010</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2408">
@@ -3388,7 +3431,7 @@
 			<field name="code">2408</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2409">
@@ -3396,7 +3439,7 @@
 			<field name="code">2409</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_3830">
@@ -3404,7 +3447,7 @@
 			<field name="code">3830</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1759">
@@ -3412,7 +3455,7 @@
 			<field name="code">1759</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_1701">
@@ -3420,7 +3463,7 @@
 			<field name="code">1701</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_8807">
@@ -3428,7 +3471,7 @@
 			<field name="code">8807</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1344">
@@ -3436,7 +3479,7 @@
 			<field name="code">1344</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1620"/>
 		</record>
 		<record model="account.account.template" id="account_4595">
@@ -3444,7 +3487,7 @@
 			<field name="code">4595</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_4730">
@@ -3452,7 +3495,7 @@
 			<field name="code">4730</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1345">
@@ -3460,7 +3503,7 @@
 			<field name="code">1345</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1630"/>
 		</record>
 		<record model="account.account.template" id="account_8330">
@@ -3468,7 +3511,7 @@
 			<field name="code">8330</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1630">
@@ -3476,7 +3519,7 @@
 			<field name="code">1630</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account_type_payable_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1950">
@@ -3484,7 +3527,7 @@
 			<field name="code">1950</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_1704">
@@ -3492,7 +3535,7 @@
 			<field name="code">1704</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_8338">
@@ -3500,7 +3543,7 @@
 			<field name="code">8338</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4679">
@@ -3508,7 +3551,7 @@
 			<field name="code">4679</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0540">
@@ -3516,7 +3559,7 @@
 			<field name="code">0540</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1325"/>
 		</record>
 		<record model="account.account.template" id="account_4870">
@@ -3524,7 +3567,7 @@
 			<field name="code">4870</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_0530">
@@ -3532,7 +3575,7 @@
 			<field name="code">0530</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1320"/>
 		</record>
 		<record model="account.account.template" id="account_4139">
@@ -3540,7 +3583,7 @@
 			<field name="code">4139</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_3560">
@@ -3548,7 +3591,7 @@
 			<field name="code">3560</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8520">
@@ -3556,7 +3599,7 @@
 			<field name="code">8520</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_2318">
@@ -3564,7 +3607,7 @@
 			<field name="code">2318</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0760">
@@ -3572,7 +3615,7 @@
 			<field name="code">0760</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_4130">
@@ -3580,7 +3623,7 @@
 			<field name="code">4130</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0430">
@@ -3588,7 +3631,7 @@
 			<field name="code">0430</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1752">
@@ -3596,7 +3639,7 @@
 			<field name="code">1752</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_2316">
@@ -3604,7 +3647,7 @@
 			<field name="code">2316</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1751">
@@ -3612,7 +3655,7 @@
 			<field name="code">1751</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_2317">
@@ -3620,7 +3663,7 @@
 			<field name="code">2317</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8970">
@@ -3628,7 +3671,7 @@
 			<field name="code">8970</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1040"/>
 		</record>
 		<record model="account.account.template" id="account_4678">
@@ -3636,7 +3679,7 @@
 			<field name="code">4678</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8975">
@@ -3644,7 +3687,7 @@
 			<field name="code">8975</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1040"/>
 		</record>
 		<record model="account.account.template" id="account_8977">
@@ -3652,7 +3695,7 @@
 			<field name="code">8977</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1040"/>
 		</record>
 		<record model="account.account.template" id="account_4900">
@@ -3660,7 +3703,7 @@
 			<field name="code">4900</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_8764">
@@ -3668,7 +3711,7 @@
 			<field name="code">8764</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1481">
@@ -3676,7 +3719,7 @@
 			<field name="code">1481</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1480">
@@ -3684,7 +3727,7 @@
 			<field name="code">1480</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account_type_receivable_de"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1485">
@@ -3692,7 +3735,7 @@
 			<field name="code">1485</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1555"/>
 		</record>
 		<record model="account.account.template" id="account_1489">
@@ -3700,7 +3743,7 @@
 			<field name="code">1489</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1555"/>
 		</record>
 		<record model="account.account.template" id="account_1488">
@@ -3708,7 +3751,7 @@
 			<field name="code">1488</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_0699">
@@ -3716,7 +3759,7 @@
 			<field name="code">0699</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2470"/>
 		</record>
 		<record model="account.account.template" id="account_3300">
@@ -3724,7 +3767,7 @@
 			<field name="code">3300</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2309">
@@ -3732,7 +3775,7 @@
 			<field name="code">2309</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1711">
@@ -3740,7 +3783,7 @@
 			<field name="code">1711</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_1710">
@@ -3748,7 +3791,7 @@
 			<field name="code">1710</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_1717">
@@ -3756,7 +3799,7 @@
 			<field name="code">1717</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_0320">
@@ -3764,7 +3807,7 @@
 			<field name="code">0320</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_2300">
@@ -3772,7 +3815,7 @@
 			<field name="code">2300</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1719">
@@ -3780,7 +3823,7 @@
 			<field name="code">1719</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_1718">
@@ -3788,7 +3831,7 @@
 			<field name="code">1718</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_2307">
@@ -3796,7 +3839,7 @@
 			<field name="code">2307</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_0990">
@@ -3804,7 +3847,7 @@
 			<field name="code">0990</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2560"/>
 		</record>
 		<record model="account.account.template" id="account_1659">
@@ -3812,7 +3855,7 @@
 			<field name="code">1659</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_0996">
@@ -3820,7 +3863,7 @@
 			<field name="code">0996</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_0997">
@@ -3828,7 +3871,7 @@
 			<field name="code">0997</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_1650">
@@ -3836,7 +3879,7 @@
 			<field name="code">1650</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account_type_payable_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1651">
@@ -3844,7 +3887,7 @@
 			<field name="code">1651</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_0440">
@@ -3852,7 +3895,7 @@
 			<field name="code">0440</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_2520">
@@ -3860,7 +3903,7 @@
 			<field name="code">2520</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1655">
@@ -3868,7 +3911,7 @@
 			<field name="code">1655</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2490"/>
 		</record>
 		<record model="account.account.template" id="account_2289">
@@ -3876,7 +3919,7 @@
 			<field name="code">2289</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_0260">
@@ -3884,7 +3927,7 @@
 			<field name="code">0260</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_3660">
@@ -3892,7 +3935,7 @@
 			<field name="code">3660</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3748">
@@ -3900,7 +3943,7 @@
 			<field name="code">3748</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1631">
@@ -3908,7 +3951,7 @@
 			<field name="code">1631</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2515"/>
 		</record>
 		<record model="account.account.template" id="account_2280">
@@ -3916,7 +3959,7 @@
 			<field name="code">2280</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2281">
@@ -3924,7 +3967,7 @@
 			<field name="code">2281</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2282">
@@ -3932,7 +3975,7 @@
 			<field name="code">2282</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2283">
@@ -3940,7 +3983,7 @@
 			<field name="code">2283</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2284">
@@ -3948,7 +3991,7 @@
 			<field name="code">2284</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2285">
@@ -3956,7 +3999,7 @@
 			<field name="code">2285</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_8200">
@@ -3964,7 +4007,7 @@
 			<field name="code">8200</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_2287">
@@ -3972,7 +4015,7 @@
 			<field name="code">2287</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_3153">
@@ -3980,7 +4023,7 @@
 			<field name="code">3153</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3152">
@@ -3988,7 +4031,7 @@
 			<field name="code">3152</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3151">
@@ -3996,7 +4039,7 @@
 			<field name="code">3151</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3150">
@@ -4004,7 +4047,7 @@
 			<field name="code">3150</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3155">
@@ -4012,7 +4055,7 @@
 			<field name="code">3155</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3154">
@@ -4020,7 +4063,7 @@
 			<field name="code">3154</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4540">
@@ -4028,7 +4071,7 @@
 			<field name="code">4540</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_4976">
@@ -4036,7 +4079,7 @@
 			<field name="code">4976</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2510">
@@ -4044,7 +4087,7 @@
 			<field name="code">2510</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2652">
@@ -4052,7 +4095,7 @@
 			<field name="code">2652</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_4970">
@@ -4060,7 +4103,7 @@
 			<field name="code">4970</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0420">
@@ -4068,7 +4111,7 @@
 			<field name="code">0420</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_4822">
@@ -4076,7 +4119,7 @@
 			<field name="code">4822</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_8729">
@@ -4084,7 +4127,7 @@
 			<field name="code">8729</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0210">
@@ -4092,7 +4135,7 @@
 			<field name="code">0210</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_0199">
@@ -4100,7 +4143,7 @@
 			<field name="code">0199</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_2149">
@@ -4108,7 +4151,7 @@
 			<field name="code">2149</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_0740">
@@ -4116,7 +4159,7 @@
 			<field name="code">0740</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_0192">
@@ -4124,7 +4167,7 @@
 			<field name="code">0192</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0661">
@@ -4132,7 +4175,7 @@
 			<field name="code">0661</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2475"/>
 		</record>
 		<record model="account.account.template" id="account_0190">
@@ -4140,7 +4183,7 @@
 			<field name="code">0190</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0191">
@@ -4148,7 +4191,7 @@
 			<field name="code">0191</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8725">
@@ -4156,7 +4199,7 @@
 			<field name="code">8725</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8724">
@@ -4164,7 +4207,7 @@
 			<field name="code">8724</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0194">
@@ -4172,7 +4215,7 @@
 			<field name="code">0194</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0195">
@@ -4180,7 +4223,7 @@
 			<field name="code">0195</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_1348">
@@ -4188,7 +4231,7 @@
 			<field name="code">1348</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1640"/>
 		</record>
 		<record model="account.account.template" id="account_1349">
@@ -4196,7 +4239,7 @@
 			<field name="code">1349</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1640"/>
 		</record>
 		<record model="account.account.template" id="account_1220">
@@ -4204,7 +4247,7 @@
 			<field name="code">1220</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_1340">
@@ -4212,7 +4255,7 @@
 			<field name="code">1340</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1620"/>
 		</record>
 		<record model="account.account.template" id="account_4180">
@@ -4220,7 +4263,7 @@
 			<field name="code">4180</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_2714">
@@ -4228,7 +4271,7 @@
 			<field name="code">2714</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2451">
@@ -4236,7 +4279,7 @@
 			<field name="code">2451</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2450">
@@ -4244,7 +4287,7 @@
 			<field name="code">2450</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_4948">
@@ -4252,7 +4295,7 @@
 			<field name="code">4948</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_8700">
@@ -4260,7 +4303,7 @@
 			<field name="code">8700</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_3770">
@@ -4268,7 +4311,7 @@
 			<field name="code">3770</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4980">
@@ -4276,7 +4319,7 @@
 			<field name="code">4980</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1870">
@@ -4284,7 +4327,7 @@
 			<field name="code">1870</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_8110">
@@ -4292,7 +4335,7 @@
 			<field name="code">8110</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1879">
@@ -4300,7 +4343,7 @@
 			<field name="code">1879</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4945">
@@ -4308,7 +4351,7 @@
 			<field name="code">4945</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1502">
@@ -4316,7 +4359,7 @@
 			<field name="code">1502</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_3200">
@@ -4324,7 +4367,7 @@
 			<field name="code">3200</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4940">
@@ -4332,7 +4375,7 @@
 			<field name="code">4940</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1503">
@@ -4340,7 +4383,7 @@
 			<field name="code">1503</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4826">
@@ -4348,7 +4391,7 @@
 			<field name="code">4826</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4824">
@@ -4356,7 +4399,7 @@
 			<field name="code">4824</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4530">
@@ -4364,7 +4407,7 @@
 			<field name="code">4530</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_1645">
@@ -4372,7 +4415,7 @@
 			<field name="code">1645</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2520"/>
 		</record>
 		<record model="account.account.template" id="account_4820">
@@ -4380,7 +4423,7 @@
 			<field name="code">4820</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2118">
@@ -4388,7 +4431,7 @@
 			<field name="code">2118</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2119">
@@ -4396,7 +4439,7 @@
 			<field name="code">2119</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_1500">
@@ -4404,7 +4447,7 @@
 			<field name="code">1500</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0065">
@@ -4412,7 +4455,7 @@
 			<field name="code">0065</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1506">
@@ -4420,7 +4463,7 @@
 			<field name="code">1506</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_1507">
@@ -4428,7 +4471,7 @@
 			<field name="code">1507</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1504">
@@ -4436,7 +4479,7 @@
 			<field name="code">1504</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_1505">
@@ -4444,7 +4487,7 @@
 			<field name="code">1505</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2110">
@@ -4452,7 +4495,7 @@
 			<field name="code">2110</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_8611">
@@ -4460,7 +4503,7 @@
 			<field name="code">8611</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1508">
@@ -4468,7 +4511,7 @@
 			<field name="code">1508</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_2113">
@@ -4476,7 +4519,7 @@
 			<field name="code">2113</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2115">
@@ -4484,7 +4527,7 @@
 			<field name="code">2115</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2116">
@@ -4492,7 +4535,7 @@
 			<field name="code">2116</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_8591">
@@ -4500,7 +4543,7 @@
 			<field name="code">8591</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1110">
@@ -4508,7 +4551,7 @@
 			<field name="code">1110</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_2620">
@@ -4516,7 +4559,7 @@
 			<field name="code">2620</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2626">
@@ -4524,7 +4567,7 @@
 			<field name="code">2626</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_0060">
@@ -4532,7 +4575,7 @@
 			<field name="code">0060</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2625">
@@ -4540,7 +4583,7 @@
 			<field name="code">2625</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_8310">
@@ -4548,7 +4591,7 @@
 			<field name="code">8310</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0963">
@@ -4556,7 +4599,7 @@
 			<field name="code">0963</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_8575">
@@ -4564,7 +4607,7 @@
 			<field name="code">8575</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8576">
@@ -4572,7 +4615,7 @@
 			<field name="code">8576</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8570">
@@ -4580,7 +4623,7 @@
 			<field name="code">8570</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0966">
@@ -4588,7 +4631,7 @@
 			<field name="code">0966</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0965">
@@ -4596,7 +4639,7 @@
 			<field name="code">0965</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_1910">
@@ -4604,7 +4647,7 @@
 			<field name="code">1910</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_0969">
@@ -4612,7 +4655,7 @@
 			<field name="code">0969</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_8579">
@@ -4620,7 +4663,7 @@
 			<field name="code">8579</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_4655">
@@ -4628,7 +4671,7 @@
 			<field name="code">4655</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8595">
@@ -4636,7 +4679,7 @@
 			<field name="code">8595</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1773">
@@ -4644,7 +4687,7 @@
 			<field name="code">1773</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_3440">
@@ -4652,7 +4695,7 @@
 			<field name="code">3440</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4985">
@@ -4660,7 +4703,7 @@
 			<field name="code">4985</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4664">
@@ -4668,7 +4711,7 @@
 			<field name="code">4664</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2020">
@@ -4676,7 +4719,7 @@
 			<field name="code">2020</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_8590">
@@ -4684,7 +4727,7 @@
 			<field name="code">8590</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_2750">
@@ -4692,7 +4735,7 @@
 			<field name="code">2750</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4666">
@@ -4700,7 +4743,7 @@
 			<field name="code">4666</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4650">
@@ -4708,7 +4751,7 @@
 			<field name="code">4650</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2405">
@@ -4716,7 +4759,7 @@
 			<field name="code">2405</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_0499">
@@ -4724,7 +4767,7 @@
 			<field name="code">0499</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0498">
@@ -4732,7 +4775,7 @@
 			<field name="code">0498</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0490">
@@ -4740,7 +4783,7 @@
 			<field name="code">0490</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_3746">
@@ -4748,7 +4791,7 @@
 			<field name="code">3746</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4590">
@@ -4756,7 +4799,7 @@
 			<field name="code">4590</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_4760">
@@ -4764,7 +4807,7 @@
 			<field name="code">4760</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_4910">
@@ -4772,7 +4815,7 @@
 			<field name="code">4910</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0799">
@@ -4780,7 +4823,7 @@
 			<field name="code">0799</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1970">
@@ -4788,7 +4831,7 @@
 			<field name="code">1970</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4199">
@@ -4796,7 +4839,7 @@
 			<field name="code">4199</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0400">
@@ -4804,7 +4847,7 @@
 			<field name="code">0400</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_4165">
@@ -4812,7 +4855,7 @@
 			<field name="code">4165</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4160">
@@ -4820,7 +4863,7 @@
 			<field name="code">4160</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1960">
@@ -4828,7 +4871,7 @@
 			<field name="code">1960</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_1470">
@@ -4836,7 +4879,7 @@
 			<field name="code">1470</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account_type_receivable_de"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_1610">
@@ -4844,7 +4887,7 @@
 			<field name="code">1610</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account_type_payable_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_4168">
@@ -4852,7 +4895,7 @@
 			<field name="code">4168</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_3970">
@@ -4860,7 +4903,7 @@
 			<field name="code">3970</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1450"/>
 		</record>
 		<record model="account.account.template" id="account_8925">
@@ -4868,7 +4911,7 @@
 			<field name="code">8925</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1471">
@@ -4876,7 +4919,7 @@
 			<field name="code">1471</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_4152">
@@ -4884,7 +4927,7 @@
 			<field name="code">4152</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_8921">
@@ -4892,7 +4935,7 @@
 			<field name="code">8921</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8920">
@@ -4900,7 +4943,7 @@
 			<field name="code">8920</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8929">
@@ -4908,7 +4951,7 @@
 			<field name="code">8929</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8760">
@@ -4916,7 +4959,7 @@
 			<field name="code">8760</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8648">
@@ -4924,7 +4967,7 @@
 			<field name="code">8648</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8140">
@@ -4932,7 +4975,7 @@
 			<field name="code">8140</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0380">
@@ -4940,7 +4983,7 @@
 			<field name="code">0380</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_0220">
@@ -4948,7 +4991,7 @@
 			<field name="code">0220</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_8915">
@@ -4956,7 +4999,7 @@
 			<field name="code">8915</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8818">
@@ -4964,7 +5007,7 @@
 			<field name="code">8818</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_7100">
@@ -4972,7 +5015,7 @@
 			<field name="code">7100</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1470"/>
 		</record>
 		<record model="account.account.template" id="account_4128">
@@ -4980,7 +5023,7 @@
 			<field name="code">4128</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1558">
@@ -4988,7 +5031,7 @@
 			<field name="code">1558</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1501">
@@ -4996,7 +5039,7 @@
 			<field name="code">1501</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1478">
@@ -5004,7 +5047,7 @@
 			<field name="code">1478</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_8574">
@@ -5012,7 +5055,7 @@
 			<field name="code">8574</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1570">
@@ -5020,7 +5063,7 @@
 			<field name="code">1570</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4710">
@@ -5028,7 +5071,7 @@
 			<field name="code">4710</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_3745">
@@ -5036,7 +5079,7 @@
 			<field name="code">3745</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8769">
@@ -5044,7 +5087,7 @@
 			<field name="code">8769</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1680">
@@ -5052,7 +5095,7 @@
 			<field name="code">1680</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2500"/>
 		</record>
 		<record model="account.account.template" id="account_1768">
@@ -5060,7 +5103,7 @@
 			<field name="code">1768</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1769">
@@ -5068,7 +5111,7 @@
 			<field name="code">1769</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_8640">
@@ -5076,7 +5119,7 @@
 			<field name="code">8640</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1762">
@@ -5084,7 +5127,7 @@
 			<field name="code">1762</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_1763">
@@ -5092,7 +5135,7 @@
 			<field name="code">1763</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_1760">
@@ -5100,7 +5143,7 @@
 			<field name="code">1760</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_0700">
@@ -5108,7 +5151,7 @@
 			<field name="code">0700</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2515"/>
 		</record>
 		<record model="account.account.template" id="account_1766">
@@ -5116,7 +5159,7 @@
 			<field name="code">1766</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_1767">
@@ -5124,7 +5167,7 @@
 			<field name="code">1767</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1764">
@@ -5132,7 +5175,7 @@
 			<field name="code">1764</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_1765">
@@ -5140,7 +5183,7 @@
 			<field name="code">1765</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_4301">
@@ -5148,7 +5191,7 @@
 			<field name="code">4301</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4289">
@@ -5156,7 +5199,7 @@
 			<field name="code">4289</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_0039">
@@ -5164,7 +5207,7 @@
 			<field name="code">0039</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1150"/>
 		</record>
 		<record model="account.account.template" id="account_0038">
@@ -5172,7 +5215,7 @@
 			<field name="code">0038</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1150"/>
 		</record>
 		<record model="account.account.template" id="account_2713">
@@ -5180,7 +5223,7 @@
 			<field name="code">2713</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0035">
@@ -5188,7 +5231,7 @@
 			<field name="code">0035</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1130"/>
 		</record>
 		<record model="account.account.template" id="account_8625">
@@ -5196,7 +5239,7 @@
 			<field name="code">8625</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0030">
@@ -5204,7 +5247,7 @@
 			<field name="code">0030</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_8150">
@@ -5212,7 +5255,7 @@
 			<field name="code">8150</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4570">
@@ -5220,7 +5263,7 @@
 			<field name="code">4570</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_2711">
@@ -5228,7 +5271,7 @@
 			<field name="code">2711</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8808">
@@ -5236,7 +5279,7 @@
 			<field name="code">8808</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1300">
@@ -5244,7 +5287,7 @@
 			<field name="code">1300</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_8780">
@@ -5252,7 +5295,7 @@
 			<field name="code">8780</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_3552">
@@ -5260,7 +5303,7 @@
 			<field name="code">3552</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4909">
@@ -5268,7 +5311,7 @@
 			<field name="code">4909</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1547">
@@ -5276,7 +5319,7 @@
 			<field name="code">1547</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1545">
@@ -5284,7 +5327,7 @@
 			<field name="code">1545</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1542">
@@ -5292,7 +5335,7 @@
 			<field name="code">1542</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1543">
@@ -5300,7 +5343,7 @@
 			<field name="code">1543</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1540">
@@ -5308,7 +5351,7 @@
 			<field name="code">1540</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0755">
@@ -5316,7 +5359,7 @@
 			<field name="code">0755</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_4676">
@@ -5324,7 +5367,7 @@
 			<field name="code">4676</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_3120">
@@ -5332,7 +5375,7 @@
 			<field name="code">3120</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4674">
@@ -5340,7 +5383,7 @@
 			<field name="code">4674</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4673">
@@ -5348,7 +5391,7 @@
 			<field name="code">4673</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4672">
@@ -5356,7 +5399,7 @@
 			<field name="code">4672</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1548">
@@ -5364,7 +5407,7 @@
 			<field name="code">1548</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1549">
@@ -5372,7 +5415,7 @@
 			<field name="code">1549</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_8710">
@@ -5380,7 +5423,7 @@
 			<field name="code">8710</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0140">
@@ -5388,7 +5431,7 @@
 			<field name="code">0140</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0145">
@@ -5396,7 +5439,7 @@
 			<field name="code">0145</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0631">
@@ -5404,7 +5447,7 @@
 			<field name="code">0631</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2475"/>
 		</record>
 		<record model="account.account.template" id="account_0146">
@@ -5412,7 +5455,7 @@
 			<field name="code">0146</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0149">
@@ -5420,7 +5463,7 @@
 			<field name="code">0149</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0148">
@@ -5428,7 +5471,7 @@
 			<field name="code">0148</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1461">
@@ -5436,7 +5479,7 @@
 			<field name="code">1461</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1460">
@@ -5444,7 +5487,7 @@
 			<field name="code">1460</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1315">
@@ -5452,7 +5495,7 @@
 			<field name="code">1315</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_2709">
@@ -5460,7 +5503,7 @@
 			<field name="code">2709</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1312">
@@ -5468,7 +5511,7 @@
 			<field name="code">1312</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1545"/>
 		</record>
 		<record model="account.account.template" id="account_1311">
@@ -5476,7 +5519,7 @@
 			<field name="code">1311</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_1310">
@@ -5484,7 +5527,7 @@
 			<field name="code">1310</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_2705">
@@ -5492,7 +5535,7 @@
 			<field name="code">2705</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2707">
@@ -5500,7 +5543,7 @@
 			<field name="code">2707</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2700">
@@ -5508,7 +5551,7 @@
 			<field name="code">2700</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4886">
@@ -5516,7 +5559,7 @@
 			<field name="code">4886</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4887">
@@ -5524,7 +5567,7 @@
 			<field name="code">4887</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2389">
@@ -5532,7 +5575,7 @@
 			<field name="code">2389</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1020">
@@ -5540,7 +5583,7 @@
 			<field name="code">1020</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4875">
@@ -5548,7 +5591,7 @@
 			<field name="code">4875</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4874">
@@ -5556,7 +5599,7 @@
 			<field name="code">4874</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2649">
@@ -5564,7 +5607,7 @@
 			<field name="code">2649</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_0616">
@@ -5572,7 +5615,7 @@
 			<field name="code">0616</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2465"/>
 		</record>
 		<record model="account.account.template" id="account_4871">
@@ -5580,7 +5623,7 @@
 			<field name="code">4871</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_0640">
@@ -5588,7 +5631,7 @@
 			<field name="code">0640</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2470"/>
 		</record>
 		<record model="account.account.template" id="account_3400">
@@ -5596,7 +5639,7 @@
 			<field name="code">3400</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4872">
@@ -5604,7 +5647,7 @@
 			<field name="code">4872</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4879">
@@ -5612,7 +5655,7 @@
 			<field name="code">4879</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1820">
@@ -5620,7 +5663,7 @@
 			<field name="code">1820</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_2140">
@@ -5628,7 +5671,7 @@
 			<field name="code">2140</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2792">
@@ -5636,7 +5679,7 @@
 			<field name="code">2792</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4975">
@@ -5644,7 +5687,7 @@
 			<field name="code">4975</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2790">
@@ -5652,7 +5695,7 @@
 			<field name="code">2790</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8731">
@@ -5660,7 +5703,7 @@
 			<field name="code">8731</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1380">
@@ -5668,7 +5711,7 @@
 			<field name="code">1380</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2794">
@@ -5676,7 +5719,7 @@
 			<field name="code">2794</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8980">
@@ -5684,7 +5727,7 @@
 			<field name="code">8980</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1040"/>
 		</record>
 		<record model="account.account.template" id="account_8516">
@@ -5692,7 +5735,7 @@
 			<field name="code">8516</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4700">
@@ -5700,7 +5743,7 @@
 			<field name="code">4700</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_4668">
@@ -5708,7 +5751,7 @@
 			<field name="code">4668</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1920">
@@ -5716,7 +5759,7 @@
 			<field name="code">1920</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_8515">
@@ -5724,7 +5767,7 @@
 			<field name="code">8515</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8320">
@@ -5732,7 +5775,7 @@
 			<field name="code">8320</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4280">
@@ -5740,7 +5783,7 @@
 			<field name="code">4280</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_0520">
@@ -5748,7 +5791,7 @@
 			<field name="code">0520</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1310"/>
 		</record>
 		<record model="account.account.template" id="account_8609">
@@ -5756,7 +5799,7 @@
 			<field name="code">8609</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8510">
@@ -5764,7 +5807,7 @@
 			<field name="code">8510</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0525">
@@ -5772,7 +5815,7 @@
 			<field name="code">0525</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1320"/>
 		</record>
 		<record model="account.account.template" id="account_0910">
@@ -5780,7 +5823,7 @@
 			<field name="code">0910</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_4120">
@@ -5788,7 +5831,7 @@
 			<field name="code">4120</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4127">
@@ -5796,7 +5839,7 @@
 			<field name="code">4127</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4126">
@@ -5804,7 +5847,7 @@
 			<field name="code">4126</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4125">
@@ -5812,7 +5855,7 @@
 			<field name="code">4125</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4124">
@@ -5820,7 +5863,7 @@
 			<field name="code">4124</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_2666">
@@ -5828,7 +5871,7 @@
 			<field name="code">2666</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_2660">
@@ -5836,7 +5879,7 @@
 			<field name="code">2660</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0159">
@@ -5844,7 +5887,7 @@
 			<field name="code">0159</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0880">
@@ -5852,7 +5895,7 @@
 			<field name="code">0880</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_8960">
@@ -5860,7 +5903,7 @@
 			<field name="code">8960</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1040"/>
 		</record>
 		<record model="account.account.template" id="account_1775">
@@ -5868,7 +5911,7 @@
 			<field name="code">1775</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_4882">
@@ -5876,7 +5919,7 @@
 			<field name="code">4882</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1776">
@@ -5884,7 +5927,7 @@
 			<field name="code">1776</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_8518">
@@ -5892,7 +5935,7 @@
 			<field name="code">8518</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0764">
@@ -5900,7 +5943,7 @@
 			<field name="code">0764</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1771">
@@ -5908,7 +5951,7 @@
 			<field name="code">1771</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1567">
@@ -5916,7 +5959,7 @@
 			<field name="code">1567</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1746">
@@ -5924,7 +5967,7 @@
 			<field name="code">1746</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1770">
@@ -5932,7 +5975,7 @@
 			<field name="code">1770</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_0299">
@@ -5940,7 +5983,7 @@
 			<field name="code">0299</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_1641">
@@ -5948,7 +5991,7 @@
 			<field name="code">1641</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2525"/>
 		</record>
 		<record model="account.account.template" id="account_1640">
@@ -5956,7 +5999,7 @@
 			<field name="code">1640</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account_type_payable_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_4750">
@@ -5964,7 +6007,7 @@
 			<field name="code">4750</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_0290">
@@ -5972,7 +6015,7 @@
 			<field name="code">0290</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0731">
@@ -5980,7 +6023,7 @@
 			<field name="code">0731</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1722">
@@ -5988,7 +6031,7 @@
 			<field name="code">1722</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_1490"/>
 		</record>
 		<record model="account.account.template" id="account_1648">
@@ -5996,7 +6039,7 @@
 			<field name="code">1648</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2520"/>
 		</record>
 		<record model="account.account.template" id="account_1720">
@@ -6004,7 +6047,7 @@
 			<field name="code">1720</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2480"/>
 		</record>
 		<record model="account.account.template" id="account_1721">
@@ -6012,7 +6055,7 @@
 			<field name="code">1721</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2480"/>
 		</record>
 		<record model="account.account.template" id="account_8817">
@@ -6020,7 +6063,7 @@
 			<field name="code">8817</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0595">
@@ -6028,7 +6071,7 @@
 			<field name="code">0595</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1330"/>
 		</record>
 		<record model="account.account.template" id="account_0590">
@@ -6036,7 +6079,7 @@
 			<field name="code">0590</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1325"/>
 		</record>
 		<record model="account.account.template" id="account_0985">
@@ -6044,7 +6087,7 @@
 			<field name="code">0985</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1680"/>
 		</record>
 		<record model="account.account.template" id="account_0984">
@@ -6052,7 +6095,7 @@
 			<field name="code">0984</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1680"/>
 		</record>
 		<record model="account.account.template" id="account_0986">
@@ -6060,7 +6103,7 @@
 			<field name="code">0986</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1680"/>
 		</record>
 		<record model="account.account.template" id="account_0980">
@@ -6068,7 +6111,7 @@
 			<field name="code">0980</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1680"/>
 		</record>
 		<record model="account.account.template" id="account_0983">
@@ -6076,7 +6119,7 @@
 			<field name="code">0983</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1700"/>
 		</record>
 		<record model="account.account.template" id="account_0450">
@@ -6084,7 +6127,7 @@
 			<field name="code">0450</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_0178">
@@ -6092,7 +6135,7 @@
 			<field name="code">0178</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0179">
@@ -6100,7 +6143,7 @@
 			<field name="code">0179</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8100">
@@ -6108,7 +6151,7 @@
 			<field name="code">8100</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8748">
@@ -6116,7 +6159,7 @@
 			<field name="code">8748</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0170">
@@ -6124,7 +6167,7 @@
 			<field name="code">0170</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_3750">
@@ -6132,7 +6175,7 @@
 			<field name="code">3750</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8745">
@@ -6140,7 +6183,7 @@
 			<field name="code">8745</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8743">
@@ -6148,7 +6191,7 @@
 			<field name="code">8743</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0175">
@@ -6156,7 +6199,7 @@
 			<field name="code">0175</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0176">
@@ -6164,7 +6207,7 @@
 			<field name="code">0176</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0177">
@@ -6172,7 +6215,7 @@
 			<field name="code">0177</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4632">
@@ -6180,7 +6223,7 @@
 			<field name="code">4632</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4631">
@@ -6188,7 +6231,7 @@
 			<field name="code">4631</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4630">
@@ -6196,7 +6239,7 @@
 			<field name="code">4630</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4637">
@@ -6204,7 +6247,7 @@
 			<field name="code">4637</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_3000">
@@ -6212,7 +6255,7 @@
 			<field name="code">3000</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4635">
@@ -6220,7 +6263,7 @@
 			<field name="code">4635</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4638">
@@ -6228,7 +6271,7 @@
 			<field name="code">4638</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2200">
@@ -6236,7 +6279,7 @@
 			<field name="code">2200</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_1371">
@@ -6244,7 +6287,7 @@
 			<field name="code">1371</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1588">
@@ -6252,7 +6295,7 @@
 			<field name="code">1588</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2203">
@@ -6260,7 +6303,7 @@
 			<field name="code">2203</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2204">
@@ -6268,7 +6311,7 @@
 			<field name="code">2204</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_0180">
@@ -6276,7 +6319,7 @@
 			<field name="code">0180</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_2206">
@@ -6284,7 +6327,7 @@
 			<field name="code">2206</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_1370">
@@ -6292,7 +6335,7 @@
 			<field name="code">1370</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2208">
@@ -6300,7 +6343,7 @@
 			<field name="code">2208</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2209">
@@ -6308,7 +6351,7 @@
 			<field name="code">2209</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_1580">
@@ -6316,7 +6359,7 @@
 			<field name="code">1580</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1581">
@@ -6324,7 +6367,7 @@
 			<field name="code">1581</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0189">
@@ -6332,7 +6375,7 @@
 			<field name="code">0189</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_1587">
@@ -6340,7 +6383,7 @@
 			<field name="code">1587</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1584">
@@ -6348,7 +6391,7 @@
 			<field name="code">1584</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1585">
@@ -6356,7 +6399,7 @@
 			<field name="code">1585</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0770">
@@ -6364,7 +6407,7 @@
 			<field name="code">0770</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0771">
@@ -6372,7 +6415,7 @@
 			<field name="code">0771</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0777">
@@ -6380,7 +6423,7 @@
 			<field name="code">0777</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_0774">
@@ -6388,7 +6431,7 @@
 			<field name="code">0774</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_2150">
@@ -6396,7 +6439,7 @@
 			<field name="code">2150</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0670">
@@ -6404,7 +6447,7 @@
 			<field name="code">0670</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2470"/>
 		</record>
 		<record model="account.account.template" id="account_8105">
@@ -6412,7 +6455,7 @@
 			<field name="code">8105</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0350">
@@ -6420,7 +6463,7 @@
 			<field name="code">0350</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1210">
@@ -6428,7 +6471,7 @@
 			<field name="code">1210</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4270">
@@ -6436,7 +6479,7 @@
 			<field name="code">4270</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_0001">
@@ -6444,7 +6487,7 @@
 			<field name="code">0001</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1050"/>
 		</record>
 		<record model="account.account.template" id="account_1352">
@@ -6452,7 +6495,7 @@
 			<field name="code">1352</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1350">
@@ -6460,7 +6503,7 @@
 			<field name="code">1350</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1355">
@@ -6468,7 +6511,7 @@
 			<field name="code">1355</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4780">
@@ -6476,7 +6519,7 @@
 			<field name="code">4780</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1860">
@@ -6484,7 +6527,7 @@
 			<field name="code">1860</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4810">
@@ -6492,7 +6535,7 @@
 			<field name="code">4810</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1869">
@@ -6500,7 +6543,7 @@
 			<field name="code">1869</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_3725">
@@ -6508,7 +6551,7 @@
 			<field name="code">3725</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3726">
@@ -6516,7 +6559,7 @@
 			<field name="code">3726</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3727">
@@ -6524,7 +6567,7 @@
 			<field name="code">3727</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3720">
@@ -6532,7 +6575,7 @@
 			<field name="code">3720</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3722">
@@ -6540,7 +6583,7 @@
 			<field name="code">3722</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3723">
@@ -6548,7 +6591,7 @@
 			<field name="code">3723</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4930">
@@ -6556,7 +6599,7 @@
 			<field name="code">4930</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4680">
@@ -6564,7 +6607,7 @@
 			<field name="code">4680</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2895">
@@ -6572,7 +6615,7 @@
 			<field name="code">2895</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_2894">
@@ -6580,7 +6623,7 @@
 			<field name="code">2894</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_4833">
@@ -6588,7 +6631,7 @@
 			<field name="code">4833</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4832">
@@ -6596,7 +6639,7 @@
 			<field name="code">4832</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2891">
@@ -6604,7 +6647,7 @@
 			<field name="code">2891</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_2890">
@@ -6612,7 +6655,7 @@
 			<field name="code">2890</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_2893">
@@ -6620,7 +6663,7 @@
 			<field name="code">2893</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_2892">
@@ -6628,7 +6671,7 @@
 			<field name="code">2892</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_8589">
@@ -6636,7 +6679,7 @@
 			<field name="code">8589</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0070">
@@ -6644,7 +6687,7 @@
 			<field name="code">0070</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2109">
@@ -6652,7 +6695,7 @@
 			<field name="code">2109</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2108">
@@ -6660,7 +6703,7 @@
 			<field name="code">2108</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_0075">
@@ -6668,7 +6711,7 @@
 			<field name="code">0075</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1451">
@@ -6676,7 +6719,7 @@
 			<field name="code">1451</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1100">
@@ -6684,7 +6727,7 @@
 			<field name="code">1100</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_2103">
@@ -6692,7 +6735,7 @@
 			<field name="code">2103</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_1517">
@@ -6700,7 +6743,7 @@
 			<field name="code">1517</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1480"/>
 		</record>
 		<record model="account.account.template" id="account_2100">
@@ -6708,7 +6751,7 @@
 			<field name="code">2100</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2107">
@@ -6716,7 +6759,7 @@
 			<field name="code">2107</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2106">
@@ -6724,7 +6767,7 @@
 			<field name="code">2106</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2105">
@@ -6732,7 +6775,7 @@
 			<field name="code">2105</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2104">
@@ -6740,7 +6783,7 @@
 			<field name="code">2104</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2734">
@@ -6748,7 +6791,7 @@
 			<field name="code">2734</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2735">
@@ -6756,7 +6799,7 @@
 			<field name="code">2735</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2736">
@@ -6764,7 +6807,7 @@
 			<field name="code">2736</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2730">
@@ -6772,7 +6815,7 @@
 			<field name="code">2730</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2731">
@@ -6780,7 +6823,7 @@
 			<field name="code">2731</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2732">
@@ -6788,7 +6831,7 @@
 			<field name="code">2732</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2733">
@@ -6796,7 +6839,7 @@
 			<field name="code">2733</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2738">
@@ -6804,7 +6847,7 @@
 			<field name="code">2738</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2739">
@@ -6812,7 +6855,7 @@
 			<field name="code">2739</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0767">
@@ -6820,7 +6863,7 @@
 			<field name="code">0767</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_0956">
@@ -6828,7 +6871,7 @@
 			<field name="code">0956</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_0957">
@@ -6836,7 +6879,7 @@
 			<field name="code">0957</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_0955">
@@ -6844,7 +6887,7 @@
 			<field name="code">0955</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_0950">
@@ -6852,7 +6895,7 @@
 			<field name="code">0950</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2380"/>
 		</record>
 		<record model="account.account.template" id="account_4993">
@@ -6860,7 +6903,7 @@
 			<field name="code">4993</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1810">
@@ -6868,7 +6911,7 @@
 			<field name="code">1810</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_3430">
@@ -6876,7 +6919,7 @@
 			<field name="code">3430</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3435">
@@ -6884,7 +6927,7 @@
 			<field name="code">3435</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2740">
@@ -6892,7 +6935,7 @@
 			<field name="code">2740</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2743">
@@ -6900,7 +6943,7 @@
 			<field name="code">2743</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2742">
@@ -6908,7 +6951,7 @@
 			<field name="code">2742</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2744">
@@ -6916,7 +6959,7 @@
 			<field name="code">2744</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2747">
@@ -6924,7 +6967,7 @@
 			<field name="code">2747</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2746">
@@ -6932,7 +6975,7 @@
 			<field name="code">2746</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4840">
@@ -6940,7 +6983,7 @@
 			<field name="code">4840</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4841">
@@ -6948,7 +6991,7 @@
 			<field name="code">4841</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4842">
@@ -6956,7 +6999,7 @@
 			<field name="code">4842</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4843">
@@ -6964,7 +7007,7 @@
 			<field name="code">4843</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4167">
@@ -6972,7 +7015,7 @@
 			<field name="code">4167</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4100">
@@ -6980,7 +7023,7 @@
 			<field name="code">4100</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_8315">
@@ -6988,7 +7031,7 @@
 			<field name="code">8315</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0781">
@@ -6996,7 +7039,7 @@
 			<field name="code">0781</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0780">
@@ -7004,7 +7047,7 @@
 			<field name="code">0780</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0787">
@@ -7012,7 +7055,7 @@
 			<field name="code">0787</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_0784">
@@ -7020,7 +7063,7 @@
 			<field name="code">0784</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_4790">
@@ -7028,7 +7071,7 @@
 			<field name="code">4790</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1609">
@@ -7036,7 +7079,7 @@
 			<field name="code">1609</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_4150">
@@ -7044,7 +7087,7 @@
 			<field name="code">4150</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0410">
@@ -7052,7 +7095,7 @@
 			<field name="code">0410</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_3540">
@@ -7060,7 +7103,7 @@
 			<field name="code">3540</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4925">
@@ -7068,7 +7111,7 @@
 			<field name="code">4925</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4155">
@@ -7076,7 +7119,7 @@
 			<field name="code">4155</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1601">
@@ -7084,7 +7127,7 @@
 			<field name="code">1601</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account_type_payable_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1600">
@@ -7092,7 +7135,7 @@
 			<field name="code">1600</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account_type_payable_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_8720">
@@ -7100,7 +7143,7 @@
 			<field name="code">8720</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1605">
@@ -7108,7 +7151,7 @@
 			<field name="code">1605</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account_type_payable_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1607">
@@ -7116,7 +7159,7 @@
 			<field name="code">1607</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account_type_payable_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1606">
@@ -7124,7 +7167,7 @@
 			<field name="code">1606</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account_type_payable_de"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_8950">
@@ -7132,7 +7175,7 @@
 			<field name="code">8950</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8910">
@@ -7140,7 +7183,7 @@
 			<field name="code">8910</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8819">
@@ -7148,7 +7191,7 @@
 			<field name="code">8819</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1574">
@@ -7156,7 +7199,7 @@
 			<field name="code">1574</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_8853">
@@ -7164,7 +7207,7 @@
 			<field name="code">8853</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8852">
@@ -7172,7 +7215,7 @@
 			<field name="code">8852</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0550">
@@ -7180,7 +7223,7 @@
 			<field name="code">0550</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1325"/>
 		</record>
 		<record model="account.account.template" id="account_4955">
@@ -7188,7 +7231,7 @@
 			<field name="code">4955</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_3980">
@@ -7196,7 +7239,7 @@
 			<field name="code">3980</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1470"/>
 		</record>
 		<record model="account.account.template" id="account_8337">
@@ -7204,7 +7247,7 @@
 			<field name="code">8337</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1788">
@@ -7212,7 +7255,7 @@
 			<field name="code">1788</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1789">
@@ -7220,7 +7263,7 @@
 			<field name="code">1789</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1780">
@@ -7228,7 +7271,7 @@
 			<field name="code">1780</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1781">
@@ -7236,7 +7279,7 @@
 			<field name="code">1781</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1782">
@@ -7244,7 +7287,7 @@
 			<field name="code">1782</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1783">
@@ -7252,7 +7295,7 @@
 			<field name="code">1783</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1784">
@@ -7260,7 +7303,7 @@
 			<field name="code">1784</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1785">
@@ -7268,7 +7311,7 @@
 			<field name="code">1785</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1786">
@@ -7276,7 +7319,7 @@
 			<field name="code">1786</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1787">
@@ -7284,7 +7327,7 @@
 			<field name="code">1787</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_7110">
@@ -7292,7 +7335,7 @@
 			<field name="code">7110</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1470"/>
 		</record>
 		<record model="account.account.template" id="account_4169">
@@ -7300,7 +7343,7 @@
 			<field name="code">4169</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4288">
@@ -7308,7 +7351,7 @@
 			<field name="code">4288</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4290">
@@ -7316,7 +7359,7 @@
 			<field name="code">4290</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_2323">
@@ -7324,7 +7367,7 @@
 			<field name="code">2323</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1774">
@@ -7332,7 +7375,7 @@
 			<field name="code">1774</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1777">
@@ -7340,7 +7383,7 @@
 			<field name="code">1777</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_2320">
@@ -7348,7 +7391,7 @@
 			<field name="code">2320</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2327">
@@ -7356,7 +7399,7 @@
 			<field name="code">2327</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2326">
@@ -7364,7 +7407,7 @@
 			<field name="code">2326</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2325">
@@ -7372,7 +7415,7 @@
 			<field name="code">2325</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1772">
@@ -7380,7 +7423,7 @@
 			<field name="code">1772</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_8930">
@@ -7388,7 +7431,7 @@
 			<field name="code">8930</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_7050">
@@ -7396,7 +7439,7 @@
 			<field name="code">7050</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1460"/>
 		</record>
 		<record model="account.account.template" id="account_2328">
@@ -7404,7 +7447,7 @@
 			<field name="code">2328</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1779">
@@ -7412,7 +7455,7 @@
 			<field name="code">1779</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1778">
@@ -7420,7 +7463,7 @@
 			<field name="code">1778</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_4140">
@@ -7428,7 +7471,7 @@
 			<field name="code">4140</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_8924">
@@ -7436,7 +7479,7 @@
 			<field name="code">8924</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8746">
@@ -7444,7 +7487,7 @@
 			<field name="code">8746</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8931">
@@ -7452,7 +7495,7 @@
 			<field name="code">8931</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0300">
@@ -7460,7 +7503,7 @@
 			<field name="code">0300</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_3760">
@@ -7468,7 +7511,7 @@
 			<field name="code">3760</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4138">
@@ -7476,7 +7519,7 @@
 			<field name="code">4138</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_3764">
@@ -7484,7 +7527,7 @@
 			<field name="code">3764</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_0120">
@@ -7492,7 +7535,7 @@
 			<field name="code">0120</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0040">
@@ -7500,7 +7543,7 @@
 			<field name="code">0040</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1130"/>
 		</record>
 		<record model="account.account.template" id="account_3769">
@@ -7508,7 +7551,7 @@
 			<field name="code">3769</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8829">
@@ -7516,7 +7559,7 @@
 			<field name="code">8829</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0129">
@@ -7524,7 +7567,7 @@
 			<field name="code">0129</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_8630">
@@ -7532,7 +7575,7 @@
 			<field name="code">8630</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_3135">
@@ -7540,7 +7583,7 @@
 			<field name="code">3135</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4560">
@@ -7548,7 +7591,7 @@
 			<field name="code">4560</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_3130">
@@ -7556,7 +7599,7 @@
 			<field name="code">3130</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1561">
@@ -7564,7 +7607,7 @@
 			<field name="code">1561</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_8801">
@@ -7572,7 +7615,7 @@
 			<field name="code">8801</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1290">
@@ -7580,7 +7623,7 @@
 			<field name="code">1290</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_0535">
@@ -7588,7 +7631,7 @@
 			<field name="code">0535</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1320"/>
 		</record>
 		<record model="account.account.template" id="account_1551">
@@ -7596,7 +7639,7 @@
 			<field name="code">1551</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1550">
@@ -7604,7 +7647,7 @@
 			<field name="code">1550</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1555">
@@ -7612,7 +7655,7 @@
 			<field name="code">1555</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_8932">
@@ -7620,7 +7663,7 @@
 			<field name="code">8932</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1557">
@@ -7628,7 +7671,7 @@
 			<field name="code">1557</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1556">
@@ -7636,7 +7679,7 @@
 			<field name="code">1556</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1559">
@@ -7644,7 +7687,7 @@
 			<field name="code">1559</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2490">
@@ -7652,7 +7695,7 @@
 			<field name="code">2490</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2493">
@@ -7660,7 +7703,7 @@
 			<field name="code">2493</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2492">
@@ -7668,7 +7711,7 @@
 			<field name="code">2492</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2494">
@@ -7676,7 +7719,7 @@
 			<field name="code">2494</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2990">
@@ -7684,7 +7727,7 @@
 			<field name="code">2990</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0600">
@@ -7692,7 +7735,7 @@
 			<field name="code">0600</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2467"/>
 		</record>
 		<record model="account.account.template" id="account_0601">
@@ -7700,7 +7743,7 @@
 			<field name="code">0601</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2467"/>
 		</record>
 		<record model="account.account.template" id="account_2501">
@@ -7708,7 +7751,7 @@
 			<field name="code">2501</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2390">
@@ -7716,7 +7759,7 @@
 			<field name="code">2390</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_0605">
@@ -7724,7 +7767,7 @@
 			<field name="code">0605</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2460"/>
 		</record>
 		<record model="account.account.template" id="account_1410">
@@ -7732,7 +7775,7 @@
 			<field name="code">1410</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account_type_receivable_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_2255">
@@ -7740,7 +7783,7 @@
 			<field name="code">2255</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_1295">
@@ -7748,7 +7791,7 @@
 			<field name="code">1295</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4640">
@@ -7756,7 +7799,7 @@
 			<field name="code">4640</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2250">
@@ -7764,7 +7807,7 @@
 			<field name="code">2250</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_1322">
@@ -7772,7 +7815,7 @@
 			<field name="code">1322</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1555"/>
 		</record>
 		<record model="account.account.template" id="account_1320">
@@ -7780,7 +7823,7 @@
 			<field name="code">1320</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1321">
@@ -7788,7 +7831,7 @@
 			<field name="code">1321</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1327">
@@ -7796,7 +7839,7 @@
 			<field name="code">1327</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1640"/>
 		</record>
 		<record model="account.account.template" id="account_1325">
@@ -7804,7 +7847,7 @@
 			<field name="code">1325</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1329">
@@ -7812,7 +7855,7 @@
 			<field name="code">1329</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1640"/>
 		</record>
 		<record model="account.account.template" id="account_4852">
@@ -7820,7 +7863,7 @@
 			<field name="code">4852</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_8519">
@@ -7828,7 +7871,7 @@
 			<field name="code">8519</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4670">
@@ -7836,7 +7879,7 @@
 			<field name="code">4670</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0870">
@@ -7844,7 +7887,7 @@
 			<field name="code">0870</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_8135">
@@ -7852,7 +7895,7 @@
 			<field name="code">8135</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4200">
@@ -7860,7 +7903,7 @@
 			<field name="code">4200</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_0920">
@@ -7868,7 +7911,7 @@
 			<field name="code">0920</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_8130">
@@ -7876,7 +7919,7 @@
 			<field name="code">8130</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4800">
@@ -7884,7 +7927,7 @@
 			<field name="code">4800</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1250"/>
 		</record>
 		<record model="account.account.template" id="account_1568">
@@ -7892,7 +7935,7 @@
 			<field name="code">1568</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4636">
@@ -7900,7 +7943,7 @@
 			<field name="code">4636</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4805">
@@ -7908,7 +7951,7 @@
 			<field name="code">4805</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1250"/>
 		</record>
 		<record model="account.account.template" id="account_4806">
@@ -7916,7 +7959,7 @@
 			<field name="code">4806</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1250"/>
 		</record>
 		<record model="account.account.template" id="account_4876">
@@ -7924,7 +7967,7 @@
 			<field name="code">4876</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1850">
@@ -7932,7 +7975,7 @@
 			<field name="code">1850</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4809">
@@ -7940,7 +7983,7 @@
 			<field name="code">4809</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1250"/>
 		</record>
 		<record model="account.account.template" id="account_4949">
@@ -7948,7 +7991,7 @@
 			<field name="code">4949</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1525">
@@ -7956,7 +7999,7 @@
 			<field name="code">1525</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1526">
@@ -7964,7 +8007,7 @@
 			<field name="code">1526</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1527">
@@ -7972,7 +8015,7 @@
 			<field name="code">1527</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_2176">
@@ -7980,7 +8023,7 @@
 			<field name="code">2176</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1521">
@@ -7988,7 +8031,7 @@
 			<field name="code">1521</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1250">
@@ -7996,7 +8039,7 @@
 			<field name="code">1250</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4965">
@@ -8004,7 +8047,7 @@
 			<field name="code">4965</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0761">
@@ -8012,7 +8055,7 @@
 			<field name="code">0761</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1528">
@@ -8020,7 +8063,7 @@
 			<field name="code">1528</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1529">
@@ -8028,7 +8071,7 @@
 			<field name="code">1529</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4961">
@@ -8036,7 +8079,7 @@
 			<field name="code">4961</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1390">
@@ -8044,7 +8087,7 @@
 			<field name="code">1390</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2600">
@@ -8052,7 +8095,7 @@
 			<field name="code">2600</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_8705">
@@ -8060,7 +8103,7 @@
 			<field name="code">8705</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_2375">
@@ -8068,7 +8111,7 @@
 			<field name="code">2375</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_1930">
@@ -8076,7 +8119,7 @@
 			<field name="code">1930</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_0900">
@@ -8084,7 +8127,7 @@
 			<field name="code">0900</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_4110">
@@ -8092,7 +8135,7 @@
 			<field name="code">4110</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_8945">
@@ -8100,7 +8143,7 @@
 			<field name="code">8945</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4873">
@@ -8108,7 +8151,7 @@
 			<field name="code">4873</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2205">
@@ -8116,7 +8159,7 @@
 			<field name="code">2205</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_4890">
@@ -8124,7 +8167,7 @@
 			<field name="code">4890</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_7080">
@@ -8132,7 +8175,7 @@
 			<field name="code">7080</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1460"/>
 		</record>
 		<record model="account.account.template" id="account_7090">
@@ -8140,7 +8183,7 @@
 			<field name="code">7090</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1465"/>
 		</record>
 		<record model="account.account.template" id="account_0518">
@@ -8148,7 +8191,7 @@
 			<field name="code">0518</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_0519">
@@ -8156,7 +8199,7 @@
 			<field name="code">0519</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_0516">
@@ -8164,7 +8207,7 @@
 			<field name="code">0516</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_0517">
@@ -8172,7 +8215,7 @@
 			<field name="code">0517</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_3505">
@@ -8180,7 +8223,7 @@
 			<field name="code">3505</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_0510">
@@ -8188,7 +8231,7 @@
 			<field name="code">0510</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_1582">
@@ -8196,7 +8239,7 @@
 			<field name="code">1582</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1583">
@@ -8204,7 +8247,7 @@
 			<field name="code">1583</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2679">
@@ -8212,7 +8255,7 @@
 			<field name="code">2679</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_0999">
@@ -8220,7 +8263,7 @@
 			<field name="code">0999</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_4998">
@@ -8228,7 +8271,7 @@
 			<field name="code">4998</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_8918">
@@ -8236,7 +8279,7 @@
 			<field name="code">8918</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_4663">
@@ -8244,7 +8287,7 @@
 			<field name="code">4663</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8614">
@@ -8252,7 +8295,7 @@
 			<field name="code">8614</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1739">
@@ -8260,7 +8303,7 @@
 			<field name="code">1739</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1738">
@@ -8268,7 +8311,7 @@
 			<field name="code">1738</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1635">
@@ -8276,7 +8319,7 @@
 			<field name="code">1635</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2510"/>
 		</record>
 		<record model="account.account.template" id="account_1980">
@@ -8284,7 +8327,7 @@
 			<field name="code">1980</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4999">
@@ -8292,7 +8335,7 @@
 			<field name="code">4999</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1638">
@@ -8300,7 +8343,7 @@
 			<field name="code">1638</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2510"/>
 		</record>
 		<record model="account.account.template" id="account_1730">
@@ -8308,7 +8351,7 @@
 			<field name="code">1730</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1733">
@@ -8316,7 +8359,7 @@
 			<field name="code">1733</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1732">
@@ -8324,7 +8367,7 @@
 			<field name="code">1732</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1735">
@@ -8332,7 +8375,7 @@
 			<field name="code">1735</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1734">
@@ -8340,7 +8383,7 @@
 			<field name="code">1734</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1737">
@@ -8348,7 +8391,7 @@
 			<field name="code">1737</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1736">
@@ -8356,7 +8399,7 @@
 			<field name="code">1736</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_0580">
@@ -8364,7 +8407,7 @@
 			<field name="code">0580</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1325"/>
 		</record>
 		<record model="account.account.template" id="account_8820">
@@ -8372,7 +8415,7 @@
 			<field name="code">8820</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8827">
@@ -8380,7 +8423,7 @@
 			<field name="code">8827</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0460">
@@ -8388,7 +8431,7 @@
 			<field name="code">0460</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1195">
@@ -8396,7 +8439,7 @@
 			<field name="code">1195</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_1446">
@@ -8404,7 +8447,7 @@
 			<field name="code">1446</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account_type_receivable_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_0240">
@@ -8412,7 +8455,7 @@
 			<field name="code">0240</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_3600">
@@ -8420,7 +8463,7 @@
 			<field name="code">3600</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8770">
@@ -8428,7 +8471,7 @@
 			<field name="code">8770</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0160">
@@ -8436,7 +8479,7 @@
 			<field name="code">0160</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0165">
@@ -8444,7 +8487,7 @@
 			<field name="code">0165</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1595">
@@ -8452,7 +8495,7 @@
 			<field name="code">1595</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_1594">
@@ -8460,7 +8503,7 @@
 			<field name="code">1594</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_1597">
@@ -8468,7 +8511,7 @@
 			<field name="code">1597</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1596">
@@ -8476,7 +8519,7 @@
 			<field name="code">1596</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1545"/>
 		</record>
 		<record model="account.account.template" id="account_1590">
@@ -8484,7 +8527,7 @@
 			<field name="code">1590</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1593">
@@ -8492,7 +8535,7 @@
 			<field name="code">1593</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1592">
@@ -8500,7 +8543,7 @@
 			<field name="code">1592</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1599">
@@ -8508,7 +8551,7 @@
 			<field name="code">1599</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1555"/>
 		</record>
 		<record model="account.account.template" id="account_1598">
@@ -8516,7 +8559,7 @@
 			<field name="code">1598</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_4600">
@@ -8524,7 +8567,7 @@
 			<field name="code">4600</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2213">
@@ -8532,7 +8575,7 @@
 			<field name="code">2213</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2212">
@@ -8540,7 +8583,7 @@
 			<field name="code">2212</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2210">
@@ -8548,7 +8591,7 @@
 			<field name="code">2210</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_4865">
@@ -8556,7 +8599,7 @@
 			<field name="code">4865</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2216">
@@ -8564,7 +8607,7 @@
 			<field name="code">2216</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2215">
@@ -8572,7 +8615,7 @@
 			<field name="code">2215</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2214">
@@ -8580,7 +8623,7 @@
 			<field name="code">2214</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2219">
@@ -8588,7 +8631,7 @@
 			<field name="code">2219</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2218">
@@ -8596,7 +8639,7 @@
 			<field name="code">2218</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_8735">
@@ -8604,7 +8647,7 @@
 			<field name="code">8735</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1748">
@@ -8612,7 +8655,7 @@
 			<field name="code">1748</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1749">
@@ -8620,7 +8663,7 @@
 			<field name="code">1749</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1744">
@@ -8628,7 +8671,7 @@
 			<field name="code">1744</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_1745">
@@ -8636,7 +8679,7 @@
 			<field name="code">1745</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_2350">
@@ -8644,7 +8687,7 @@
 			<field name="code">2350</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1747">
@@ -8652,7 +8695,7 @@
 			<field name="code">1747</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1740">
@@ -8660,7 +8703,7 @@
 			<field name="code">1740</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1741">
@@ -8668,7 +8711,7 @@
 			<field name="code">1741</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1742">
@@ -8676,7 +8719,7 @@
 			<field name="code">1742</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_1743">
@@ -8684,7 +8727,7 @@
 			<field name="code">1743</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_0015">
@@ -8692,7 +8735,7 @@
 			<field name="code">0015</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4366">
@@ -8700,7 +8743,7 @@
 			<field name="code">4366</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_4360">
@@ -8708,7 +8751,7 @@
 			<field name="code">4360</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_0010">
@@ -8716,7 +8759,7 @@
 			<field name="code">0010</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_2430">
@@ -8724,7 +8767,7 @@
 			<field name="code">2430</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1200">
@@ -8732,7 +8775,7 @@
 			<field name="code">1200</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4240">
@@ -8740,7 +8783,7 @@
 			<field name="code">4240</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4396">
@@ -8748,7 +8791,7 @@
 			<field name="code">4396</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_3736">
@@ -8756,7 +8799,7 @@
 			<field name="code">3736</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3735">
@@ -8764,7 +8807,7 @@
 			<field name="code">3735</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1890">
@@ -8772,7 +8815,7 @@
 			<field name="code">1890</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_3731">
@@ -8780,7 +8823,7 @@
 			<field name="code">3731</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3730">
@@ -8788,7 +8831,7 @@
 			<field name="code">3730</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4920">
@@ -8796,7 +8839,7 @@
 			<field name="code">4920</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2130">
@@ -8804,7 +8847,7 @@
 			<field name="code">2130</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_4510">
@@ -8812,7 +8855,7 @@
 			<field name="code">4510</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_3100">
@@ -8820,7 +8863,7 @@
 			<field name="code">3100</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4994">
@@ -8828,7 +8871,7 @@
 			<field name="code">4994</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2139">
@@ -8836,7 +8879,7 @@
 			<field name="code">2139</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_1447">
@@ -8844,7 +8887,7 @@
 			<field name="code">1447</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account_type_receivable_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1569">
@@ -8852,7 +8895,7 @@
 			<field name="code">1569</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1445">
@@ -8860,7 +8903,7 @@
 			<field name="code">1445</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_4995">
@@ -8868,7 +8911,7 @@
 			<field name="code">4995</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1658">
@@ -8876,7 +8919,7 @@
 			<field name="code">1658</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2490"/>
 		</record>
 		<record model="account.account.template" id="account_1560">
@@ -8884,7 +8927,7 @@
 			<field name="code">1560</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0085">
@@ -8892,7 +8935,7 @@
 			<field name="code">0085</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2505">
@@ -8900,7 +8943,7 @@
 			<field name="code">2505</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1563">
@@ -8908,7 +8951,7 @@
 			<field name="code">1563</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0080">
@@ -8916,7 +8959,7 @@
 			<field name="code">0080</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1565">
@@ -8924,7 +8967,7 @@
 			<field name="code">1565</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1566">
@@ -8932,7 +8975,7 @@
 			<field name="code">1566</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2500">
@@ -8940,7 +8983,7 @@
 			<field name="code">2500</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2726">
@@ -8948,7 +8991,7 @@
 			<field name="code">2726</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2725">
@@ -8956,7 +8999,7 @@
 			<field name="code">2725</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2723">
@@ -8964,7 +9007,7 @@
 			<field name="code">2723</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4990">
@@ -8972,7 +9015,7 @@
 			<field name="code">4990</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0110">
@@ -8980,7 +9023,7 @@
 			<field name="code">0110</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2720">
@@ -8988,7 +9031,7 @@
 			<field name="code">2720</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4991">
@@ -8996,7 +9039,7 @@
 			<field name="code">4991</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_2710">
@@ -9004,7 +9047,7 @@
 			<field name="code">2710</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1562">
@@ -9012,7 +9055,7 @@
 			<field name="code">1562</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0949">
@@ -9020,7 +9063,7 @@
 			<field name="code">0949</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2335"/>
 		</record>
 		<record model="account.account.template" id="account_0948">
@@ -9028,7 +9071,7 @@
 			<field name="code">0948</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_0940">
@@ -9036,7 +9079,7 @@
 			<field name="code">0940</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_0943">
@@ -9044,7 +9087,7 @@
 			<field name="code">0943</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_8410">
@@ -9052,7 +9095,7 @@
 			<field name="code">8410</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0701">
@@ -9060,7 +9103,7 @@
 			<field name="code">0701</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2515"/>
 		</record>
 		<record model="account.account.template" id="account_0947">
@@ -9068,7 +9111,7 @@
 			<field name="code">0947</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_1716">
@@ -9076,7 +9119,7 @@
 			<field name="code">1716</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_3780">
@@ -9084,7 +9127,7 @@
 			<field name="code">3780</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1761">
@@ -9092,7 +9135,7 @@
 			<field name="code">1761</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_1800">
@@ -9100,7 +9143,7 @@
 			<field name="code">1800</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4390">
@@ -9108,7 +9151,7 @@
 			<field name="code">4390</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_0310">
@@ -9116,7 +9159,7 @@
 			<field name="code">0310</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_8990">
@@ -9124,7 +9167,7 @@
 			<field name="code">8990</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1045"/>
 		</record>
 		<record model="account.account.template" id="account_3420">
@@ -9132,7 +9175,7 @@
 			<field name="code">3420</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2170">
@@ -9140,7 +9183,7 @@
 			<field name="code">2170</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_3425">
@@ -9148,7 +9191,7 @@
 			<field name="code">3425</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4397">
@@ -9156,7 +9199,7 @@
 			<field name="code">4397</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_4996">
@@ -9164,7 +9207,7 @@
 			<field name="code">4996</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4997">
@@ -9172,7 +9215,7 @@
 			<field name="code">4997</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2000">
@@ -9180,7 +9223,7 @@
 			<field name="code">2000</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2001">
@@ -9188,7 +9231,7 @@
 			<field name="code">2001</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_4992">
@@ -9196,7 +9239,7 @@
 			<field name="code">4992</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0705">
@@ -9204,7 +9247,7 @@
 			<field name="code">0705</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account_type_liability_de"/>
 			<field name="parent_id" ref="view_balance_2510"/>
 		</record>
 		<record model="account.account.template" id="account_1360">
@@ -9212,7 +9255,7 @@
 			<field name="code">1360</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account_type_asset_de"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2005">
@@ -9220,7 +9263,7 @@
 			<field name="code">2005</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_8340">
@@ -9228,7 +9271,7 @@
 			<field name="code">8340</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account_type_income_de"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4855">
@@ -9236,7 +9279,7 @@
 			<field name="code">4855</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4854">
@@ -9244,7 +9287,7 @@
 			<field name="code">4854</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4853">
@@ -9252,7 +9295,7 @@
 			<field name="code">4853</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4580">
@@ -9260,7 +9303,7 @@
 			<field name="code">4580</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_4851">
@@ -9268,7 +9311,7 @@
 			<field name="code">4851</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4850">
@@ -9276,10 +9319,10 @@
 			<field name="code">4850</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account_type_expense_de"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
-    
+
     <record id="account_K9VKS1" model="account.account.template">
       <field name="code">K9VKS1</field>
       <field name="name">Vortragskonten</field>
@@ -9287,7 +9330,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9000" model="account.account.template">
       <field name="code">9000</field>
       <field name="name">Saldenvorträge- Sachkonten</field>
@@ -9296,7 +9339,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9001" model="account.account.template">
       <field name="code">9001</field>
       <field name="name">Saldenvorträge</field>
@@ -9305,7 +9348,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9008" model="account.account.template">
       <field name="code">9008</field>
       <field name="name">Saldenvorträge Debitoren</field>
@@ -9314,7 +9357,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9009" model="account.account.template">
       <field name="code">9009</field>
       <field name="name">Saldenvorträge Kreditoren</field>
@@ -9323,7 +9366,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9060" model="account.account.template">
       <field name="code">9060</field>
       <field name="name">Offene Posten aus 1990</field>
@@ -9332,7 +9375,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9069" model="account.account.template">
       <field name="code">9069</field>
       <field name="name">Offene Posten aus 1999</field>
@@ -9341,7 +9384,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9070" model="account.account.template">
       <field name="code">9070</field>
       <field name="name">Offene Posten aus 2000</field>
@@ -9350,7 +9393,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9071" model="account.account.template">
       <field name="code">9071</field>
       <field name="name">Offene Posten aus 2001</field>
@@ -9359,7 +9402,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9072" model="account.account.template">
       <field name="code">9072</field>
       <field name="name">Offene Posten aus 2002</field>
@@ -9368,7 +9411,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9073" model="account.account.template">
       <field name="code">9073</field>
       <field name="name">Offene Posten aus 2003</field>
@@ -9377,7 +9420,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9074" model="account.account.template">
       <field name="code">9074</field>
       <field name="name">Offene Posten aus 2004</field>
@@ -9386,7 +9429,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9075" model="account.account.template">
       <field name="code">9075</field>
       <field name="name">Offene Posten aus 2005</field>
@@ -9395,7 +9438,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9076" model="account.account.template">
       <field name="code">9076</field>
       <field name="name">Offene Posten aus 2006</field>
@@ -9404,7 +9447,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9077" model="account.account.template">
       <field name="code">9077</field>
       <field name="name">Offene Posten aus 2007</field>
@@ -9431,7 +9474,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9090" model="account.account.template">
       <field name="code">9090</field>
       <field name="name">Summenvortragskonto</field>
@@ -9440,7 +9483,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9091" model="account.account.template">
       <field name="code">9091</field>
       <field name="name">Offene Posten aus 1991</field>
@@ -9449,7 +9492,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9092" model="account.account.template">
       <field name="code">9092</field>
       <field name="name">Offene Posten aus 1992</field>
@@ -9458,7 +9501,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9093" model="account.account.template">
       <field name="code">9093</field>
       <field name="name">Offene Posten aus 1993</field>
@@ -9467,7 +9510,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9094" model="account.account.template">
       <field name="code">9094</field>
       <field name="name">Offene Posten aus 1994</field>
@@ -9476,7 +9519,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9095" model="account.account.template">
       <field name="code">9095</field>
       <field name="name">Offene Posten aus 1995</field>
@@ -9485,7 +9528,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9096" model="account.account.template">
       <field name="code">9096</field>
       <field name="name">Offene Posten aus 1996</field>
@@ -9494,7 +9537,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9097" model="account.account.template">
       <field name="code">9097</field>
       <field name="name">Offene Posten aus 1997</field>
@@ -9503,7 +9546,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9098" model="account.account.template">
       <field name="code">9098</field>
       <field name="name">Offene Posten aus 1998</field>
@@ -9512,7 +9555,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKS2" model="account.account.template">
       <field name="code">K9VKS2</field>
       <field name="name">Statistische Konten für Betriebswirtschaftliche Auswertungen (BWA)</field>
@@ -9520,7 +9563,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9101" model="account.account.template">
       <field name="code">9101</field>
       <field name="name">Verkaufstage</field>
@@ -9529,7 +9572,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9102" model="account.account.template">
       <field name="code">9102</field>
       <field name="name">Anzahl der Barkunden</field>
@@ -9538,7 +9581,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9103" model="account.account.template">
       <field name="code">9103</field>
       <field name="name">Beschäftigte Personen</field>
@@ -9547,7 +9590,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9104" model="account.account.template">
       <field name="code">9104</field>
       <field name="name">Unbezahlte Personen</field>
@@ -9556,7 +9599,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9105" model="account.account.template">
       <field name="code">9105</field>
       <field name="name">Verkaufskräfte</field>
@@ -9565,7 +9608,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9106" model="account.account.template">
       <field name="code">9106</field>
       <field name="name">Geschäftsraum m2</field>
@@ -9574,7 +9617,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9107" model="account.account.template">
       <field name="code">9107</field>
       <field name="name">Verkaufsraum m2</field>
@@ -9583,7 +9626,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9116" model="account.account.template">
       <field name="code">9116</field>
       <field name="name">Anzahl Rechnungen</field>
@@ -9592,7 +9635,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9117" model="account.account.template">
       <field name="code">9117</field>
       <field name="name">Anzahl Kreditkunden monatlich</field>
@@ -9601,7 +9644,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9118" model="account.account.template">
       <field name="code">9118</field>
       <field name="name">Anzahl Kreditkunden aufgelaufen</field>
@@ -9610,7 +9653,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9120" model="account.account.template">
       <field name="code">9120</field>
       <field name="name">Erweiterungsinvestitionen</field>
@@ -9619,7 +9662,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9135" model="account.account.template">
       <field name="code">9135</field>
       <field name="name">Auftragseingang im Geschäftsjahr</field>
@@ -9628,7 +9671,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9140" model="account.account.template">
       <field name="code">9140</field>
       <field name="name">Auftragsbestand</field>
@@ -9637,7 +9680,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9190" model="account.account.template">
       <field name="code">9190</field>
       <field name="name">Gegenkonto für statistische Mengeneinheiten Konten 9101-9107 und Konten 9116-9118</field>
@@ -9646,7 +9689,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9199" model="account.account.template">
       <field name="code">9199</field>
       <field name="name">Gegenkonto zu Konten 9120- 9135-9140</field>
@@ -9655,7 +9698,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKS3" model="account.account.template">
       <field name="code">K9VKS3</field>
       <field name="name">Statistische Konten für den Kennziffernteil der Bilanz</field>
@@ -9663,7 +9706,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9200" model="account.account.template">
       <field name="code">9200</field>
       <field name="name">Beschäftigte Personen</field>
@@ -9672,7 +9715,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9209" model="account.account.template">
       <field name="code">9209</field>
       <field name="name">Gegenkonto zu 9200</field>
@@ -9681,7 +9724,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9210" model="account.account.template">
       <field name="code">9210</field>
       <field name="name">Produktive Löhne</field>
@@ -9690,7 +9733,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9219" model="account.account.template">
       <field name="code">9219</field>
       <field name="name">Gegenkonto zu 9210</field>
@@ -9699,7 +9742,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKS4" model="account.account.template">
       <field name="code">K9VKS4</field>
       <field name="name">Statistische Konten zur informativen Angabe des gezeichneten Kapitals in anderer Währung</field>
@@ -9707,7 +9750,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_K9VKS41" model="account.account.template">
       <field name="code">K9VKS41</field>
       <field name="name">Gezeichnetes Kapital in DM</field>
@@ -9715,7 +9758,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9220" model="account.account.template">
       <field name="code">9220</field>
       <field name="name">Gezeichnetes Kapital in DM (Art. 42 Abs. 3 S. 1 EGHGB)</field>
@@ -9724,7 +9767,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKS42" model="account.account.template">
       <field name="code">K9VKS42</field>
       <field name="name">Gezeichnetes Kapital in Euro</field>
@@ -9732,7 +9775,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9221" model="account.account.template">
       <field name="code">9221</field>
       <field name="name">Gezeichnetes Kapital in Euro (Art. 42 Abs. 3 S. 2 EGHGB)</field>
@@ -9741,7 +9784,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9229" model="account.account.template">
       <field name="code">9229</field>
       <field name="name">Gegenkonto zu 9220-9221</field>
@@ -9750,7 +9793,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKS5" model="account.account.template">
       <field name="code">K9VKS5</field>
       <field name="name">Passive Rechnungsabgrenzung</field>
@@ -9758,7 +9801,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9230" model="account.account.template">
       <field name="code">9230</field>
       <field name="name">Baukostenzuschüsse</field>
@@ -9767,7 +9810,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9232" model="account.account.template">
       <field name="code">9232</field>
       <field name="name">Investitionszulagen </field>
@@ -9776,7 +9819,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9234" model="account.account.template">
       <field name="code">9234</field>
       <field name="name">Investitionszuschüsse </field>
@@ -9785,7 +9828,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9239" model="account.account.template">
       <field name="code">9239</field>
       <field name="name">Gegenkonto zu Konten 9230- 9238</field>
@@ -9794,7 +9837,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9240" model="account.account.template">
       <field name="code">9240</field>
       <field name="name">Investitionsverbindlichkeiten bei den Leistungsverbindlichkeiten</field>
@@ -9803,7 +9846,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9241" model="account.account.template">
       <field name="code">9241</field>
       <field name="name">Investitionsverbindlichkeiten aus Sachanlagenkäufen bei Leistungsverbindlichkeiten</field>
@@ -9812,7 +9855,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9242" model="account.account.template">
       <field name="code">9242</field>
       <field name="name">Investitionsverbindlichkeiten aus Käufen von immateriellen Vermögensgegenständen bei Leistungsverbindlichkeiten</field>
@@ -9821,7 +9864,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9243" model="account.account.template">
       <field name="code">9243</field>
       <field name="name">Investitionsverbindlichkeiten aus Käufen von Finanzanlagen bei Leistungsverbindlichkeiten</field>
@@ -9830,7 +9873,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9244" model="account.account.template">
       <field name="code">9244</field>
       <field name="name">Gegenkonto zu Konto 9240-43</field>
@@ -9839,7 +9882,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9245" model="account.account.template">
       <field name="code">9245</field>
       <field name="name">Forderungen aus Sachanlagenverkäufen bei sonstigen Vermögensgegenständen</field>
@@ -9848,7 +9891,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9246" model="account.account.template">
       <field name="code">9246</field>
       <field name="name">Forderungen aus Verkäufen immaterielle Vermögensgegenstände bei sonstigen Vermögensgegenständen</field>
@@ -9857,7 +9900,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9247" model="account.account.template">
       <field name="code">9247</field>
       <field name="name">Forderungen aus Verkäufen von Finanzanlagen bei sonstigen Vermögensgegenständen</field>
@@ -9866,7 +9909,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9249" model="account.account.template">
       <field name="code">9249</field>
       <field name="name">Gegenkonto zu Konto 9245-47</field>
@@ -9875,7 +9918,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKS6" model="account.account.template">
       <field name="code">K9VKS6</field>
       <field name="name">Eigenkapitalersetzende Gesellschafterdarlehen </field>
@@ -9883,7 +9926,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9250" model="account.account.template">
       <field name="code">9250</field>
       <field name="name">Eigenkapitalersetzende Gesellschafterdarlehen </field>
@@ -9892,7 +9935,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9255" model="account.account.template">
       <field name="code">9255</field>
       <field name="name">Ungesicherte Gesellschafterdarlehen mit Restlaufzeit größer 5 Jahre</field>
@@ -9901,7 +9944,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9259" model="account.account.template">
       <field name="code">9259</field>
       <field name="name">Gegenkonto zu 9250 und 9255</field>
@@ -9910,7 +9953,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKS7" model="account.account.template">
       <field name="code">K9VKS7</field>
       <field name="name">Aufgliederung der Rückstellungen</field>
@@ -9918,7 +9961,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9260" model="account.account.template">
       <field name="code">9260</field>
       <field name="name">Kurzfristige Rückstellungen</field>
@@ -9927,7 +9970,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9262" model="account.account.template">
       <field name="code">9262</field>
       <field name="name">Mittelfristige Rückstellungen</field>
@@ -9936,7 +9979,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9264" model="account.account.template">
       <field name="code">9264</field>
       <field name="name">Langfristige Rückstellungen- außer Pensionen</field>
@@ -9945,7 +9988,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9269" model="account.account.template">
       <field name="code">9269</field>
       <field name="name">Gegenkonto zu Konto 9260 - 9268</field>
@@ -9954,7 +9997,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKS8" model="account.account.template">
       <field name="code">K9VKS8</field>
       <field name="name">Statistische Konten für in der Bilanz auszuweisende Haftungsverhältnisse</field>
@@ -9962,7 +10005,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9270" model="account.account.template">
       <field name="code">9270</field>
       <field name="name">Gegenkonto zu 9271 - 9279 (Soll-Buchung)</field>
@@ -9971,7 +10014,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9271" model="account.account.template">
       <field name="code">9271</field>
       <field name="name">Verbindlichkeiten aus der Begebung und übertragung von Wechseln</field>
@@ -9980,7 +10023,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9272" model="account.account.template">
       <field name="code">9272</field>
       <field name="name">Verbindlichkeiten aus der Begebung und übertragung von Wechseln gegenüber verbundenen Unternehmen</field>
@@ -9989,7 +10032,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9273" model="account.account.template">
       <field name="code">9273</field>
       <field name="name">Verbindlichkeiten aus Bürgschaften- Wechsel- und Scheckbürgschaften</field>
@@ -9998,7 +10041,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9274" model="account.account.template">
       <field name="code">9274</field>
       <field name="name">Verbindlichkeiten aus Bürgschaften- Wechsel- und Scheckbürgschaften gegenüber verbundenen Unternehmen</field>
@@ -10007,7 +10050,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9275" model="account.account.template">
       <field name="code">9275</field>
       <field name="name">Verbindlichkeiten aus Gewährleistungsverträgen</field>
@@ -10016,7 +10059,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9276" model="account.account.template">
       <field name="code">9276</field>
       <field name="name">Verbindlichkeiten aus Gewährleistungsverträgen gegenüber verbundenen Unternehmen</field>
@@ -10025,7 +10068,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9277" model="account.account.template">
       <field name="code">9277</field>
       <field name="name">Haftung aus der Bestellung von Sicherheiten für fremde Verbindlichkeiten</field>
@@ -10034,7 +10077,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9278" model="account.account.template">
       <field name="code">9278</field>
       <field name="name">Haftung aus der Bestellung von Sicherheiten für fremde Verbindlichkeiten gegenüber verbundenen Unternehmen</field>
@@ -10043,7 +10086,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9279" model="account.account.template">
       <field name="code">9279</field>
       <field name="name">Verpflichtungen aus Treuhandvermögen</field>
@@ -10052,7 +10095,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKS9" model="account.account.template">
       <field name="code">K9VKS9</field>
       <field name="name">Statistische Konten für die im Anhang anzugebenden sonstigen finanziellen Verpflichtungen</field>
@@ -10060,7 +10103,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9280" model="account.account.template">
       <field name="code">9280</field>
       <field name="name">Gegenkonto zu 9281-9284</field>
@@ -10069,7 +10112,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9281" model="account.account.template">
       <field name="code">9281</field>
       <field name="name">Verpflichtungen aus Miet- und Leasingsverträgen</field>
@@ -10078,7 +10121,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9282" model="account.account.template">
       <field name="code">9282</field>
       <field name="name">Verpflichtungen aus Miet- und Leasingsverträgen gegenüber verbundenen Unternehmen</field>
@@ -10087,7 +10130,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9283" model="account.account.template">
       <field name="code">9283</field>
       <field name="name">Andere Verpflichtungen gemäß § 285 Nr. 3 HGB</field>
@@ -10096,7 +10139,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9284" model="account.account.template">
       <field name="code">9284</field>
       <field name="name">Andere Verpflichtungen gemäß § 285 Nr. 3 HGB gegenüber verbundenen Unternehmen</field>
@@ -10105,7 +10148,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSa" model="account.account.template">
       <field name="code">K9VKSa</field>
       <field name="name">Statistische Konten für 4 Abs. 3 EStG</field>
@@ -10113,7 +10156,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9287" model="account.account.template">
       <field name="code">9287</field>
       <field name="name">Zinsen bei Buchungen über Debitoren bei § 4 Abs. 3 EStG</field>
@@ -10122,7 +10165,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9288" model="account.account.template">
       <field name="code">9288</field>
       <field name="name">Mahngebühren bei Buchungen über Debitoren bei § 4 Abs. 3 EStG</field>
@@ -10131,7 +10174,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9289" model="account.account.template">
       <field name="code">9289</field>
       <field name="name">Gegenkonto zu 9287 und 9288</field>
@@ -10140,7 +10183,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9290" model="account.account.template">
       <field name="code">9290</field>
       <field name="name">Statistisches Konto steuerfreie Auslagen</field>
@@ -10149,7 +10192,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9291" model="account.account.template">
       <field name="code">9291</field>
       <field name="name">Gegenkonto zu 9290</field>
@@ -10158,7 +10201,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9292" model="account.account.template">
       <field name="code">9292</field>
       <field name="name">Statistisches Konto Fremdgeld</field>
@@ -10167,7 +10210,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9293" model="account.account.template">
       <field name="code">9293</field>
       <field name="name">Gegenkonto zu 9292</field>
@@ -10176,7 +10219,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSa1" model="account.account.template">
       <field name="code">K9VKSa1</field>
       <field name="name">Einlagen stiller Gesellschafter</field>
@@ -10184,7 +10227,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9295" model="account.account.template">
       <field name="code">9295</field>
       <field name="name">Einlagen stiller Gesellschafter</field>
@@ -10193,7 +10236,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSa2" model="account.account.template">
       <field name="code">K9VKSa2</field>
       <field name="name">Steuerrechtlicher Ausgleichsposten</field>
@@ -10201,7 +10244,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9297" model="account.account.template">
       <field name="code">9297</field>
       <field name="name">Steuerrechtlicher Ausgleichsposten</field>
@@ -10210,7 +10253,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSb" model="account.account.template">
       <field name="code">K9VKSb</field>
       <field name="name">Privat Teilhafter (für Verrechnung Gesellschafterdarlehen mit Eigenkapitalcharakter- Konto 9840-9849)</field>
@@ -10218,7 +10261,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9400" model="account.account.template">
       <field name="code">9400</field>
       <field name="name">Privatentnahmen allgemein</field>
@@ -10227,7 +10270,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9410" model="account.account.template">
       <field name="code">9410</field>
       <field name="name">Privatsteuern</field>
@@ -10236,7 +10279,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9420" model="account.account.template">
       <field name="code">9420</field>
       <field name="name">Sonderausgaben beschränkt abzugsfähig</field>
@@ -10245,7 +10288,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9430" model="account.account.template">
       <field name="code">9430</field>
       <field name="name">Sonderausgaben unbeschränkt abzugsfähig</field>
@@ -10254,7 +10297,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9440" model="account.account.template">
       <field name="code">9440</field>
       <field name="name">Zuwendungen- Spenden</field>
@@ -10263,7 +10306,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9450" model="account.account.template">
       <field name="code">9450</field>
       <field name="name">Außergewöhnliche Belastungen</field>
@@ -10272,7 +10315,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9460" model="account.account.template">
       <field name="code">9460</field>
       <field name="name">Grundstücksaufwand</field>
@@ -10281,7 +10324,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9470" model="account.account.template">
       <field name="code">9470</field>
       <field name="name">Grundstücksertrag</field>
@@ -10290,7 +10333,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9480" model="account.account.template">
       <field name="code">9480</field>
       <field name="name">Unentgeltliche Wertabgaben</field>
@@ -10299,7 +10342,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9490" model="account.account.template">
       <field name="code">9490</field>
       <field name="name">Privateinlagen</field>
@@ -10308,7 +10351,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSc" model="account.account.template">
       <field name="code">K9VKSc</field>
       <field name="name">Statistische Konten für die Kapitalkontenentwicklung</field>
@@ -10316,7 +10359,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9500" model="account.account.template">
       <field name="code">9500</field>
       <field name="name">Anteil für Konto Vollhafter 2000</field>
@@ -10325,7 +10368,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9501" model="account.account.template">
       <field name="code">9501</field>
       <field name="name">Anteil für Konto Vollhafter 2001</field>
@@ -10334,7 +10377,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9502" model="account.account.template">
       <field name="code">9502</field>
       <field name="name">Anteil für Konto Vollhafter 2002</field>
@@ -10343,7 +10386,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9503" model="account.account.template">
       <field name="code">9503</field>
       <field name="name">Anteil für Konto Vollhafter 2003</field>
@@ -10352,7 +10395,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9504" model="account.account.template">
       <field name="code">9504</field>
       <field name="name">Anteil für Konto Vollhafter 2004</field>
@@ -10361,7 +10404,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9505" model="account.account.template">
       <field name="code">9505</field>
       <field name="name">Anteil für Konto Vollhafter 2005</field>
@@ -10370,7 +10413,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9506" model="account.account.template">
       <field name="code">9506</field>
       <field name="name">Anteil für Konto Vollhafter 2006</field>
@@ -10379,7 +10422,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9507" model="account.account.template">
       <field name="code">9507</field>
       <field name="name">Anteil für Konto Vollhafter 2007</field>
@@ -10388,7 +10431,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9508" model="account.account.template">
       <field name="code">9508</field>
       <field name="name">Anteil für Konto Vollhafter 2008</field>
@@ -10397,7 +10440,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9509" model="account.account.template">
       <field name="code">9509</field>
       <field name="name">Anteil für Konto Vollhafter 2009</field>
@@ -10406,7 +10449,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9510" model="account.account.template">
       <field name="code">9510</field>
       <field name="name">Anteil für Konto Vollhafter 2010</field>
@@ -10415,7 +10458,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9511" model="account.account.template">
       <field name="code">9511</field>
       <field name="name">Anteil für Konto Vollhafter 2011</field>
@@ -10424,7 +10467,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9512" model="account.account.template">
       <field name="code">9512</field>
       <field name="name">Anteil für Konto Vollhafter 2012</field>
@@ -10433,7 +10476,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9513" model="account.account.template">
       <field name="code">9513</field>
       <field name="name">Anteil für Konto Vollhafter 2013</field>
@@ -10442,7 +10485,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9514" model="account.account.template">
       <field name="code">9514</field>
       <field name="name">Anteil für Konto Vollhafter 2014</field>
@@ -10451,7 +10494,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9515" model="account.account.template">
       <field name="code">9515</field>
       <field name="name">Anteil für Konto Vollhafter 2015</field>
@@ -10460,7 +10503,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9516" model="account.account.template">
       <field name="code">9516</field>
       <field name="name">Anteil für Konto Vollhafter 2016</field>
@@ -10469,7 +10512,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9517" model="account.account.template">
       <field name="code">9517</field>
       <field name="name">Anteil für Konto Vollhafter 2017</field>
@@ -10478,7 +10521,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9518" model="account.account.template">
       <field name="code">9518</field>
       <field name="name">Anteil für Konto Vollhafter 2018</field>
@@ -10487,7 +10530,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9519" model="account.account.template">
       <field name="code">9519</field>
       <field name="name">Anteil für Konto Vollhafter 2019</field>
@@ -10496,7 +10539,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9520" model="account.account.template">
       <field name="code">9520</field>
       <field name="name">Anteil für Konto Vollhafter 2020</field>
@@ -10505,7 +10548,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9521" model="account.account.template">
       <field name="code">9521</field>
       <field name="name">Anteil für Konto Vollhafter 2021</field>
@@ -10514,7 +10557,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9522" model="account.account.template">
       <field name="code">9522</field>
       <field name="name">Anteil für Konto Vollhafter 2022</field>
@@ -10523,7 +10566,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9523" model="account.account.template">
       <field name="code">9523</field>
       <field name="name">Anteil für Konto Vollhafter 2023</field>
@@ -10532,7 +10575,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9524" model="account.account.template">
       <field name="code">9524</field>
       <field name="name">Anteil für Konto Vollhafter 2024</field>
@@ -10541,7 +10584,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9525" model="account.account.template">
       <field name="code">9525</field>
       <field name="name">Anteil für Konto Vollhafter 2025</field>
@@ -10550,7 +10593,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9526" model="account.account.template">
       <field name="code">9526</field>
       <field name="name">Anteil für Konto Vollhafter 2026</field>
@@ -10559,7 +10602,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9527" model="account.account.template">
       <field name="code">9527</field>
       <field name="name">Anteil für Konto Vollhafter 2027</field>
@@ -10568,7 +10611,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9528" model="account.account.template">
       <field name="code">9528</field>
       <field name="name">Anteil für Konto Vollhafter 2028</field>
@@ -10577,7 +10620,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9529" model="account.account.template">
       <field name="code">9529</field>
       <field name="name">Anteil für Konto Vollhafter 2029</field>
@@ -10586,7 +10629,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9530" model="account.account.template">
       <field name="code">9530</field>
       <field name="name">Anteil für Konto Vollhafter 9810</field>
@@ -10595,7 +10638,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9531" model="account.account.template">
       <field name="code">9531</field>
       <field name="name">Anteil für Konto Vollhafter 9811</field>
@@ -10604,7 +10647,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9532" model="account.account.template">
       <field name="code">9532</field>
       <field name="name">Anteil für Konto Vollhafter 9812</field>
@@ -10613,7 +10656,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9533" model="account.account.template">
       <field name="code">9533</field>
       <field name="name">Anteil für Konto Vollhafter 9813</field>
@@ -10622,7 +10665,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9534" model="account.account.template">
       <field name="code">9534</field>
       <field name="name">Anteil für Konto Vollhafter 9814</field>
@@ -10631,7 +10674,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9535" model="account.account.template">
       <field name="code">9535</field>
       <field name="name">Anteil für Konto Vollhafter 9815</field>
@@ -10640,7 +10683,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9536" model="account.account.template">
       <field name="code">9536</field>
       <field name="name">Anteil für Konto Vollhafter 9816</field>
@@ -10649,7 +10692,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9537" model="account.account.template">
       <field name="code">9537</field>
       <field name="name">Anteil für Konto Vollhafter 9817</field>
@@ -10658,7 +10701,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9538" model="account.account.template">
       <field name="code">9538</field>
       <field name="name">Anteil für Konto Vollhafter 9818</field>
@@ -10667,7 +10710,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9539" model="account.account.template">
       <field name="code">9539</field>
       <field name="name">Anteil für Konto Vollhafter 9819</field>
@@ -10676,7 +10719,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9540" model="account.account.template">
       <field name="code">9540</field>
       <field name="name">Anteil für Konto Vollhafter 0060</field>
@@ -10685,7 +10728,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9541" model="account.account.template">
       <field name="code">9541</field>
       <field name="name">Anteil für Konto Vollhafter 0061</field>
@@ -10694,7 +10737,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9542" model="account.account.template">
       <field name="code">9542</field>
       <field name="name">Anteil für Konto Vollhafter 0062</field>
@@ -10703,7 +10746,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9543" model="account.account.template">
       <field name="code">9543</field>
       <field name="name">Anteil für Konto Vollhafter 0063</field>
@@ -10712,7 +10755,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9544" model="account.account.template">
       <field name="code">9544</field>
       <field name="name">Anteil für Konto Vollhafter 0064</field>
@@ -10721,7 +10764,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9545" model="account.account.template">
       <field name="code">9545</field>
       <field name="name">Anteil für Konto Vollhafter 0065</field>
@@ -10730,7 +10773,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9546" model="account.account.template">
       <field name="code">9546</field>
       <field name="name">Anteil für Konto Vollhafter 0066</field>
@@ -10739,7 +10782,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9547" model="account.account.template">
       <field name="code">9547</field>
       <field name="name">Anteil für Konto Vollhafter 0067</field>
@@ -10748,7 +10791,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9548" model="account.account.template">
       <field name="code">9548</field>
       <field name="name">Anteil für Konto Vollhafter 0068</field>
@@ -10757,7 +10800,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9549" model="account.account.template">
       <field name="code">9549</field>
       <field name="name">Anteil für Konto Vollhafter 0069</field>
@@ -10766,7 +10809,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9550" model="account.account.template">
       <field name="code">9550</field>
       <field name="name">Anteil für Konto Teilhafter 2050</field>
@@ -10775,7 +10818,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9551" model="account.account.template">
       <field name="code">9551</field>
       <field name="name">Anteil für Konto Teilhafter 2051</field>
@@ -10784,7 +10827,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9552" model="account.account.template">
       <field name="code">9552</field>
       <field name="name">Anteil für Konto Teilhafter 2052</field>
@@ -10793,7 +10836,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9553" model="account.account.template">
       <field name="code">9553</field>
       <field name="name">Anteil für Konto Teilhafter 2053</field>
@@ -10802,7 +10845,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9554" model="account.account.template">
       <field name="code">9554</field>
       <field name="name">Anteil für Konto Teilhafter 2054</field>
@@ -10811,7 +10854,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9555" model="account.account.template">
       <field name="code">9555</field>
       <field name="name">Anteil für Konto Teilhafter 2055</field>
@@ -10820,7 +10863,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9556" model="account.account.template">
       <field name="code">9556</field>
       <field name="name">Anteil für Konto Teilhafter 2056</field>
@@ -10829,7 +10872,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9557" model="account.account.template">
       <field name="code">9557</field>
       <field name="name">Anteil für Konto Teilhafter 2057</field>
@@ -10838,7 +10881,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9558" model="account.account.template">
       <field name="code">9558</field>
       <field name="name">Anteil für Konto Teilhafter 2058</field>
@@ -10847,7 +10890,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9559" model="account.account.template">
       <field name="code">9559</field>
       <field name="name">Anteil für Konto Teilhafter 2059</field>
@@ -10856,7 +10899,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9560" model="account.account.template">
       <field name="code">9560</field>
       <field name="name">Anteil für Konto Teilhafter 2060</field>
@@ -10865,7 +10908,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9561" model="account.account.template">
       <field name="code">9561</field>
       <field name="name">Anteil für Konto Teilhafter 2061</field>
@@ -10874,7 +10917,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9562" model="account.account.template">
       <field name="code">9562</field>
       <field name="name">Anteil für Konto Teilhafter 2062</field>
@@ -10883,7 +10926,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9563" model="account.account.template">
       <field name="code">9563</field>
       <field name="name">Anteil für Konto Teilhafter 2063</field>
@@ -10892,7 +10935,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9564" model="account.account.template">
       <field name="code">9564</field>
       <field name="name">Anteil für Konto Teilhafter 2064</field>
@@ -10901,7 +10944,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9565" model="account.account.template">
       <field name="code">9565</field>
       <field name="name">Anteil für Konto Teilhafter 2065</field>
@@ -10910,7 +10953,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9566" model="account.account.template">
       <field name="code">9566</field>
       <field name="name">Anteil für Konto Teilhafter 2066</field>
@@ -10919,7 +10962,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9567" model="account.account.template">
       <field name="code">9567</field>
       <field name="name">Anteil für Konto Teilhafter 2067</field>
@@ -10928,7 +10971,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9568" model="account.account.template">
       <field name="code">9568</field>
       <field name="name">Anteil für Konto Teilhafter 2068</field>
@@ -10937,7 +10980,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9569" model="account.account.template">
       <field name="code">9569</field>
       <field name="name">Anteil für Konto Teilhafter 2069</field>
@@ -10946,7 +10989,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9570" model="account.account.template">
       <field name="code">9570</field>
       <field name="name">Anteil für Konto Teilhafter 2070 </field>
@@ -10955,7 +10998,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9571" model="account.account.template">
       <field name="code">9571</field>
       <field name="name">Anteil für Konto Teilhafter 2071</field>
@@ -10964,7 +11007,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9572" model="account.account.template">
       <field name="code">9572</field>
       <field name="name">Anteil für Konto Teilhafter 2072</field>
@@ -10973,7 +11016,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9573" model="account.account.template">
       <field name="code">9573</field>
       <field name="name">Anteil für Konto Teilhafter 2073</field>
@@ -10982,7 +11025,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9574" model="account.account.template">
       <field name="code">9574</field>
       <field name="name">Anteil für Konto Teilhafter 2074</field>
@@ -10991,7 +11034,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9575" model="account.account.template">
       <field name="code">9575</field>
       <field name="name">Anteil für Konto Teilhafter 2075</field>
@@ -11000,7 +11043,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9576" model="account.account.template">
       <field name="code">9576</field>
       <field name="name">Anteil für Konto Teilhafter 2076</field>
@@ -11009,7 +11052,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9577" model="account.account.template">
       <field name="code">9577</field>
       <field name="name">Anteil für Konto Teilhafter 2077</field>
@@ -11018,7 +11061,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9578" model="account.account.template">
       <field name="code">9578</field>
       <field name="name">Anteil für Konto Teilhafter 2078</field>
@@ -11027,7 +11070,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9579" model="account.account.template">
       <field name="code">9579</field>
       <field name="name">Anteil für Konto Teilhafter 2079</field>
@@ -11036,7 +11079,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9580" model="account.account.template">
       <field name="code">9580</field>
       <field name="name">Anteil für Konto Vollhafter 9820 </field>
@@ -11045,7 +11088,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9581" model="account.account.template">
       <field name="code">9581</field>
       <field name="name">Anteil für Konto Vollhafter 9821</field>
@@ -11054,7 +11097,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9582" model="account.account.template">
       <field name="code">9582</field>
       <field name="name">Anteil für Konto Vollhafter 9822</field>
@@ -11063,7 +11106,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9583" model="account.account.template">
       <field name="code">9583</field>
       <field name="name">Anteil für Konto Vollhafter 9823</field>
@@ -11072,7 +11115,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9584" model="account.account.template">
       <field name="code">9584</field>
       <field name="name">Anteil für Konto Vollhafter 9824</field>
@@ -11081,7 +11124,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9585" model="account.account.template">
       <field name="code">9585</field>
       <field name="name">Anteil für Konto Vollhafter 9825</field>
@@ -11090,7 +11133,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9586" model="account.account.template">
       <field name="code">9586</field>
       <field name="name">Anteil für Konto Vollhafter 9826</field>
@@ -11099,7 +11142,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9587" model="account.account.template">
       <field name="code">9587</field>
       <field name="name">Anteil für Konto Vollhafter 9827</field>
@@ -11108,7 +11151,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9588" model="account.account.template">
       <field name="code">9588</field>
       <field name="name">Anteil für Konto Vollhafter 9828</field>
@@ -11117,7 +11160,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9589" model="account.account.template">
       <field name="code">9589</field>
       <field name="name">Anteil für Konto Vollhafter 9829</field>
@@ -11126,7 +11169,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9590" model="account.account.template">
       <field name="code">9590</field>
       <field name="name">Anteil für Konto Teilhafter 0080 </field>
@@ -11135,7 +11178,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9591" model="account.account.template">
       <field name="code">9591</field>
       <field name="name">Anteil für Konto Teilhafter 0081</field>
@@ -11144,7 +11187,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9592" model="account.account.template">
       <field name="code">9592</field>
       <field name="name">Anteil für Konto Teilhafter 0082</field>
@@ -11153,7 +11196,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9593" model="account.account.template">
       <field name="code">9593</field>
       <field name="name">Anteil für Konto Teilhafter 0083</field>
@@ -11162,7 +11205,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9594" model="account.account.template">
       <field name="code">9594</field>
       <field name="name">Anteil für Konto Teilhafter 0084</field>
@@ -11171,7 +11214,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9595" model="account.account.template">
       <field name="code">9595</field>
       <field name="name">Anteil für Konto Teilhafter 0085</field>
@@ -11180,7 +11223,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9596" model="account.account.template">
       <field name="code">9596</field>
       <field name="name">Anteil für Konto Teilhafter 0086</field>
@@ -11189,7 +11232,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9597" model="account.account.template">
       <field name="code">9597</field>
       <field name="name">Anteil für Konto Teilhafter 0087</field>
@@ -11198,7 +11241,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9598" model="account.account.template">
       <field name="code">9598</field>
       <field name="name">Anteil für Konto Teilhafter 0088</field>
@@ -11207,7 +11250,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9599" model="account.account.template">
       <field name="code">9599</field>
       <field name="name">Anteil für Konto Teilhafter 0089</field>
@@ -11216,7 +11259,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9600" model="account.account.template">
       <field name="code">9600</field>
       <field name="name">Name des Gesellschafters Vollhafter</field>
@@ -11225,7 +11268,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9610" model="account.account.template">
       <field name="code">9610</field>
       <field name="name">Tätigkeitsvergütung Vollhafter</field>
@@ -11234,7 +11277,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9620" model="account.account.template">
       <field name="code">9620</field>
       <field name="name">Tantieme Vollhafter</field>
@@ -11243,7 +11286,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9630" model="account.account.template">
       <field name="code">9630</field>
       <field name="name">Darlehensverzinsung Vollhafter</field>
@@ -11252,7 +11295,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9640" model="account.account.template">
       <field name="code">9640</field>
       <field name="name">Gebrauchsüberlassung Vollhafter</field>
@@ -11261,7 +11304,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9650" model="account.account.template">
       <field name="code">9650</field>
       <field name="name">Sonstige Vergütungen Vollhafter</field>
@@ -11270,7 +11313,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9690" model="account.account.template">
       <field name="code">9690</field>
       <field name="name">Restanteil Vollhafter</field>
@@ -11279,7 +11322,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9700" model="account.account.template">
       <field name="code">9700</field>
       <field name="name">Name des Gesellschafters Teillhafter</field>
@@ -11288,7 +11331,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9710" model="account.account.template">
       <field name="code">9710</field>
       <field name="name">Tätigkeitsvergütung Teillhafter</field>
@@ -11297,7 +11340,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9720" model="account.account.template">
       <field name="code">9720</field>
       <field name="name">Tantieme Teillhafter</field>
@@ -11306,7 +11349,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9730" model="account.account.template">
       <field name="code">9730</field>
       <field name="name">Darlehensverzinsung Teillhafter</field>
@@ -11315,7 +11358,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9740" model="account.account.template">
       <field name="code">9740</field>
       <field name="name">Gebrauchsüberlassung Teillhafter</field>
@@ -11324,7 +11367,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9750" model="account.account.template">
       <field name="code">9750</field>
       <field name="name">Sonstige Vergütungen Teillhafter</field>
@@ -11333,7 +11376,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9780" model="account.account.template">
       <field name="code">9780</field>
       <field name="name">Anteil für Konto 9840-49 Teilhafter</field>
@@ -11342,7 +11385,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9790" model="account.account.template">
       <field name="code">9790</field>
       <field name="name">Restanteil Teillhafter</field>
@@ -11351,7 +11394,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9800" model="account.account.template">
       <field name="code">9800</field>
       <field name="name">Lösch- und Korrekturschlüssel</field>
@@ -11360,7 +11403,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9801" model="account.account.template">
       <field name="code">9801</field>
       <field name="name">Lösch- und Korrekturschlüssel</field>
@@ -11369,7 +11412,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSd" model="account.account.template">
       <field name="code">K9VKSd</field>
       <field name="name">Kapital Personenhandelsgesellschaft Vollhafter</field>
@@ -11377,7 +11420,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9810" model="account.account.template">
       <field name="code">9810</field>
       <field name="name">Gesellschafter-Darlehen</field>
@@ -11386,7 +11429,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9820" model="account.account.template">
       <field name="code">9820</field>
       <field name="name">Verlust-/ Vortragskonto</field>
@@ -11395,7 +11438,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9830" model="account.account.template">
       <field name="code">9830</field>
       <field name="name">Verrechnungskonto für Einzahlungsverpflichtungen</field>
@@ -11404,7 +11447,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSe" model="account.account.template">
       <field name="code">K9VKSe</field>
       <field name="name">Kapital Personenhandelsgesellschaft Teilhafter</field>
@@ -11412,7 +11455,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9840" model="account.account.template">
       <field name="code">9840</field>
       <field name="name">Gesellschafter-Darlehen</field>
@@ -11421,7 +11464,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9850" model="account.account.template">
       <field name="code">9850</field>
       <field name="name">Verrechnungskonto für Einzahlungsverpflichtungen</field>
@@ -11430,7 +11473,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSf" model="account.account.template">
       <field name="code">K9VKSf</field>
       <field name="name">Einzahlungsverpflichtungen im Bereich der Forderungen</field>
@@ -11438,7 +11481,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9860" model="account.account.template">
       <field name="code">9860</field>
       <field name="name">Einzahlungsverpflichtungen persönlich haftender Gesellschafter</field>
@@ -11447,7 +11490,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9870" model="account.account.template">
       <field name="code">9870</field>
       <field name="name">Einzahlungsverpflichtungen Kommanditisten</field>
@@ -11456,7 +11499,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSg" model="account.account.template">
       <field name="code">K9VKSg</field>
       <field name="name">Ausgleichsposten für aktivierte eigene Anteile und Bilanzierungshilfen</field>
@@ -11464,7 +11507,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9880" model="account.account.template">
       <field name="code">9880</field>
       <field name="name">Ausgleichsposten für aktivierte eigene Anteile </field>
@@ -11473,7 +11516,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9882" model="account.account.template">
       <field name="code">9882</field>
       <field name="name">Ausgleichsposten für aktivierte Bilanzierungshilfen</field>
@@ -11482,7 +11525,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSh" model="account.account.template">
       <field name="code">K9VKSh</field>
       <field name="name">Nicht durch Vermögenseinlagen gedeckte Entnahmen</field>
@@ -11490,7 +11533,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9883" model="account.account.template">
       <field name="code">9883</field>
       <field name="name">Nicht durch Vermögenseinlagen gedeckte Entnahmen persönlich haftender Gesellschafter</field>
@@ -11499,7 +11542,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9884" model="account.account.template">
       <field name="code">9884</field>
       <field name="name">Nicht durch Vermögenseinlagen gedeckte Entnahmen Kommanditisten</field>
@@ -11508,7 +11551,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSi" model="account.account.template">
       <field name="code">K9VKSi</field>
       <field name="name">Verrechnungskonto für nicht durch Vermögenseinlagen gedeckte Entnahmen</field>
@@ -11516,7 +11559,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9885" model="account.account.template">
       <field name="code">9885</field>
       <field name="name">Verrechnungskonto für nicht durch Vermögenseinlagen gedeckte Entnahmen persönlich haftender Gesellschafter</field>
@@ -11525,7 +11568,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9886" model="account.account.template">
       <field name="code">9886</field>
       <field name="name">Verrechnungskonto für nicht durch Vermögenseinlagen gedeckte Entnahmen Kommanditisten</field>
@@ -11534,7 +11577,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSj" model="account.account.template">
       <field name="code">K9VKSj</field>
       <field name="name">Steueraufwand der Gesellschafter</field>
@@ -11542,7 +11585,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9887" model="account.account.template">
       <field name="code">9887</field>
       <field name="name">Steueraufwand der Gesellschafter </field>
@@ -11551,7 +11594,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9889" model="account.account.template">
       <field name="code">9889</field>
       <field name="name">Gegenkonto zu 9887</field>
@@ -11560,7 +11603,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSk" model="account.account.template">
       <field name="code">K9VKSk</field>
       <field name="name">Statistische Konten für Gewinnzuschlag</field>
@@ -11568,7 +11611,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9890" model="account.account.template">
       <field name="code">9890</field>
       <field name="name">Statistische Konten für den Gewinnzuschlag nach §§ 6b- 6c und 7g EStG (Haben-Buchung)</field>
@@ -11577,7 +11620,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9891" model="account.account.template">
       <field name="code">9891</field>
       <field name="name">Statistische Konten für den Gewinnzuschlag- Gegenkonto zu 9890</field>
@@ -11586,7 +11629,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSl" model="account.account.template">
       <field name="code">K9VKSl</field>
       <field name="name">Vorsteuer-/Umsatzsteuerkonten zur Korrektur der Forderungen/ Verbindlichkeiten (EüR)</field>
@@ -11594,7 +11637,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9893" model="account.account.template">
       <field name="code">9893</field>
       <field name="name">Umsatzsteuer in den Forderungen zum allgemeinen Umsatzsteuersatz (EüR)</field>
@@ -11603,7 +11646,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9894" model="account.account.template">
       <field name="code">9894</field>
       <field name="name">Umsatzsteuer in den Forderungen zum ermäßigten Umsatzsteuersatz (EüR)</field>
@@ -11612,7 +11655,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9895" model="account.account.template">
       <field name="code">9895</field>
       <field name="name">Gegenkonto 9893-9894 für die Aufteilung der Umsatzsteuersatz (EüR)</field>
@@ -11621,7 +11664,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9896" model="account.account.template">
       <field name="code">9896</field>
       <field name="name">Vorsteuer in den Verbindlichkeiten zum allgemeinen Umsatzsteuersatz (EüR)</field>
@@ -11630,7 +11673,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9897" model="account.account.template">
       <field name="code">9897</field>
       <field name="name">Vorsteuer in den Verbindlichkeiten zum ermäßigten Umsatzsteuersatz (EüR)</field>
@@ -11639,7 +11682,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9899" model="account.account.template">
       <field name="code">9899</field>
       <field name="name">Gegenkonto 9896-9897 für die Aufteilung der Vorsteuer (EüR)</field>
@@ -11648,7 +11691,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9900" model="account.account.template">
       <field name="code">9900</field>
       <field name="name">SO Commitment</field>
@@ -11657,7 +11700,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSm" model="account.account.template">
       <field name="code">K9VKSm</field>
       <field name="name">Statistische Konten zu § 4 (4a) EStG</field>
@@ -11665,7 +11708,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9910" model="account.account.template">
       <field name="code">9910</field>
       <field name="name">Gegenkonto zur Minderung der Entnahmen §4 (4a) EStG</field>
@@ -11674,7 +11717,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9911" model="account.account.template">
       <field name="code">9911</field>
       <field name="name">Minderung der Entnahmen §4 (4a) EStG (Haben)</field>
@@ -11683,7 +11726,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9912" model="account.account.template">
       <field name="code">9912</field>
       <field name="name">Erhöhung der Entnahmen §4 (4a) EStG</field>
@@ -11692,7 +11735,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9913" model="account.account.template">
       <field name="code">9913</field>
       <field name="name">Gegenkonto zur Erhöhung der Entnahmen §4 (4a) EStG (Haben)</field>
@@ -11701,7 +11744,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSn" model="account.account.template">
       <field name="code">K9VKSn</field>
       <field name="name">Statistische konten für Kinderbetreuungskosten</field>
@@ -11709,7 +11752,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9918" model="account.account.template">
       <field name="code">9918</field>
       <field name="name">Kinderbetreuungskosten (wie Betriebsausgaben steuerlich anzusetzender Betrag)</field>
@@ -11718,7 +11761,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9919" model="account.account.template">
       <field name="code">9919</field>
       <field name="name">Gegenkonto zu 9918 (Haben)</field>
@@ -11727,7 +11770,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_K9VKSo" model="account.account.template">
       <field name="code">K9VKSo</field>
       <field name="name">Statistische Konten für den GuV-Ausweis in "Gutschrift bzw. Belastung auf Verbindlichkeitskonten" bei den Zuordnungstabellen für PersHG nach KapCoRiLiG</field>
@@ -11735,7 +11778,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="account_9980" model="account.account.template">
       <field name="code">9980</field>
       <field name="name">Anteil für Verbindlichkeitskonten</field>
@@ -11744,7 +11787,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="account_9981" model="account.account.template">
       <field name="code">9981</field>
       <field name="name">Verrechnungskonto für Anteil Verbindlichkeitskonten</field>
diff --git a/addons/l10n_de/account_chart_skr04.xml b/addons/l10n_de/account_chart_skr04.xml
index 09af6c20e28..728b340267f 100644
--- a/addons/l10n_de/account_chart_skr04.xml
+++ b/addons/l10n_de/account_chart_skr04.xml
@@ -2,7 +2,7 @@
 <openerp>
   <data noupdate="1">
     <!-- account templates -->
-    
+
     <record id="chart_skr04" model="account.account.template">
       <field name="code">skr04</field>
       <field name="name">Deutscher Kontenplan SKR04</field>
@@ -17,7 +17,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_BA" model="account.account.template">
       <field name="code">BA</field>
       <field name="name">Bilanz - Aktiva</field>
@@ -25,7 +25,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_BP" model="account.account.template">
       <field name="code">BP</field>
       <field name="name">Bilanz - Passiva</field>
@@ -41,7 +41,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_GVA" model="account.account.template">
       <field name="code">GVA</field>
       <field name="name">Gewinn u. Verlust - Aufwendungen</field>
@@ -49,7 +49,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_GVE" model="account.account.template">
       <field name="code">GVE</field>
       <field name="name">Gewinn u. Verlust - Erträge</field>
@@ -57,7 +57,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA" model="account.account.template">
       <field name="code">K0BA</field>
       <field name="name">Anlagevermögen</field>
@@ -65,7 +65,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA" model="account.account.template">
       <field name="code">K1BA</field>
       <field name="name">Umlaufvermögen</field>
@@ -73,7 +73,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP" model="account.account.template">
       <field name="code">K2BP</field>
       <field name="name">Eigenkapital</field>
@@ -81,7 +81,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP" model="account.account.template">
       <field name="code">K3BP</field>
       <field name="name">Fremdkapital</field>
@@ -89,7 +89,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE" model="account.account.template">
       <field name="code">K4GVE</field>
       <field name="name">Betriebliche Erträge</field>
@@ -97,7 +97,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE" model="account.account.template">
       <field name="code">K7GVE</field>
       <field name="name">Weitere Erträge</field>
@@ -105,7 +105,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K5GVA" model="account.account.template">
       <field name="code">K5GVA</field>
       <field name="name">Betriebliche Aufwendungen</field>
@@ -113,7 +113,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA" model="account.account.template">
       <field name="code">K6GVA</field>
       <field name="name">Betriebliche Aufwendungen</field>
@@ -121,7 +121,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA" model="account.account.template">
       <field name="code">K7GVA</field>
       <field name="name">Weitere Aufwendungen</field>
@@ -129,7 +129,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS" model="account.account.template">
       <field name="code">VKS</field>
       <field name="name">Vortrags- Kapital- und Statistische Konten</field>
@@ -137,7 +137,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA1" model="account.account.template">
       <field name="code">K0BA1</field>
       <field name="name">Ausstehende Einlagen auf das gezeichnete Kapital</field>
@@ -145,7 +145,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA11" model="account.account.template">
       <field name="code">K0BA11</field>
       <field name="name">Ausstehende Einlagen auf das gezeichnete Kapital</field>
@@ -153,25 +153,25 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1" model="account.account.template">
       <field name="code">0001</field>
       <field name="name">Ausstehende Einlagen auf das gezeichnete Kapital- nichteingefordert (Aktivausweis)</field>
       <field name="parent_id" ref="chart_skr04_K0BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_40" model="account.account.template">
       <field name="code">0040</field>
       <field name="name">Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert (Aktivausweis)</field>
       <field name="parent_id" ref="chart_skr04_K0BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA12" model="account.account.template">
       <field name="code">K0BA12</field>
       <field name="name">Sonstige Aktiva oder sonstige Passiva</field>
@@ -179,367 +179,367 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_50" model="account.account.template">
       <field name="code">0050</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_51" model="account.account.template">
       <field name="code">0051</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_52" model="account.account.template">
       <field name="code">0052</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_53" model="account.account.template">
       <field name="code">0053</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_54" model="account.account.template">
       <field name="code">0054</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_55" model="account.account.template">
       <field name="code">0055</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_56" model="account.account.template">
       <field name="code">0056</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_57" model="account.account.template">
       <field name="code">0057</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_58" model="account.account.template">
       <field name="code">0058</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_59" model="account.account.template">
       <field name="code">0059</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_60" model="account.account.template">
       <field name="code">0060</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_61" model="account.account.template">
       <field name="code">0061</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_62" model="account.account.template">
       <field name="code">0062</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_63" model="account.account.template">
       <field name="code">0063</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_64" model="account.account.template">
       <field name="code">0064</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_65" model="account.account.template">
       <field name="code">0065</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_66" model="account.account.template">
       <field name="code">0066</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_67" model="account.account.template">
       <field name="code">0067</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_68" model="account.account.template">
       <field name="code">0068</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_69" model="account.account.template">
       <field name="code">0069</field>
       <field name="name">Ausstehende Einlagen auf das Komplementär-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_70" model="account.account.template">
       <field name="code">0070</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_71" model="account.account.template">
       <field name="code">0071</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_72" model="account.account.template">
       <field name="code">0072</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_73" model="account.account.template">
       <field name="code">0073</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_74" model="account.account.template">
       <field name="code">0074</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_75" model="account.account.template">
       <field name="code">0075</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_76" model="account.account.template">
       <field name="code">0076</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_77" model="account.account.template">
       <field name="code">0077</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_78" model="account.account.template">
       <field name="code">0078</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_79" model="account.account.template">
       <field name="code">0079</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_80" model="account.account.template">
       <field name="code">0080</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_81" model="account.account.template">
       <field name="code">0081</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_82" model="account.account.template">
       <field name="code">0082</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_83" model="account.account.template">
       <field name="code">0083</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_84" model="account.account.template">
       <field name="code">0084</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_85" model="account.account.template">
       <field name="code">0085</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_86" model="account.account.template">
       <field name="code">0086</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_87" model="account.account.template">
       <field name="code">0087</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_88" model="account.account.template">
       <field name="code">0088</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_89" model="account.account.template">
       <field name="code">0089</field>
       <field name="name">Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert</field>
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA2" model="account.account.template">
       <field name="code">K0BA2</field>
       <field name="name">Aufwendungen für die Ingangsetzung und Erweiterung des Geschäftsbetriebs</field>
@@ -547,7 +547,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA21" model="account.account.template">
       <field name="code">K0BA21</field>
       <field name="name">Aufwendungen für die Ingangsetzung und Erweiterung des Geschäftsbetriebs</field>
@@ -555,16 +555,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_95" model="account.account.template">
       <field name="code">0095</field>
       <field name="name">Aufwendungen für die Ingangsetzung und Erweiterung des Geschäftsbetriebs</field>
       <field name="parent_id" ref="chart_skr04_K0BA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA22" model="account.account.template">
       <field name="code">K0BA22</field>
       <field name="name">Aufwendungen für die Währungsumstellung auf den Euro</field>
@@ -572,16 +572,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_96" model="account.account.template">
       <field name="code">0096</field>
       <field name="name">Aufwendungen für die Währungsumstellung auf den Euro</field>
       <field name="parent_id" ref="chart_skr04_K0BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA3" model="account.account.template">
       <field name="code">K0BA3</field>
       <field name="name">Anlagevermögen Immaterielle Vermögensgegenstände</field>
@@ -589,7 +589,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA31" model="account.account.template">
       <field name="code">K0BA31</field>
       <field name="name">Konzessionen- gewerbliche Schutzrechte und ähnliche Rechte und Werte sowie Lizenzen an solchen Rechten und Werten</field>
@@ -597,61 +597,61 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_100" model="account.account.template">
       <field name="code">0100</field>
       <field name="name">Konzessionen- gewerbliche Schutzrechte und ähnliche Rechte und Werte sowie Lizenzen an solchen Rechten und Werten</field>
       <field name="parent_id" ref="chart_skr04_K0BA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_110" model="account.account.template">
       <field name="code">0110</field>
       <field name="name">Konzessionen </field>
       <field name="parent_id" ref="chart_skr04_100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_120" model="account.account.template">
       <field name="code">0120</field>
       <field name="name">Gewerbliche Schutzrechte</field>
       <field name="parent_id" ref="chart_skr04_100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_130" model="account.account.template">
       <field name="code">0130</field>
       <field name="name">ähnliche Rechte und Werte </field>
       <field name="parent_id" ref="chart_skr04_100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_135" model="account.account.template">
       <field name="code">0135</field>
       <field name="name">EDV-Software</field>
       <field name="parent_id" ref="chart_skr04_100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_140" model="account.account.template">
       <field name="code">0140</field>
       <field name="name">Lizenzen an gewerblichen Schutzrechten und ähnlichen Rechten und Werten </field>
       <field name="parent_id" ref="chart_skr04_100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA32" model="account.account.template">
       <field name="code">K0BA32</field>
       <field name="name">Geschäfts- oder Firmenwert</field>
@@ -659,16 +659,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_150" model="account.account.template">
       <field name="code">0150</field>
       <field name="name">Geschäfts- oder Firmenwert</field>
       <field name="parent_id" ref="chart_skr04_K0BA32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA33" model="account.account.template">
       <field name="code">K0BA33</field>
       <field name="name">Verschmelzungsmehrwert</field>
@@ -676,16 +676,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_160" model="account.account.template">
       <field name="code">0160</field>
       <field name="name">Verschmelzungsmehrwert</field>
       <field name="parent_id" ref="chart_skr04_K0BA33"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA34" model="account.account.template">
       <field name="code">K0BA34</field>
       <field name="name">Geleistete Anzahlungen</field>
@@ -693,25 +693,25 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_170" model="account.account.template">
       <field name="code">0170</field>
       <field name="name">Geleistete Anzahlungen auf immaterielle Vermögensgegenstände</field>
       <field name="parent_id" ref="chart_skr04_K0BA34"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_179" model="account.account.template">
       <field name="code">0179</field>
       <field name="name">Anzahlungen auf Geschäfts- oder Firmenwert</field>
       <field name="parent_id" ref="chart_skr04_K0BA34"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA4" model="account.account.template">
       <field name="code">K0BA4</field>
       <field name="name">Sachanlagen</field>
@@ -719,7 +719,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA41" model="account.account.template">
       <field name="code">K0BA41</field>
       <field name="name">Grundstücke- grundstücksgleiche Rechte und Bauten einschließlich der Bauten auf fremden Grundstücken</field>
@@ -727,277 +727,277 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_200" model="account.account.template">
       <field name="code">0200</field>
       <field name="name">Grundstücke- grundstücksgleiche Rechte und Bauten einschließlich der Bauten auf fremden Grundstücken</field>
       <field name="parent_id" ref="chart_skr04_K0BA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_210" model="account.account.template">
       <field name="code">0210</field>
       <field name="name">Grundstücke und grundstücksgleiche Rechte ohne Bauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_215" model="account.account.template">
       <field name="code">0215</field>
       <field name="name">Unbebaute Grundstücke</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_220" model="account.account.template">
       <field name="code">0220</field>
       <field name="name">Grundstücksgleiche Rechte (Erbbaurecht- Dauerwohnrecht)</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_225" model="account.account.template">
       <field name="code">0225</field>
       <field name="name">Grundstücke mit Substanzverzehr</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_229" model="account.account.template">
       <field name="code">0229</field>
       <field name="name">Grundstücksanteil des häuslichen Arbeitszimmers</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_230" model="account.account.template">
       <field name="code">0230</field>
       <field name="name">Bauten auf eigenen Grundstücken und grundstücksgleichen Rechten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_235" model="account.account.template">
       <field name="code">0235</field>
       <field name="name">Grundstückswerte eigener bebauter Grundstücke</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_240" model="account.account.template">
       <field name="code">0240</field>
       <field name="name">Geschäftsbauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_250" model="account.account.template">
       <field name="code">0250</field>
       <field name="name">Fabrikbauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_260" model="account.account.template">
       <field name="code">0260</field>
       <field name="name">Andere Bauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_270" model="account.account.template">
       <field name="code">0270</field>
       <field name="name">Garagen</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_280" model="account.account.template">
       <field name="code">0280</field>
       <field name="name">Außenanlagen für Geschäfts- Fabrik- und andere Bauten </field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_285" model="account.account.template">
       <field name="code">0285</field>
       <field name="name">Hof- und Wegebefestigungen</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_290" model="account.account.template">
       <field name="code">0290</field>
       <field name="name">Einrichtungen für Geschäfts-Fabrik und andere Bauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_300" model="account.account.template">
       <field name="code">0300</field>
       <field name="name">Wohnbauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_305" model="account.account.template">
       <field name="code">0305</field>
       <field name="name">Garagen</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_310" model="account.account.template">
       <field name="code">0310</field>
       <field name="name">Außenanlagen </field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_315" model="account.account.template">
       <field name="code">0315</field>
       <field name="name">Hof- und Wegebefestigungen</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_320" model="account.account.template">
       <field name="code">0320</field>
       <field name="name">Einrichtungen für Wohnbauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_329" model="account.account.template">
       <field name="code">0329</field>
       <field name="name">Gebäudeteile des häuslischen Arbeitszimmers</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_330" model="account.account.template">
       <field name="code">0330</field>
       <field name="name">Bauten auf fremden Grundstücken</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_340" model="account.account.template">
       <field name="code">0340</field>
       <field name="name">Geschäftsbauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_350" model="account.account.template">
       <field name="code">0350</field>
       <field name="name">Fabrikbauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_360" model="account.account.template">
       <field name="code">0360</field>
       <field name="name">Wohnbauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_370" model="account.account.template">
       <field name="code">0370</field>
       <field name="name">Andere Bauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_380" model="account.account.template">
       <field name="code">0380</field>
       <field name="name">Garagen</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_390" model="account.account.template">
       <field name="code">0390</field>
       <field name="name">Außenanlagen</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_395" model="account.account.template">
       <field name="code">0395</field>
       <field name="name">Hof- und Wegebefestigungen</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_398" model="account.account.template">
       <field name="code">0398</field>
       <field name="name">Einrichtungen für Geschäfts-Fabrik und andere Bauten</field>
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA42" model="account.account.template">
       <field name="code">K0BA42</field>
       <field name="name">Technische Anlagen und Maschinen</field>
@@ -1005,52 +1005,52 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_400" model="account.account.template">
       <field name="code">0400</field>
       <field name="name">Technische Anlagen und Maschinen</field>
       <field name="parent_id" ref="chart_skr04_K0BA42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_420" model="account.account.template">
       <field name="code">0420</field>
       <field name="name">Technische Anlagen </field>
       <field name="parent_id" ref="chart_skr04_400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_440" model="account.account.template">
       <field name="code">0440</field>
       <field name="name">Maschinen</field>
       <field name="parent_id" ref="chart_skr04_400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_460" model="account.account.template">
       <field name="code">0460</field>
       <field name="name">Maschinen gebundene Werkzeuge</field>
       <field name="parent_id" ref="chart_skr04_400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_470" model="account.account.template">
       <field name="code">0470</field>
       <field name="name">Betriebsvorrichtungen</field>
       <field name="parent_id" ref="chart_skr04_400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA43" model="account.account.template">
       <field name="code">K0BA43</field>
       <field name="name">Andere Anlagen- Betriebs- und Geschäftsaustattung</field>
@@ -1058,115 +1058,115 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_500" model="account.account.template">
       <field name="code">0500</field>
       <field name="name">Andere Anlagen- Betriebs- und Geschäftsaustattung</field>
       <field name="parent_id" ref="chart_skr04_K0BA43"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_510" model="account.account.template">
       <field name="code">0510</field>
       <field name="name">Andere Anlagen </field>
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_520" model="account.account.template">
       <field name="code">0520</field>
       <field name="name">Pkw</field>
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_540" model="account.account.template">
       <field name="code">0540</field>
       <field name="name">Lkw</field>
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_560" model="account.account.template">
       <field name="code">0560</field>
       <field name="name">Sonstige Transportmittel</field>
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_620" model="account.account.template">
       <field name="code">0620</field>
       <field name="name">Werkzeuge</field>
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_640" model="account.account.template">
       <field name="code">0640</field>
       <field name="name">Ladeneinrichtungen</field>
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_650" model="account.account.template">
       <field name="code">0650</field>
       <field name="name">Büroeinrichtungen</field>
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_660" model="account.account.template">
       <field name="code">0660</field>
       <field name="name">Gerüst- und Schalungsmaterial</field>
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_670" model="account.account.template">
       <field name="code">0670</field>
       <field name="name">Geringwertige Wirtschaftsgüter bis 410 Euro</field>
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_680" model="account.account.template">
       <field name="code">0680</field>
       <field name="name">Einbauten in fremde Grundstücke</field>
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_690" model="account.account.template">
       <field name="code">0690</field>
       <field name="name">Sonstige Betriebs- und Geschäftsausstattung</field>
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA44" model="account.account.template">
       <field name="code">K0BA44</field>
       <field name="name">Geleistete Anzahlungen und Anlagen im Bau</field>
@@ -1174,133 +1174,133 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_700" model="account.account.template">
       <field name="code">0700</field>
       <field name="name">Geleistete Anzahlungen und Anlagen im Bau</field>
       <field name="parent_id" ref="chart_skr04_K0BA44"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_705" model="account.account.template">
       <field name="code">0705</field>
       <field name="name">Anzahlungen auf Grundstücke und grundstücksgleiche Rechte ohne Bauten</field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_710" model="account.account.template">
       <field name="code">0710</field>
       <field name="name">Geschäfts- Fabrik- und andere Bauten im Bau auf eingenen Grundstücken</field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_720" model="account.account.template">
       <field name="code">0720</field>
       <field name="name">Anzahlungen auf Geschäfts- Fabrik-und andere Bauten auf eigenen Grundstücken und grundstücksgleichen Rechten </field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_725" model="account.account.template">
       <field name="code">0725</field>
       <field name="name">Wohnbauten im Bau</field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_735" model="account.account.template">
       <field name="code">0735</field>
       <field name="name">Anzahlungen auf Wohnbauten auf eigenen Grundstücken und grundstücksgleichen Rechten</field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_740" model="account.account.template">
       <field name="code">0740</field>
       <field name="name">Geschäfts- Fabrik- und andere Bauten im Bau auf fremden Grundstücken</field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_750" model="account.account.template">
       <field name="code">0750</field>
       <field name="name">Anzahlungen auf Geschäfts- Fabrik- und andere Bauten auf fremden Grundstücken</field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_755" model="account.account.template">
       <field name="code">0755</field>
       <field name="name">Wohnbauten im Bau</field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_765" model="account.account.template">
       <field name="code">0765</field>
       <field name="name">Anzahlungen auf Wohnbauten auf fremden Grundstücken </field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_770" model="account.account.template">
       <field name="code">0770</field>
       <field name="name">Technische Anlagen und Maschinen im Bau </field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_780" model="account.account.template">
       <field name="code">0780</field>
       <field name="name">Anzahlungen auf technische Anlagen und Maschinen</field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_785" model="account.account.template">
       <field name="code">0785</field>
       <field name="name">Andere Anlagen- Betriebs- und Geschäftsaustattung im Bau</field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_795" model="account.account.template">
       <field name="code">0795</field>
       <field name="name">Anzahlungen auf andere Anlagen- Betriebs und Geschäftsausstattung</field>
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA5" model="account.account.template">
       <field name="code">K0BA5</field>
       <field name="name">Finanzanlagen</field>
@@ -1308,7 +1308,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA51" model="account.account.template">
       <field name="code">K0BA51</field>
       <field name="name">Anteile an verbundenen Unternehmen</field>
@@ -1316,25 +1316,25 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_800" model="account.account.template">
       <field name="code">0800</field>
       <field name="name">Anteile an verbundenen Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K0BA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_809" model="account.account.template">
       <field name="code">0809</field>
       <field name="name">Anteile an herrschender oder mit Mehrheit beteiligter Gesellschaft</field>
       <field name="parent_id" ref="chart_skr04_K0BA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA52" model="account.account.template">
       <field name="code">K0BA52</field>
       <field name="name">Ausleihungen an verbundene Unternehmen</field>
@@ -1342,16 +1342,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_810" model="account.account.template">
       <field name="code">0810</field>
       <field name="name">Ausleihungen an verbundene Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K0BA52"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA53" model="account.account.template">
       <field name="code">K0BA53</field>
       <field name="name">Beteiligungen</field>
@@ -1359,61 +1359,61 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_820" model="account.account.template">
       <field name="code">0820</field>
       <field name="name">Beteiligungen</field>
       <field name="parent_id" ref="chart_skr04_K0BA53"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_829" model="account.account.template">
       <field name="code">0829</field>
       <field name="name">Beteiligungen einer GmbH Co. KG an einer Komplementär GmbH</field>
       <field name="parent_id" ref="chart_skr04_820"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_830" model="account.account.template">
       <field name="code">0830</field>
       <field name="name">Typisch stille Beteiligungen</field>
       <field name="parent_id" ref="chart_skr04_820"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_840" model="account.account.template">
       <field name="code">0840</field>
       <field name="name">Atypisch stille Beteiligungen</field>
       <field name="parent_id" ref="chart_skr04_820"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_850" model="account.account.template">
       <field name="code">0850</field>
       <field name="name">Andere Beteiligungen an Kapitalgesellschaften</field>
       <field name="parent_id" ref="chart_skr04_820"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_860" model="account.account.template">
       <field name="code">0860</field>
       <field name="name">Andere Beteilgungen an Personengesellschaften</field>
       <field name="parent_id" ref="chart_skr04_820"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA54" model="account.account.template">
       <field name="code">K0BA54</field>
       <field name="name">Ausleihungen an Unternehmen- mit denen ein Beteiligungsverhältnis besteht</field>
@@ -1421,16 +1421,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_880" model="account.account.template">
       <field name="code">0880</field>
       <field name="name">Ausleihungen an Unternehmen- mit denen ein Beteiligungsverhältnis besteht</field>
       <field name="parent_id" ref="chart_skr04_K0BA54"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA55" model="account.account.template">
       <field name="code">K0BA55</field>
       <field name="name">Wertpapiere des Anlagevermögens</field>
@@ -1438,34 +1438,34 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_900" model="account.account.template">
       <field name="code">0900</field>
       <field name="name">Wertpapiere des Anlagevermögens</field>
       <field name="parent_id" ref="chart_skr04_K0BA55"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_910" model="account.account.template">
       <field name="code">0910</field>
       <field name="name">Wertpapiere mit Gewinnbeteiligungsansprüchen- die dem Halbeinkünfteverfahren unterliegen</field>
       <field name="parent_id" ref="chart_skr04_900"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_920" model="account.account.template">
       <field name="code">0920</field>
       <field name="name">Festverzinsliche Wertpapiere</field>
       <field name="parent_id" ref="chart_skr04_900"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA56" model="account.account.template">
       <field name="code">K0BA56</field>
       <field name="name">Sonstige Ausleihungen</field>
@@ -1473,43 +1473,43 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_930" model="account.account.template">
       <field name="code">0930</field>
       <field name="name">Sonstige Ausleihungen</field>
       <field name="parent_id" ref="chart_skr04_K0BA56"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_940" model="account.account.template">
       <field name="code">0940</field>
       <field name="name">Darlehen</field>
       <field name="parent_id" ref="chart_skr04_930"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_960" model="account.account.template">
       <field name="code">0960</field>
       <field name="name">Ausleihungen an Gesellschafter</field>
       <field name="parent_id" ref="chart_skr04_930"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_970" model="account.account.template">
       <field name="code">0970</field>
       <field name="name">Ausleihungen an nahe stehende Personen</field>
       <field name="parent_id" ref="chart_skr04_930"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA57" model="account.account.template">
       <field name="code">K0BA57</field>
       <field name="name">Genossenschaftsanteile</field>
@@ -1517,16 +1517,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_980" model="account.account.template">
       <field name="code">0980</field>
       <field name="name">Genossenschaftsanteile zum langfristigen Verbleib</field>
       <field name="parent_id" ref="chart_skr04_K0BA57"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K0BA58" model="account.account.template">
       <field name="code">K0BA58</field>
       <field name="name">Rückdeckungsansprüche aus Lebensversicherungen</field>
@@ -1534,16 +1534,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_990" model="account.account.template">
       <field name="code">0990</field>
       <field name="name">Rückdeckungsansprüche aus Lebensversicherungen zum langfristigen Verbleib</field>
       <field name="parent_id" ref="chart_skr04_K0BA58"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA1" model="account.account.template">
       <field name="code">K1BA1</field>
       <field name="name">Vorräte</field>
@@ -1551,7 +1551,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA11" model="account.account.template">
       <field name="code">K1BA11</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe</field>
@@ -1559,367 +1559,367 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1000" model="account.account.template">
       <field name="code">1000</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1001" model="account.account.template">
       <field name="code">1001</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1002" model="account.account.template">
       <field name="code">1002</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1003" model="account.account.template">
       <field name="code">1003</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1004" model="account.account.template">
       <field name="code">1004</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1005" model="account.account.template">
       <field name="code">1005</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1006" model="account.account.template">
       <field name="code">1006</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1007" model="account.account.template">
       <field name="code">1007</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1008" model="account.account.template">
       <field name="code">1008</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1009" model="account.account.template">
       <field name="code">1009</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1010" model="account.account.template">
       <field name="code">1010</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1011" model="account.account.template">
       <field name="code">1011</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1012" model="account.account.template">
       <field name="code">1012</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1013" model="account.account.template">
       <field name="code">1013</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1014" model="account.account.template">
       <field name="code">1014</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1015" model="account.account.template">
       <field name="code">1015</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1016" model="account.account.template">
       <field name="code">1016</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1017" model="account.account.template">
       <field name="code">1017</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1018" model="account.account.template">
       <field name="code">1018</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1019" model="account.account.template">
       <field name="code">1019</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1020" model="account.account.template">
       <field name="code">1020</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1021" model="account.account.template">
       <field name="code">1021</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1022" model="account.account.template">
       <field name="code">1022</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1023" model="account.account.template">
       <field name="code">1023</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1024" model="account.account.template">
       <field name="code">1024</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1025" model="account.account.template">
       <field name="code">1025</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1026" model="account.account.template">
       <field name="code">1026</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1027" model="account.account.template">
       <field name="code">1027</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1028" model="account.account.template">
       <field name="code">1028</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1029" model="account.account.template">
       <field name="code">1029</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1030" model="account.account.template">
       <field name="code">1030</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1031" model="account.account.template">
       <field name="code">1031</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1032" model="account.account.template">
       <field name="code">1032</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1033" model="account.account.template">
       <field name="code">1033</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1034" model="account.account.template">
       <field name="code">1034</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1035" model="account.account.template">
       <field name="code">1035</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1036" model="account.account.template">
       <field name="code">1036</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1037" model="account.account.template">
       <field name="code">1037</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1038" model="account.account.template">
       <field name="code">1038</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1039" model="account.account.template">
       <field name="code">1039</field>
       <field name="name">Roh- Hilfs- und Betriebsstoffe (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA12" model="account.account.template">
       <field name="code">K1BA12</field>
       <field name="name">Unfertige Erzeugnisse- unfertige Leistungen</field>
@@ -1927,457 +1927,457 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1040" model="account.account.template">
       <field name="code">1040</field>
       <field name="name">Unfertige Erzeugnisse- unfertige Leistungen (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1041" model="account.account.template">
       <field name="code">1041</field>
       <field name="name">Unfertige Erzeugnisse- unfertige Leistungen (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1042" model="account.account.template">
       <field name="code">1042</field>
       <field name="name">Unfertige Erzeugnisse- unfertige Leistungen (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1043" model="account.account.template">
       <field name="code">1043</field>
       <field name="name">Unfertige Erzeugnisse- unfertige Leistungen (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1044" model="account.account.template">
       <field name="code">1044</field>
       <field name="name">Unfertige Erzeugnisse- unfertige Leistungen (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1045" model="account.account.template">
       <field name="code">1045</field>
       <field name="name">Unfertige Erzeugnisse- unfertige Leistungen (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1046" model="account.account.template">
       <field name="code">1046</field>
       <field name="name">Unfertige Erzeugnisse- unfertige Leistungen (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1047" model="account.account.template">
       <field name="code">1047</field>
       <field name="name">Unfertige Erzeugnisse- unfertige Leistungen (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1048" model="account.account.template">
       <field name="code">1048</field>
       <field name="name">Unfertige Erzeugnisse- unfertige Leistungen (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1049" model="account.account.template">
       <field name="code">1049</field>
       <field name="name">Unfertige Erzeugnisse- unfertige Leistungen (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1050" model="account.account.template">
       <field name="code">1050</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1051" model="account.account.template">
       <field name="code">1051</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1052" model="account.account.template">
       <field name="code">1052</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1053" model="account.account.template">
       <field name="code">1053</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1054" model="account.account.template">
       <field name="code">1054</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1055" model="account.account.template">
       <field name="code">1055</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1056" model="account.account.template">
       <field name="code">1056</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1057" model="account.account.template">
       <field name="code">1057</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1058" model="account.account.template">
       <field name="code">1058</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1059" model="account.account.template">
       <field name="code">1059</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1060" model="account.account.template">
       <field name="code">1060</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1061" model="account.account.template">
       <field name="code">1061</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1062" model="account.account.template">
       <field name="code">1062</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1063" model="account.account.template">
       <field name="code">1063</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1064" model="account.account.template">
       <field name="code">1064</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1065" model="account.account.template">
       <field name="code">1065</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1066" model="account.account.template">
       <field name="code">1066</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1067" model="account.account.template">
       <field name="code">1067</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1068" model="account.account.template">
       <field name="code">1068</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1069" model="account.account.template">
       <field name="code">1069</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1070" model="account.account.template">
       <field name="code">1070</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1071" model="account.account.template">
       <field name="code">1071</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1072" model="account.account.template">
       <field name="code">1072</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1073" model="account.account.template">
       <field name="code">1073</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1074" model="account.account.template">
       <field name="code">1074</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1075" model="account.account.template">
       <field name="code">1075</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1076" model="account.account.template">
       <field name="code">1076</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1077" model="account.account.template">
       <field name="code">1077</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1078" model="account.account.template">
       <field name="code">1078</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1079" model="account.account.template">
       <field name="code">1079</field>
       <field name="name">Unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1080" model="account.account.template">
       <field name="code">1080</field>
       <field name="name">Unfertige Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1081" model="account.account.template">
       <field name="code">1081</field>
       <field name="name">Unfertige Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1082" model="account.account.template">
       <field name="code">1082</field>
       <field name="name">Unfertige Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1083" model="account.account.template">
       <field name="code">1083</field>
       <field name="name">Unfertige Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1084" model="account.account.template">
       <field name="code">1084</field>
       <field name="name">Unfertige Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1085" model="account.account.template">
       <field name="code">1085</field>
       <field name="name">Unfertige Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1086" model="account.account.template">
       <field name="code">1086</field>
       <field name="name">Unfertige Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1087" model="account.account.template">
       <field name="code">1087</field>
       <field name="name">Unfertige Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1088" model="account.account.template">
       <field name="code">1088</field>
       <field name="name">Unfertige Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1089" model="account.account.template">
       <field name="code">1089</field>
       <field name="name">Unfertige Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA13" model="account.account.template">
       <field name="code">K1BA13</field>
       <field name="name">In Ausführung befindliche Bauaufträge</field>
@@ -2385,52 +2385,52 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1090" model="account.account.template">
       <field name="code">1090</field>
       <field name="name">In Ausführung befindliche Bauaufträge</field>
       <field name="parent_id" ref="chart_skr04_K1BA13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1091" model="account.account.template">
       <field name="code">1091</field>
       <field name="name">In Ausführung befindliche Bauaufträge</field>
       <field name="parent_id" ref="chart_skr04_K1BA13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1092" model="account.account.template">
       <field name="code">1092</field>
       <field name="name">In Ausführung befindliche Bauaufträge</field>
       <field name="parent_id" ref="chart_skr04_K1BA13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1093" model="account.account.template">
       <field name="code">1093</field>
       <field name="name">In Ausführung befindliche Bauaufträge</field>
       <field name="parent_id" ref="chart_skr04_K1BA13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1094" model="account.account.template">
       <field name="code">1094</field>
       <field name="name">In Ausführung befindliche Bauaufträge</field>
       <field name="parent_id" ref="chart_skr04_K1BA13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA14" model="account.account.template">
       <field name="code">K1BA14</field>
       <field name="name">In Arbeit befindliche Aufträge </field>
@@ -2438,52 +2438,52 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1095" model="account.account.template">
       <field name="code">1095</field>
       <field name="name">In Arbeit befindliche Aufträge </field>
       <field name="parent_id" ref="chart_skr04_K1BA14"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1096" model="account.account.template">
       <field name="code">1096</field>
       <field name="name">In Arbeit befindliche Aufträge </field>
       <field name="parent_id" ref="chart_skr04_K1BA14"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1097" model="account.account.template">
       <field name="code">1097</field>
       <field name="name">In Arbeit befindliche Aufträge </field>
       <field name="parent_id" ref="chart_skr04_K1BA14"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1098" model="account.account.template">
       <field name="code">1098</field>
       <field name="name">In Arbeit befindliche Aufträge </field>
       <field name="parent_id" ref="chart_skr04_K1BA14"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1099" model="account.account.template">
       <field name="code">1099</field>
       <field name="name">In Arbeit befindliche Aufträge </field>
       <field name="parent_id" ref="chart_skr04_K1BA14"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA15" model="account.account.template">
       <field name="code">K1BA15</field>
       <field name="name">Fertige Erzeugnisse und Waren</field>
@@ -2491,727 +2491,727 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1100" model="account.account.template">
       <field name="code">1100</field>
       <field name="name">Fertige Erzeugnisse und Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1101" model="account.account.template">
       <field name="code">1101</field>
       <field name="name">Fertige Erzeugnisse und Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1102" model="account.account.template">
       <field name="code">1102</field>
       <field name="name">Fertige Erzeugnisse und Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1103" model="account.account.template">
       <field name="code">1103</field>
       <field name="name">Fertige Erzeugnisse und Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1104" model="account.account.template">
       <field name="code">1104</field>
       <field name="name">Fertige Erzeugnisse und Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1105" model="account.account.template">
       <field name="code">1105</field>
       <field name="name">Fertige Erzeugnisse und Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1106" model="account.account.template">
       <field name="code">1106</field>
       <field name="name">Fertige Erzeugnisse und Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1107" model="account.account.template">
       <field name="code">1107</field>
       <field name="name">Fertige Erzeugnisse und Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1108" model="account.account.template">
       <field name="code">1108</field>
       <field name="name">Fertige Erzeugnisse und Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1109" model="account.account.template">
       <field name="code">1109</field>
       <field name="name">Fertige Erzeugnisse und Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1110" model="account.account.template">
       <field name="code">1110</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1111" model="account.account.template">
       <field name="code">1111</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1112" model="account.account.template">
       <field name="code">1112</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1113" model="account.account.template">
       <field name="code">1113</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1114" model="account.account.template">
       <field name="code">1114</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1115" model="account.account.template">
       <field name="code">1115</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1116" model="account.account.template">
       <field name="code">1116</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1117" model="account.account.template">
       <field name="code">1117</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1118" model="account.account.template">
       <field name="code">1118</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1119" model="account.account.template">
       <field name="code">1119</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1120" model="account.account.template">
       <field name="code">1120</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1121" model="account.account.template">
       <field name="code">1121</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1122" model="account.account.template">
       <field name="code">1122</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1123" model="account.account.template">
       <field name="code">1123</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1124" model="account.account.template">
       <field name="code">1124</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1125" model="account.account.template">
       <field name="code">1125</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1126" model="account.account.template">
       <field name="code">1126</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1127" model="account.account.template">
       <field name="code">1127</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1128" model="account.account.template">
       <field name="code">1128</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1129" model="account.account.template">
       <field name="code">1129</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1130" model="account.account.template">
       <field name="code">1130</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1131" model="account.account.template">
       <field name="code">1131</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1132" model="account.account.template">
       <field name="code">1132</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1133" model="account.account.template">
       <field name="code">1133</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1134" model="account.account.template">
       <field name="code">1134</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1135" model="account.account.template">
       <field name="code">1135</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1136" model="account.account.template">
       <field name="code">1136</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1137" model="account.account.template">
       <field name="code">1137</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1138" model="account.account.template">
       <field name="code">1138</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1139" model="account.account.template">
       <field name="code">1139</field>
       <field name="name">Fertige Erzeugnisse (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1140" model="account.account.template">
       <field name="code">1140</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1141" model="account.account.template">
       <field name="code">1141</field>
       <field name="name">* Lager Bestandswert Korrektur</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1142" model="account.account.template">
       <field name="code">1142</field>
       <field name="name">* Lager Differenzkorrektur Gewinn / Verlust</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1143" model="account.account.template">
       <field name="code">1143</field>
       <field name="name">* Lager Differenzkorrektur Marktwert</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1144" model="account.account.template">
       <field name="code">1144</field>
       <field name="name">* Lager Bestand Zwischenkonto</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1145" model="account.account.template">
       <field name="code">1145</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1146" model="account.account.template">
       <field name="code">1146</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1147" model="account.account.template">
       <field name="code">1147</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1148" model="account.account.template">
       <field name="code">1148</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1149" model="account.account.template">
       <field name="code">1149</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1150" model="account.account.template">
       <field name="code">1150</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1151" model="account.account.template">
       <field name="code">1151</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1152" model="account.account.template">
       <field name="code">1152</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1153" model="account.account.template">
       <field name="code">1153</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1154" model="account.account.template">
       <field name="code">1154</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1155" model="account.account.template">
       <field name="code">1155</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1156" model="account.account.template">
       <field name="code">1156</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1157" model="account.account.template">
       <field name="code">1157</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1158" model="account.account.template">
       <field name="code">1158</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1159" model="account.account.template">
       <field name="code">1159</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1160" model="account.account.template">
       <field name="code">1160</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1161" model="account.account.template">
       <field name="code">1161</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1162" model="account.account.template">
       <field name="code">1162</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1163" model="account.account.template">
       <field name="code">1163</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1164" model="account.account.template">
       <field name="code">1164</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1165" model="account.account.template">
       <field name="code">1165</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1166" model="account.account.template">
       <field name="code">1166</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1167" model="account.account.template">
       <field name="code">1167</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1168" model="account.account.template">
       <field name="code">1168</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1169" model="account.account.template">
       <field name="code">1169</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1170" model="account.account.template">
       <field name="code">1170</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1171" model="account.account.template">
       <field name="code">1171</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1172" model="account.account.template">
       <field name="code">1172</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1173" model="account.account.template">
       <field name="code">1173</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1174" model="account.account.template">
       <field name="code">1174</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1175" model="account.account.template">
       <field name="code">1175</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1176" model="account.account.template">
       <field name="code">1176</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1177" model="account.account.template">
       <field name="code">1177</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1178" model="account.account.template">
       <field name="code">1178</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1179" model="account.account.template">
       <field name="code">1179</field>
       <field name="name">Waren (Bestand)</field>
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA16" model="account.account.template">
       <field name="code">K1BA16</field>
       <field name="name">Geleistete Anzahlungen </field>
@@ -3219,52 +3219,52 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1180" model="account.account.template">
       <field name="code">1180</field>
       <field name="name">Geleistete Anzahlungen auf Vorräte</field>
       <field name="parent_id" ref="chart_skr04_K1BA16"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1181" model="account.account.template">
       <field name="code">1181</field>
       <field name="name">Geleistete Anzahlungen 7% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_1180"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1184" model="account.account.template">
       <field name="code">1184</field>
       <field name="name">Geleistete Anzahlungen 16% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_1180"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1185" model="account.account.template">
       <field name="code">1185</field>
       <field name="name">Geleistete Anzahlungen 15% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_1180"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1186" model="account.account.template">
       <field name="code">1186</field>
       <field name="name">Geleistete Anzahlungen 19% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_1180"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA17" model="account.account.template">
       <field name="code">K1BA17</field>
       <field name="name">Erhaltene Anzahlungen auf Bestellungen</field>
@@ -3272,16 +3272,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1190" model="account.account.template">
       <field name="code">1190</field>
       <field name="name">Erhaltene Anzahlungen auf Bestellungen (</field>
       <field name="parent_id" ref="chart_skr04_K1BA17"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA2" model="account.account.template">
       <field name="code">K1BA2</field>
       <field name="name">Forderungen und sonstige Vermögensgegenstände</field>
@@ -3289,7 +3289,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA21" model="account.account.template">
       <field name="code">K1BA21</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen oder sonstige Verbindlichkeiten</field>
@@ -3297,205 +3297,205 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1200" model="account.account.template">
       <field name="code">1200</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen </field>
       <field name="parent_id" ref="chart_skr04_K1BA21"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1206" model="account.account.template">
       <field name="code">1206</field>
       <field name="name">Forderungen aus Dienstleistungen</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account_type_receivable_de"/>
     </record>
-    
+
     <record id="chart_skr04_1210" model="account.account.template">
       <field name="code">1210</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen ohne Kontokorent</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1211" model="account.account.template">
       <field name="code">1211</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen ohne Kontokorent</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1212" model="account.account.template">
       <field name="code">1212</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen ohne Kontokorent</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1213" model="account.account.template">
       <field name="code">1213</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen ohne Kontokorent</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1214" model="account.account.template">
       <field name="code">1214</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen ohne Kontokorent</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1215" model="account.account.template">
       <field name="code">1215</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen zum allgemeinen Umsatzsteuersatz oder eines Kleinunternehmers (EüR)</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account_type_receivable_de"/>
     </record>
-    
+
     <record id="chart_skr04_1216" model="account.account.template">
       <field name="code">1216</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen zum ermäßigten Umsatzsteuersatz (EüR)</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account_type_receivable_de"/>
     </record>
-    
+
     <record id="chart_skr04_1217" model="account.account.template">
       <field name="code">1217</field>
       <field name="name">Forderungen aus steuerfreien oder nicht steuerbaren Lieferungen und Leistungen (EüR)</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account_type_receivable_de"/>
     </record>
-    
+
     <record id="chart_skr04_1218" model="account.account.template">
       <field name="code">1218</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen nach Durchschnittssätzen gemäß §24 UStG (EüR)</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account_type_receivable_de"/>
     </record>
-    
+
     <record id="chart_skr04_1219" model="account.account.template">
       <field name="code">1219</field>
       <field name="name">Gegenkonto 1215-1218 bei Aufteilung der Forderungen nach Steuersätzen (EüR)</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account_type_receivable_de"/>
     </record>
-    
+
     <record id="chart_skr04_1220" model="account.account.template">
       <field name="code">1220</field>
       <field name="name">Forderungen nach §11 Abs. 1 Satz 2 EStG für § 4/3 EStG</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account_type_receivable_de"/>
     </record>
-    
+
     <record id="chart_skr04_1221" model="account.account.template">
       <field name="code">1221</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen ohne Kontokorent - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1225" model="account.account.template">
       <field name="code">1225</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen ohne Kontokorent - Restlaufzeit größer 1 Jahr.</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1230" model="account.account.template">
       <field name="code">1230</field>
       <field name="name">Wechsel aus Lieferungen und Leistungen</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1231" model="account.account.template">
       <field name="code">1231</field>
       <field name="name">Wechsel aus Lieferungen und Leistungen Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1232" model="account.account.template">
       <field name="code">1232</field>
       <field name="name">Wechsel aus Lieferungen und Leistungen Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1235" model="account.account.template">
       <field name="code">1235</field>
       <field name="name">Wechsel aus Lieferungen und Leistungen- bundesbankfähig.</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1240" model="account.account.template">
       <field name="code">1240</field>
       <field name="name">Zweifelhafte Forderungen</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1241" model="account.account.template">
       <field name="code">1241</field>
       <field name="name">Zweifelhafte Forderungen - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1245" model="account.account.template">
       <field name="code">1245</field>
       <field name="name">Zweifelhafte Forderungen - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA22" model="account.account.template">
       <field name="code">K1BA22</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen H-Saldo</field>
@@ -3503,79 +3503,79 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1246" model="account.account.template">
       <field name="code">1246</field>
       <field name="name">Einzelwertberechtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_K1BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1247" model="account.account.template">
       <field name="code">1247</field>
       <field name="name">Einzelwertberechtigungen zu Forderungen mit einer Restlaufzeit von mehr als 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_K1BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1248" model="account.account.template">
       <field name="code">1248</field>
       <field name="name">Pauschalwertberichtigung zu Forderung mit einer Restlaufzeit bis zu 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_K1BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1249" model="account.account.template">
       <field name="code">1249</field>
       <field name="name">Pauschalwertberichtigung zu Forderung mit einer Restlaufzeit von mehr als 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_K1BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1250" model="account.account.template">
       <field name="code">1250</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen gegen Gesellschafter</field>
       <field name="parent_id" ref="chart_skr04_K1BA21"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account_type_receivable_de"/>
     </record>
-    
+
     <record id="chart_skr04_1251" model="account.account.template">
       <field name="code">1251</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen gegen Gesellschafter - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_K1BA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1255" model="account.account.template">
       <field name="code">1255</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen gegen Gesellschafter - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_K1BA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1258" model="account.account.template">
       <field name="code">1258</field>
       <field name="name">Gegenkonto zu sonstigen Vermögensgegenständen bei Buchungen über Debitorenkonto</field>
       <field name="parent_id" ref="chart_skr04_K1BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA23" model="account.account.template">
       <field name="code">K1BA23</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen H-Saldo oder sonstige Verbindlichkeiten S-Saldo</field>
@@ -3583,16 +3583,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1259" model="account.account.template">
       <field name="code">1259</field>
       <field name="name">Gegenkonto 1221-1229- 1240-1245- 1250-1257- 1270-1279- 1290-1297 bei Aufteilung Debitorenkonto</field>
       <field name="parent_id" ref="chart_skr04_K1BA23"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA24" model="account.account.template">
       <field name="code">K1BA24</field>
       <field name="name">Forderungen gegen verbundene Unternehmen oder Verbindlichkeiten gegenüber verbundenen Unternehmen</field>
@@ -3600,97 +3600,97 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1260" model="account.account.template">
       <field name="code">1260</field>
       <field name="name">Forderungen gegen verbundene Unternehmen </field>
       <field name="parent_id" ref="chart_skr04_K1BA24"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1261" model="account.account.template">
       <field name="code">1261</field>
       <field name="name">Forderungen gegen verbundene Unternehmen - Restlaufzeit bis 1 Jahr. </field>
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1265" model="account.account.template">
       <field name="code">1265</field>
       <field name="name">Forderungen gegen verbundene Unternehmen - Restlaufzeit größer 1 Jahr. </field>
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1266" model="account.account.template">
       <field name="code">1266</field>
       <field name="name">Besitzwechsel gegen verbundene Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1267" model="account.account.template">
       <field name="code">1267</field>
       <field name="name">Besitzwechsel gegen verbundene Unternehmen - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1268" model="account.account.template">
       <field name="code">1268</field>
       <field name="name">Besitzwechsel gegen verbundene Unternehmen - Restlaufzeit größer Jahr</field>
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1269" model="account.account.template">
       <field name="code">1269</field>
       <field name="name">Besitzwechsel gegen verbundene Unternehmen- bundesbankfähig</field>
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1270" model="account.account.template">
       <field name="code">1270</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen gegen verbundenen Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account_type_receivable_de"/>
     </record>
-    
+
     <record id="chart_skr04_1271" model="account.account.template">
       <field name="code">1271</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen gegen verbundenen Unternehmen - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1275" model="account.account.template">
       <field name="code">1275</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen gegen verbundenen Unternehmen - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA25" model="account.account.template">
       <field name="code">K1BA25</field>
       <field name="name">Forderungen gegen verbundene Unternehmen H-Saldo</field>
@@ -3698,25 +3698,25 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1276" model="account.account.template">
       <field name="code">1276</field>
       <field name="name">Wertberichtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr gegen verbundene Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K1BA25"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1277" model="account.account.template">
       <field name="code">1277</field>
       <field name="name">Wertberichtigungen zu Forderungen mit einer Restlaufzeit von mehr als 1 Jahr gegen verbundene Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K1BA25"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA26" model="account.account.template">
       <field name="code">K1BA26</field>
       <field name="name">Forderungen geg. Untern.- m. d. e. Beteiligungsverhältnis besteht od. Verbindl. gegen Untern. - mit denen ein Beteiligungsverhältnis besteht</field>
@@ -3724,97 +3724,97 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1280" model="account.account.template">
       <field name="code">1280</field>
       <field name="name">Forderungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht</field>
       <field name="parent_id" ref="chart_skr04_K1BA26"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1281" model="account.account.template">
       <field name="code">1281</field>
       <field name="name">Forderungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1285" model="account.account.template">
       <field name="code">1285</field>
       <field name="name">Forderungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1286" model="account.account.template">
       <field name="code">1286</field>
       <field name="name">Besitzwechsel gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht</field>
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1287" model="account.account.template">
       <field name="code">1287</field>
       <field name="name">Besitzwechsel gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1288" model="account.account.template">
       <field name="code">1288</field>
       <field name="name">Besitzwechsel gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1289" model="account.account.template">
       <field name="code">1289</field>
       <field name="name">Besitzwechsel gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht- bundesbankfähig</field>
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1290" model="account.account.template">
       <field name="code">1290</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht</field>
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account_type_receivable_de"/>
     </record>
-    
+
     <record id="chart_skr04_1291" model="account.account.template">
       <field name="code">1291</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1295" model="account.account.template">
       <field name="code">1295</field>
       <field name="name">Forderungen aus Lieferungen und Leistungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA27" model="account.account.template">
       <field name="code">K1BA27</field>
       <field name="name">Forderungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht H-Saldo</field>
@@ -3822,25 +3822,25 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1296" model="account.account.template">
       <field name="code">1296</field>
       <field name="name">Wertberichtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr gegen Unternhemen- mit denen ein Beteiligungsverhältnis besteht</field>
       <field name="parent_id" ref="chart_skr04_K1BA27"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1297" model="account.account.template">
       <field name="code">1297</field>
       <field name="name">Wertberichtigungen zu Forderungen mit einer Restlaufzeit von mehr als 1 Jahr gegen Unternhemen- mit denen ein Beteiligungsverhältnis besteht</field>
       <field name="parent_id" ref="chart_skr04_K1BA27"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA28" model="account.account.template">
       <field name="code">K1BA28</field>
       <field name="name">Eingeforderte- noch ausstehende Kapitaleinlagen</field>
@@ -3848,16 +3848,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1298" model="account.account.template">
       <field name="code">1298</field>
       <field name="name">Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert (Forderungen- nicht eingeforderte ausstehende Einlagen s. Konto 2910)</field>
       <field name="parent_id" ref="chart_skr04_K1BA28"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA29" model="account.account.template">
       <field name="code">K1BA29</field>
       <field name="name">Eingeforderte Nachschüsse</field>
@@ -3865,16 +3865,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1299" model="account.account.template">
       <field name="code">1299</field>
       <field name="name">Eingeforderte Nachschüsse (gegenkonto 2929)</field>
       <field name="parent_id" ref="chart_skr04_K1BA29"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA2a" model="account.account.template">
       <field name="code">K1BA2a</field>
       <field name="name">Sonstige Vermögensgegenstände</field>
@@ -3882,196 +3882,196 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1300" model="account.account.template">
       <field name="code">1300</field>
       <field name="name">Sonstige Vermögensgegenstände</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1301" model="account.account.template">
       <field name="code">1301</field>
       <field name="name">Sonstige Vermögensgegenstände - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1305" model="account.account.template">
       <field name="code">1305</field>
       <field name="name">Sonstige Vermögensgegenstände - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1310" model="account.account.template">
       <field name="code">1310</field>
       <field name="name">Forderungen gegen Vorstandsmitglieder und Geschäftsführer</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1311" model="account.account.template">
       <field name="code">1311</field>
       <field name="name">Forderungen gegen Vorstandsmitglieder und Geschäftsführer - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1315" model="account.account.template">
       <field name="code">1315</field>
       <field name="name">Forderungen gegen Vorstandsmitglieder und Geschäftsführer - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1320" model="account.account.template">
       <field name="code">1320</field>
       <field name="name">Forderung gegen Aufsichtsrats- und Beirats- Mitglieder</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1321" model="account.account.template">
       <field name="code">1321</field>
       <field name="name">Forderung gegen Aufsichtsrats- und Beirats- Mitglieder - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1325" model="account.account.template">
       <field name="code">1325</field>
       <field name="name">Forderung gegen Aufsichtsrats- und Beirats- Mitglieder - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1330" model="account.account.template">
       <field name="code">1330</field>
       <field name="name">Forderungen gegen Gesellschafter</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1331" model="account.account.template">
       <field name="code">1331</field>
       <field name="name">Forderungen gegen Gesellschafter - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1335" model="account.account.template">
       <field name="code">1335</field>
       <field name="name">Forderungen gegen Gesellschafter - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1340" model="account.account.template">
       <field name="code">1340</field>
       <field name="name">Forderungen gegen Personal aus Lohn- und Gehaltsabrechnung</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1341" model="account.account.template">
       <field name="code">1341</field>
       <field name="name">Forderungen gegen Personal aus Lohn- und Gehaltsabrechnung - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1345" model="account.account.template">
       <field name="code">1345</field>
       <field name="name">Forderungen gegen Personal aus Lohn- und Gehaltsabrechnung - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1350" model="account.account.template">
       <field name="code">1350</field>
       <field name="name">Kautionen </field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1351" model="account.account.template">
       <field name="code">1351</field>
       <field name="name">Kautionen - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1355" model="account.account.template">
       <field name="code">1355</field>
       <field name="name">Kautionen - Restlaufzeit größer 1 Jar</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1360" model="account.account.template">
       <field name="code">1360</field>
       <field name="name">Darlehen</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1361" model="account.account.template">
       <field name="code">1361</field>
       <field name="name">Darlehen - Restlaufzeit bis 1 jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1365" model="account.account.template">
       <field name="code">1365</field>
       <field name="name">Darlehen - Restlaufzeit größer 1 jahr</field>
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA2b" model="account.account.template">
       <field name="code">K1BA2b</field>
       <field name="name">Sonstige Vermögensgegenstände oder sonstige Verbindlichkeiten</field>
@@ -4079,511 +4079,511 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1370" model="account.account.template">
       <field name="code">1370</field>
       <field name="name">Durchlaufende Posten</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1374" model="account.account.template">
       <field name="code">1374</field>
       <field name="name">Fremdgeld</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1375" model="account.account.template">
       <field name="code">1375</field>
       <field name="name">Agenturwarenabrechnung</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1376" model="account.account.template">
       <field name="code">1376</field>
       <field name="name">Nachträglich abziehbare Vorsteuer- § 15a Abs. 2 UStG</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1377" model="account.account.template">
       <field name="code">1377</field>
       <field name="name">Zurückzuzahlende Vorsteuer- § 15a Abs. 2 UStG</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1378" model="account.account.template">
       <field name="code">1378</field>
       <field name="name">Ansprüche aus Rückdeckungsversicherungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1390" model="account.account.template">
       <field name="code">1390</field>
       <field name="name">GmbH-Anteile zum kurzfristigen Verbleib</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1395" model="account.account.template">
       <field name="code">1395</field>
       <field name="name">Genossenschaftsanteile zum kurzfristigen Verbleib</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1396" model="account.account.template">
       <field name="code">1396</field>
       <field name="name">Nachträglich abziehbare Vorsteuer- § 15a Abs. 1 UStG- bewegliche Wirtschaftsgüter</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1397" model="account.account.template">
       <field name="code">1397</field>
       <field name="name">Zurückzuzahlende Vorsteuer- § 15a Abs. 1 UStG- bewegliche Wirtschaftsgüter</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1398" model="account.account.template">
       <field name="code">1398</field>
       <field name="name">Natürlich abziehbare Vorsteuer- § 15a Abs. 1 UStG- unbewegliche Wirtschaftsgüter</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1399" model="account.account.template">
       <field name="code">1399</field>
       <field name="name">Zurückzahlende Vorsteuer- § 15a Abs. 1 UStG- unbewegliche Wirtschaftsgüter</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
 <record id="chart_skr04_1400" model="account.account.template">
       <field name="code">1400</field>
       <field name="name">Abziehbare Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1401" model="account.account.template">
       <field name="code">1401</field>
       <field name="name">Abziehbare Vorsteuer 7%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1402" model="account.account.template">
       <field name="code">1402</field>
       <field name="name">Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1403" model="account.account.template">
       <field name="code">1403</field>
       <field name="name">Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb 16%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1404" model="account.account.template">
       <field name="code">1404</field>
       <field name="name">Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb 19%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1405" model="account.account.template">
       <field name="code">1405</field>
       <field name="name">Abziehbare Vorsteuer 16%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1406" model="account.account.template">
       <field name="code">1406</field>
       <field name="name">Abziehbare Vorsteuer 19%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1407" model="account.account.template">
       <field name="code">1407</field>
       <field name="name">Abziehbare Vorsteuer nach § 13b UStG 19%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1408" model="account.account.template">
       <field name="code">1408</field>
       <field name="name">Abziehbare Vorsteuer nach § 13b UStG </field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1409" model="account.account.template">
       <field name="code">1409</field>
       <field name="name">Abziehbare Vorsteuer nach § 13b UStG 16%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1410" model="account.account.template">
       <field name="code">1410</field>
       <field name="name">Aufzuteilende Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1411" model="account.account.template">
       <field name="code">1411</field>
       <field name="name">Aufzuteilende Vorsteuer 7%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1412" model="account.account.template">
       <field name="code">1412</field>
       <field name="name">Aufzuteilende Vorsteuer aus innergemeinschaftlichem Erwerb</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1413" model="account.account.template">
       <field name="code">1413</field>
       <field name="name">Aufzuteilende Vorsteuer aus innergemeinschaftlichem Erwerb 19%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1415" model="account.account.template">
       <field name="code">1415</field>
       <field name="name">Aufzuteilende Vorsteuer 16%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1416" model="account.account.template">
       <field name="code">1416</field>
       <field name="name">Aufzuteilende Vorsteuer 19%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1417" model="account.account.template">
       <field name="code">1417</field>
       <field name="name">Aufzuteilende Vorsteuer nach §§ 13a/13b UStG</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1418" model="account.account.template">
       <field name="code">1418</field>
       <field name="name">Aufzuteilende Vorsteuer nach §§ 13a/13b UStG 16%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1419" model="account.account.template">
       <field name="code">1419</field>
       <field name="name">Aufzuteilende Vorsteuer nach §§ 13a/13b UStG 19%</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1420" model="account.account.template">
       <field name="code">1420</field>
       <field name="name">Umsatzsteuerforderung</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1421" model="account.account.template">
       <field name="code">1421</field>
       <field name="name">Umsatzsteuerforderungen laufendes Jahr</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1422" model="account.account.template">
       <field name="code">1422</field>
       <field name="name">Umsatzsteuerforderungen Vorjahr</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1425" model="account.account.template">
       <field name="code">1425</field>
       <field name="name">Umsatzsteuerforderungen frühere Jahre</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1427" model="account.account.template">
       <field name="code">1427</field>
       <field name="name">Forderungen aus einrichteten Verbrauchsteuern</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1431" model="account.account.template">
       <field name="code">1431</field>
       <field name="name">Abziehbare Vorsteuer aus der Auslagerung von Gegenständen aus einem Unsatzsteuerlager</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1432" model="account.account.template">
       <field name="code">1432</field>
       <field name="name">Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb von Neufahrzeugen von Lieferanten ohne Ust-Identifikationsnummer</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1433" model="account.account.template">
       <field name="code">1433</field>
       <field name="name">Bezahlte Einfuhrumsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1434" model="account.account.template">
       <field name="code">1434</field>
       <field name="name">Vorsteuer im Folgejahr abziehbar</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1435" model="account.account.template">
       <field name="code">1435</field>
       <field name="name">Steuerüberzahlungen</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1440" model="account.account.template">
       <field name="code">1440</field>
       <field name="name">Steuererstattungsanspruch gegenüber andere EG-Ländern</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1450" model="account.account.template">
       <field name="code">1450</field>
       <field name="name">Körperschaftsteuerrückforderung</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1452" model="account.account.template">
       <field name="code">1452</field>
       <field name="name">Körperschaftsteuerguthaben nach § 37 KStG - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1453" model="account.account.template">
       <field name="code">1453</field>
       <field name="name">Körperschaftsteuerguthaben nach § 37 KStG - Restlaufzeit größer 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1456" model="account.account.template">
       <field name="code">1456</field>
       <field name="name">Forderungen an das Finanzamt aus abgeführtem Bauabzugsbetrag</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1460" model="account.account.template">
       <field name="code">1460</field>
       <field name="name">Geldtransit</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1480" model="account.account.template">
       <field name="code">1480</field>
       <field name="name">Gegenkonto Vorsteuer § 4/3 EStG</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1481" model="account.account.template">
       <field name="code">1481</field>
       <field name="name">Auflösung Vorsteuer aus Vorjahr § 4/3 EStG</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1482" model="account.account.template">
       <field name="code">1482</field>
       <field name="name">Vorsteuer aus Investitionen § 4/3 EStG</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1483" model="account.account.template">
       <field name="code">1483</field>
       <field name="name">Gegenkonto für Vorsteuer nach Durchschnittssätzen für § 4 Abs. 3 EStG</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1484" model="account.account.template">
       <field name="code">1484</field>
       <field name="name">Vorsteuer nach allgemeinen Durchschnittssätzen UStVA Kz. 63</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1485" model="account.account.template">
       <field name="code">1485</field>
       <field name="name">Verrechnungskonto Gewinnermittlung § 4/3 EStG- ergebniswirksam</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1486" model="account.account.template">
       <field name="code">1486</field>
       <field name="name">Verrechnungskonto Gewinnermittlung § 4/3 EStG- nicht ergebniswirksam</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1487" model="account.account.template">
       <field name="code">1487</field>
       <field name="name">Wirtschaftsgüter des Umlaufvermögens gemäß §4 Abs. 3 Satz 4 EStG</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1490" model="account.account.template">
       <field name="code">1490</field>
       <field name="name">Verrechnungskonto Ist-Versteuerung</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA2c" model="account.account.template">
       <field name="code">K1BA2c</field>
       <field name="name">Sonstige Verbindlichkeiten S-Saldo</field>
@@ -4591,25 +4591,25 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1495" model="account.account.template">
       <field name="code">1495</field>
       <field name="name">Verrechnungskonto erhaltene Anzahlungen bei Buchungen über Debitorenkonto</field>
       <field name="parent_id" ref="chart_skr04_K1BA2c"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1498" model="account.account.template">
       <field name="code">1498</field>
       <field name="name">überleitungskonto Kostenstellen</field>
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA3" model="account.account.template">
       <field name="code">K1BA3</field>
       <field name="name">Wertpapiere</field>
@@ -4617,7 +4617,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA31" model="account.account.template">
       <field name="code">K1BA31</field>
       <field name="name">Anteile an verbundenen Unternehmen</field>
@@ -4625,25 +4625,25 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1500" model="account.account.template">
       <field name="code">1500</field>
       <field name="name">Anteile an verbundenen Unternehmen (Umlaufvermögen)</field>
       <field name="parent_id" ref="chart_skr04_K1BA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1504" model="account.account.template">
       <field name="code">1504</field>
       <field name="name">Anteile an herrschender oder mit Mehrheit beteiligter Gesellschaft</field>
       <field name="parent_id" ref="chart_skr04_K1BA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA32" model="account.account.template">
       <field name="code">K1BA32</field>
       <field name="name">Eigene Anteile </field>
@@ -4651,16 +4651,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1505" model="account.account.template">
       <field name="code">1505</field>
       <field name="name">Eigene Anteile </field>
       <field name="parent_id" ref="chart_skr04_K1BA32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA33" model="account.account.template">
       <field name="code">K1BA33</field>
       <field name="name">Sonstige Wertpapiere</field>
@@ -4668,43 +4668,43 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1510" model="account.account.template">
       <field name="code">1510</field>
       <field name="name">Sonstige Wertpapiere</field>
       <field name="parent_id" ref="chart_skr04_K1BA33"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1520" model="account.account.template">
       <field name="code">1520</field>
       <field name="name">Finanzwechsel</field>
       <field name="parent_id" ref="chart_skr04_1510"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1525" model="account.account.template">
       <field name="code">1525</field>
       <field name="name">Andere Wertpapiere mit unwesentlichen Wertschwankungen im Sinne Textziffer 18 DRS 2</field>
       <field name="parent_id" ref="chart_skr04_1510"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1530" model="account.account.template">
       <field name="code">1530</field>
       <field name="name">Wertpapieranlagen im Rahmen der Kurzfristigen Finanzdisposition </field>
       <field name="parent_id" ref="chart_skr04_1510"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA4" model="account.account.template">
       <field name="code">K1BA4</field>
       <field name="name">Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks</field>
@@ -4712,7 +4712,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA41" model="account.account.template">
       <field name="code">K1BA41</field>
       <field name="name">Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks</field>
@@ -4720,43 +4720,43 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1550" model="account.account.template">
       <field name="code">1550</field>
       <field name="name">Schecks</field>
       <field name="parent_id" ref="chart_skr04_K1BA41"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1600" model="account.account.template">
       <field name="code">1600</field>
       <field name="name">Kasse </field>
       <field name="parent_id" ref="chart_skr04_K1BA41"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1610" model="account.account.template">
       <field name="code">1610</field>
       <field name="name">Nebenkasse 1</field>
       <field name="parent_id" ref="chart_skr04_1600"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1620" model="account.account.template">
       <field name="code">1620</field>
       <field name="name">Nebenkasse 2</field>
       <field name="parent_id" ref="chart_skr04_1600"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA42" model="account.account.template">
       <field name="code">K1BA42</field>
       <field name="name">Kassenbestand - Bundesbankguthaben - Guthaben b. Kreditinstit. u. Schecks o. Verbindlichk. geg. Kreditinstituten</field>
@@ -4764,123 +4764,123 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1700" model="account.account.template">
       <field name="code">1700</field>
       <field name="name">Postbank</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1710" model="account.account.template">
       <field name="code">1710</field>
       <field name="name">Postbank 1</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1720" model="account.account.template">
       <field name="code">1720</field>
       <field name="name">Postbank 2</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1730" model="account.account.template">
       <field name="code">1730</field>
       <field name="name">Postbank 3</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1780" model="account.account.template">
       <field name="code">1780</field>
       <field name="name">LZB-Guthaben</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1790" model="account.account.template">
       <field name="code">1790</field>
       <field name="name">Bundesbankguthaben</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1800" model="account.account.template">
       <field name="code">1800</field>
       <field name="name">Bank</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
-       
+
+
     <record id="chart_skr04_1810" model="account.account.template">
       <field name="code">1810</field>
       <field name="name">Bank 1</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1820" model="account.account.template">
       <field name="code">1820</field>
       <field name="name">Bank 2</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1830" model="account.account.template">
       <field name="code">1830</field>
       <field name="name">Bank 3</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1840" model="account.account.template">
       <field name="code">1840</field>
       <field name="name">Bank 4</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1850" model="account.account.template">
       <field name="code">1850</field>
       <field name="name">Bank 5</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
      </record>
-    
+
     <record id="chart_skr04_1890" model="account.account.template">
       <field name="code">1890</field>
       <field name="name">Finanzmittelanlagen im Rahmen der Kurzfristigen Finanzdisposition</field>
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
      </record>
 
     <record id="chart_skr04_1895" model="account.account.template">
@@ -4889,9 +4889,9 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA5" model="account.account.template">
       <field name="code">K1BA5</field>
       <field name="name">Abgrenzungsposten</field>
@@ -4899,7 +4899,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA51" model="account.account.template">
       <field name="code">K1BA51</field>
       <field name="name">Rechnungsabgrenzungsposten</field>
@@ -4907,43 +4907,43 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1900" model="account.account.template">
       <field name="code">1900</field>
       <field name="name">Aktive Rechnungsabgrenzung</field>
       <field name="parent_id" ref="chart_skr04_K1BA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1920" model="account.account.template">
       <field name="code">1920</field>
       <field name="name">Als Aufwand berücksichtigte Zölle und Verbrauchsteuern auf Vorräte</field>
       <field name="parent_id" ref="chart_skr04_1900"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1930" model="account.account.template">
       <field name="code">1930</field>
       <field name="name">Als Aufwand berücksichtigte Umstazsteuer auf Anzahlungen</field>
       <field name="parent_id" ref="chart_skr04_1900"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_1940" model="account.account.template">
       <field name="code">1940</field>
       <field name="name">Damnum/Disagio</field>
       <field name="parent_id" ref="chart_skr04_1900"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K1BA52" model="account.account.template">
       <field name="code">K1BA52</field>
       <field name="name">Abgrenzung latenter Steuern</field>
@@ -4951,16 +4951,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_1950" model="account.account.template">
       <field name="code">1950</field>
       <field name="name">Abgrenzung aktive latente Steuern </field>
       <field name="parent_id" ref="chart_skr04_K1BA52"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account_type_asset_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP1" model="account.account.template">
       <field name="code">K2BP1</field>
       <field name="name">Kapital Vollhafter / Einzelunternehmer</field>
@@ -4968,43 +4968,43 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2000" model="account.account.template">
       <field name="code">2000</field>
       <field name="name">Festkapital</field>
       <field name="parent_id" ref="chart_skr04_K2BP1"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2010" model="account.account.template">
       <field name="code">2010</field>
       <field name="name">Variables Kapital</field>
       <field name="parent_id" ref="chart_skr04_K2BP1"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2020" model="account.account.template">
       <field name="code">2020</field>
       <field name="name">Gesellschafter-Darlehen</field>
       <field name="parent_id" ref="chart_skr04_K2BP1"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2030" model="account.account.template">
       <field name="code">2030</field>
       <field name="name">(zur freien Verfügung )</field>
       <field name="parent_id" ref="chart_skr04_K2BP1"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP2" model="account.account.template">
       <field name="code">K2BP2</field>
       <field name="name">Kapital Teilhaber</field>
@@ -5012,43 +5012,43 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2050" model="account.account.template">
       <field name="code">2050</field>
       <field name="name">Kommandit-Kapital</field>
       <field name="parent_id" ref="chart_skr04_K2BP2"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2060" model="account.account.template">
       <field name="code">2060</field>
       <field name="name">Verlustausgleichskonto</field>
       <field name="parent_id" ref="chart_skr04_K2BP2"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2070" model="account.account.template">
       <field name="code">2070</field>
       <field name="name">Gesellschafter-Darlehen</field>
       <field name="parent_id" ref="chart_skr04_K2BP2"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2080" model="account.account.template">
       <field name="code">2080</field>
       <field name="name">(zur freien Verfügung )</field>
       <field name="parent_id" ref="chart_skr04_K2BP2"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP3" model="account.account.template">
       <field name="code">K2BP3</field>
       <field name="name">Privat Vollhafter/ Einzelunternehmer</field>
@@ -5056,115 +5056,115 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2100" model="account.account.template">
       <field name="code">2100</field>
       <field name="name">Privatentnahmen allgemein</field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2130" model="account.account.template">
       <field name="code">2130</field>
       <field name="name">Unentgeltliche Wertabgaben</field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2150" model="account.account.template">
       <field name="code">2150</field>
       <field name="name">Privatsteuern</field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2180" model="account.account.template">
       <field name="code">2180</field>
       <field name="name">Privateinlagen</field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2200" model="account.account.template">
       <field name="code">2200</field>
       <field name="name">Sonderausgaben beschränkt abzugsfähig</field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2230" model="account.account.template">
       <field name="code">2230</field>
       <field name="name">Sonderausgaben unbeschränkt abzugsfähig </field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2250" model="account.account.template">
       <field name="code">2250</field>
       <field name="name">Zuwendungen- Spenden</field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2280" model="account.account.template">
       <field name="code">2280</field>
       <field name="name">Ausgewöhnliche Belastungen</field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2300" model="account.account.template">
       <field name="code">2300</field>
       <field name="name">Grundstücksaufwand</field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2349" model="account.account.template">
       <field name="code">2349</field>
       <field name="name">Grundstücksaufwand (Umsatzsteuerschlüssel möglich)</field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2350" model="account.account.template">
       <field name="code">2350</field>
       <field name="name">Grundstücksertrag</field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2399" model="account.account.template">
       <field name="code">2399</field>
       <field name="name">Grundstücksertrag ( Umsatzsteuerschlüssel möglich)</field>
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP4" model="account.account.template">
       <field name="code">K2BP4</field>
       <field name="name">Privat Teilhafter</field>
@@ -5172,97 +5172,97 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2500" model="account.account.template">
       <field name="code">2500</field>
       <field name="name">Privatentnahmen allgemein</field>
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2530" model="account.account.template">
       <field name="code">2530</field>
       <field name="name">Unentgeltliche Wertabgaben</field>
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2550" model="account.account.template">
       <field name="code">2550</field>
       <field name="name">Privatsteuern</field>
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2580" model="account.account.template">
       <field name="code">2580</field>
       <field name="name">Privateinlagen</field>
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2600" model="account.account.template">
       <field name="code">2600</field>
       <field name="name">Sonderausgaben beschränkt abzugsfähig</field>
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2630" model="account.account.template">
       <field name="code">2630</field>
       <field name="name">Sonderausgaben unbeschränkt abzugsfähig </field>
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2650" model="account.account.template">
       <field name="code">2650</field>
       <field name="name">Zuwendungen- Spenden</field>
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2680" model="account.account.template">
       <field name="code">2680</field>
       <field name="name">Ausgewöhnliche Belastungen</field>
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2700" model="account.account.template">
       <field name="code">2700</field>
       <field name="name">Grundstücksaufwand</field>
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2750" model="account.account.template">
       <field name="code">2750</field>
       <field name="name">Grundstücksertrag</field>
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP5" model="account.account.template">
       <field name="code">K2BP5</field>
       <field name="name">Gezeichnetes Kapital</field>
@@ -5270,7 +5270,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP51" model="account.account.template">
       <field name="code">K2BP51</field>
       <field name="name">Gezeichnetes Kapital</field>
@@ -5278,16 +5278,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2900" model="account.account.template">
       <field name="code">2900</field>
       <field name="name">Gezeichnetes Kapital</field>
       <field name="parent_id" ref="chart_skr04_K2BP51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP52" model="account.account.template">
       <field name="code">K2BP52</field>
       <field name="name">Nicht eingeforderte ausstehende Einlagen</field>
@@ -5295,16 +5295,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2910" model="account.account.template">
       <field name="code">2910</field>
       <field name="name">Ausstehende Einlagen auf das gezeichnete Kapital- nicht eingefordert (Passivausweis- von gezeichnetem Kapital offen abgesetzt eingeforderte ausstehende Einlagen s. Konto 1298)</field>
       <field name="parent_id" ref="chart_skr04_K2BP52"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP6" model="account.account.template">
       <field name="code">K2BP6</field>
       <field name="name">Kapitalrücklage</field>
@@ -5312,7 +5312,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP61" model="account.account.template">
       <field name="code">K2BP61</field>
       <field name="name">Kapitalrücklage</field>
@@ -5320,61 +5320,61 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2920" model="account.account.template">
       <field name="code">2920</field>
       <field name="name">Kapitalrücklage</field>
       <field name="parent_id" ref="chart_skr04_K2BP61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2925" model="account.account.template">
       <field name="code">2925</field>
       <field name="name">Kapitalrücklage durch Ausgabe von Anteilen über Nennbetrag</field>
       <field name="parent_id" ref="chart_skr04_2920"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2926" model="account.account.template">
       <field name="code">2926</field>
       <field name="name">Kapitalrücklage durch Ausgabe von Schuldverschreibungen für Wandlungsrechte und Optionsrechte zum Erwerb von Anteilen</field>
       <field name="parent_id" ref="chart_skr04_2920"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2927" model="account.account.template">
       <field name="code">2927</field>
       <field name="name">Kapitalrücklage durch Zuzahlungen gegen Gewährung eines Vorzugs für Anteile</field>
       <field name="parent_id" ref="chart_skr04_2920"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2928" model="account.account.template">
       <field name="code">2928</field>
       <field name="name">Andere Zuzahlungen in das Eigenkapital </field>
       <field name="parent_id" ref="chart_skr04_2920"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2929" model="account.account.template">
       <field name="code">2929</field>
       <field name="name">Eingefordertes Nachschusskapital (Gegenkonto 1299)</field>
       <field name="parent_id" ref="chart_skr04_2920"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP7" model="account.account.template">
       <field name="code">K2BP7</field>
       <field name="name">Gewinnrücklagen</field>
@@ -5382,7 +5382,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP71" model="account.account.template">
       <field name="code">K2BP71</field>
       <field name="name">Gesetzliche Rücklagen</field>
@@ -5390,16 +5390,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2930" model="account.account.template">
       <field name="code">2930</field>
       <field name="name">Gesetzliche Rücklagen</field>
       <field name="parent_id" ref="chart_skr04_K2BP71"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP72" model="account.account.template">
       <field name="code">K2BP72</field>
       <field name="name">Rücklage für Eigene Anteile</field>
@@ -5407,16 +5407,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2940" model="account.account.template">
       <field name="code">2940</field>
       <field name="name">Rücklage für Eigene Anteile</field>
       <field name="parent_id" ref="chart_skr04_K2BP72"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP73" model="account.account.template">
       <field name="code">K2BP73</field>
       <field name="name">Satzungsmäßige Rücklagen</field>
@@ -5424,16 +5424,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2950" model="account.account.template">
       <field name="code">2950</field>
       <field name="name">Satzungsmäßige Rücklagen</field>
       <field name="parent_id" ref="chart_skr04_K2BP73"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP74" model="account.account.template">
       <field name="code">K2BP74</field>
       <field name="name">Andere Gewinnrücklagen</field>
@@ -5441,25 +5441,25 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2960" model="account.account.template">
       <field name="code">2960</field>
       <field name="name">Andere Gewinnrücklagen </field>
       <field name="parent_id" ref="chart_skr04_K2BP74"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2962" model="account.account.template">
       <field name="code">2962</field>
       <field name="name">Eigenkapitalanteil von Wertaufholungen</field>
       <field name="parent_id" ref="chart_skr04_2960"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP8" model="account.account.template">
       <field name="code">K2BP8</field>
       <field name="name">Gewinnvortrag / Verlustvortrag vor Verwendung</field>
@@ -5467,7 +5467,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP81" model="account.account.template">
       <field name="code">K2BP81</field>
       <field name="name">Gewinnvortrag / Verlustvortrag</field>
@@ -5475,25 +5475,25 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2970" model="account.account.template">
       <field name="code">2970</field>
       <field name="name">Gewinnvortrag vor Verwendung</field>
       <field name="parent_id" ref="chart_skr04_K2BP81"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2978" model="account.account.template">
       <field name="code">2978</field>
       <field name="name">Verlustvortrag vor Verwendung</field>
       <field name="parent_id" ref="chart_skr04_K2BP81"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP82" model="account.account.template">
       <field name="code">K2BP82</field>
       <field name="name">Vortrag auf neue Rechnung </field>
@@ -5501,16 +5501,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2979" model="account.account.template">
       <field name="code">2979</field>
       <field name="name">Vortrag auf neue Rechnung (Bilanz)</field>
       <field name="parent_id" ref="chart_skr04_K2BP82"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP9" model="account.account.template">
       <field name="code">K2BP9</field>
       <field name="name">Sonderposten mit Rücklageanteil</field>
@@ -5518,7 +5518,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP91" model="account.account.template">
       <field name="code">K2BP91</field>
       <field name="name">Sonderposten mit Rücklageanteil</field>
@@ -5526,52 +5526,52 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2980" model="account.account.template">
       <field name="code">2980</field>
       <field name="name">Sonderposten mit Rücklageanteil steuerfreie Rücklagen</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2981" model="account.account.template">
       <field name="code">2981</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 6b EStG</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2982" model="account.account.template">
       <field name="code">2982</field>
       <field name="name">Sonderposten mit Rücklageanteil nach Abschnitt 35 EStG</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2983" model="account.account.template">
       <field name="code">2983</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 6d EStG</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2984" model="account.account.template">
       <field name="code">2984</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 1 EntwLStG</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP92" model="account.account.template">
       <field name="code">K2BP92</field>
       <field name="name">Sonderposten aus der Währungsumstellung auf den Euro</field>
@@ -5579,133 +5579,133 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2985" model="account.account.template">
       <field name="code">2985</field>
       <field name="name">Sonderposten aus der Währungsumstellung auf den Euro</field>
       <field name="parent_id" ref="chart_skr04_K2BP92"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2986" model="account.account.template">
       <field name="code">2986</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 7d EStG</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2987" model="account.account.template">
       <field name="code">2987</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 79 EStDV</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2988" model="account.account.template">
       <field name="code">2988</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 80 EStDV</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2989" model="account.account.template">
       <field name="code">2989</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 52 Abs. 16 EStG</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2990" model="account.account.template">
       <field name="code">2990</field>
       <field name="name">Sonderposten mit Rücklageanteil- Sonderabschreibung</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2991" model="account.account.template">
       <field name="code">2991</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 82a EStDV</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2992" model="account.account.template">
       <field name="code">2992</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 82d EStDV</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2993" model="account.account.template">
       <field name="code">2993</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 82e EStDV</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2994" model="account.account.template">
       <field name="code">2994</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 14 BerlinFG</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2995" model="account.account.template">
       <field name="code">2995</field>
       <field name="name">Sonderposten mit Rücklageanteil für Förderung nach § 3 ZonenRFG / §4-6 FördergebietsG</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2996" model="account.account.template">
       <field name="code">2996</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 4d EStG</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2997" model="account.account.template">
       <field name="code">2997</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 7g Abs. 1 EStG</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_2998" model="account.account.template">
       <field name="code">2998</field>
       <field name="name">Sonderposten mit Rücklageanteil nach § 7g Abs. 3 u. 7 EStG</field>
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K2BP93" model="account.account.template">
       <field name="code">K2BP93</field>
       <field name="name">Sonderposten für Zuschüsse und Zulagen</field>
@@ -5713,16 +5713,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_2999" model="account.account.template">
       <field name="code">2999</field>
       <field name="name">Sonderposten für Zuschüsse und Zulagen</field>
       <field name="parent_id" ref="chart_skr04_K2BP93"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP1" model="account.account.template">
       <field name="code">K3BP1</field>
       <field name="name">Rückstellungen </field>
@@ -5730,7 +5730,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP11" model="account.account.template">
       <field name="code">K3BP11</field>
       <field name="name">Rückstellungen für Pensionen und ähnliche Verpflichtungen</field>
@@ -5738,34 +5738,34 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3000" model="account.account.template">
       <field name="code">3000</field>
       <field name="name">Rückstellungen für Pensionen und ähnliche Verpflichtungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3010" model="account.account.template">
       <field name="code">3010</field>
       <field name="name">Pensionsrückstellungen</field>
       <field name="parent_id" ref="chart_skr04_3000"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3015" model="account.account.template">
       <field name="code">3015</field>
       <field name="name">Rückstellungen für Pensionsähnliche Verpflichtungen</field>
       <field name="parent_id" ref="chart_skr04_3000"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP12" model="account.account.template">
       <field name="code">K3BP12</field>
       <field name="name">Steuerrückstellungen</field>
@@ -5773,43 +5773,43 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3020" model="account.account.template">
       <field name="code">3020</field>
       <field name="name">Steuerrückstellungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3030" model="account.account.template">
       <field name="code">3030</field>
       <field name="name">Gewerbesteuerrückstellung</field>
       <field name="parent_id" ref="chart_skr04_3020"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3040" model="account.account.template">
       <field name="code">3040</field>
       <field name="name">Körperschaftsteuerrückstellung</field>
       <field name="parent_id" ref="chart_skr04_3020"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3060" model="account.account.template">
       <field name="code">3060</field>
       <field name="name">Rückstellung für latente Steuern </field>
       <field name="parent_id" ref="chart_skr04_3020"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP13" model="account.account.template">
       <field name="code">K3BP13</field>
       <field name="name">Sonstige Rückstellungen</field>
@@ -5817,106 +5817,106 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3070" model="account.account.template">
       <field name="code">3070</field>
       <field name="name">Sonstige Rückstellungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3074" model="account.account.template">
       <field name="code">3074</field>
       <field name="name">Rückstellungen für Personelkosten</field>
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3075" model="account.account.template">
       <field name="code">3075</field>
       <field name="name">Rückstellungen für unterlassene Aufwendungenn für Instandhaltung- Nachholung in den ersten drei Monaten</field>
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3080" model="account.account.template">
       <field name="code">3080</field>
       <field name="name">Rückstellungen für unterlassene Aufwendungenn für Instandhaltung- Nachholung innerhalb des 4. bis 12. Monats</field>
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3085" model="account.account.template">
       <field name="code">3085</field>
       <field name="name">Rückstellungen für Abraum- und Abfallbeseitigung</field>
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3090" model="account.account.template">
       <field name="code">3090</field>
       <field name="name">Rückstellungen für Gewährleistungen (Gegenkonto 6790)</field>
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3092" model="account.account.template">
       <field name="code">3092</field>
       <field name="name">Rückstellungen für drohende Verluste aus schwebenden Geschäften</field>
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3095" model="account.account.template">
       <field name="code">3095</field>
       <field name="name">Rückstellungen für Abschluss- und Prüfungskosten</field>
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3096" model="account.account.template">
       <field name="code">3096</field>
       <field name="name">Rückstellungen zur Erfüllung der Aufbewahrungspflichten</field>
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3098" model="account.account.template">
       <field name="code">3098</field>
       <field name="name">Aufwandsrückstellungen gemäß § 249 Abs. 2 HGB</field>
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3099" model="account.account.template">
       <field name="code">3099</field>
       <field name="name">Rückstellungen für Umweltschutz</field>
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP2" model="account.account.template">
       <field name="code">K3BP2</field>
       <field name="name">Verbindlichkeiten </field>
@@ -5924,7 +5924,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP21" model="account.account.template">
       <field name="code">K3BP21</field>
       <field name="name">Anleihen</field>
@@ -5932,79 +5932,79 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3100" model="account.account.template">
       <field name="code">3100</field>
       <field name="name">Anleihen- nicht konvertibel</field>
       <field name="parent_id" ref="chart_skr04_K3BP21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3101" model="account.account.template">
       <field name="code">3101</field>
       <field name="name">Anleihen- nicht konvertibel Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3105" model="account.account.template">
       <field name="code">3105</field>
       <field name="name">Anleihen- nicht konvertibel Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3110" model="account.account.template">
       <field name="code">3110</field>
       <field name="name">Anleihen- nicht konvertibel Restlaufzeit größer 5 Jahre </field>
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3120" model="account.account.template">
       <field name="code">3120</field>
       <field name="name">Anleihen- konvertibel</field>
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3121" model="account.account.template">
       <field name="code">3121</field>
       <field name="name">Anleihen- konvertibel Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3125" model="account.account.template">
       <field name="code">3125</field>
       <field name="name">Anleihen- konvertibel Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3130" model="account.account.template">
       <field name="code">3130</field>
       <field name="name">Anleihen- konvertibel Restlaufzeit größer 5 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP22" model="account.account.template">
       <field name="code">K3BP22</field>
       <field name="name">Verbindlichkeiten gegenüber Kreditinstituten oder Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks</field>
@@ -6012,88 +6012,88 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3150" model="account.account.template">
       <field name="code">3150</field>
       <field name="name">Verbindlichkeiten gegenüber Kreditinstituten </field>
       <field name="parent_id" ref="chart_skr04_K3BP22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3151" model="account.account.template">
       <field name="code">3151</field>
       <field name="name">Verbindlichkeiten gegenüber Kreditinstituten Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3160" model="account.account.template">
       <field name="code">3160</field>
       <field name="name">Verbindlichkeiten gegenüber Kreditinstituten Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3170" model="account.account.template">
       <field name="code">3170</field>
       <field name="name">Verbindlichkeiten gegenüber Kreditinstituten Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3180" model="account.account.template">
       <field name="code">3180</field>
       <field name="name">Verbindlichkeiten gegenüber Kreditinstituten aus Teilzahlungsverträgen</field>
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3181" model="account.account.template">
       <field name="code">3181</field>
       <field name="name">Verbindlichkeiten gegenüber Kreditinstituten aus Teilzahlungsverträgen Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3190" model="account.account.template">
       <field name="code">3190</field>
       <field name="name">Verbindlichkeiten gegenüber Kreditinstituten aus Teilzahlungsverträgen Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3200" model="account.account.template">
       <field name="code">3200</field>
       <field name="name">Verbindlichkeiten gegenüber Kreditinstituten aus Teilzahlungsverträgen Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3210" model="account.account.template">
       <field name="code">3210</field>
       <field name="name">(frei- in Bilanz kein Restlaufzeit vermerkt)</field>
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP23" model="account.account.template">
       <field name="code">K3BP23</field>
       <field name="name">Verbindlichkeiten gegenüber Kreditinstituten </field>
@@ -6101,16 +6101,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3249" model="account.account.template">
       <field name="code">3249</field>
       <field name="name">Gegenkonto 3159-3209 bei Aufteilung der Konten 3210-3248</field>
       <field name="parent_id" ref="chart_skr04_K3BP23"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP24" model="account.account.template">
       <field name="code">K3BP24</field>
       <field name="name">Erhaltene Anzahlungen auf Bestellungen</field>
@@ -6118,79 +6118,79 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3250" model="account.account.template">
       <field name="code">3250</field>
       <field name="name">Erhaltene Anzahlungen auf Bestellungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP24"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3260" model="account.account.template">
       <field name="code">3260</field>
       <field name="name">Erhaltene Anzahlungen 7% USt</field>
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3270" model="account.account.template">
       <field name="code">3270</field>
       <field name="name">Erhaltene Anzahlungen 16% USt</field>
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3271" model="account.account.template">
       <field name="code">3271</field>
       <field name="name">Erhaltene Anzahlungen 15% USt</field>
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3272" model="account.account.template">
       <field name="code">3272</field>
       <field name="name">Erhaltene- versteuerte Anzahlungen 19% Ust (Verbindlichkeiten)</field>
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3280" model="account.account.template">
       <field name="code">3280</field>
       <field name="name">Erhaltene Anzahlungen Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3284" model="account.account.template">
       <field name="code">3284</field>
       <field name="name">Erhaltene Anzahlungen Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3285" model="account.account.template">
       <field name="code">3285</field>
       <field name="name">Erhaltene Anzahlungen Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP25" model="account.account.template">
       <field name="code">K3BP25</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen oder sonstige Vermögensgegenstände</field>
@@ -6198,142 +6198,142 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3300" model="account.account.template">
       <field name="code">3300</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen </field>
       <field name="parent_id" ref="chart_skr04_K3BP25"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3301" model="account.account.template">
       <field name="code">3301</field>
       <field name="name">Lieferanten Verbindlichkeiten Dienstleistungen</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account_type_payable_de"/>
     </record>
-    
+
     <record id="chart_skr04_3305" model="account.account.template">
       <field name="code">3305</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen zum allgemeinen Umsatzsteuersatz (EüR)</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account_type_payable_de"/>
     </record>
-    
+
     <record id="chart_skr04_3306" model="account.account.template">
       <field name="code">3306</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen zum ermäßigten Umsatzsteuersatz (EüR)</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account_type_payable_de"/>
     </record>
-    
+
     <record id="chart_skr04_3307" model="account.account.template">
       <field name="code">3307</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen ohne Vorsteuer (EüR)</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account_type_payable_de"/>
     </record>
-    
+
     <record id="chart_skr04_3309" model="account.account.template">
       <field name="code">3309</field>
       <field name="name">Gegenkonto 3305-3307 bei Aufteilung der Verbindlichkeiten nach Steuersätzen (EüR)</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3310" model="account.account.template">
       <field name="code">3310</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent </field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3334" model="account.account.template">
       <field name="code">3334</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen für Investitionen für § 4/3 EStG</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account_type_payable_de"/>
     </record>
-    
+
     <record id="chart_skr04_3335" model="account.account.template">
       <field name="code">3335</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3337" model="account.account.template">
       <field name="code">3337</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3338" model="account.account.template">
       <field name="code">3338</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3340" model="account.account.template">
       <field name="code">3340</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber Gesellschaftern </field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account_type_payable_de"/>
     </record>
-    
+
     <record id="chart_skr04_3341" model="account.account.template">
       <field name="code">3341</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber Gesellschaftern Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3345" model="account.account.template">
       <field name="code">3345</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber Gesellschaftern Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3348" model="account.account.template">
       <field name="code">3348</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber Gesellschaftern Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP26" model="account.account.template">
       <field name="code">K3BP26</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen S-Saldo oder sonstige Vermögensgegenstände H-Saldo</field>
@@ -6341,16 +6341,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3349" model="account.account.template">
       <field name="code">3349</field>
       <field name="name">Gegenkonto 3335-3348- 3420-3449- 3470-3499 bei Aufteilung Kreditorenkonto</field>
       <field name="parent_id" ref="chart_skr04_K3BP26"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP27" model="account.account.template">
       <field name="code">K3BP27</field>
       <field name="name">Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel</field>
@@ -6358,43 +6358,43 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3350" model="account.account.template">
       <field name="code">3350</field>
       <field name="name">Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel</field>
       <field name="parent_id" ref="chart_skr04_K3BP27"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3351" model="account.account.template">
       <field name="code">3351</field>
       <field name="name">Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3350"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3380" model="account.account.template">
       <field name="code">3380</field>
       <field name="name">Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3350"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3390" model="account.account.template">
       <field name="code">3390</field>
       <field name="name">Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3350"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP28" model="account.account.template">
       <field name="code">K3BP28</field>
       <field name="name">Verbindlichkeiten gegenüber verbundenen Unternehmen oder Forderungen gegen verbundene Unternehmen</field>
@@ -6402,79 +6402,79 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3400" model="account.account.template">
       <field name="code">3400</field>
       <field name="name">Verbindlichkeiten gegenüber verbundenen Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K3BP28"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3401" model="account.account.template">
       <field name="code">3401</field>
       <field name="name">Verbindlichkeiten gegenüber verbundenen Unternehmen Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3405" model="account.account.template">
       <field name="code">3405</field>
       <field name="name">Verbindlichkeiten gegenüber verbundenen Unternehmen Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3410" model="account.account.template">
       <field name="code">3410</field>
       <field name="name">Verbindlichkeiten gegenüber verbundenen Unternehmen Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3420" model="account.account.template">
       <field name="code">3420</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber verbundenen Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account_type_payable_de"/>
     </record>
-    
+
     <record id="chart_skr04_3421" model="account.account.template">
       <field name="code">3421</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber verbundenen Unternehmen Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3425" model="account.account.template">
       <field name="code">3425</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber verbundenen Unternehmen Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3430" model="account.account.template">
       <field name="code">3430</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber verbundenen Unternehmen Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP29" model="account.account.template">
       <field name="code">K3BP29</field>
       <field name="name">Verbindlichkeiten gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht oder Forderungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht</field>
@@ -6482,79 +6482,79 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3450" model="account.account.template">
       <field name="code">3450</field>
       <field name="name">Verbindlichkeiten gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht </field>
       <field name="parent_id" ref="chart_skr04_K3BP29"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3451" model="account.account.template">
       <field name="code">3451</field>
       <field name="name">Verbindlichkeiten gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3455" model="account.account.template">
       <field name="code">3455</field>
       <field name="name">Verbindlichkeiten gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3460" model="account.account.template">
       <field name="code">3460</field>
       <field name="name">Verbindlichkeiten gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3470" model="account.account.template">
       <field name="code">3470</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht</field>
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account_type_payable_de"/>
     </record>
-    
+
     <record id="chart_skr04_3471" model="account.account.template">
       <field name="code">3471</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3475" model="account.account.template">
       <field name="code">3475</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht - Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3480" model="account.account.template">
       <field name="code">3480</field>
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht - Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP2a" model="account.account.template">
       <field name="code">K3BP2a</field>
       <field name="name">Sonstige Verbindlichkeiten </field>
@@ -6562,313 +6562,313 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3500" model="account.account.template">
       <field name="code">3500</field>
       <field name="name">Sonstige Verbindlichkeiten</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3501" model="account.account.template">
       <field name="code">3501</field>
       <field name="name">Sonstige Verbindlichkeiten - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3504" model="account.account.template">
       <field name="code">3504</field>
       <field name="name">Sonstige Verbindlichkeiten - Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3507" model="account.account.template">
       <field name="code">3507</field>
       <field name="name">Sonstige Verbindlichkeiten - Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3509" model="account.account.template">
       <field name="code">3509</field>
       <field name="name">Sonstige Verbindlichkeiten z.B. nach § 11 Abs. 2 Satz 2 EStG für § 4/3 EStG</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3510" model="account.account.template">
       <field name="code">3510</field>
       <field name="name">Verbindlichkeiten gegenüber Gesellschaftern </field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3511" model="account.account.template">
       <field name="code">3511</field>
       <field name="name">Verbindlichkeiten gegenüber Gesellschaftern - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3514" model="account.account.template">
       <field name="code">3514</field>
       <field name="name">Verbindlichkeiten gegenüber Gesellschaftern - Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3517" model="account.account.template">
       <field name="code">3517</field>
       <field name="name">Verbindlichkeiten gegenüber Gesellschaftern - Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3519" model="account.account.template">
       <field name="code">3519</field>
       <field name="name">Verbindlichkeiten gegenüber Gesellschaftern für offene Ausschüttungen</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3520" model="account.account.template">
       <field name="code">3520</field>
       <field name="name">Darlehen typisch stiller Gesellschaftler</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3521" model="account.account.template">
       <field name="code">3521</field>
       <field name="name">Darlehen typisch stiller Gesellschaftler - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3524" model="account.account.template">
       <field name="code">3524</field>
       <field name="name">Darlehen typisch stiller Gesellschaftler - Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3527" model="account.account.template">
       <field name="code">3527</field>
       <field name="name">Darlehen typisch stiller Gesellschaftler - Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3530" model="account.account.template">
       <field name="code">3530</field>
       <field name="name">Darlehen atypisch stiller Gesellschaftler </field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3531" model="account.account.template">
       <field name="code">3531</field>
       <field name="name">Darlehen atypisch stiller Gesellschaftler - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3534" model="account.account.template">
       <field name="code">3534</field>
       <field name="name">Darlehen atypisch stiller Gesellschaftler - Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3537" model="account.account.template">
       <field name="code">3537</field>
       <field name="name">Darlehen atypisch stiller Gesellschaftler - Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3540" model="account.account.template">
       <field name="code">3540</field>
       <field name="name">Partiarische Darlehen</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3541" model="account.account.template">
       <field name="code">3541</field>
       <field name="name">Partiarische Darlehen - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3544" model="account.account.template">
       <field name="code">3544</field>
       <field name="name">Partiarische Darlehen - Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3547" model="account.account.template">
       <field name="code">3547</field>
       <field name="name">Partiarische Darlehen - Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3550" model="account.account.template">
       <field name="code">3550</field>
       <field name="name">Erhaltene Kautionen</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3551" model="account.account.template">
       <field name="code">3551</field>
       <field name="name">Erhaltene Kautionen - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3554" model="account.account.template">
       <field name="code">3554</field>
       <field name="name">Erhaltene Kautionen - Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3557" model="account.account.template">
       <field name="code">3557</field>
       <field name="name">Erhaltene Kautionen - Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3560" model="account.account.template">
       <field name="code">3560</field>
       <field name="name">Darlehen</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3561" model="account.account.template">
       <field name="code">3561</field>
       <field name="name">Darlehen - Restlaufzeit bis 1 jahr</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3564" model="account.account.template">
       <field name="code">3564</field>
       <field name="name">Darlehen - Restlaufzeit 1 bis 5 jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3567" model="account.account.template">
       <field name="code">3567</field>
       <field name="name">Darlehen - Restlaufzeit größer 5 jahre</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3570" model="account.account.template">
       <field name="code">3570</field>
       <field name="name">(frei- in Bilanz kein Restlaufzeit vermerkt)</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3599" model="account.account.template">
       <field name="code">3599</field>
       <field name="name">Gegenkonto 3500-3569 bei Aufteilung der Konten 3570-3598</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3600" model="account.account.template">
       <field name="code">3600</field>
       <field name="name">Agenturwarenabrechnungen</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3610" model="account.account.template">
       <field name="code">3610</field>
       <field name="name">Kreditkartenabrechnung</field>
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP2b" model="account.account.template">
       <field name="code">K3BP2b</field>
       <field name="name">Sonstige Vermögensgegenstände oder sonstige Verbindlichkeiten</field>
@@ -6876,25 +6876,25 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3620" model="account.account.template">
       <field name="code">3620</field>
       <field name="name">Gewinnverfügungskonto stille Gesellschafter</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3630" model="account.account.template">
       <field name="code">3630</field>
       <field name="name">Sonstige Verrechnungskonten (Interimskonto)</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP2c" model="account.account.template">
       <field name="code">K3BP2c</field>
       <field name="name">Sonstige Vermögensgegenstände H-Saldo</field>
@@ -6902,304 +6902,304 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3695" model="account.account.template">
       <field name="code">3695</field>
       <field name="name">Verrechnungskonto geleistete Anzahlungen bei Buchung über Kreditorenkonto</field>
       <field name="parent_id" ref="chart_skr04_K3BP2c"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3700" model="account.account.template">
       <field name="code">3700</field>
       <field name="name">Verbindlichkeiten aus Betriebssteuern und -abgaben</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3701" model="account.account.template">
       <field name="code">3701</field>
       <field name="name">Verbindlichkeiten aus Betriebssteuern und -abgaben - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3710" model="account.account.template">
       <field name="code">3710</field>
       <field name="name">Verbindlichkeiten aus Betriebssteuern und -abgaben - Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3715" model="account.account.template">
       <field name="code">3715</field>
       <field name="name">Verbindlichkeiten aus Betriebssteuern und -abgaben - Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3720" model="account.account.template">
       <field name="code">3720</field>
       <field name="name">Verbindlichkeiten aus Lohn und Gehalt</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3725" model="account.account.template">
       <field name="code">3725</field>
       <field name="name">Verbindlichkeiten für Einbehaltungen von Arbeitnehmern</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3726" model="account.account.template">
       <field name="code">3726</field>
       <field name="name">Verbindlichkeiten an das Finanzamt aus abzuführendem Bauabzugsbetrag</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3730" model="account.account.template">
       <field name="code">3730</field>
       <field name="name">Verbindlichkeiten aus Lohn- und Kirchensteuer</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3740" model="account.account.template">
       <field name="code">3740</field>
       <field name="name">Verbindlichkeiten im Rahmen der sozialen Sicherheit</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3741" model="account.account.template">
       <field name="code">3741</field>
       <field name="name">Verbindlichkeiten im Rahmen der sozialen Sicherheit - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3750" model="account.account.template">
       <field name="code">3750</field>
       <field name="name">Verbindlichkeiten im Rahmen der sozialen Sicherheit - Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3755" model="account.account.template">
       <field name="code">3755</field>
       <field name="name">Verbindlichkeiten im Rahmen der sozialen Sicherheit - Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3759" model="account.account.template">
       <field name="code">3759</field>
       <field name="name">Voraussichtliche Beitragsschuld gegenüber den Sozialversicherungsträgern</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3760" model="account.account.template">
       <field name="code">3760</field>
       <field name="name">Verbindlichkeiten aus Einbehaltungen (KapESt und Solz auf KapESt)</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3761" model="account.account.template">
       <field name="code">3761</field>
       <field name="name">Verbindlichkeiten für Verbrauchsteuern</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3770" model="account.account.template">
       <field name="code">3770</field>
       <field name="name">Verbindlichkeiten aus Vermögensbildung </field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3771" model="account.account.template">
       <field name="code">3771</field>
       <field name="name">Verbindlichkeiten aus Vermögensbildung - Restlaufzeit bis 1 Jahr</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3780" model="account.account.template">
       <field name="code">3780</field>
       <field name="name">Verbindlichkeiten aus Vermögensbildung - Restlaufzeit 1 bis 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3785" model="account.account.template">
       <field name="code">3785</field>
       <field name="name">Verbindlichkeiten aus Vermögensbildung - Restlaufzeit größer 5 Jahre</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3790" model="account.account.template">
       <field name="code">3790</field>
       <field name="name">Lohn- und Gehaltsverrechnungskonto</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3791" model="account.account.template">
       <field name="code">3791</field>
       <field name="name">Lohn- und Gehaltsverrechnung § 11 Abs. 2 EStG für § a Abs. 3 EStG</field>
       <field name="parent_id" ref="chart_skr04_3790"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3796" model="account.account.template">
       <field name="code">3796</field>
       <field name="name">Verbindlichkeiten im Rahmen der sozialen Sicherheit (für § 4/3 EStG)</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
      <record id="chart_skr04_3800" model="account.account.template">
       <field name="code">3800</field>
       <field name="name">Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3801" model="account.account.template">
       <field name="code">3801</field>
       <field name="name">Umsatzsteuer 7%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3802" model="account.account.template">
       <field name="code">3802</field>
       <field name="name">Umsatzsteuer aus innergemeinschaftlichem Erwerb </field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3803" model="account.account.template">
       <field name="code">3803</field>
       <field name="name">Umsatzsteuer aus innergemeinschaftlichem Erwerb 16%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3804" model="account.account.template">
       <field name="code">3804</field>
       <field name="name">Umsatzsteuer aus innergemeinschaftlichem Erwerb 19%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3805" model="account.account.template">
       <field name="code">3805</field>
       <field name="name">Umsatzsteuer 16%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3806" model="account.account.template">
       <field name="code">3806</field>
       <field name="name">Umsatzsteuer 19%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3807" model="account.account.template">
       <field name="code">3807</field>
       <field name="name">Umsatzsteuer aus im Inland steuerpflichtigen EG-Lieferungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3808" model="account.account.template">
       <field name="code">3808</field>
       <field name="name">Umsatzsteuer aus im Inland steuerpflichtigen EG-Lieferungen 19%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3809" model="account.account.template">
       <field name="code">3809</field>
       <field name="name">Umsatzsteuer aus innergemeinschaftlichem Erwerb ohne Vorsteuerabzug</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP2d" model="account.account.template">
       <field name="code">K3BP2d</field>
       <field name="name">Steuerrückstellungen oder sonstige Vermögensgegenstände </field>
@@ -7207,214 +7207,214 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3810" model="account.account.template">
       <field name="code">3810</field>
       <field name="name">Umsatzsteuer nicht fällig</field>
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3811" model="account.account.template">
       <field name="code">3811</field>
       <field name="name">Umsatzsteuer nicht fällig 7%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3812" model="account.account.template">
       <field name="code">3812</field>
       <field name="name">Umsatzsteuer nicht fällig aus im Inland steuerpflichtigen EG-Lieferungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3813" model="account.account.template">
       <field name="code">3813</field>
       <field name="name">Umsatzsteuer nicht fällig aus im Inland steuerpflichtigen EG-Lieferungen 16%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3814" model="account.account.template">
       <field name="code">3814</field>
       <field name="name">Umsatzsteuer nicht fällig aus im Inland steuerpflichtigen EG-Lieferungen 19%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3815" model="account.account.template">
       <field name="code">3815</field>
       <field name="name">Umsatzsteuer nicht fällig 16%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3816" model="account.account.template">
       <field name="code">3816</field>
       <field name="name">Umsatzsteuer nicht fällig 19%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3817" model="account.account.template">
       <field name="code">3817</field>
       <field name="name">Umsatzsteuer aus im anderen EG-Land steuerpflichtigen Lieferungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3818" model="account.account.template">
       <field name="code">3818</field>
       <field name="name">Umsatzsteuer aus im anderen EG-Land steuerpflichtigen sonstigen Leistungen/Werlieferungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3820" model="account.account.template">
       <field name="code">3820</field>
       <field name="name">Umsatzsteuer- Vorauszahlungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3830" model="account.account.template">
       <field name="code">3830</field>
       <field name="name">Umsatzsteuer- Vorauszahlungen 1/11</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3832" model="account.account.template">
       <field name="code">3832</field>
       <field name="name">Nachsteuer- UStVA Kz. 65</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3834" model="account.account.template">
       <field name="code">3834</field>
       <field name="name">Umsatzsteuer aus innergemeinschaftlichem Erwerb von Neufahrzeugen von Lieferanten ohne Umsatzsteuer-Identifikationsnummer</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3835" model="account.account.template">
       <field name="code">3835</field>
       <field name="name">Umsatzsteuer nach §13b UStG</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3836" model="account.account.template">
       <field name="code">3836</field>
       <field name="name">Umsatzsteuer nach §13b UStG 16%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3837" model="account.account.template">
       <field name="code">3837</field>
       <field name="name">Umsatzsteuer nach §13b UStG 19%</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3839" model="account.account.template">
       <field name="code">3839</field>
       <field name="name">Umsatzsteuer aus der Auslagerung von Gegenständen aus einem Umsatzsteuerlager</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3840" model="account.account.template">
       <field name="code">3840</field>
       <field name="name">Umsatzsteuer laufendes Jahr</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3841" model="account.account.template">
       <field name="code">3841</field>
       <field name="name">Umsatzsteuer Vorjahr</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3845" model="account.account.template">
       <field name="code">3845</field>
       <field name="name">Umsatzsteuer frühere Jahre</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3850" model="account.account.template">
       <field name="code">3850</field>
       <field name="name">Einfuhrumsatzsteuer aufgeschoben bis</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3851" model="account.account.template">
       <field name="code">3851</field>
       <field name="name">In Rechnung unrichtig oder unberechtigt ausgewiesene Steuerbeträge- UStVA Kz. 69</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_3854" model="account.account.template">
       <field name="code">3854</field>
       <field name="name">Steuerzahlungen an andere EG-Länder</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP3" model="account.account.template">
       <field name="code">K3BP3</field>
       <field name="name">Rechnungsabgrenzungsposten</field>
@@ -7422,7 +7422,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP31" model="account.account.template">
       <field name="code">K3BP31</field>
       <field name="name">Rechnungsabgrenzungsposten</field>
@@ -7430,16 +7430,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3900" model="account.account.template">
       <field name="code">3900</field>
       <field name="name">Passive Rechnungsabgrenzung</field>
       <field name="parent_id" ref="chart_skr04_K3BP31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K3BP32" model="account.account.template">
       <field name="code">K3BP32</field>
       <field name="name">Sonstige Passiva oder sontige Aktiva</field>
@@ -7447,16 +7447,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_3950" model="account.account.template">
       <field name="code">3950</field>
       <field name="name">Abgrenzungen zur unterjährigen Kostenverrechnung für BWA</field>
       <field name="parent_id" ref="chart_skr04_K3BP32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE1" model="account.account.template">
       <field name="code">K4GVE1</field>
       <field name="name">Umsatzerlöse</field>
@@ -7464,7 +7464,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE11" model="account.account.template">
       <field name="code">K4GVE11</field>
       <field name="name">Umsatzerlöse</field>
@@ -7472,358 +7472,358 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_4000" model="account.account.template">
       <field name="code">4000</field>
       <field name="name">Umsatzerlöse (zur fr. Verfügung)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4100" model="account.account.template">
       <field name="code">4100</field>
       <field name="name">Steuerfreie Umsätze §4 Nr. 8 ff. UStG</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4105" model="account.account.template">
       <field name="code">4105</field>
       <field name="name">Steuerfreie Umsätze nach § 4 Nr. 12 UStG (Vermietung und Verpackung)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4110" model="account.account.template">
       <field name="code">4110</field>
       <field name="name">Sonstige steuerfreie Umsätze Inland</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4120" model="account.account.template">
       <field name="code">4120</field>
       <field name="name">Steuerfreie Umsätze §4 Nr. 1a UStG</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4125" model="account.account.template">
       <field name="code">4125</field>
       <field name="name">Steuerfreie innergemeinschaftliche Lieferungen §4 Nr. 1b UStG</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4130" model="account.account.template">
       <field name="code">4130</field>
       <field name="name">Lieferungen des ersten Abnehmers bei innergemeinschaftlichen Dreiecksgeschäften § 25b abs. UStG</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4135" model="account.account.template">
       <field name="code">4135</field>
       <field name="name">Steuerfreie innergemeinschaftliche Lieferungen von Neufahrzeugen an Abnehmer ohne Umsatzsteuer-Identifikationsnummer</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4140" model="account.account.template">
       <field name="code">4140</field>
       <field name="name">Steuerfreie Umsätze offshore etc.</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4150" model="account.account.template">
       <field name="code">4150</field>
       <field name="name">Sonstige steuerfreie Umsätze (z.B. § 4 Nr. 2-7 UStG)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4160" model="account.account.template">
       <field name="code">4160</field>
       <field name="name">Steuerfreie Umsätze ohne Vorsteuerabzug zum Gesamtumsatz gehörend</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4180" model="account.account.template">
       <field name="code">4180</field>
       <field name="name">Erlöse. Die mit den Durchschnittssätzen des § 24 UStG versteuert werden</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4185" model="account.account.template">
       <field name="code">4185</field>
       <field name="name">Erlöse als Kleinunternehmer i.S.d. § 19 Abs. 1 UStG</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4186" model="account.account.template">
       <field name="code">4186</field>
       <field name="name">Erlöse aus Geldspielautomaten 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4187" model="account.account.template">
       <field name="code">4187</field>
       <field name="name">Erlöse aus Geldspielautomaten 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4200" model="account.account.template">
       <field name="code">4200</field>
       <field name="name">Erlöse</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4300" model="account.account.template">
       <field name="code">4300</field>
       <field name="name">Erlöse 7% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4310" model="account.account.template">
       <field name="code">4310</field>
       <field name="name">Erlöse aus im Inland steuerpflichtigen EG-Lieferungen 7% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4315" model="account.account.template">
       <field name="code">4315</field>
       <field name="name">Erlöse aus im Inland steuerpflichtigen EG-Lieferungen 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4320" model="account.account.template">
       <field name="code">4320</field>
       <field name="name">Erlöse aus im anderen EG-Land steuerpflichtigen Lieferungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4330" model="account.account.template">
       <field name="code">4330</field>
       <field name="name">Erlöse aus im Inland steuerpflichtigen EG-Lieferungen 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4337" model="account.account.template">
       <field name="code">4337</field>
       <field name="name">Erlöse aus Leistungen- für die der Leistungsempfänger die Umsatzsteuer nach § 13b UStG schuldet</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4338" model="account.account.template">
       <field name="code">4338</field>
       <field name="name">Erlöse aus im Drittland steuerbaren Leistungen- im Inland ncht steuerbare Umsätze</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4339" model="account.account.template">
       <field name="code">4339</field>
       <field name="name">Erlöse aus im anderen EG-Land steuerbaren Leistungen- im Inland nicht steuerbare Umsätze</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4340" model="account.account.template">
       <field name="code">4340</field>
       <field name="name">Erlöse 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4400" model="account.account.template">
       <field name="code">4400</field>
       <field name="name">Erlöse 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4401" model="account.account.template">
       <field name="code">4401</field>
       <field name="name">* Vorausberechnete Einnahmen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4402" model="account.account.template">
       <field name="code">4402</field>
       <field name="name">* Sonstige Einnahmen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4403" model="account.account.template">
       <field name="code">4403</field>
       <field name="name">* Konto Kasse Ertrag</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4410" model="account.account.template">
       <field name="code">4410</field>
       <field name="name">Erlöse 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4499" model="account.account.template">
       <field name="code">4499</field>
       <field name="name">Nicht abgerechnete Einnahmen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4510" model="account.account.template">
       <field name="code">4510</field>
       <field name="name">Erlöse Abfallverwertung</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4520" model="account.account.template">
       <field name="code">4520</field>
       <field name="name">Erlöse Leergut</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4560" model="account.account.template">
       <field name="code">4560</field>
       <field name="name">Provisionsumsätze</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4564" model="account.account.template">
       <field name="code">4564</field>
       <field name="name">Provisionsumsätze- steuerfrei (§4 Nr. 8 ff. UStG)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4565" model="account.account.template">
       <field name="code">4565</field>
       <field name="name">Provisionsumsätze- steuerfrei (§4 Nr. 5 UStG)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4566" model="account.account.template">
       <field name="code">4566</field>
       <field name="name">Provisionsumsätze 7% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4568" model="account.account.template">
       <field name="code">4568</field>
       <field name="name">Provisionsumsätze 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4569" model="account.account.template">
       <field name="code">4569</field>
       <field name="name">Provisionsumsätze 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE12" model="account.account.template">
       <field name="code">K4GVE12</field>
       <field name="name">Sotige betriebliche Erträge</field>
@@ -7831,61 +7831,61 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_4570" model="account.account.template">
       <field name="code">4570</field>
       <field name="name">Provision- sonstige Erträge</field>
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4574" model="account.account.template">
       <field name="code">4574</field>
       <field name="name">Provision- sonstige Erträge steuerfrei (§ 4 Nr. 8 ff. UStG)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4575" model="account.account.template">
       <field name="code">4575</field>
       <field name="name">Provision- sonstige Erträge steuerfrei (§ 4 Nr. 5 UStG)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4576" model="account.account.template">
       <field name="code">4576</field>
       <field name="name">Provision- sonstige Erträge 7% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4578" model="account.account.template">
       <field name="code">4578</field>
       <field name="name">Provision- sonstige Erträge 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4579" model="account.account.template">
       <field name="code">4579</field>
       <field name="name">Provision- sonstige Erträge 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE2" model="account.account.template">
       <field name="code">K4GVE2</field>
       <field name="name">Statistische Konten EüR</field>
@@ -7893,7 +7893,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE21" model="account.account.template">
       <field name="code">K4GVE21</field>
       <field name="name">Umsatzerlöse</field>
@@ -7901,97 +7901,97 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_4580" model="account.account.template">
       <field name="code">4580</field>
       <field name="name">Statistisches Konto Erlöse zum allgemeinen Umsatzsteuersatz (EüR)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4581" model="account.account.template">
       <field name="code">4581</field>
       <field name="name">Statistisches Konto Erlöse zum ermäßigten Umsatzsteuersatz (EüR)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4582" model="account.account.template">
       <field name="code">4582</field>
       <field name="name">Statistisches konto Erlöse steuerfrei und nicht steuerbar (EüR)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4589" model="account.account.template">
       <field name="code">4589</field>
       <field name="name">Gegenkonto 4580-4582 bei Aufteilung der Erlöse nach Steuersätzen (EüR)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4600" model="account.account.template">
       <field name="code">4600</field>
       <field name="name">Unentgeltliche Wertabgaben</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4605" model="account.account.template">
       <field name="code">4605</field>
       <field name="name">Entnahme von Gegensänden ohne USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4610" model="account.account.template">
       <field name="code">4610</field>
       <field name="name">Entnahme durh Unternehmer für Zwecke außerhalb des Unternehmens (Waren) 7% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4619" model="account.account.template">
       <field name="code">4619</field>
       <field name="name">Entnahme durch Unternehmer für Zwecke außerhalb des Unternehmens (Waren) ohne USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4620" model="account.account.template">
       <field name="code">4620</field>
       <field name="name">Entnahme durch den Unternehmer für Zwecke außerhalb des Unternehmens (Waren) 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4627" model="account.account.template">
       <field name="code">4627</field>
       <field name="name">Entnahme durch den Unternehmer für Zwecke außerhalb des Unternehmens (Waren) 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE22" model="account.account.template">
       <field name="code">K4GVE22</field>
       <field name="name">Sonstige betriebliche Erträge</field>
@@ -7999,466 +7999,466 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_4630" model="account.account.template">
       <field name="code">4630</field>
       <field name="name">Verwendung von Gegenständen für Zwecke außerhalb des Unternehmens 7% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4637" model="account.account.template">
       <field name="code">4637</field>
       <field name="name">Verwendung von Gegenständen für Zwecke außerhalb des Unternehmens ohne USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4638" model="account.account.template">
       <field name="code">4638</field>
       <field name="name">Verwendung von Gegenständen für Zwecke außerhalb des Unternehmens ohne USt (Telefon-Nutzung)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4639" model="account.account.template">
       <field name="code">4639</field>
       <field name="name">Verwendung von Gegenständen für Zwecke außerhalb des Unternehmens ohne USt (Kfz-Nutzung)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4640" model="account.account.template">
       <field name="code">4640</field>
       <field name="name">Verwendung von Gegenständen für Zwecke außerhalb des Unternehmens 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4645" model="account.account.template">
       <field name="code">4645</field>
       <field name="name">Verwendung von Gegenständen für Zwecke außerhalb des Unternehmens 19% USt (Kfz-Nutzung)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4646" model="account.account.template">
       <field name="code">4646</field>
       <field name="name">Verwendung von Gegenständen für Zwecke außerhalb des Unternehmens 19% USt (Telefon-Nutzung)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4647" model="account.account.template">
       <field name="code">4647</field>
       <field name="name">Verwendung von Gegenständen für Zwecke außerhalb des Unternehmens 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4648" model="account.account.template">
       <field name="code">4648</field>
       <field name="name">Verwendung von Gegenständen für Zwecke außerhalb des Unternehmens 16% USt (Kfz-Nutzung)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4649" model="account.account.template">
       <field name="code">4649</field>
       <field name="name">Verwendung von Gegenständen für Zwecke außerhalb des Unternehmens 16% USt (Telefon-Nutzung)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4650" model="account.account.template">
       <field name="code">4650</field>
       <field name="name">Unentgeltliche Erbringung einer sonstigen Leistung 7% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4659" model="account.account.template">
       <field name="code">4659</field>
       <field name="name">Unentgeltliche Erbringung einer sostigen Leistung ohne USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4660" model="account.account.template">
       <field name="code">4660</field>
       <field name="name">Unentgeltliche Erbringung einer sostigen Leistung 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4667" model="account.account.template">
       <field name="code">4667</field>
       <field name="name">Unentgeltliche Erbringung einer sostigen Leistung 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4670" model="account.account.template">
       <field name="code">4670</field>
       <field name="name">Unentgeltliche Zuwendung von Waren 7% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4679" model="account.account.template">
       <field name="code">4679</field>
       <field name="name">Unentgeltliche Zuwendung von Waren ohne USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4680" model="account.account.template">
       <field name="code">4680</field>
       <field name="name">Unentgeltliche Zuwendung von Waren 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4685" model="account.account.template">
       <field name="code">4685</field>
       <field name="name">Unentgeltliche Zuwendung von Waren 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4686" model="account.account.template">
       <field name="code">4686</field>
       <field name="name">Unentgeltliche Zuwendung von Gegenständen 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4688" model="account.account.template">
       <field name="code">4688</field>
       <field name="name">Unentgeltliche Zuwendung von Gegenständen 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4689" model="account.account.template">
       <field name="code">4689</field>
       <field name="name">Unentgeltliche Zuwendung von Gegenständen ohne USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4690" model="account.account.template">
       <field name="code">4690</field>
       <field name="name">Nicht steuerbare umsätze (Innenumsätze)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4695" model="account.account.template">
       <field name="code">4695</field>
       <field name="name">Umsatzsteuervergütung</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4700" model="account.account.template">
       <field name="code">4700</field>
       <field name="name">Erlösschmälerungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4705" model="account.account.template">
       <field name="code">4705</field>
       <field name="name">Erlösschmälerungen aus steuerfreien Umsätzen § 4 Nr. 1a UStG</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4710" model="account.account.template">
       <field name="code">4710</field>
       <field name="name">Erlösschmälerungen 7 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4720" model="account.account.template">
       <field name="code">4720</field>
       <field name="name">Erlösschmälerungen 19 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4723" model="account.account.template">
       <field name="code">4723</field>
       <field name="name">Erlösschmälerungen 16 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4724" model="account.account.template">
       <field name="code">4724</field>
       <field name="name">Erlösschmälerungen aus steuerfreien innergemeinschaftlichen Lieferungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4725" model="account.account.template">
       <field name="code">4725</field>
       <field name="name">Erlösschmälerung aus im Inland steuerpflichtigen EG-lieferungen 7 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4726" model="account.account.template">
       <field name="code">4726</field>
       <field name="name">Erlösschmälerung aus im Inland steuerpflichtigen EG-lieferungen 19% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4727" model="account.account.template">
       <field name="code">4727</field>
       <field name="name">Erlösschmälerung aus im anderen EG-lieferungen steuerpflichtigen Lieferungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4729" model="account.account.template">
       <field name="code">4729</field>
       <field name="name">Erlösschmälerung aus im Inland steuerpflichtigen EG-lieferungen 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4730" model="account.account.template">
       <field name="code">4730</field>
       <field name="name">Gewährte Skonti</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4731" model="account.account.template">
       <field name="code">4731</field>
       <field name="name">Gewährte Skonti 7 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4735" model="account.account.template">
       <field name="code">4735</field>
       <field name="name">Gewährte Skonti 16 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4736" model="account.account.template">
       <field name="code">4736</field>
       <field name="name">Gewährte Skonti 19 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4741" model="account.account.template">
       <field name="code">4741</field>
       <field name="name">Gewährte Skonti aus Leistungen- für die der Leistungsempfänger die umsatzsteuer nach § 13b UStG schuldet</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4743" model="account.account.template">
       <field name="code">4743</field>
       <field name="name">Gewährte Skonti aus steuerfreien innergemeinschaftlichen Lieferungen § 4 Nr. 1b UStG</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4745" model="account.account.template">
       <field name="code">4745</field>
       <field name="name">Gewährte Skonti aus im Inland steuerpflichtigen EG-Lieferungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4746" model="account.account.template">
       <field name="code">4746</field>
       <field name="name">Gewährte Skonti aus im Inland steuerpflichtigen EG-Lieferungen 7 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4748" model="account.account.template">
       <field name="code">4748</field>
       <field name="name">Gewährte Skonti aus im Inland steuerpflichtigen EG-Lieferungen 19 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4749" model="account.account.template">
       <field name="code">4749</field>
       <field name="name">Gewährte Skonti aus im Inland steuerpflichtigen EG-Lieferungen 16 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4750" model="account.account.template">
       <field name="code">4750</field>
       <field name="name">Gewährte Boni 7 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4760" model="account.account.template">
       <field name="code">4760</field>
       <field name="name">Gewährte Boni 19 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4762" model="account.account.template">
       <field name="code">4762</field>
       <field name="name">Gewährte Boni 16 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4769" model="account.account.template">
       <field name="code">4769</field>
       <field name="name">Gewährte Boni </field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4770" model="account.account.template">
       <field name="code">4770</field>
       <field name="name">Gewährte Rabatte</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_4780" model="account.account.template">
       <field name="code">4780</field>
       <field name="name">Gewährte Rabatte 7 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4790" model="account.account.template">
       <field name="code">4790</field>
       <field name="name">Gewährte Rabatte 19 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4792" model="account.account.template">
       <field name="code">4792</field>
       <field name="name">Gewährte Rabatte 16 % USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE3" model="account.account.template">
       <field name="code">K4GVE3</field>
       <field name="name">Erhöhung oder Verminderung des Bestands an fertigen und unfertige Erzeugnissen</field>
@@ -8466,7 +8466,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE31" model="account.account.template">
       <field name="code">K4GVE31</field>
       <field name="name">Erhöhung des Bestands an fertigen und unfertigen Erzeugnissen oder Verminderung des Bestands an fertigen und unfertigen Erzeugnissen</field>
@@ -8474,34 +8474,34 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_4800" model="account.account.template">
       <field name="code">4800</field>
       <field name="name">Bestandsveränderungen - fertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K4GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4810" model="account.account.template">
       <field name="code">4810</field>
       <field name="name">Bestandsveränderungen - unfertige Erzeugnisse</field>
       <field name="parent_id" ref="chart_skr04_K4GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4815" model="account.account.template">
       <field name="code">4815</field>
       <field name="name">Bestandsveränderungen - unfertige Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE32" model="account.account.template">
       <field name="code">K4GVE32</field>
       <field name="name">Erhöhung des Bestands in Ausführung befindlicher Bauafträge oder Verminderung des Bestands in Ausführung befindlicher Bauaufträge</field>
@@ -8509,16 +8509,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_4816" model="account.account.template">
       <field name="code">4816</field>
       <field name="name">Bestandsveränderungen in Ausführung befindliche Bauaufträge</field>
       <field name="parent_id" ref="chart_skr04_K4GVE32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE33" model="account.account.template">
       <field name="code">K4GVE33</field>
       <field name="name">Erhöhung des Bestands in Arbeit befindlicher Aufträge oder Verminderung des Bestands in Arbeit befindlicher Aufträge</field>
@@ -8526,16 +8526,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_4818" model="account.account.template">
       <field name="code">4818</field>
       <field name="name">Bestandsveränderungen in Arbeit befindlicher Aufträge</field>
       <field name="parent_id" ref="chart_skr04_K4GVE33"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE4" model="account.account.template">
       <field name="code">K4GVE4</field>
       <field name="name">Andere aktivierte Eigenleistungen</field>
@@ -8543,7 +8543,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE41" model="account.account.template">
       <field name="code">K4GVE41</field>
       <field name="name">Andere aktivierte Eigenleistungen</field>
@@ -8551,16 +8551,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_4820" model="account.account.template">
       <field name="code">4820</field>
       <field name="name">Andere aktivierte Eigenleistungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE5" model="account.account.template">
       <field name="code">K4GVE5</field>
       <field name="name">Sonstige betriebliche Erträge</field>
@@ -8568,7 +8568,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K4GVE51" model="account.account.template">
       <field name="code">K4GVE51</field>
       <field name="name">Sonstige betriebliche Erträge</field>
@@ -8576,664 +8576,664 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_4830" model="account.account.template">
       <field name="code">4830</field>
       <field name="name">Sonstige betriebliche Erträge</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4834" model="account.account.template">
       <field name="code">4834</field>
       <field name="name">Sonstige Erträge betrieblich und regelmäßig 16% USt</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4835" model="account.account.template">
       <field name="code">4835</field>
       <field name="name">Sonstige Erträge betrieblich und regelmäßig </field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4836" model="account.account.template">
       <field name="code">4836</field>
       <field name="name">Sonstige Erträge betrieblich und regelmäßig 19% USt </field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4837" model="account.account.template">
       <field name="code">4837</field>
       <field name="name">Sonstige Erträge betriebsfremd und regelmäßig</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4839" model="account.account.template">
       <field name="code">4839</field>
       <field name="name">Sonstige Erträge unregelmßig</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4840" model="account.account.template">
       <field name="code">4840</field>
       <field name="name">Erträge aus Kursdifferenzen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4843" model="account.account.template">
       <field name="code">4843</field>
       <field name="name">Erträge aus Bewertung Finanzmittelfonds</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4844" model="account.account.template">
       <field name="code">4844</field>
       <field name="name">Erlöse aus Verkäufen Sachanlagevermögen steuerfrei § 4 Nr. 1a UStG (bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4845" model="account.account.template">
       <field name="code">4845</field>
       <field name="name">Erlöse aus Verkäufen Sachanlagevermögen 19% USt (bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4846" model="account.account.template">
       <field name="code">4846</field>
       <field name="name">Erlöse aus Verkäufen Sachanlagevermögen 16% USt (bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4848" model="account.account.template">
       <field name="code">4848</field>
       <field name="name">Erlöse aus Verkäufen Sachanlagevermögen steuerfrei § 4 Nr. 1b UStG (bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4849" model="account.account.template">
       <field name="code">4849</field>
       <field name="name">Erlöse aus Verkäufen Sachanlagevermögen (bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4850" model="account.account.template">
       <field name="code">4850</field>
       <field name="name">Erlöse aus Verkauf immaterieller Vermögensgegenstände (bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4851" model="account.account.template">
       <field name="code">4851</field>
       <field name="name">Erlöse aus Verkäufen Finanzanlagen (bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4852" model="account.account.template">
       <field name="code">4852</field>
       <field name="name">Erlöse aus Verkäufen Finanzanlagen 100% / 50% steuerfrei (inlandische Kap.Ges.)(bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4855" model="account.account.template">
       <field name="code">4855</field>
       <field name="name">Anlagenabgänge Sachanlagen (Restbuchwert bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4856" model="account.account.template">
       <field name="code">4856</field>
       <field name="name">Anlagenabgänge immaterielle Vermögensgegenstände (Restbuchwert bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4857" model="account.account.template">
       <field name="code">4857</field>
       <field name="name">Anlagenabgänge Finanzanlagen (Restbuchwert bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4858" model="account.account.template">
       <field name="code">4858</field>
       <field name="name">Anlagenabgänge Finanzanlagen 100% / 50% steuerfrei (inländische Kap. Ges.)(Restbuchwert bei Buchgewinn)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4860" model="account.account.template">
       <field name="code">4860</field>
       <field name="name">Grundstückserträge</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4865" model="account.account.template">
       <field name="code">4865</field>
       <field name="name">Erlöse aus Verkauen von Wirtschaftsgütern des Umlaufvermögens 19% USt für § 4 Abs. 3 Satz 4 EStG</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4866" model="account.account.template">
       <field name="code">4866</field>
       <field name="name">Erlöse aus Verkauen von Wirtschaftsgütern des Umlaufvermögens- umsatzsteuerfrei § 4 Nr. 8 ff UStG i. V. m. § 4 Abs. 3 Satz 4 EStG</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4867" model="account.account.template">
       <field name="code">4867</field>
       <field name="name">Erl. a. Verk. v. Wirtschaftsg. d. Umlaufv.- umsatzsteuerf. § 4 Nr. 8 ff UStG i. V. m. § 4 Abs. 3 Satz 4 EStG- 100%/50% steuerf.(inlandische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4869" model="account.account.template">
       <field name="code">4869</field>
       <field name="name">Erlöse aus Verkäufen von Wirtschaftsgütern des Umlaufvermögens nach § 4 Abs. 3 Satz 4 EStG</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4871" model="account.account.template">
       <field name="code">4871</field>
       <field name="name">Nicht realisierbare Waehrungsdifferenzen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4872" model="account.account.template">
       <field name="code">4872</field>
       <field name="name">Realisierte Waehrungsdifferenzen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4873" model="account.account.template">
       <field name="code">4873</field>
       <field name="name">Produkt Rechnung Preisdifferenz</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4874" model="account.account.template">
       <field name="code">4874</field>
       <field name="name">Realisierte Waehrungsdifferenzen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4875" model="account.account.template">
       <field name="code">4875</field>
       <field name="name">Ertraege a. Waehrungsumstellung auf Euro</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4877" model="account.account.template">
       <field name="code">4877</field>
       <field name="name">Bank Waehrungsverlust (Konto)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4878" model="account.account.template">
       <field name="code">4878</field>
       <field name="name">Waehrungsdifferenz zum Kontenausgleich</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4879" model="account.account.template">
       <field name="code">4879</field>
       <field name="name">Nicht realisierbare Waehrungsdifferenzen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4881" model="account.account.template">
       <field name="code">4881</field>
       <field name="name">Bank Bewertungsertrag</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4882" model="account.account.template">
       <field name="code">4882</field>
       <field name="name">Rundungsdifferenzen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4883" model="account.account.template">
       <field name="code">4883</field>
       <field name="name">Kassendifferenzen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4900" model="account.account.template">
       <field name="code">4900</field>
       <field name="name">Erträge aus dem Abgang von Gegenständen des Anlagevermögens</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4901" model="account.account.template">
       <field name="code">4901</field>
       <field name="name">Erträge aus der Veräußerung vo Anteilen an Kapitalgesellschaften 100% / 50% steuerfrei (inlandische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4905" model="account.account.template">
       <field name="code">4905</field>
       <field name="name">Erträge aus dem abgang von Gegenständen des Umlaufvermögens außer Vorräte</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4906" model="account.account.template">
       <field name="code">4906</field>
       <field name="name">Erträge aus dem abgang von Gegenständen des Umlaufvermögens (außer Vorräte) 100% / 50%steuerfrei (inlandische Kap.Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4910" model="account.account.template">
       <field name="code">4910</field>
       <field name="name">Erträge aus Zuschreibungen des Sachanlagevermögens</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4911" model="account.account.template">
       <field name="code">4911</field>
       <field name="name">Erträge aus Zuschreibungen des immateriellen Anlagevermögens</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4912" model="account.account.template">
       <field name="code">4912</field>
       <field name="name">Erträge aus Zuschreibungen des Finanzanlagevermögens</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4913" model="account.account.template">
       <field name="code">4913</field>
       <field name="name">Erträge aus Zuschreibungen des Finanzanlagevermögens 100% / 50% steuerfrei (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4914" model="account.account.template">
       <field name="code">4914</field>
       <field name="name">Erträge aus Zuschreibungen des anderen Anlagevermögens 100% / 50% steuerfrei (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4915" model="account.account.template">
       <field name="code">4915</field>
       <field name="name">Erträge aus Zuschreibungen des Umlaufvermögens außer Vorräten</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4916" model="account.account.template">
       <field name="code">4916</field>
       <field name="name">Erträge aus Zuschreibungen des Umlaufvermögens 100% / 50% steuerfrei (inlandische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4920" model="account.account.template">
       <field name="code">4920</field>
       <field name="name">Erträge aus der Herabsetzung der Pauschalwertberichtigung zu Forderungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4923" model="account.account.template">
       <field name="code">4923</field>
       <field name="name">Erträge aus der Herabsetzung der Einzelwertberichtigung zu Forderungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4925" model="account.account.template">
       <field name="code">4925</field>
       <field name="name">Erträge aus abgeschriebenen Forderungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4930" model="account.account.template">
       <field name="code">4930</field>
       <field name="name">Erträge aus der Auflösung von Rückstellungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4932" model="account.account.template">
       <field name="code">4932</field>
       <field name="name">Erträge aus der steuerlich niedrigeren Bewertung von Rückstellungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4933" model="account.account.template">
       <field name="code">4933</field>
       <field name="name">Erträge aus der steuerlich niedrigeren Bewertung von Verbindlichkeiten</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4934" model="account.account.template">
       <field name="code">4934</field>
       <field name="name">Erträge aus der Auflösung von Sonderposten mit Rücklageanteil (Existenzgründerrücklage)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4935" model="account.account.template">
       <field name="code">4935</field>
       <field name="name">Erträge aus der Auflösung von Sonderposten mit Rücklageanteil (steuerfreie Rücklage)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4936" model="account.account.template">
       <field name="code">4936</field>
       <field name="name">Erträge aus der Auflösung von Sonderposten mit Rücklageanteil (Ansparabschreibungen)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4937" model="account.account.template">
       <field name="code">4937</field>
       <field name="name">Erträge aus der Auflösung von Sonderposten mit Rücklageanteil (Sonderabschreibungen)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4938" model="account.account.template">
       <field name="code">4938</field>
       <field name="name">Erträge aus der Auflösung von Sonderposten mit Rücklageanteil (aus der Währungsumstellung auf den Euro)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4939" model="account.account.template">
       <field name="code">4939</field>
       <field name="name">Erträge aus der Auflösung von Sonderposten mit Rücklageanteil nach § 52 Abs. 16 EStG</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4940" model="account.account.template">
       <field name="code">4940</field>
       <field name="name">Verrechnete sonstige Sachbezüge (keine Waren)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4941" model="account.account.template">
       <field name="code">4941</field>
       <field name="name">Sachbezüge 7% USt (Waren)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4944" model="account.account.template">
       <field name="code">4944</field>
       <field name="name">Sachbezüge 16% USt (Waren)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4945" model="account.account.template">
       <field name="code">4945</field>
       <field name="name">Sachbezüge 19% USt (Waren)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4946" model="account.account.template">
       <field name="code">4946</field>
       <field name="name">Verrechnete sonstige Sachbezüge </field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4947" model="account.account.template">
       <field name="code">4947</field>
       <field name="name">Verrechnete sonstige Sachbezüge 19 % USt ( z.B. Kfz-Gestellung)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4948" model="account.account.template">
       <field name="code">4948</field>
       <field name="name">Verrechnete sonstige Sachbezüge 16 % USt ( z.B. Kfz-Gestellung)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4949" model="account.account.template">
       <field name="code">4949</field>
       <field name="name">Verrechnete sonstige Sachbezüge ohne Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4960" model="account.account.template">
       <field name="code">4960</field>
       <field name="name">Periodenfremde Erträge (soweit nicht außerordentlich)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4970" model="account.account.template">
       <field name="code">4970</field>
       <field name="name">Versicherungsentschädigungen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4975" model="account.account.template">
       <field name="code">4975</field>
       <field name="name">Investitionszuschüsse (steuerpflichtig)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4980" model="account.account.template">
       <field name="code">4980</field>
       <field name="name">Investitionszulagen (steuerfrei)</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4981" model="account.account.template">
       <field name="code">4981</field>
       <field name="name">steuerfreie Erträge aus der Auflösung von Sonderposten mit Rücklageanteil</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_4982" model="account.account.template">
       <field name="code">4982</field>
       <field name="name">Sonstige steuerfreie Betriebseinnahmen</field>
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K5GVA1" model="account.account.template">
       <field name="code">K5GVA1</field>
       <field name="name">Material- und Stoffverbrauch</field>
@@ -9241,7 +9241,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K5GVA11" model="account.account.template">
       <field name="code">K5GVA11</field>
       <field name="name">Aufwendungen für Roh- Hilfs- und Betriebsstoffe und für bezogene Waren</field>
@@ -9249,16 +9249,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_5000" model="account.account.template">
       <field name="code">5000</field>
       <field name="name">Aufwendungen für Roh- Hilfs- und Betriebsstoffe und für bezogene Waren</field>
       <field name="parent_id" ref="chart_skr04_K5GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K5GVA2" model="account.account.template">
       <field name="code">K5GVA2</field>
       <field name="name">Materialaufwand</field>
@@ -9266,7 +9266,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K5GVA21" model="account.account.template">
       <field name="code">K5GVA21</field>
       <field name="name">Aufwendungen für Roh- Hilfs- und Betriebsstoffe und für bezogene Waren</field>
@@ -9274,547 +9274,547 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_5100" model="account.account.template">
       <field name="code">5100</field>
       <field name="name">Einkauf von Roh- Hilfs- und Betriebsstoffen</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5190" model="account.account.template">
       <field name="code">5190</field>
       <field name="name">Energiestoffe (Fertigung)</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5200" model="account.account.template">
       <field name="code">5200</field>
       <field name="name">Wareneingang</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5300" model="account.account.template">
       <field name="code">5300</field>
       <field name="name">Wareneingang 7 % Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5340" model="account.account.template">
       <field name="code">5340</field>
       <field name="name">Wareneingang 16 % Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5400" model="account.account.template">
       <field name="code">5400</field>
       <field name="name">Wareneingang 19 % Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5401" model="account.account.template">
       <field name="code">5401</field>
       <field name="name">* Produkt Ausgaben</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5402" model="account.account.template">
       <field name="code">5402</field>
       <field name="name">* Produkt Vertriebsausgaben</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5403" model="account.account.template">
       <field name="code">5403</field>
       <field name="name">* Konto Kasse Aufwand</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5420" model="account.account.template">
       <field name="code">5420</field>
       <field name="name">Innergemeinschaftlicher Erwerb 7% Vorsteuer und 7% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5425" model="account.account.template">
       <field name="code">5425</field>
       <field name="name">Innergemeinschaftlicher Erwerb 19% Vorsteuer und 19% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5430" model="account.account.template">
       <field name="code">5430</field>
       <field name="name">Innergemeinschaftlicher Erwerb ohne Vorsteuerabzug- 7% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5433" model="account.account.template">
       <field name="code">5433</field>
       <field name="name">Innergemeinschaftlicher Erwerb 16% Vorsteuer und 16% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5435" model="account.account.template">
       <field name="code">5435</field>
       <field name="name">Innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 19% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5436" model="account.account.template">
       <field name="code">5436</field>
       <field name="name">Innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 16% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5440" model="account.account.template">
       <field name="code">5440</field>
       <field name="name">Innergemeinschaftlicher Erwerb von Neufahrzeugen von Lieferanten ohne Umsatzsteuer-Identifikationsnummer 19% Vorsteuer und 19% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5441" model="account.account.template">
       <field name="code">5441</field>
       <field name="name">Innergemeinschaftlicher Erwerb von Neufahrzeugen von Lieferanten ohne Umsatzsteuer-Identifikationsnummer 16% Vorsteuer und 16% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5500" model="account.account.template">
       <field name="code">5500</field>
       <field name="name">Wareneingang 5 % Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5505" model="account.account.template">
       <field name="code">5505</field>
       <field name="name">Wareneingang 5-5 % Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5530" model="account.account.template">
       <field name="code">5530</field>
       <field name="name">Wareneingang 9 % Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5540" model="account.account.template">
       <field name="code">5540</field>
       <field name="name">Wareneingang 10-7 % Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5550" model="account.account.template">
       <field name="code">5550</field>
       <field name="name">Steuerfreier innergemeinschaftlicher Erwerb</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5559" model="account.account.template">
       <field name="code">5559</field>
       <field name="name">Steuerfreie Einfuhren</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5560" model="account.account.template">
       <field name="code">5560</field>
       <field name="name">Waren aus einem Umsatzsteuerlager- § 13a UStG 7% Vorsteuer und 7% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5565" model="account.account.template">
       <field name="code">5565</field>
       <field name="name">Waren aus einem Umsatzsteuerlager- § 13a UStG 19% Vorsteuer und 19% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5566" model="account.account.template">
       <field name="code">5566</field>
       <field name="name">Waren aus einem Umsatzsteuerlager- § 13a UStG 16% Vorsteuer und 16% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5600" model="account.account.template">
       <field name="code">5600</field>
       <field name="name">Nicht abziehbare Vorsteuer </field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5610" model="account.account.template">
       <field name="code">5610</field>
       <field name="name">Nicht abziehbare Vorsteuer 7%</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5650" model="account.account.template">
       <field name="code">5650</field>
       <field name="name">Nicht abziehbare Vorsteuer 16%</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5660" model="account.account.template">
       <field name="code">5660</field>
       <field name="name">Nicht abziehbare Vorsteuer 19%</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5700" model="account.account.template">
       <field name="code">5700</field>
       <field name="name">Nachlässe</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5710" model="account.account.template">
       <field name="code">5710</field>
       <field name="name">Nachlässe 7 % Vorsteuer </field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5720" model="account.account.template">
       <field name="code">5720</field>
       <field name="name">Nachlässe 19 % Vorsteuer </field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5722" model="account.account.template">
       <field name="code">5722</field>
       <field name="name">Nachlässe 16 % Vorsteuer </field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5723" model="account.account.template">
       <field name="code">5723</field>
       <field name="name">Nachlässe 15 % Vorsteuer </field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5724" model="account.account.template">
       <field name="code">5724</field>
       <field name="name">Nachlässe aus innergemeinschaftlichem Erwerb 7% Vorsteuer und 7% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5725" model="account.account.template">
       <field name="code">5725</field>
       <field name="name">Nachlässe aus innergemeinschaftlichem Erwerb 19% Vorsteuer und 19% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5726" model="account.account.template">
       <field name="code">5726</field>
       <field name="name">Nachlässe aus innergemeinschaftlichem Erwerb 16% Vorsteuer und 16% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5727" model="account.account.template">
       <field name="code">5727</field>
       <field name="name">Nachlässe aus innergemeinschaftlichem Erwerb 15% Vorsteuer und 15% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5730" model="account.account.template">
       <field name="code">5730</field>
       <field name="name">Erhaltene Skonti </field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5731" model="account.account.template">
       <field name="code">5731</field>
       <field name="name">Erhaltene Skonti 7% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5735" model="account.account.template">
       <field name="code">5735</field>
       <field name="name">Erhaltene Skonti 16% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5736" model="account.account.template">
       <field name="code">5736</field>
       <field name="name">Erhaltene Skonti 19% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5745" model="account.account.template">
       <field name="code">5745</field>
       <field name="name">Erhaltene Skonti aus steuerpflichtigem innergemeinschaftlichem Erwerb </field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5746" model="account.account.template">
       <field name="code">5746</field>
       <field name="name">Erhaltene Skonti aus steuerpflichtigem innergemeinschaftlichem Erwerb 7% Vorsteuer und 7% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5748" model="account.account.template">
       <field name="code">5748</field>
       <field name="name">Erhaltene Skonti aus steuerpflichtigem innergemeinschaftlichem Erwerb 19% Vorsteuer und 19% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5749" model="account.account.template">
       <field name="code">5749</field>
       <field name="name">Erhaltene Skonti aus steuerpflichtigem innergemeinschaftlichem Erwerb 16% Vorsteuer und 16% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5750" model="account.account.template">
       <field name="code">5750</field>
       <field name="name">Erhaltene Boni 7% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5760" model="account.account.template">
       <field name="code">5760</field>
       <field name="name">Erhaltene Boni 19% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5764" model="account.account.template">
       <field name="code">5764</field>
       <field name="name">Erhaltene Boni 16% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5769" model="account.account.template">
       <field name="code">5769</field>
       <field name="name">Erhaltene Boni </field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5770" model="account.account.template">
       <field name="code">5770</field>
       <field name="name">Erhaltene Rabatte</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5780" model="account.account.template">
       <field name="code">5780</field>
       <field name="name">Erhaltene Rabatte 7% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5790" model="account.account.template">
       <field name="code">5790</field>
       <field name="name">Erhaltene Rabatte 19% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5794" model="account.account.template">
       <field name="code">5794</field>
       <field name="name">Erhaltene Rabatte 16% Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5800" model="account.account.template">
       <field name="code">5800</field>
       <field name="name">Bezugsnebenkosten</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5820" model="account.account.template">
       <field name="code">5820</field>
       <field name="name">Leergut</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5840" model="account.account.template">
       <field name="code">5840</field>
       <field name="name">Zölle und Einfuhrabgaben</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5860" model="account.account.template">
       <field name="code">5860</field>
       <field name="name">Verrechnete Stoffkosten (Gegenkonto 5000-99)</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5880" model="account.account.template">
       <field name="code">5880</field>
       <field name="name">Bestandsveränderungen Roh- Hilfs- und Betriebsstoffe/Waren</field>
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K5GVA3" model="account.account.template">
       <field name="code">K5GVA3</field>
       <field name="name">Aufwendungen für bezogene Leistungen</field>
@@ -9822,7 +9822,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K5GVA31" model="account.account.template">
       <field name="code">K5GVA31</field>
       <field name="name">Aufwendungen für bezogene Leistungen</field>
@@ -9830,16 +9830,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_5900" model="account.account.template">
       <field name="code">5900</field>
       <field name="name">Fremdleistungen</field>
       <field name="parent_id" ref="chart_skr04_K5GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K5GVA4" model="account.account.template">
       <field name="code">K5GVA4</field>
       <field name="name">Umsätze- für die als Leistungsempfänger die Steuer nach § 13b Abs. 2 UStG geschuldet wird</field>
@@ -9847,7 +9847,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K5GVA41" model="account.account.template">
       <field name="code">K5GVA41</field>
       <field name="name">Aufwendungen für bezogene Leistungen</field>
@@ -9855,151 +9855,151 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_5910" model="account.account.template">
       <field name="code">5910</field>
       <field name="name">Bauleistungen eines im Inland ansässigen Unternehmers 7% Vorsteuer und 7% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5915" model="account.account.template">
       <field name="code">5915</field>
       <field name="name">Leistungen eines im Ausland ansässigen Unternehmers 7% Vorsteuer und 7% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5920" model="account.account.template">
       <field name="code">5920</field>
       <field name="name">Bauleistungen eines im Inland ansässigen Unternehmers 19% Vorsteuer und 19% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5922" model="account.account.template">
       <field name="code">5922</field>
       <field name="name">Bauleistungen eines im Inland ansässigen Unternehmers 16% Vorsteuer und 16% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5925" model="account.account.template">
       <field name="code">5925</field>
       <field name="name">Leistungen eines im Ausland ansässigen Unternehmers 19% Vorsteuer und 19% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5927" model="account.account.template">
       <field name="code">5927</field>
       <field name="name">Leistungen eines im Ausland ansässigen Unternehmers 16% Vorsteuer und 16% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5930" model="account.account.template">
       <field name="code">5930</field>
       <field name="name">Bauleistungen eines im Inland ansässigen Unternehmers ohne Vorsteuer und 7% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5935" model="account.account.template">
       <field name="code">5935</field>
       <field name="name">Leistungen eines im Ausland ansässigen Unternehmers ohne Vorsteuer und 7% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5940" model="account.account.template">
       <field name="code">5940</field>
       <field name="name">Bauleistungen eines im Inland ansässigen Unternehmers ohne Vorsteuer und 19% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5942" model="account.account.template">
       <field name="code">5942</field>
       <field name="name">Bauleistungen eines im Inland ansässigen Unternehmers ohne Vorsteuer und 16% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5945" model="account.account.template">
       <field name="code">5945</field>
       <field name="name">Leistungen eines im Ausland ansässigen Unternehmers ohne Vorsteuer und 19% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5947" model="account.account.template">
       <field name="code">5947</field>
       <field name="name">Leistungen eines im Ausland ansässigen Unternehmers ohne Vorsteuer und 16% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5950" model="account.account.template">
       <field name="code">5950</field>
       <field name="name">Erhaltene Skonti aus Leistungen- für die als Leistungsempfänger die Steuer nach § 13b UStG geschuldet wird</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5951" model="account.account.template">
       <field name="code">5951</field>
       <field name="name">Erhaltene Skonti aus Leistungen- für die als Leistungsempfänger die Steuer nach § 13b UStG geschuldet wird 19% Vorsteuer und 19% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5952" model="account.account.template">
       <field name="code">5952</field>
       <field name="name">Erhaltene Skonti aus Leistungen- für die als Leistungsempfänger die Steuer nach § 13b UStG geschuldet wird 16% Vorsteuer und 16% Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_5953" model="account.account.template">
       <field name="code">5953</field>
       <field name="name">Erhaltene Skonti aus Leistungen- für die als Leistungsempfänger die Steuer nach § 13b UStG geschuldet wird ohne Vorsteuer aber mit Umsatzsteuer</field>
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA1" model="account.account.template">
       <field name="code">K6GVA1</field>
       <field name="name">Personalaufwand</field>
@@ -10007,7 +10007,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA11" model="account.account.template">
       <field name="code">K6GVA11</field>
       <field name="name">Löhne und Gehälter</field>
@@ -10015,160 +10015,160 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_6000" model="account.account.template">
       <field name="code">6000</field>
       <field name="name">Löhne und Gehälter</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6010" model="account.account.template">
       <field name="code">6010</field>
       <field name="name">Löhne </field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6020" model="account.account.template">
       <field name="code">6020</field>
       <field name="name">Gehälter</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6024" model="account.account.template">
       <field name="code">6024</field>
       <field name="name">Geschäftsführergehälter der GmbH-Gesellschafter</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6026" model="account.account.template">
       <field name="code">6026</field>
       <field name="name">Tantiemen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6027" model="account.account.template">
       <field name="code">6027</field>
       <field name="name">Geschäftsführergehälter </field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6028" model="account.account.template">
       <field name="code">6028</field>
       <field name="name">Vergütungen an angestellte Mitunternehmer § 15 EStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6030" model="account.account.template">
       <field name="code">6030</field>
       <field name="name">Aushilfslöhne</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6040" model="account.account.template">
       <field name="code">6040</field>
       <field name="name">Pauschale Steuer für Aushilfen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6045" model="account.account.template">
       <field name="code">6045</field>
       <field name="name">Bedienungsgelder</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6050" model="account.account.template">
       <field name="code">6050</field>
       <field name="name">Ehegattengehalt</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6060" model="account.account.template">
       <field name="code">6060</field>
       <field name="name">Freiwillige soziale Aufwendungen- lohnsteuerpflichtig</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6069" model="account.account.template">
       <field name="code">6069</field>
       <field name="name">Pauschale Steuer auf sonstige Bezüge (z.B. Fahrkosten Zuschüsse)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6070" model="account.account.template">
       <field name="code">6070</field>
       <field name="name">Krankengeldzuschüsse</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6075" model="account.account.template">
       <field name="code">6075</field>
       <field name="name">Zuschüsse der Agenturen für Arbeit (Haben)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6080" model="account.account.template">
       <field name="code">6080</field>
       <field name="name">Vermögenswirksame Leistungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6090" model="account.account.template">
       <field name="code">6090</field>
       <field name="name">Fahrkostenerstattung Wohnung/Arbeitsstätte</field>
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA12" model="account.account.template">
       <field name="code">K6GVA12</field>
       <field name="name">Soziale Abgaben und Aufwendungen für Altersversorgung und für Unterstützung</field>
@@ -10176,106 +10176,106 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_6100" model="account.account.template">
       <field name="code">6100</field>
       <field name="name">Soziale Abgaben und Aufwendungen für Altersversorgung und für Unterstützung</field>
       <field name="parent_id" ref="chart_skr04_K6GVA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6110" model="account.account.template">
       <field name="code">6110</field>
       <field name="name">Gesetzliche soziale Aufwendungen</field>
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6118" model="account.account.template">
       <field name="code">6118</field>
       <field name="name">Gesetzliche soziale Aufwendungen für Mitunternehmer § 15 EStG</field>
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6120" model="account.account.template">
       <field name="code">6120</field>
       <field name="name">Beiträge zur Berufsgenossenschaft</field>
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6130" model="account.account.template">
       <field name="code">6130</field>
       <field name="name">Freiwillige soziale Aufwendungen- lohnsteuerfrei</field>
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6140" model="account.account.template">
       <field name="code">6140</field>
       <field name="name">Aufwendungen für Altersversorgung</field>
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6147" model="account.account.template">
       <field name="code">6147</field>
       <field name="name">Pauschale Steuer auf sonstige Bezüge (z.B. Direktversicherungen)</field>
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6148" model="account.account.template">
       <field name="code">6148</field>
       <field name="name">Aufwendungen für Altersversorgung für Mitunternehmer § 15 EStG</field>
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6150" model="account.account.template">
       <field name="code">6150</field>
       <field name="name">Versorgungskassen</field>
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6160" model="account.account.template">
       <field name="code">6160</field>
       <field name="name">Aufwendungen für Unterstützung</field>
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6170" model="account.account.template">
       <field name="code">6170</field>
       <field name="name">Sonstige soziale Abgaben</field>
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA2" model="account.account.template">
       <field name="code">K6GVA2</field>
       <field name="name">Abschreibungen auf immaterielle Vermögensgegenstände des Anlagevermögens und Sachanlagen sowie auf aktivierte Aufwendungen für die Ingangsetzung und Erweiterung des Geschäftsbetriebs</field>
@@ -10283,7 +10283,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA21" model="account.account.template">
       <field name="code">K6GVA21</field>
       <field name="name">Abschreibungen auf immaterielle Vermögensgegenstände des Anlagevermögens und Sachanlagen sowie auf aktivierte Aufwendungen für die Ingangsetzung und Erweiterung des Geschäftsbetriebs</field>
@@ -10291,187 +10291,187 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_6200" model="account.account.template">
       <field name="code">6200</field>
       <field name="name">Abschreibungen auf immaterielle Vermögensgegenstände</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6205" model="account.account.template">
       <field name="code">6205</field>
       <field name="name">Abschreibungen auf den Geschäfts- oder Firmenwert</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6210" model="account.account.template">
       <field name="code">6210</field>
       <field name="name">Außerplanmäßige Abschreibungen auf immaterielle Vermögensgegenstände</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6220" model="account.account.template">
       <field name="code">6220</field>
       <field name="name">Abschreibungen auf Sachanlagen (ohne AfA auf Kfz und Gebäude)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6221" model="account.account.template">
       <field name="code">6221</field>
       <field name="name">Abschreibungen auf Gebäude</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6222" model="account.account.template">
       <field name="code">6222</field>
       <field name="name">Abschreibungen auf Kfz</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6223" model="account.account.template">
       <field name="code">6223</field>
       <field name="name">Abschreibungen auf Gebäudeteil des häuslischen Arbeitszimmers</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6230" model="account.account.template">
       <field name="code">6230</field>
       <field name="name">Außerplanmäßige Abschreibungen auf Sachanlagen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6231" model="account.account.template">
       <field name="code">6231</field>
       <field name="name">Absetzung für Außergewöhnliche technische und wirtschaftliche Abnutzung der Gebäude</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6232" model="account.account.template">
       <field name="code">6232</field>
       <field name="name">Absetzung für Außergewöhnliche technische und wirtschaftliche Abnutzung des Kfz</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6233" model="account.account.template">
       <field name="code">6233</field>
       <field name="name">Absetzung für Außergewöhnliche technische und wirtschaftliche Abnutzung sonstiger Wirtschaftsgüter</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6240" model="account.account.template">
       <field name="code">6240</field>
       <field name="name">Abschreibungen auf Sachanlagen auf Grund steuerlicher Sondervorschriften </field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6241" model="account.account.template">
       <field name="code">6241</field>
       <field name="name">Sonderabschreibungen nach § 7g Abs. 1 u. 2 EStG (ohne Kfz)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6242" model="account.account.template">
       <field name="code">6242</field>
       <field name="name">Sonderabschreibungen nach § 7g Abs. 1 u. 2 EStG (für Kfz)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6250" model="account.account.template">
       <field name="code">6250</field>
       <field name="name">Kaufleasing</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6260" model="account.account.template">
       <field name="code">6260</field>
       <field name="name">Sofortabschreibungen geringwertiger Wirtschaftsgüter</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6262" model="account.account.template">
       <field name="code">6262</field>
       <field name="name">Abschreibungen auf aktivierte- geringwertige Wirtschaftsgüter</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6266" model="account.account.template">
       <field name="code">6266</field>
       <field name="name">Außerplanmaßige Abschreibungen auf aktivierte- geringwertige Wirtschaftsgüter</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6268" model="account.account.template">
       <field name="code">6268</field>
       <field name="name">Abschreibungen auf Aufwendungen für die Ingangsetzung und Erweiterung des Geschäftsbetriebs</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6269" model="account.account.template">
       <field name="code">6269</field>
       <field name="name">Abschreibungen auf Aufwendungen für die Währungsumstellung auf den Euro</field>
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA3" model="account.account.template">
       <field name="code">K6GVA3</field>
       <field name="name">Abschreibungen a. Vermögensgeg.  d. Umlaufvermögens- soweit diese die in der Kapitalgesellschaft üblichen Abschreibungen überschreiten</field>
@@ -10479,7 +10479,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA31" model="account.account.template">
       <field name="code">K6GVA31</field>
       <field name="name">Abschreibungen a. Vermögensgeg. d. Umlaufvermögens- soweit diese die in der Kapitalgesellschaft üblichen Abschreibungen überschreiten</field>
@@ -10487,79 +10487,79 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_6270" model="account.account.template">
       <field name="code">6270</field>
       <field name="name">Abschreibungen auf Vermögensgegenstände des Umlaufvermögens (soweit unüblich hoch)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6272" model="account.account.template">
       <field name="code">6272</field>
       <field name="name">Abschreibungen auf Umlaufvermögen- steuerrechtlich bedingt (soweit unüblich hoch)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6275" model="account.account.template">
       <field name="code">6275</field>
       <field name="name">Vorwegnahme künftiger Wertschwankungen im Umlaufvermögen (soweit unüblich hoch)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6280" model="account.account.template">
       <field name="code">6280</field>
       <field name="name">Forderungsverluste (soweit unüblich hoch)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6281" model="account.account.template">
       <field name="code">6281</field>
       <field name="name">Forderungsverluste 7% USt (soweit unüblich hoch)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6285" model="account.account.template">
       <field name="code">6285</field>
       <field name="name">Forderungsverluste 16% USt (soweit unüblich hoch)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6286" model="account.account.template">
       <field name="code">6286</field>
       <field name="name">Forderungsverluste 19% USt (soweit unüblich hoch)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6287" model="account.account.template">
       <field name="code">6287</field>
       <field name="name">Forderungsverluste 15% USt (soweit unüblich hoch)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA4" model="account.account.template">
       <field name="code">K6GVA4</field>
       <field name="name">Sonstige betriebliche Aufwendungen</field>
@@ -10567,7 +10567,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA41" model="account.account.template">
       <field name="code">K6GVA41</field>
       <field name="name">Sonstige betriebliche Aufwendungen</field>
@@ -10575,1447 +10575,1447 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_6300" model="account.account.template">
       <field name="code">6300</field>
       <field name="name">Sonstige betriebliche Aufwendungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6303" model="account.account.template">
       <field name="code">6303</field>
       <field name="name">Fremdleistungen / Fremdarbeiten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6304" model="account.account.template">
       <field name="code">6304</field>
       <field name="name">Sonstige Aufwendungen betrieblich und Regelmäßig</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6305" model="account.account.template">
       <field name="code">6305</field>
       <field name="name">Raumkosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6310" model="account.account.template">
       <field name="code">6310</field>
       <field name="name">Mietekosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6313" model="account.account.template">
       <field name="code">6313</field>
       <field name="name">Gewerbesteuerlich zu berücksichtigende Miete § 8 GewStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6314" model="account.account.template">
       <field name="code">6314</field>
       <field name="name">Vergütungen an Mitunternehmer für die mietweise überlassung ihrer Wirtschaftsgüter § 15 EStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6315" model="account.account.template">
       <field name="code">6315</field>
       <field name="name">Pacht</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6318" model="account.account.template">
       <field name="code">6318</field>
       <field name="name">Gewerbesteuerlich zu berücksichtigende Pacht § 8 GewStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6319" model="account.account.template">
       <field name="code">6319</field>
       <field name="name">Vergütungen an Mitunternehmer für die Pachtweise überlassung ihrer Wirtschaftsgüter § 15 EStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6320" model="account.account.template">
       <field name="code">6320</field>
       <field name="name">Heizung</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6325" model="account.account.template">
       <field name="code">6325</field>
       <field name="name">Gas- Strom- Wasser</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6330" model="account.account.template">
       <field name="code">6330</field>
       <field name="name">Reinigung</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6335" model="account.account.template">
       <field name="code">6335</field>
       <field name="name">Instandhaltung betrieblicher Räume</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6340" model="account.account.template">
       <field name="code">6340</field>
       <field name="name">Abgaben für betrieblich genutzten Grundbesitz</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6345" model="account.account.template">
       <field name="code">6345</field>
       <field name="name">Sonstige Raumkosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6348" model="account.account.template">
       <field name="code">6348</field>
       <field name="name">Aufwendungen für ein häusliches Arbeitszimmer (abziehbarer Anteil)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6349" model="account.account.template">
       <field name="code">6349</field>
       <field name="name">Aufwendungen für ein häusliches Arbeitszimmer (nicht abziehbarer Anteil)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6350" model="account.account.template">
       <field name="code">6350</field>
       <field name="name">Grundstückaufwendungen- betrieblich</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6352" model="account.account.template">
       <field name="code">6352</field>
       <field name="name">Grundstückaufwendungen- sonstige neutrale</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6390" model="account.account.template">
       <field name="code">6390</field>
       <field name="name">Zuwendungen- Spenden- steuerlich nicht abziehbar</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6391" model="account.account.template">
       <field name="code">6391</field>
       <field name="name">Zuwendungen- Spenden für wissenschaftliche und kulturelle Zwecke</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6392" model="account.account.template">
       <field name="code">6392</field>
       <field name="name">Zuwendungen- Spenden für mildtätige Zwecke</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6393" model="account.account.template">
       <field name="code">6393</field>
       <field name="name">Zuwendungen- Spenden für kirchliche- religiöse und gemeinnützige Zwecke</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6394" model="account.account.template">
       <field name="code">6394</field>
       <field name="name">Zuwendungen- Spenden an politische Parteien</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6395" model="account.account.template">
       <field name="code">6395</field>
       <field name="name">Zuwendungen- Spenden an Stiftungen für gemeinnützige Zwecke i. S. d. § 52 Abs. 2 Nr. 1-3 AO</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6396" model="account.account.template">
       <field name="code">6396</field>
       <field name="name">Zuwendungen- Spenden an Stiftungen für gemeinnützige Zwecke i. S. d. § 52 Abs. 2 Nr. 4 AO</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6397" model="account.account.template">
       <field name="code">6397</field>
       <field name="name">Zuwendungen- Spenden an Stiftungen für Kirchliche- religiöse und gemeinnützige Zwecke</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6398" model="account.account.template">
       <field name="code">6398</field>
       <field name="name">Zuwendungen- Spenden an Stiftungen für wissenschaftliche- mitdtätige- kulturelle Zwecke</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6400" model="account.account.template">
       <field name="code">6400</field>
       <field name="name">Versicherungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6405" model="account.account.template">
       <field name="code">6405</field>
       <field name="name">Versicherungen für Gebäude</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6410" model="account.account.template">
       <field name="code">6410</field>
       <field name="name">Netto-Prämie für Rückdeckung künftiger Versorgungsleistungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6420" model="account.account.template">
       <field name="code">6420</field>
       <field name="name">Beiträge </field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6430" model="account.account.template">
       <field name="code">6430</field>
       <field name="name">Sonstige Abgaben</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6436" model="account.account.template">
       <field name="code">6436</field>
       <field name="name">Steuerlich abzugsfähige Verspätungszuschläge und Zwangsgelder</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6437" model="account.account.template">
       <field name="code">6437</field>
       <field name="name">steuerlich nicht abzugsfähige Verspätungszuschläge und Zwangsgelder</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6440" model="account.account.template">
       <field name="code">6440</field>
       <field name="name">Ausgleichsabgabe i. S. d. Schwerbehindertengesetzes</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6450" model="account.account.template">
       <field name="code">6450</field>
       <field name="name">Reparaturen und Instandhaltung von Bauten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6460" model="account.account.template">
       <field name="code">6460</field>
       <field name="name">Reparaturen und Instandhaltung von technischen Anlagen und Maschinen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6470" model="account.account.template">
       <field name="code">6470</field>
       <field name="name">Reparaturen und Instandhaltung von Betriebs- und Geschäftsausstattung</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6485" model="account.account.template">
       <field name="code">6485</field>
       <field name="name">Reparaturen und Instandhaltung von anderen Anlagen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6490" model="account.account.template">
       <field name="code">6490</field>
       <field name="name">Sonstige Reparaturen und Instandhaltung </field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6495" model="account.account.template">
       <field name="code">6495</field>
       <field name="name">Wartungskosten für Hard- und Software</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6498" model="account.account.template">
       <field name="code">6498</field>
       <field name="name">Mietleasing</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6499" model="account.account.template">
       <field name="code">6499</field>
       <field name="name">Gewerbesteuerlich zu berücksichtigendes Mietleasing § 8 GewStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6500" model="account.account.template">
       <field name="code">6500</field>
       <field name="name">Fahrzeugkosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6520" model="account.account.template">
       <field name="code">6520</field>
       <field name="name">Kfz-Versicherungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6530" model="account.account.template">
       <field name="code">6530</field>
       <field name="name">Laufende Kfz-Betriebskosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6540" model="account.account.template">
       <field name="code">6540</field>
       <field name="name">kfz-Reparaturen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6550" model="account.account.template">
       <field name="code">6550</field>
       <field name="name">Garagenmiete</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6560" model="account.account.template">
       <field name="code">6560</field>
       <field name="name">Leasingfahrzeugkosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6570" model="account.account.template">
       <field name="code">6570</field>
       <field name="name">Sonstige Kfz-kosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6580" model="account.account.template">
       <field name="code">6580</field>
       <field name="name">Mautgebühren</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6590" model="account.account.template">
       <field name="code">6590</field>
       <field name="name">Kfz-Kosten für betrieblich genutzte zum Privatvermögen gehörende Kraftfahrzeuge</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6595" model="account.account.template">
       <field name="code">6595</field>
       <field name="name">Fremdfahrzeugkosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6600" model="account.account.template">
       <field name="code">6600</field>
       <field name="name">Werbekosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6610" model="account.account.template">
       <field name="code">6610</field>
       <field name="name">Geschenke abzugsfähig</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6620" model="account.account.template">
       <field name="code">6620</field>
       <field name="name">Geschenke nicht abzugsfähig</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6625" model="account.account.template">
       <field name="code">6625</field>
       <field name="name">Geschenke ausschließlich betrieblich genutzt</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6630" model="account.account.template">
       <field name="code">6630</field>
       <field name="name">Repräsentationskosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6640" model="account.account.template">
       <field name="code">6640</field>
       <field name="name">Bewirtungskosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6641" model="account.account.template">
       <field name="code">6641</field>
       <field name="name">Sonstige eingeschränkt abziehbare Betriebsausgaben (abziehbarer Anteil)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6642" model="account.account.template">
       <field name="code">6642</field>
       <field name="name">Sonstige eingeschränkt abziehbare Betriebsausgaben (nicht abziehbarer Anteil)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6643" model="account.account.template">
       <field name="code">6643</field>
       <field name="name">Aufmerksamkeiten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6644" model="account.account.template">
       <field name="code">6644</field>
       <field name="name">Nicht Abzugsfähige Bewirtungskosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6645" model="account.account.template">
       <field name="code">6645</field>
       <field name="name">Nicht Abzugsfähige Betriebsausgaben aus Werbe- und Repräsentationskosten (nicht abziehbarer Anteil)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6650" model="account.account.template">
       <field name="code">6650</field>
       <field name="name">Reisekosten Arbeitnehmer</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6652" model="account.account.template">
       <field name="code">6652</field>
       <field name="name">Reisekosten Arbeitnehmer (nicht abziehbarer Anteil)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6660" model="account.account.template">
       <field name="code">6660</field>
       <field name="name">Reisekosten Arbeitnehmer übernachtungsaufwand</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6663" model="account.account.template">
       <field name="code">6663</field>
       <field name="name">Reisekosten Arbeitnehmer Fahrkosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6664" model="account.account.template">
       <field name="code">6664</field>
       <field name="name">Reisekosten Arbeitnehmer Verpflegungsmehraufwand</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6668" model="account.account.template">
       <field name="code">6668</field>
       <field name="name">Kilometergelderstattung Arbeitnehmer</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6670" model="account.account.template">
       <field name="code">6670</field>
       <field name="name">Reisekosten Unternehmer</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6672" model="account.account.template">
       <field name="code">6672</field>
       <field name="name">Reisekosten Unternehmer (nicht abziehbarer anteil)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6673" model="account.account.template">
       <field name="code">6673</field>
       <field name="name">Reisekosten Unternehmer Fahrkosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6674" model="account.account.template">
       <field name="code">6674</field>
       <field name="name">Reisekosten Unternehmer Verpflegungsmehraufwand</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6680" model="account.account.template">
       <field name="code">6680</field>
       <field name="name">Reisekosten Unternehmer übernachtungsaufwand</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6688" model="account.account.template">
       <field name="code">6688</field>
       <field name="name">Fahrten zwischen Wohnung und Arbeitsstätte (abziehbarer Anteil)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6689" model="account.account.template">
       <field name="code">6689</field>
       <field name="name">Fahrten zwischen Wohnung und Arbeitsstätte (nicht abziehbarer Anteil)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6690" model="account.account.template">
       <field name="code">6690</field>
       <field name="name">Fahrten zwischen Wohnung und Arbeitsstätte (Haben)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6700" model="account.account.template">
       <field name="code">6700</field>
       <field name="name">Kosten der Warenabgabe</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6710" model="account.account.template">
       <field name="code">6710</field>
       <field name="name">Verpackungsmaterial</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6740" model="account.account.template">
       <field name="code">6740</field>
       <field name="name">Ausgangsfrachten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6760" model="account.account.template">
       <field name="code">6760</field>
       <field name="name">Transportversicherungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6770" model="account.account.template">
       <field name="code">6770</field>
       <field name="name">Verkaufsprovisionen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6780" model="account.account.template">
       <field name="code">6780</field>
       <field name="name">Fremdarbeiten (Vertrieb)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6790" model="account.account.template">
       <field name="code">6790</field>
       <field name="name">Aufwand für Gewährleistung</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6800" model="account.account.template">
       <field name="code">6800</field>
       <field name="name">Porto</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6805" model="account.account.template">
       <field name="code">6805</field>
       <field name="name">Telefon</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6810" model="account.account.template">
       <field name="code">6810</field>
       <field name="name">Telefax und Internetkosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6815" model="account.account.template">
       <field name="code">6815</field>
       <field name="name">Bürobedarf</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6820" model="account.account.template">
       <field name="code">6820</field>
       <field name="name">Zeitschriften und Bücher</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6821" model="account.account.template">
       <field name="code">6821</field>
       <field name="name">Fortbildungskosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6822" model="account.account.template">
       <field name="code">6822</field>
       <field name="name">Freiwillige Sozialleistungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6823" model="account.account.template">
       <field name="code">6823</field>
       <field name="name">Vergütungen an Mitunternehmer § 15 EStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6824" model="account.account.template">
       <field name="code">6824</field>
       <field name="name">Haftungsvergütung an Mitunternehmer § 15 EStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6825" model="account.account.template">
       <field name="code">6825</field>
       <field name="name">Rechts- und Beratungskosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6827" model="account.account.template">
       <field name="code">6827</field>
       <field name="name">Abschluss- und Prüfungskosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6830" model="account.account.template">
       <field name="code">6830</field>
       <field name="name">Buchführungskosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6835" model="account.account.template">
       <field name="code">6835</field>
       <field name="name">Mieten für Einrichtungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6839" model="account.account.template">
       <field name="code">6839</field>
       <field name="name">Gewerbesteuerlich zu berücksichtigende Miete für Einrichtungen § 8 GewStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6840" model="account.account.template">
       <field name="code">6840</field>
       <field name="name">Mietleasing</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6844" model="account.account.template">
       <field name="code">6844</field>
       <field name="name">Gewerbesteuerlich zu berücksichtigendes Mietleasing § 8 GewStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6845" model="account.account.template">
       <field name="code">6845</field>
       <field name="name">Werkzeuge und Kleingeräte</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6850" model="account.account.template">
       <field name="code">6850</field>
       <field name="name">Sonstiger Betriebsbedarf</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6855" model="account.account.template">
       <field name="code">6855</field>
       <field name="name">Nebenkosten des Geldverkehrs</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6856" model="account.account.template">
       <field name="code">6856</field>
       <field name="name">Aufwendungen aus Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsfähig (inlandische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6857" model="account.account.template">
       <field name="code">6857</field>
       <field name="name">Aufwendungen aus der Veräußerung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsfähig (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6859" model="account.account.template">
       <field name="code">6859</field>
       <field name="name">Aufwendungen für Abraum- und Abfallbeseitigung</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6860" model="account.account.template">
       <field name="code">6860</field>
       <field name="name">Nicht abziehbare Vorsteuer</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6865" model="account.account.template">
       <field name="code">6865</field>
       <field name="name">Nicht abziehbare Vorsteuer 7% </field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6870" model="account.account.template">
       <field name="code">6870</field>
       <field name="name">Nicht abziehbare Vorsteuer 16% </field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6871" model="account.account.template">
       <field name="code">6871</field>
       <field name="name">Nicht abziehbare Vorsteuer 19% </field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6875" model="account.account.template">
       <field name="code">6875</field>
       <field name="name">Nicht abziehbare Hälfte der Aufsichtsratsvergütungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6876" model="account.account.template">
       <field name="code">6876</field>
       <field name="name">Abziehbare Aufsichtsratsvergütungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6880" model="account.account.template">
       <field name="code">6880</field>
       <field name="name">Aufwendungen aus Kursdifferenzen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6883" model="account.account.template">
       <field name="code">6883</field>
       <field name="name">Aufwendungen aus Bewertung Finanzmittelfonds</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6884" model="account.account.template">
       <field name="code">6884</field>
       <field name="name">Erlöse aus Verkäufen Sachanlagevermögen steuerfrei § 4 Nr. 1a UStG (bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6885" model="account.account.template">
       <field name="code">6885</field>
       <field name="name">Erlöse aus Verkäufen Sachanlagevermögen 19% USt (bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6886" model="account.account.template">
       <field name="code">6886</field>
       <field name="name">Erlöse aus Verkäufen Sachanlagevermögen 16% USt (bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6888" model="account.account.template">
       <field name="code">6888</field>
       <field name="name">Erlöse aus Verkäufen Sachanlagevermögen steuerfrei § 4 Nr. 1b UStG (bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6889" model="account.account.template">
       <field name="code">6889</field>
       <field name="name">Erlöse aus Verkäufen Sachanlagevermögen (bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6890" model="account.account.template">
       <field name="code">6890</field>
       <field name="name">Erlöse aus Verkäufen immaterieller Vermögensgegenstände (bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6891" model="account.account.template">
       <field name="code">6891</field>
       <field name="name">Erlöse aus Verkäufen Finanzanlagen (bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6892" model="account.account.template">
       <field name="code">6892</field>
       <field name="name">Erlöse aus Verkäufen Finanzanlagen 100% / 50% steuerfrei (inlandische Kap.Ges.)(bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6895" model="account.account.template">
       <field name="code">6895</field>
       <field name="name">Anlagenabgänge Sachanlagen (Restbuchwert bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6896" model="account.account.template">
       <field name="code">6896</field>
       <field name="name">Anlagenabgänge immaterielle Vermögensgegenstände (Restbuchwert bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6897" model="account.account.template">
       <field name="code">6897</field>
       <field name="name">Anlagenabgänge Finanzanlagen (Restbuchwert bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6898" model="account.account.template">
       <field name="code">6898</field>
       <field name="name">Anlagenabgänge Finanzanlagen 100% / 50% steuerfrei (inländische Kap. Ges.)(Restbuchwert bei Buchverlust)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6900" model="account.account.template">
       <field name="code">6900</field>
       <field name="name">Verluste aus dem Abgang von Gegenständen des Anlagevermögens</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6903" model="account.account.template">
       <field name="code">6903</field>
       <field name="name">Verluste aus der Veräußerung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsfähig (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6905" model="account.account.template">
       <field name="code">6905</field>
       <field name="name">Verluste aus dem Abgang von Gegenständen des Umlaufvermögens außer Vorräte</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6906" model="account.account.template">
       <field name="code">6906</field>
       <field name="name">Verluste aus dem Abgang von Gegenständen des Umlaufvermögens (außer Vorräte) 100% / 50% nicht anzugsfähig (inlandische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6907" model="account.account.template">
       <field name="code">6907</field>
       <field name="name">Abgang von Wirtschaftsgütern des Umlaufvermögens nach § 4 Abs. 3 Satz 4 EStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6908" model="account.account.template">
       <field name="code">6908</field>
       <field name="name">Abgang von Wirtschaftsgütern des Umlaufvermögens 100% / 50% nicht abzugsfähig (inlandische Kap. Ges.) nach § 4 Abs. 3 Satz 4 EStG</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6910" model="account.account.template">
       <field name="code">6910</field>
       <field name="name">Abschreibung auf Umlaufvermögen außer Vorräte und Wertpapieren des UV (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6912" model="account.account.template">
       <field name="code">6912</field>
       <field name="name">Abschreibung auf Umlaufvermögen außer Vorräte und Wertpapieren des UV- steuerlich bedingt (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6915" model="account.account.template">
       <field name="code">6915</field>
       <field name="name">Vorwegnahme künftiger Wertschwankungen im Umlaufvermögen außer Vorräte und Wertpapiere</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6916" model="account.account.template">
       <field name="code">6916</field>
       <field name="name">Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten Verbindlichkeiten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6917" model="account.account.template">
       <field name="code">6917</field>
       <field name="name">Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten Rückstellungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6920" model="account.account.template">
       <field name="code">6920</field>
       <field name="name">Einstellungen in die Pauschalwertberichtigung zu Forderungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6923" model="account.account.template">
       <field name="code">6923</field>
       <field name="name">Einstellungen in die Einzelwertberichtigung zu Forderungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6925" model="account.account.template">
       <field name="code">6925</field>
       <field name="name">Einstellungen in Sonderposten mit Rücklageanteil (Steuerfreie Rücklagen)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6926" model="account.account.template">
       <field name="code">6926</field>
       <field name="name">Einstellungen in Sonderposten mit Rücklageanteil (Ansparabschreibungen)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6927" model="account.account.template">
       <field name="code">6927</field>
       <field name="name">Einstellungen in Sonderposten mit Rücklageanteil (Sonderabschreibungen)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6928" model="account.account.template">
       <field name="code">6928</field>
       <field name="name">Einstellungen in Sonderposten mit Rücklageanteil (Existenzgründerrücklage)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6929" model="account.account.template">
       <field name="code">6929</field>
       <field name="name">Einstellungen in Sonderposten mit Rücklageanteil (§ 52 Abs. 16 EStG)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6930" model="account.account.template">
       <field name="code">6930</field>
       <field name="name">Forderungsverluste (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6931" model="account.account.template">
       <field name="code">6931</field>
       <field name="name">Forderungsverluste 7 % USt (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6932" model="account.account.template">
       <field name="code">6932</field>
       <field name="name">Forderungsverluste aus steuerfreien EG-Lieferungen (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6933" model="account.account.template">
       <field name="code">6933</field>
       <field name="name">Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 7% USt (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6934" model="account.account.template">
       <field name="code">6934</field>
       <field name="name">Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 16% USt (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6935" model="account.account.template">
       <field name="code">6935</field>
       <field name="name">Forderungsverluste 16% USt (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6936" model="account.account.template">
       <field name="code">6936</field>
       <field name="name">Forderungsverluste 19% USt (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6937" model="account.account.template">
       <field name="code">6937</field>
       <field name="name">Forderungsverluste 15% USt (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6938" model="account.account.template">
       <field name="code">6938</field>
       <field name="name">Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 19% USt (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6939" model="account.account.template">
       <field name="code">6939</field>
       <field name="name">Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 15% USt (übliche Höhe)</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6960" model="account.account.template">
       <field name="code">6960</field>
       <field name="name">Periodenfremde Aufwendungen soweit nicht außerordentlich</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6967" model="account.account.template">
       <field name="code">6967</field>
       <field name="name">Sonstige Aufwendungen betrieblich und regelmäßig</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6969" model="account.account.template">
       <field name="code">6969</field>
       <field name="name">Sonstige Aufwendungen unregelmäßig</field>
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA5" model="account.account.template">
       <field name="code">K6GVA5</field>
       <field name="name">Kalkulatorische Kosten</field>
@@ -12023,7 +12023,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA51" model="account.account.template">
       <field name="code">K6GVA51</field>
       <field name="name">Sonstige betriebliche Aufwendungen</field>
@@ -12031,115 +12031,115 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_6970" model="account.account.template">
       <field name="code">6970</field>
       <field name="name">Kalkulatorischer Unternehmerlohn</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6972" model="account.account.template">
       <field name="code">6972</field>
       <field name="name">Kalkulatorische Miete/Pacht</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6974" model="account.account.template">
       <field name="code">6974</field>
       <field name="name">Kalkulatorische Zinsen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6976" model="account.account.template">
       <field name="code">6976</field>
       <field name="name">Kalkulatorische Abschreibungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6978" model="account.account.template">
       <field name="code">6978</field>
       <field name="name">Kalkulatorische Wagnisse</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6979" model="account.account.template">
       <field name="code">6979</field>
       <field name="name">Kalkulatorischer Lohn für unentgeltliche Mitarbeiter</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6980" model="account.account.template">
       <field name="code">6980</field>
       <field name="name">Verrechneter kalkulatorischer Unternehmerlohn</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6982" model="account.account.template">
       <field name="code">6982</field>
       <field name="name">Verrechnete kalkulatorische Miete/Pacht</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6984" model="account.account.template">
       <field name="code">6984</field>
       <field name="name">Verrechnete kalkulatorische Zinsen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6986" model="account.account.template">
       <field name="code">6986</field>
       <field name="name">Verrechnete kalkulatorische Abschreibungen</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6988" model="account.account.template">
       <field name="code">6988</field>
       <field name="name">Verrechnete kalkulatorische Wagnisse</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6989" model="account.account.template">
       <field name="code">6989</field>
       <field name="name">Verrechneter kalkulatorischer Lohn für unentgeltliche Mitarbeiter</field>
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA6" model="account.account.template">
       <field name="code">K6GVA6</field>
       <field name="name">Kosten bei Anwendung des Umsatzkostenverfahrens</field>
@@ -12147,7 +12147,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K6GVA61" model="account.account.template">
       <field name="code">K6GVA61</field>
       <field name="name">Sonstige betriebliche Aufwendungen</field>
@@ -12155,43 +12155,43 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_6990" model="account.account.template">
       <field name="code">6990</field>
       <field name="name">Herstellungskosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6992" model="account.account.template">
       <field name="code">6992</field>
       <field name="name">Verwaltungskosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6994" model="account.account.template">
       <field name="code">6994</field>
       <field name="name">Vertriebskosten</field>
       <field name="parent_id" ref="chart_skr04_K6GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_6999" model="account.account.template">
       <field name="code">6999</field>
       <field name="name">Gegenkonto 6990-6998</field>
       <field name="parent_id" ref="chart_skr04_K6GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE1" model="account.account.template">
       <field name="code">K7GVE1</field>
       <field name="name">Erträge aus Beteiligungen</field>
@@ -12199,7 +12199,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE11" model="account.account.template">
       <field name="code">K7GVE11</field>
       <field name="name">Erträge aus Beteiligungen</field>
@@ -12207,61 +12207,61 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7000" model="account.account.template">
       <field name="code">7000</field>
       <field name="name">Erträge aus Beteiligungen</field>
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7005" model="account.account.template">
       <field name="code">7005</field>
       <field name="name">Laufende Erträge aus Anteilen an Kapitalgesellschaften (Beteiligung) 100% / 50% steuerfrei (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7006" model="account.account.template">
       <field name="code">7006</field>
       <field name="name">Laufende Erträge aus Anteilen an Kapitalgesellschaften (verbundene Unternehmen) 100% / 50% steuerfrei (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7007" model="account.account.template">
       <field name="code">7007</field>
       <field name="name">Gewinne aus Anteilen an nicht steuerbefreiten inländischen Kapitalgesellschaften § 9 Nr. 2a GewStG</field>
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7008" model="account.account.template">
       <field name="code">7008</field>
       <field name="name">Gewinnanteile aus Mitunternehmerschaften § 9 GewStG</field>
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7009" model="account.account.template">
       <field name="code">7009</field>
       <field name="name">Erträge aus Beteiligungen an verbundenen Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE2" model="account.account.template">
       <field name="code">K7GVE2</field>
       <field name="name">Erträge aus anderen Wertpapieren und Ausleihungen des Finanzanlagevermögens</field>
@@ -12269,7 +12269,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE21" model="account.account.template">
       <field name="code">K7GVE21</field>
       <field name="name">Erträge aus anderen Wertpapieren und Ausleihungen des Finanzanlagevermögens</field>
@@ -12277,43 +12277,43 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7010" model="account.account.template">
       <field name="code">7010</field>
       <field name="name">Erträge aus anderen Wertpapieren und Ausleihungen des Finanzanlagevermögens</field>
       <field name="parent_id" ref="chart_skr04_K7GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7014" model="account.account.template">
       <field name="code">7014</field>
       <field name="name">Laufende Erträge aus Anteilen an Kapitalgesellschaften (Finanzanlagevermögen) 100% / 50% steuerfrei (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K7GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7015" model="account.account.template">
       <field name="code">7015</field>
       <field name="name">Laufende Erträge aus Anteilen an Kapitalgesellschaften (verbundene Unternehmen) 100% / 50% steuerfrei (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K7GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7019" model="account.account.template">
       <field name="code">7019</field>
       <field name="name">Eträge aus anderen Wertpapieren und Ausleihungen des Finanzanlagevermögens aus verbundenen Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K7GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE3" model="account.account.template">
       <field name="code">K7GVE3</field>
       <field name="name">Sonstige Zinsen und ähnliche Erträge</field>
@@ -12321,7 +12321,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE31" model="account.account.template">
       <field name="code">K7GVE31</field>
       <field name="name">Sonstige Zinsen und ähnliche Erträge</field>
@@ -12329,124 +12329,124 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7100" model="account.account.template">
       <field name="code">7100</field>
       <field name="name">Sonstige Zinsen und ähnliche Erträge</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7102" model="account.account.template">
       <field name="code">7102</field>
       <field name="name">Steuerfreie Aufzinsung des Körperschaftsteuerguthabens nach §37 KStG</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7103" model="account.account.template">
       <field name="code">7103</field>
       <field name="name">Laufende Erträge aus Anteilen an Kapitalgesellschaften (Umlaufvermögen) 100% / 50% steuerfrei (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7104" model="account.account.template">
       <field name="code">7104</field>
       <field name="name">Laufende Erträge aus Anteilen an Kapitalgesellschaften (verbundene Unternehmen) 100% / 50% steuerfrei (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7105" model="account.account.template">
       <field name="code">7105</field>
       <field name="name">Zinserträge § 233a AO</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7106" model="account.account.template">
       <field name="code">7106</field>
       <field name="name">Zinserträge § 233a AO Sonderfall anlage A KSt</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7109" model="account.account.template">
       <field name="code">7109</field>
       <field name="name">Sonstige Zinsen und ähnliche Erträge aus verbundenen Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7110" model="account.account.template">
       <field name="code">7110</field>
       <field name="name">Sonstige Zinserträge</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7119" model="account.account.template">
       <field name="code">7119</field>
       <field name="name">Sonstige Zinserträge aus verbundenen Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7120" model="account.account.template">
       <field name="code">7120</field>
       <field name="name">Zinsähnliche Erträge</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7129" model="account.account.template">
       <field name="code">7129</field>
       <field name="name">Zinsähnliche Erträge aus verbundenen Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7130" model="account.account.template">
       <field name="code">7130</field>
       <field name="name">Diskonterträge</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7139" model="account.account.template">
       <field name="code">7139</field>
       <field name="name">Diskonterträge aus verbundenen Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE4" model="account.account.template">
       <field name="code">K7GVE4</field>
       <field name="name">Erträge aus Verlustübernahme und auf Grund einer Gewinngemeinschaft- eines Gewinn- oder Teilgewinnabführungsvertrags erhaltene Gewinne</field>
@@ -12454,7 +12454,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE41" model="account.account.template">
       <field name="code">K7GVE41</field>
       <field name="name">Erträge aus Verlustübernahme </field>
@@ -12462,16 +12462,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7190" model="account.account.template">
       <field name="code">7190</field>
       <field name="name">Erträge aus Verlustübernahme</field>
       <field name="parent_id" ref="chart_skr04_K7GVE41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE42" model="account.account.template">
       <field name="code">K7GVE42</field>
       <field name="name">Auf Grund einer Gewinngemeinschaft- eines Gewinn- oder Teilgewinnabführungsvertrags erhaltene </field>
@@ -12479,25 +12479,25 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7192" model="account.account.template">
       <field name="code">7192</field>
       <field name="name">Erhaltene Gewinne auf Grund einer Gewinngemeinschaft</field>
       <field name="parent_id" ref="chart_skr04_K7GVE42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7194" model="account.account.template">
       <field name="code">7194</field>
       <field name="name">Erhaltene Gewinne auf Grund eines Gewinn- oder Teilgewinnabführungsvertrags</field>
       <field name="parent_id" ref="chart_skr04_K7GVE42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA1" model="account.account.template">
       <field name="code">K7GVA1</field>
       <field name="name">Abschreibungen auf Finanzanlagen und auf Wertpapiere des Umlaufvermögens</field>
@@ -12505,7 +12505,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA11" model="account.account.template">
       <field name="code">K7GVA11</field>
       <field name="name">Abschreibungen auf Finanzanlagen und auf Wertpapiere des Umlaufvermögens</field>
@@ -12513,79 +12513,79 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7200" model="account.account.template">
       <field name="code">7200</field>
       <field name="name">Abschreibungen auf Finanzanlagen </field>
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7204" model="account.account.template">
       <field name="code">7204</field>
       <field name="name">Abschreibungen auf Finanzanlagen 100% / 50% nicht abzugsfähig (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7208" model="account.account.template">
       <field name="code">7208</field>
       <field name="name">Abschreibungen auf Grund von Verlustanteilen an Mitunternehmerschaften § 8 GewStG</field>
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7210" model="account.account.template">
       <field name="code">7210</field>
       <field name="name">Abschreibungen auf Wertpapiere des Umlaufvermögens</field>
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7214" model="account.account.template">
       <field name="code">7214</field>
       <field name="name">Abschreibungen auf Wertpapiere des Umlaufvermögens 100% / 50% nicht abzugsfähig (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7250" model="account.account.template">
       <field name="code">7250</field>
       <field name="name">Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften</field>
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7255" model="account.account.template">
       <field name="code">7255</field>
       <field name="name">Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften 100% / 50% nicht abzugsfähig (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7260" model="account.account.template">
       <field name="code">7260</field>
       <field name="name">Vorwegnahme künftiger Wertschwankungen bei Wertpapieren des Umlaufvermögens</field>
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA2" model="account.account.template">
       <field name="code">K7GVA2</field>
       <field name="name">Zinsen und ähnliche Aufwendungen</field>
@@ -12593,7 +12593,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA21" model="account.account.template">
       <field name="code">K7GVA21</field>
       <field name="name">Zinsen und ähnliche Aufwendungen</field>
@@ -12601,205 +12601,205 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7300" model="account.account.template">
       <field name="code">7300</field>
       <field name="name">Zinsen und ähnliche Aufwendungen</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7303" model="account.account.template">
       <field name="code">7303</field>
       <field name="name">Steuerlich abzugsfähige- andere Nebenleistungen zu steuern </field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7304" model="account.account.template">
       <field name="code">7304</field>
       <field name="name">Steuerlich nicht abzugsfähige- andere Nebenleistungen zu steuern </field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7305" model="account.account.template">
       <field name="code">7305</field>
       <field name="name">Zinsaufwendungen §§ 233a AO betriebliche Steuern</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7306" model="account.account.template">
       <field name="code">7306</field>
       <field name="name">Zinsaufwendungen §§ 233a bis 237 AO Personensteuern</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7309" model="account.account.template">
       <field name="code">7309</field>
       <field name="name">Zinsen und ähnliche Aufwendungen an verbundene Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7310" model="account.account.template">
       <field name="code">7310</field>
       <field name="name">Zinsaufwendungen für kurzfristige Verbindlichkeiten</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7313" model="account.account.template">
       <field name="code">7313</field>
       <field name="name">Nicht abzugsfähige Schuldzinsen gemäß § 4 Abs. 4a EStG (Hinzurechnungsbetrag)</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7318" model="account.account.template">
       <field name="code">7318</field>
       <field name="name">In Dauerschuldzinsen unqualifizierte Zinsen auf kurzfristige Verbindlichkeiten</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7319" model="account.account.template">
       <field name="code">7319</field>
       <field name="name">Zinsaufwendungen für kurzfristige Verbindlichkeiten an verbundene Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7320" model="account.account.template">
       <field name="code">7320</field>
       <field name="name">Zinsaufwendungen für langfristige Verbindlichkeiten</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7325" model="account.account.template">
       <field name="code">7325</field>
       <field name="name">Zinsaufwendungen für Gebäude- die zum Betriebsvermögen gehören</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7326" model="account.account.template">
       <field name="code">7326</field>
       <field name="name">Zinsen zur Finanzierung des Anlagevermögens</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7327" model="account.account.template">
       <field name="code">7327</field>
       <field name="name">Renten und dauernde Lasten aus Gründung/Erwerb §8 GewStG</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7328" model="account.account.template">
       <field name="code">7328</field>
       <field name="name">Zinsaufwendungen an Mitunternehmer für die Hingabe von Kapital § 15 EStG</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7329" model="account.account.template">
       <field name="code">7329</field>
       <field name="name">Zinsaufwendungen für langfristige Verbindlichkeiten an verbundene Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7330" model="account.account.template">
       <field name="code">7330</field>
       <field name="name">Zinsähnliche Aufwendungen</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7339" model="account.account.template">
       <field name="code">7339</field>
       <field name="name">Zinsähnliche Aufwendungen an verbundene Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7340" model="account.account.template">
       <field name="code">7340</field>
       <field name="name">Diskontaufwendungen</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7349" model="account.account.template">
       <field name="code">7349</field>
       <field name="name">Diskontaufwendungen an verbundene Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7350" model="account.account.template">
       <field name="code">7350</field>
       <field name="name">Zinsen und ähnliche Aufwendungen 100% / 50% nicht abzugsfähig (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7351" model="account.account.template">
       <field name="code">7351</field>
       <field name="name">Zinsen und ähnliche Aufwendungen an verbundene Unternehmen 100% / 50% nicht abzugsfähig (inländische Kap. Ges.)</field>
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA3" model="account.account.template">
       <field name="code">K7GVA3</field>
       <field name="name">Aufwendungen aus Verlustübernahme und auf Grund einer Gewinngemeinschaft- eines Gewinn- oder Teilgewinnabführungsvertrags abgeführte Gewinne</field>
@@ -12807,7 +12807,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA31" model="account.account.template">
       <field name="code">K7GVA31</field>
       <field name="name">Aufwendungen aus Verlustübernahme</field>
@@ -12815,16 +12815,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7390" model="account.account.template">
       <field name="code">7390</field>
       <field name="name">Aufwendungen aus Verlustübernahme</field>
       <field name="parent_id" ref="chart_skr04_K7GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA32" model="account.account.template">
       <field name="code">K7GVA32</field>
       <field name="name">Auf Grund einer Gewinngemeinschaft- eines Gewinn- oder Teilgewinnabführungsvertrags abgeführte Gewinne</field>
@@ -12832,34 +12832,34 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7392" model="account.account.template">
       <field name="code">7392</field>
       <field name="name">Abgeführte Gewinne auf Grund einer Gewinngemeinschaft</field>
       <field name="parent_id" ref="chart_skr04_K7GVA32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7394" model="account.account.template">
       <field name="code">7394</field>
       <field name="name">Abgeführte Gewinne auf Grund eines Gewinn- oder Teilgewinnabführungsvertrags</field>
       <field name="parent_id" ref="chart_skr04_K7GVA32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7399" model="account.account.template">
       <field name="code">7399</field>
       <field name="name">Abgeführte Gewinnanteile an stille Gesellschafter § 8 GewStG</field>
       <field name="parent_id" ref="chart_skr04_K7GVA32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE5" model="account.account.template">
       <field name="code">K7GVE5</field>
       <field name="name">Außerordentliche Erträge</field>
@@ -12867,7 +12867,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE51" model="account.account.template">
       <field name="code">K7GVE51</field>
       <field name="name">Außerordentliche Erträge</field>
@@ -12875,34 +12875,34 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7400" model="account.account.template">
       <field name="code">7400</field>
       <field name="name">Außerordentliche Erträge</field>
       <field name="parent_id" ref="chart_skr04_K7GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7401" model="account.account.template">
       <field name="code">7401</field>
       <field name="name">Außerordentliche Erträge finanzwirksam</field>
       <field name="parent_id" ref="chart_skr04_K7GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_7450" model="account.account.template">
       <field name="code">7450</field>
       <field name="name">Außerordentliche Erträge nicht finanzwirksam</field>
       <field name="parent_id" ref="chart_skr04_K7GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA4" model="account.account.template">
       <field name="code">K7GVA4</field>
       <field name="name">Außerordentliche Aufwendungen</field>
@@ -12910,7 +12910,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA41" model="account.account.template">
       <field name="code">K7GVA41</field>
       <field name="name">Außerordentliche Aufwendungen</field>
@@ -12918,34 +12918,34 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7500" model="account.account.template">
       <field name="code">7500</field>
       <field name="name">Außerordentliche Aufwendungen</field>
       <field name="parent_id" ref="chart_skr04_K7GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7501" model="account.account.template">
       <field name="code">7501</field>
       <field name="name">Außerordentliche Aufwendungen finanzwirksam</field>
       <field name="parent_id" ref="chart_skr04_K7GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7550" model="account.account.template">
       <field name="code">7550</field>
       <field name="name">Außerordentliche Aufwendungen nicht finanzwirksam</field>
       <field name="parent_id" ref="chart_skr04_K7GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA5" model="account.account.template">
       <field name="code">K7GVA5</field>
       <field name="name">Steuern vom Einkommen und Ertrag</field>
@@ -12953,7 +12953,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA51" model="account.account.template">
       <field name="code">K7GVA51</field>
       <field name="name">Steuern vom Einkommen und Ertrag</field>
@@ -12961,169 +12961,169 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7600" model="account.account.template">
       <field name="code">7600</field>
       <field name="name">Körperschaftssteuer</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7603" model="account.account.template">
       <field name="code">7603</field>
       <field name="name">Körperschaftssteuer für Vorjahr</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7604" model="account.account.template">
       <field name="code">7604</field>
       <field name="name">Körperschaftssteuererstattungen für Vorjahre</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7605" model="account.account.template">
       <field name="code">7605</field>
       <field name="name">Körperschaftssteuererstattung für Vorjahre nach §37 KStG</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7607" model="account.account.template">
       <field name="code">7607</field>
       <field name="name">Solidaritätszuschlagerstattungen für Vorjahre</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7608" model="account.account.template">
       <field name="code">7608</field>
       <field name="name">Solidaritätszuschlag</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7609" model="account.account.template">
       <field name="code">7609</field>
       <field name="name">Solidaritätszuschlag für Vorjahre</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7610" model="account.account.template">
       <field name="code">7610</field>
       <field name="name">Gewerbesteuer </field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7630" model="account.account.template">
       <field name="code">7630</field>
       <field name="name">Kapitalertragsteuer 25%</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7632" model="account.account.template">
       <field name="code">7632</field>
       <field name="name">Kapitalertragsteuer 20%</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7633" model="account.account.template">
       <field name="code">7633</field>
       <field name="name">Anrechenbarer Solidaritätszuschlag auf Kapitalertragsteuer 25%</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7634" model="account.account.template">
       <field name="code">7634</field>
       <field name="name">Anrechenbarer Solidaritätszuschlag auf Kapitalertragsteuer 20%</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7635" model="account.account.template">
       <field name="code">7635</field>
       <field name="name">Zinsabschlagsteuer</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7368" model="account.account.template">
       <field name="code">7368</field>
       <field name="name">Anrechenbarer Solidaritätszuschlag auf Zinsabschlagsteuer</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7639" model="account.account.template">
       <field name="code">7639</field>
       <field name="name">Anzurechnende ausländische Quellensteuer</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7640" model="account.account.template">
       <field name="code">7640</field>
       <field name="name">Steuernachzahlungen Vorjahre für Steuern vom Einkommen und Ertrag</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7642" model="account.account.template">
       <field name="code">7642</field>
       <field name="name">Steuererstattungen Vorjahre für Steuern vom Einkommen und Ertrag</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7644" model="account.account.template">
       <field name="code">7644</field>
       <field name="name">Erträge aus der Auflösung von Rückstellungen für Steuern vom Einkommen und Ertrag</field>
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA6" model="account.account.template">
       <field name="code">K7GVA6</field>
       <field name="name">Sonstige Steuern </field>
@@ -13131,7 +13131,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA61" model="account.account.template">
       <field name="code">K7GVA61</field>
       <field name="name">Sonstige Steuern </field>
@@ -13139,79 +13139,79 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7650" model="account.account.template">
       <field name="code">7650</field>
       <field name="name">Sonstige Steuern </field>
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7675" model="account.account.template">
       <field name="code">7675</field>
       <field name="name">Verbrauchsteuer</field>
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7678" model="account.account.template">
       <field name="code">7678</field>
       <field name="name">ökosteuer</field>
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7680" model="account.account.template">
       <field name="code">7680</field>
       <field name="name">Grundsteuer</field>
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7685" model="account.account.template">
       <field name="code">7685</field>
       <field name="name">Kfz-Steuer</field>
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7690" model="account.account.template">
       <field name="code">7690</field>
       <field name="name">Steuernachzahkungen Vorjahre für sonstige Steuern </field>
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7692" model="account.account.template">
       <field name="code">7692</field>
       <field name="name">Steuererstattungen Vorjahre für sonstige Steuern </field>
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_7694" model="account.account.template">
       <field name="code">7694</field>
       <field name="name">Erträge aus der Auflösung von Rückstellungen für sonstige Steuern</field>
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE6" model="account.account.template">
       <field name="code">K7GVE6</field>
       <field name="name">Gewinnvortrag</field>
@@ -13219,16 +13219,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7700" model="account.account.template">
       <field name="code">7700</field>
       <field name="name">Gewinnvortrag nach Verwendung</field>
       <field name="parent_id" ref="chart_skr04_K7GVE6"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account_type_liability_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA7" model="account.account.template">
       <field name="code">K7GVA7</field>
       <field name="name">Verlustvortrag</field>
@@ -13236,16 +13236,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7720" model="account.account.template">
       <field name="code">7720</field>
       <field name="name">Verlustvortrag nach Verwendung</field>
       <field name="parent_id" ref="chart_skr04_K7GVA7"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE7" model="account.account.template">
       <field name="code">K7GVE7</field>
       <field name="name">Entnahme aus der Kapitalrücklage</field>
@@ -13253,16 +13253,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7730" model="account.account.template">
       <field name="code">7730</field>
       <field name="name">Entnahme aus der Kapitalrücklage</field>
       <field name="parent_id" ref="chart_skr04_K7GVE7"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE8" model="account.account.template">
       <field name="code">K7GVE8</field>
       <field name="name">Entnahme aus Gewinnrücklagen</field>
@@ -13270,7 +13270,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE81" model="account.account.template">
       <field name="code">K7GVE81</field>
       <field name="name">Entnahme aus Gewinnrücklagen aus der gesetzlichen Rücklage</field>
@@ -13278,16 +13278,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7735" model="account.account.template">
       <field name="code">7735</field>
       <field name="name">Entnahme aus Gewinnrücklagen aus der gesetzlichen Rücklage</field>
       <field name="parent_id" ref="chart_skr04_K7GVE81"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE82" model="account.account.template">
       <field name="code">K7GVE82</field>
       <field name="name">Entnahme aus Gewinnrücklagen aus der Rücklage für eigene Anteile </field>
@@ -13295,16 +13295,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7740" model="account.account.template">
       <field name="code">7740</field>
       <field name="name">Entnahme aus Gewinnrücklagen aus der Rücklage für eigene Anteile </field>
       <field name="parent_id" ref="chart_skr04_K7GVE82"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE83" model="account.account.template">
       <field name="code">K7GVE83</field>
       <field name="name">Entnahme aus Gewinnrücklagen aus satzungsmäßigen Rücklage </field>
@@ -13312,16 +13312,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7745" model="account.account.template">
       <field name="code">7745</field>
       <field name="name">Entnahme aus Gewinnrücklagen aus satzungsmäßigen Rücklage </field>
       <field name="parent_id" ref="chart_skr04_K7GVE83"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE84" model="account.account.template">
       <field name="code">K7GVE84</field>
       <field name="name">Entnahme aus Gewinnrücklagen aus anderen Gewinnrücklagen</field>
@@ -13329,16 +13329,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7750" model="account.account.template">
       <field name="code">7750</field>
       <field name="name">Entnahme aus Gewinnrücklagen aus anderen Gewinnrücklagen</field>
       <field name="parent_id" ref="chart_skr04_K7GVE84"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE85" model="account.account.template">
       <field name="code">K7GVE85</field>
       <field name="name">Erträge aus Kapitalherabsetzung</field>
@@ -13346,16 +13346,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7755" model="account.account.template">
       <field name="code">7755</field>
       <field name="name">Erträge aus Kapitalherabsetzung</field>
       <field name="parent_id" ref="chart_skr04_K7GVE85"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVE86" model="account.account.template">
       <field name="code">K7GVE86</field>
       <field name="name">Einstellungen in die Kapitalrücklage nach den Vorschriften über die Vereinfachte Kapitalherabsetzung</field>
@@ -13363,16 +13363,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7760" model="account.account.template">
       <field name="code">7760</field>
       <field name="name">Einstellungen in die Kapitalrücklage nach den Vorschriften über die Vereinfachte Kapitalherabsetzung</field>
       <field name="parent_id" ref="chart_skr04_K7GVE86"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA8" model="account.account.template">
       <field name="code">K7GVA8</field>
       <field name="name">Einstellung in Gewinnrücklagen </field>
@@ -13380,7 +13380,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA81" model="account.account.template">
       <field name="code">K7GVA81</field>
       <field name="name">Einstellung in Gewinnrücklagen in die gesetzliche Rücklage </field>
@@ -13388,16 +13388,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7765" model="account.account.template">
       <field name="code">7765</field>
       <field name="name">Einstellung in die gesetzliche Rücklage </field>
       <field name="parent_id" ref="chart_skr04_K7GVA81"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA82" model="account.account.template">
       <field name="code">K7GVA82</field>
       <field name="name">Einstellung in Gewinnrücklagen in die Rücklage für eigene Anteile</field>
@@ -13405,16 +13405,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7770" model="account.account.template">
       <field name="code">7770</field>
       <field name="name">Einstellung in die Rücklage für eigene Anteile</field>
       <field name="parent_id" ref="chart_skr04_K7GVA82"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA83" model="account.account.template">
       <field name="code">K7GVA83</field>
       <field name="name">Einstellung in Gewinnrücklagen in satzungmäßige Rücklage </field>
@@ -13422,16 +13422,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7775" model="account.account.template">
       <field name="code">7775</field>
       <field name="name">Einstellung in satzungmäßige Rücklage </field>
       <field name="parent_id" ref="chart_skr04_K7GVA83"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA84" model="account.account.template">
       <field name="code">K7GVA84</field>
       <field name="name">Einstellung in Gewinnrücklagen in andere Gewinnrücklagen </field>
@@ -13439,16 +13439,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7780" model="account.account.template">
       <field name="code">7780</field>
       <field name="name">Einstellung in andere Gewinnrücklagen </field>
       <field name="parent_id" ref="chart_skr04_K7GVA84"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA85" model="account.account.template">
       <field name="code">K7GVA85</field>
       <field name="name">Ausschüttung</field>
@@ -13456,16 +13456,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7790" model="account.account.template">
       <field name="code">7790</field>
       <field name="name">Vorabausschüttung</field>
       <field name="parent_id" ref="chart_skr04_K7GVA85"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA86" model="account.account.template">
       <field name="code">K7GVA86</field>
       <field name="name">Vortrag auf neue Rechnung</field>
@@ -13473,16 +13473,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7795" model="account.account.template">
       <field name="code">7795</field>
       <field name="name">Vortrag auf neue Rechnung (GuV)</field>
       <field name="parent_id" ref="chart_skr04_K7GVA86"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account_type_income_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA87" model="account.account.template">
       <field name="code">K7GVA87</field>
       <field name="name">Sonstige betriebliche Aufwendungen</field>
@@ -13490,16 +13490,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7800" model="account.account.template">
       <field name="code">7800</field>
       <field name="name">(zu freien Verfügung)</field>
       <field name="parent_id" ref="chart_skr04_K7GVA87"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K7GVA88" model="account.account.template">
       <field name="code">K7GVA88</field>
       <field name="name">Sonstige betriebliche Erträge oder sonstige betriebliche Aufwendungen</field>
@@ -13507,16 +13507,16 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_7990" model="account.account.template">
       <field name="code">7990</field>
       <field name="name">Aufwendungen/Erträge aus Umrechnungsdifferenzen</field>
       <field name="parent_id" ref="chart_skr04_K7GVA88"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account_type_expense_de"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS1" model="account.account.template">
       <field name="code">K9VKS1</field>
       <field name="name">Vortragskonten</field>
@@ -13524,7 +13524,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9000" model="account.account.template">
       <field name="code">9000</field>
       <field name="name">Saldenvorträge- Sachkonten</field>
@@ -13533,7 +13533,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9001" model="account.account.template">
       <field name="code">9001</field>
       <field name="name">Saldenvorträge</field>
@@ -13542,7 +13542,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9008" model="account.account.template">
       <field name="code">9008</field>
       <field name="name">Saldenvorträge Debitoren</field>
@@ -13551,7 +13551,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9009" model="account.account.template">
       <field name="code">9009</field>
       <field name="name">Saldenvorträge Kreditoren</field>
@@ -13560,7 +13560,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9060" model="account.account.template">
       <field name="code">9060</field>
       <field name="name">Offene Posten aus 1990</field>
@@ -13569,7 +13569,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9069" model="account.account.template">
       <field name="code">9069</field>
       <field name="name">Offene Posten aus 1999</field>
@@ -13578,7 +13578,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9070" model="account.account.template">
       <field name="code">9070</field>
       <field name="name">Offene Posten aus 2000</field>
@@ -13587,7 +13587,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9071" model="account.account.template">
       <field name="code">9071</field>
       <field name="name">Offene Posten aus 2001</field>
@@ -13596,7 +13596,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9072" model="account.account.template">
       <field name="code">9072</field>
       <field name="name">Offene Posten aus 2002</field>
@@ -13605,7 +13605,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9073" model="account.account.template">
       <field name="code">9073</field>
       <field name="name">Offene Posten aus 2003</field>
@@ -13614,7 +13614,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9074" model="account.account.template">
       <field name="code">9074</field>
       <field name="name">Offene Posten aus 2004</field>
@@ -13623,7 +13623,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9075" model="account.account.template">
       <field name="code">9075</field>
       <field name="name">Offene Posten aus 2005</field>
@@ -13632,7 +13632,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9076" model="account.account.template">
       <field name="code">9076</field>
       <field name="name">Offene Posten aus 2006</field>
@@ -13641,7 +13641,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9077" model="account.account.template">
       <field name="code">9077</field>
       <field name="name">Offene Posten aus 2007</field>
@@ -13668,7 +13668,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9090" model="account.account.template">
       <field name="code">9090</field>
       <field name="name">Summenvortragskonto</field>
@@ -13677,7 +13677,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9091" model="account.account.template">
       <field name="code">9091</field>
       <field name="name">Offene Posten aus 1991</field>
@@ -13686,7 +13686,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9092" model="account.account.template">
       <field name="code">9092</field>
       <field name="name">Offene Posten aus 1992</field>
@@ -13695,7 +13695,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9093" model="account.account.template">
       <field name="code">9093</field>
       <field name="name">Offene Posten aus 1993</field>
@@ -13704,7 +13704,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9094" model="account.account.template">
       <field name="code">9094</field>
       <field name="name">Offene Posten aus 1994</field>
@@ -13713,7 +13713,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9095" model="account.account.template">
       <field name="code">9095</field>
       <field name="name">Offene Posten aus 1995</field>
@@ -13722,7 +13722,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9096" model="account.account.template">
       <field name="code">9096</field>
       <field name="name">Offene Posten aus 1996</field>
@@ -13731,7 +13731,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9097" model="account.account.template">
       <field name="code">9097</field>
       <field name="name">Offene Posten aus 1997</field>
@@ -13740,7 +13740,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9098" model="account.account.template">
       <field name="code">9098</field>
       <field name="name">Offene Posten aus 1998</field>
@@ -13749,7 +13749,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS2" model="account.account.template">
       <field name="code">K9VKS2</field>
       <field name="name">Statistische Konten für Betriebswirtschaftliche Auswertungen (BWA)</field>
@@ -13757,7 +13757,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9101" model="account.account.template">
       <field name="code">9101</field>
       <field name="name">Verkaufstage</field>
@@ -13766,7 +13766,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9102" model="account.account.template">
       <field name="code">9102</field>
       <field name="name">Anzahl der Barkunden</field>
@@ -13775,7 +13775,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9103" model="account.account.template">
       <field name="code">9103</field>
       <field name="name">Beschäftigte Personen</field>
@@ -13784,7 +13784,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9104" model="account.account.template">
       <field name="code">9104</field>
       <field name="name">Unbezahlte Personen</field>
@@ -13793,7 +13793,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9105" model="account.account.template">
       <field name="code">9105</field>
       <field name="name">Verkaufskräfte</field>
@@ -13802,7 +13802,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9106" model="account.account.template">
       <field name="code">9106</field>
       <field name="name">Geschäftsraum m2</field>
@@ -13811,7 +13811,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9107" model="account.account.template">
       <field name="code">9107</field>
       <field name="name">Verkaufsraum m2</field>
@@ -13820,7 +13820,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9116" model="account.account.template">
       <field name="code">9116</field>
       <field name="name">Anzahl Rechnungen</field>
@@ -13829,7 +13829,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9117" model="account.account.template">
       <field name="code">9117</field>
       <field name="name">Anzahl Kreditkunden monatlich</field>
@@ -13838,7 +13838,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9118" model="account.account.template">
       <field name="code">9118</field>
       <field name="name">Anzahl Kreditkunden aufgelaufen</field>
@@ -13847,7 +13847,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9120" model="account.account.template">
       <field name="code">9120</field>
       <field name="name">Erweiterungsinvestitionen</field>
@@ -13856,7 +13856,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9135" model="account.account.template">
       <field name="code">9135</field>
       <field name="name">Auftragseingang im Geschäftsjahr</field>
@@ -13865,7 +13865,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9140" model="account.account.template">
       <field name="code">9140</field>
       <field name="name">Auftragsbestand</field>
@@ -13874,7 +13874,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9190" model="account.account.template">
       <field name="code">9190</field>
       <field name="name">Gegenkonto für statistische Mengeneinheiten Konten 9101-9107 und Konten 9116-9118</field>
@@ -13883,7 +13883,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9199" model="account.account.template">
       <field name="code">9199</field>
       <field name="name">Gegenkonto zu Konten 9120- 9135-9140</field>
@@ -13892,7 +13892,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS3" model="account.account.template">
       <field name="code">K9VKS3</field>
       <field name="name">Statistische Konten für den Kennziffernteil der Bilanz</field>
@@ -13900,7 +13900,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9200" model="account.account.template">
       <field name="code">9200</field>
       <field name="name">Beschäftigte Personen</field>
@@ -13909,7 +13909,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9209" model="account.account.template">
       <field name="code">9209</field>
       <field name="name">Gegenkonto zu 9200</field>
@@ -13918,7 +13918,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9210" model="account.account.template">
       <field name="code">9210</field>
       <field name="name">Produktive Löhne</field>
@@ -13927,7 +13927,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9219" model="account.account.template">
       <field name="code">9219</field>
       <field name="name">Gegenkonto zu 9210</field>
@@ -13936,7 +13936,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS4" model="account.account.template">
       <field name="code">K9VKS4</field>
       <field name="name">Statistische Konten zur informativen Angabe des gezeichneten Kapitals in anderer Währung</field>
@@ -13944,7 +13944,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS41" model="account.account.template">
       <field name="code">K9VKS41</field>
       <field name="name">Gezeichnetes Kapital in DM</field>
@@ -13952,7 +13952,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9220" model="account.account.template">
       <field name="code">9220</field>
       <field name="name">Gezeichnetes Kapital in DM (Art. 42 Abs. 3 S. 1 EGHGB)</field>
@@ -13961,7 +13961,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS42" model="account.account.template">
       <field name="code">K9VKS42</field>
       <field name="name">Gezeichnetes Kapital in Euro</field>
@@ -13969,7 +13969,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9221" model="account.account.template">
       <field name="code">9221</field>
       <field name="name">Gezeichnetes Kapital in Euro (Art. 42 Abs. 3 S. 2 EGHGB)</field>
@@ -13978,7 +13978,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9229" model="account.account.template">
       <field name="code">9229</field>
       <field name="name">Gegenkonto zu 9220-9221</field>
@@ -13987,7 +13987,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS5" model="account.account.template">
       <field name="code">K9VKS5</field>
       <field name="name">Passive Rechnungsabgrenzung</field>
@@ -13995,7 +13995,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9230" model="account.account.template">
       <field name="code">9230</field>
       <field name="name">Baukostenzuschüsse</field>
@@ -14004,7 +14004,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9232" model="account.account.template">
       <field name="code">9232</field>
       <field name="name">Investitionszulagen </field>
@@ -14013,7 +14013,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9234" model="account.account.template">
       <field name="code">9234</field>
       <field name="name">Investitionszuschüsse </field>
@@ -14022,7 +14022,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9239" model="account.account.template">
       <field name="code">9239</field>
       <field name="name">Gegenkonto zu Konten 9230- 9238</field>
@@ -14031,7 +14031,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9240" model="account.account.template">
       <field name="code">9240</field>
       <field name="name">Investitionsverbindlichkeiten bei den Leistungsverbindlichkeiten</field>
@@ -14040,7 +14040,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9241" model="account.account.template">
       <field name="code">9241</field>
       <field name="name">Investitionsverbindlichkeiten aus Sachanlagenkäufen bei Leistungsverbindlichkeiten</field>
@@ -14049,7 +14049,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9242" model="account.account.template">
       <field name="code">9242</field>
       <field name="name">Investitionsverbindlichkeiten aus Käufen von immateriellen Vermögensgegenständen bei Leistungsverbindlichkeiten</field>
@@ -14058,7 +14058,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9243" model="account.account.template">
       <field name="code">9243</field>
       <field name="name">Investitionsverbindlichkeiten aus Käufen von Finanzanlagen bei Leistungsverbindlichkeiten</field>
@@ -14067,7 +14067,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9244" model="account.account.template">
       <field name="code">9244</field>
       <field name="name">Gegenkonto zu Konto 9240-43</field>
@@ -14076,7 +14076,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9245" model="account.account.template">
       <field name="code">9245</field>
       <field name="name">Forderungen aus Sachanlagenverkäufen bei sonstigen Vermögensgegenständen</field>
@@ -14085,7 +14085,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9246" model="account.account.template">
       <field name="code">9246</field>
       <field name="name">Forderungen aus Verkäufen immaterielle Vermögensgegenstände bei sonstigen Vermögensgegenständen</field>
@@ -14094,7 +14094,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9247" model="account.account.template">
       <field name="code">9247</field>
       <field name="name">Forderungen aus Verkäufen von Finanzanlagen bei sonstigen Vermögensgegenständen</field>
@@ -14103,7 +14103,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9249" model="account.account.template">
       <field name="code">9249</field>
       <field name="name">Gegenkonto zu Konto 9245-47</field>
@@ -14112,7 +14112,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS6" model="account.account.template">
       <field name="code">K9VKS6</field>
       <field name="name">Eigenkapitalersetzende Gesellschafterdarlehen </field>
@@ -14120,7 +14120,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9250" model="account.account.template">
       <field name="code">9250</field>
       <field name="name">Eigenkapitalersetzende Gesellschafterdarlehen </field>
@@ -14129,7 +14129,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9255" model="account.account.template">
       <field name="code">9255</field>
       <field name="name">Ungesicherte Gesellschafterdarlehen mit Restlaufzeit größer 5 Jahre</field>
@@ -14138,7 +14138,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9259" model="account.account.template">
       <field name="code">9259</field>
       <field name="name">Gegenkonto zu 9250 und 9255</field>
@@ -14147,7 +14147,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS7" model="account.account.template">
       <field name="code">K9VKS7</field>
       <field name="name">Aufgliederung der Rückstellungen</field>
@@ -14155,7 +14155,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9260" model="account.account.template">
       <field name="code">9260</field>
       <field name="name">Kurzfristige Rückstellungen</field>
@@ -14164,7 +14164,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9262" model="account.account.template">
       <field name="code">9262</field>
       <field name="name">Mittelfristige Rückstellungen</field>
@@ -14173,7 +14173,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9264" model="account.account.template">
       <field name="code">9264</field>
       <field name="name">Langfristige Rückstellungen- außer Pensionen</field>
@@ -14182,7 +14182,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9269" model="account.account.template">
       <field name="code">9269</field>
       <field name="name">Gegenkonto zu Konto 9260 - 9268</field>
@@ -14191,7 +14191,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS8" model="account.account.template">
       <field name="code">K9VKS8</field>
       <field name="name">Statistische Konten für in der Bilanz auszuweisende Haftungsverhältnisse</field>
@@ -14199,7 +14199,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9270" model="account.account.template">
       <field name="code">9270</field>
       <field name="name">Gegenkonto zu 9271 - 9279 (Soll-Buchung)</field>
@@ -14208,7 +14208,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9271" model="account.account.template">
       <field name="code">9271</field>
       <field name="name">Verbindlichkeiten aus der Begebung und übertragung von Wechseln</field>
@@ -14217,7 +14217,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9272" model="account.account.template">
       <field name="code">9272</field>
       <field name="name">Verbindlichkeiten aus der Begebung und übertragung von Wechseln gegenüber verbundenen Unternehmen</field>
@@ -14226,7 +14226,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9273" model="account.account.template">
       <field name="code">9273</field>
       <field name="name">Verbindlichkeiten aus Bürgschaften- Wechsel- und Scheckbürgschaften</field>
@@ -14235,7 +14235,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9274" model="account.account.template">
       <field name="code">9274</field>
       <field name="name">Verbindlichkeiten aus Bürgschaften- Wechsel- und Scheckbürgschaften gegenüber verbundenen Unternehmen</field>
@@ -14244,7 +14244,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9275" model="account.account.template">
       <field name="code">9275</field>
       <field name="name">Verbindlichkeiten aus Gewährleistungsverträgen</field>
@@ -14253,7 +14253,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9276" model="account.account.template">
       <field name="code">9276</field>
       <field name="name">Verbindlichkeiten aus Gewährleistungsverträgen gegenüber verbundenen Unternehmen</field>
@@ -14262,7 +14262,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9277" model="account.account.template">
       <field name="code">9277</field>
       <field name="name">Haftung aus der Bestellung von Sicherheiten für fremde Verbindlichkeiten</field>
@@ -14271,7 +14271,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9278" model="account.account.template">
       <field name="code">9278</field>
       <field name="name">Haftung aus der Bestellung von Sicherheiten für fremde Verbindlichkeiten gegenüber verbundenen Unternehmen</field>
@@ -14280,7 +14280,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9279" model="account.account.template">
       <field name="code">9279</field>
       <field name="name">Verpflichtungen aus Treuhandvermögen</field>
@@ -14289,7 +14289,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKS9" model="account.account.template">
       <field name="code">K9VKS9</field>
       <field name="name">Statistische Konten für die im Anhang anzugebenden sonstigen finanziellen Verpflichtungen</field>
@@ -14297,7 +14297,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9280" model="account.account.template">
       <field name="code">9280</field>
       <field name="name">Gegenkonto zu 9281-9284</field>
@@ -14306,7 +14306,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9281" model="account.account.template">
       <field name="code">9281</field>
       <field name="name">Verpflichtungen aus Miet- und Leasingsverträgen</field>
@@ -14315,7 +14315,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9282" model="account.account.template">
       <field name="code">9282</field>
       <field name="name">Verpflichtungen aus Miet- und Leasingsverträgen gegenüber verbundenen Unternehmen</field>
@@ -14324,7 +14324,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9283" model="account.account.template">
       <field name="code">9283</field>
       <field name="name">Andere Verpflichtungen gemäß § 285 Nr. 3 HGB</field>
@@ -14333,7 +14333,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9284" model="account.account.template">
       <field name="code">9284</field>
       <field name="name">Andere Verpflichtungen gemäß § 285 Nr. 3 HGB gegenüber verbundenen Unternehmen</field>
@@ -14342,7 +14342,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSa" model="account.account.template">
       <field name="code">K9VKSa</field>
       <field name="name">Statistische Konten für 4 Abs. 3 EStG</field>
@@ -14350,7 +14350,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9287" model="account.account.template">
       <field name="code">9287</field>
       <field name="name">Zinsen bei Buchungen über Debitoren bei § 4 Abs. 3 EStG</field>
@@ -14359,7 +14359,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9288" model="account.account.template">
       <field name="code">9288</field>
       <field name="name">Mahngebühren bei Buchungen über Debitoren bei § 4 Abs. 3 EStG</field>
@@ -14368,7 +14368,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9289" model="account.account.template">
       <field name="code">9289</field>
       <field name="name">Gegenkonto zu 9287 und 9288</field>
@@ -14377,7 +14377,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9290" model="account.account.template">
       <field name="code">9290</field>
       <field name="name">Statistisches Konto steuerfreie Auslagen</field>
@@ -14386,7 +14386,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9291" model="account.account.template">
       <field name="code">9291</field>
       <field name="name">Gegenkonto zu 9290</field>
@@ -14395,7 +14395,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9292" model="account.account.template">
       <field name="code">9292</field>
       <field name="name">Statistisches Konto Fremdgeld</field>
@@ -14404,7 +14404,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9293" model="account.account.template">
       <field name="code">9293</field>
       <field name="name">Gegenkonto zu 9292</field>
@@ -14413,7 +14413,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSa1" model="account.account.template">
       <field name="code">K9VKSa1</field>
       <field name="name">Einlagen stiller Gesellschafter</field>
@@ -14421,7 +14421,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9295" model="account.account.template">
       <field name="code">9295</field>
       <field name="name">Einlagen stiller Gesellschafter</field>
@@ -14430,7 +14430,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSa2" model="account.account.template">
       <field name="code">K9VKSa2</field>
       <field name="name">Steuerrechtlicher Ausgleichsposten</field>
@@ -14438,7 +14438,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9297" model="account.account.template">
       <field name="code">9297</field>
       <field name="name">Steuerrechtlicher Ausgleichsposten</field>
@@ -14447,7 +14447,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSb" model="account.account.template">
       <field name="code">K9VKSb</field>
       <field name="name">Privat Teilhafter (für Verrechnung Gesellschafterdarlehen mit Eigenkapitalcharakter- Konto 9840-9849)</field>
@@ -14455,7 +14455,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9400" model="account.account.template">
       <field name="code">9400</field>
       <field name="name">Privatentnahmen allgemein</field>
@@ -14464,7 +14464,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9410" model="account.account.template">
       <field name="code">9410</field>
       <field name="name">Privatsteuern</field>
@@ -14473,7 +14473,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9420" model="account.account.template">
       <field name="code">9420</field>
       <field name="name">Sonderausgaben beschränkt abzugsfähig</field>
@@ -14482,7 +14482,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9430" model="account.account.template">
       <field name="code">9430</field>
       <field name="name">Sonderausgaben unbeschränkt abzugsfähig</field>
@@ -14491,7 +14491,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9440" model="account.account.template">
       <field name="code">9440</field>
       <field name="name">Zuwendungen- Spenden</field>
@@ -14500,7 +14500,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9450" model="account.account.template">
       <field name="code">9450</field>
       <field name="name">Außergewöhnliche Belastungen</field>
@@ -14509,7 +14509,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9460" model="account.account.template">
       <field name="code">9460</field>
       <field name="name">Grundstücksaufwand</field>
@@ -14518,7 +14518,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9470" model="account.account.template">
       <field name="code">9470</field>
       <field name="name">Grundstücksertrag</field>
@@ -14527,7 +14527,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9480" model="account.account.template">
       <field name="code">9480</field>
       <field name="name">Unentgeltliche Wertabgaben</field>
@@ -14536,7 +14536,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9490" model="account.account.template">
       <field name="code">9490</field>
       <field name="name">Privateinlagen</field>
@@ -14545,7 +14545,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSc" model="account.account.template">
       <field name="code">K9VKSc</field>
       <field name="name">Statistische Konten für die Kapitalkontenentwicklung</field>
@@ -14553,7 +14553,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9500" model="account.account.template">
       <field name="code">9500</field>
       <field name="name">Anteil für Konto Vollhafter 2000</field>
@@ -14562,7 +14562,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9501" model="account.account.template">
       <field name="code">9501</field>
       <field name="name">Anteil für Konto Vollhafter 2001</field>
@@ -14571,7 +14571,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9502" model="account.account.template">
       <field name="code">9502</field>
       <field name="name">Anteil für Konto Vollhafter 2002</field>
@@ -14580,7 +14580,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9503" model="account.account.template">
       <field name="code">9503</field>
       <field name="name">Anteil für Konto Vollhafter 2003</field>
@@ -14589,7 +14589,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9504" model="account.account.template">
       <field name="code">9504</field>
       <field name="name">Anteil für Konto Vollhafter 2004</field>
@@ -14598,7 +14598,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9505" model="account.account.template">
       <field name="code">9505</field>
       <field name="name">Anteil für Konto Vollhafter 2005</field>
@@ -14607,7 +14607,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9506" model="account.account.template">
       <field name="code">9506</field>
       <field name="name">Anteil für Konto Vollhafter 2006</field>
@@ -14616,7 +14616,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9507" model="account.account.template">
       <field name="code">9507</field>
       <field name="name">Anteil für Konto Vollhafter 2007</field>
@@ -14625,7 +14625,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9508" model="account.account.template">
       <field name="code">9508</field>
       <field name="name">Anteil für Konto Vollhafter 2008</field>
@@ -14634,7 +14634,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9509" model="account.account.template">
       <field name="code">9509</field>
       <field name="name">Anteil für Konto Vollhafter 2009</field>
@@ -14643,7 +14643,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9510" model="account.account.template">
       <field name="code">9510</field>
       <field name="name">Anteil für Konto Vollhafter 2010</field>
@@ -14652,7 +14652,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9511" model="account.account.template">
       <field name="code">9511</field>
       <field name="name">Anteil für Konto Vollhafter 2011</field>
@@ -14661,7 +14661,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9512" model="account.account.template">
       <field name="code">9512</field>
       <field name="name">Anteil für Konto Vollhafter 2012</field>
@@ -14670,7 +14670,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9513" model="account.account.template">
       <field name="code">9513</field>
       <field name="name">Anteil für Konto Vollhafter 2013</field>
@@ -14679,7 +14679,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9514" model="account.account.template">
       <field name="code">9514</field>
       <field name="name">Anteil für Konto Vollhafter 2014</field>
@@ -14688,7 +14688,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9515" model="account.account.template">
       <field name="code">9515</field>
       <field name="name">Anteil für Konto Vollhafter 2015</field>
@@ -14697,7 +14697,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9516" model="account.account.template">
       <field name="code">9516</field>
       <field name="name">Anteil für Konto Vollhafter 2016</field>
@@ -14706,7 +14706,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9517" model="account.account.template">
       <field name="code">9517</field>
       <field name="name">Anteil für Konto Vollhafter 2017</field>
@@ -14715,7 +14715,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9518" model="account.account.template">
       <field name="code">9518</field>
       <field name="name">Anteil für Konto Vollhafter 2018</field>
@@ -14724,7 +14724,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9519" model="account.account.template">
       <field name="code">9519</field>
       <field name="name">Anteil für Konto Vollhafter 2019</field>
@@ -14733,7 +14733,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9520" model="account.account.template">
       <field name="code">9520</field>
       <field name="name">Anteil für Konto Vollhafter 2020</field>
@@ -14742,7 +14742,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9521" model="account.account.template">
       <field name="code">9521</field>
       <field name="name">Anteil für Konto Vollhafter 2021</field>
@@ -14751,7 +14751,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9522" model="account.account.template">
       <field name="code">9522</field>
       <field name="name">Anteil für Konto Vollhafter 2022</field>
@@ -14760,7 +14760,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9523" model="account.account.template">
       <field name="code">9523</field>
       <field name="name">Anteil für Konto Vollhafter 2023</field>
@@ -14769,7 +14769,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9524" model="account.account.template">
       <field name="code">9524</field>
       <field name="name">Anteil für Konto Vollhafter 2024</field>
@@ -14778,7 +14778,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9525" model="account.account.template">
       <field name="code">9525</field>
       <field name="name">Anteil für Konto Vollhafter 2025</field>
@@ -14787,7 +14787,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9526" model="account.account.template">
       <field name="code">9526</field>
       <field name="name">Anteil für Konto Vollhafter 2026</field>
@@ -14796,7 +14796,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9527" model="account.account.template">
       <field name="code">9527</field>
       <field name="name">Anteil für Konto Vollhafter 2027</field>
@@ -14805,7 +14805,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9528" model="account.account.template">
       <field name="code">9528</field>
       <field name="name">Anteil für Konto Vollhafter 2028</field>
@@ -14814,7 +14814,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9529" model="account.account.template">
       <field name="code">9529</field>
       <field name="name">Anteil für Konto Vollhafter 2029</field>
@@ -14823,7 +14823,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9530" model="account.account.template">
       <field name="code">9530</field>
       <field name="name">Anteil für Konto Vollhafter 9810</field>
@@ -14832,7 +14832,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9531" model="account.account.template">
       <field name="code">9531</field>
       <field name="name">Anteil für Konto Vollhafter 9811</field>
@@ -14841,7 +14841,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9532" model="account.account.template">
       <field name="code">9532</field>
       <field name="name">Anteil für Konto Vollhafter 9812</field>
@@ -14850,7 +14850,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9533" model="account.account.template">
       <field name="code">9533</field>
       <field name="name">Anteil für Konto Vollhafter 9813</field>
@@ -14859,7 +14859,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9534" model="account.account.template">
       <field name="code">9534</field>
       <field name="name">Anteil für Konto Vollhafter 9814</field>
@@ -14868,7 +14868,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9535" model="account.account.template">
       <field name="code">9535</field>
       <field name="name">Anteil für Konto Vollhafter 9815</field>
@@ -14877,7 +14877,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9536" model="account.account.template">
       <field name="code">9536</field>
       <field name="name">Anteil für Konto Vollhafter 9816</field>
@@ -14886,7 +14886,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9537" model="account.account.template">
       <field name="code">9537</field>
       <field name="name">Anteil für Konto Vollhafter 9817</field>
@@ -14895,7 +14895,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9538" model="account.account.template">
       <field name="code">9538</field>
       <field name="name">Anteil für Konto Vollhafter 9818</field>
@@ -14904,7 +14904,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9539" model="account.account.template">
       <field name="code">9539</field>
       <field name="name">Anteil für Konto Vollhafter 9819</field>
@@ -14913,7 +14913,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9540" model="account.account.template">
       <field name="code">9540</field>
       <field name="name">Anteil für Konto Vollhafter 0060</field>
@@ -14922,7 +14922,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9541" model="account.account.template">
       <field name="code">9541</field>
       <field name="name">Anteil für Konto Vollhafter 0061</field>
@@ -14931,7 +14931,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9542" model="account.account.template">
       <field name="code">9542</field>
       <field name="name">Anteil für Konto Vollhafter 0062</field>
@@ -14940,7 +14940,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9543" model="account.account.template">
       <field name="code">9543</field>
       <field name="name">Anteil für Konto Vollhafter 0063</field>
@@ -14949,7 +14949,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9544" model="account.account.template">
       <field name="code">9544</field>
       <field name="name">Anteil für Konto Vollhafter 0064</field>
@@ -14958,7 +14958,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9545" model="account.account.template">
       <field name="code">9545</field>
       <field name="name">Anteil für Konto Vollhafter 0065</field>
@@ -14967,7 +14967,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9546" model="account.account.template">
       <field name="code">9546</field>
       <field name="name">Anteil für Konto Vollhafter 0066</field>
@@ -14976,7 +14976,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9547" model="account.account.template">
       <field name="code">9547</field>
       <field name="name">Anteil für Konto Vollhafter 0067</field>
@@ -14985,7 +14985,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9548" model="account.account.template">
       <field name="code">9548</field>
       <field name="name">Anteil für Konto Vollhafter 0068</field>
@@ -14994,7 +14994,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9549" model="account.account.template">
       <field name="code">9549</field>
       <field name="name">Anteil für Konto Vollhafter 0069</field>
@@ -15003,7 +15003,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9550" model="account.account.template">
       <field name="code">9550</field>
       <field name="name">Anteil für Konto Teilhafter 2050</field>
@@ -15012,7 +15012,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9551" model="account.account.template">
       <field name="code">9551</field>
       <field name="name">Anteil für Konto Teilhafter 2051</field>
@@ -15021,7 +15021,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9552" model="account.account.template">
       <field name="code">9552</field>
       <field name="name">Anteil für Konto Teilhafter 2052</field>
@@ -15030,7 +15030,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9553" model="account.account.template">
       <field name="code">9553</field>
       <field name="name">Anteil für Konto Teilhafter 2053</field>
@@ -15039,7 +15039,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9554" model="account.account.template">
       <field name="code">9554</field>
       <field name="name">Anteil für Konto Teilhafter 2054</field>
@@ -15048,7 +15048,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9555" model="account.account.template">
       <field name="code">9555</field>
       <field name="name">Anteil für Konto Teilhafter 2055</field>
@@ -15057,7 +15057,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9556" model="account.account.template">
       <field name="code">9556</field>
       <field name="name">Anteil für Konto Teilhafter 2056</field>
@@ -15066,7 +15066,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9557" model="account.account.template">
       <field name="code">9557</field>
       <field name="name">Anteil für Konto Teilhafter 2057</field>
@@ -15075,7 +15075,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9558" model="account.account.template">
       <field name="code">9558</field>
       <field name="name">Anteil für Konto Teilhafter 2058</field>
@@ -15084,7 +15084,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9559" model="account.account.template">
       <field name="code">9559</field>
       <field name="name">Anteil für Konto Teilhafter 2059</field>
@@ -15093,7 +15093,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9560" model="account.account.template">
       <field name="code">9560</field>
       <field name="name">Anteil für Konto Teilhafter 2060</field>
@@ -15102,7 +15102,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9561" model="account.account.template">
       <field name="code">9561</field>
       <field name="name">Anteil für Konto Teilhafter 2061</field>
@@ -15111,7 +15111,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9562" model="account.account.template">
       <field name="code">9562</field>
       <field name="name">Anteil für Konto Teilhafter 2062</field>
@@ -15120,7 +15120,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9563" model="account.account.template">
       <field name="code">9563</field>
       <field name="name">Anteil für Konto Teilhafter 2063</field>
@@ -15129,7 +15129,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9564" model="account.account.template">
       <field name="code">9564</field>
       <field name="name">Anteil für Konto Teilhafter 2064</field>
@@ -15138,7 +15138,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9565" model="account.account.template">
       <field name="code">9565</field>
       <field name="name">Anteil für Konto Teilhafter 2065</field>
@@ -15147,7 +15147,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9566" model="account.account.template">
       <field name="code">9566</field>
       <field name="name">Anteil für Konto Teilhafter 2066</field>
@@ -15156,7 +15156,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9567" model="account.account.template">
       <field name="code">9567</field>
       <field name="name">Anteil für Konto Teilhafter 2067</field>
@@ -15165,7 +15165,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9568" model="account.account.template">
       <field name="code">9568</field>
       <field name="name">Anteil für Konto Teilhafter 2068</field>
@@ -15174,7 +15174,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9569" model="account.account.template">
       <field name="code">9569</field>
       <field name="name">Anteil für Konto Teilhafter 2069</field>
@@ -15183,7 +15183,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9570" model="account.account.template">
       <field name="code">9570</field>
       <field name="name">Anteil für Konto Teilhafter 2070 </field>
@@ -15192,7 +15192,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9571" model="account.account.template">
       <field name="code">9571</field>
       <field name="name">Anteil für Konto Teilhafter 2071</field>
@@ -15201,7 +15201,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9572" model="account.account.template">
       <field name="code">9572</field>
       <field name="name">Anteil für Konto Teilhafter 2072</field>
@@ -15210,7 +15210,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9573" model="account.account.template">
       <field name="code">9573</field>
       <field name="name">Anteil für Konto Teilhafter 2073</field>
@@ -15219,7 +15219,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9574" model="account.account.template">
       <field name="code">9574</field>
       <field name="name">Anteil für Konto Teilhafter 2074</field>
@@ -15228,7 +15228,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9575" model="account.account.template">
       <field name="code">9575</field>
       <field name="name">Anteil für Konto Teilhafter 2075</field>
@@ -15237,7 +15237,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9576" model="account.account.template">
       <field name="code">9576</field>
       <field name="name">Anteil für Konto Teilhafter 2076</field>
@@ -15246,7 +15246,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9577" model="account.account.template">
       <field name="code">9577</field>
       <field name="name">Anteil für Konto Teilhafter 2077</field>
@@ -15255,7 +15255,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9578" model="account.account.template">
       <field name="code">9578</field>
       <field name="name">Anteil für Konto Teilhafter 2078</field>
@@ -15264,7 +15264,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9579" model="account.account.template">
       <field name="code">9579</field>
       <field name="name">Anteil für Konto Teilhafter 2079</field>
@@ -15273,7 +15273,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9580" model="account.account.template">
       <field name="code">9580</field>
       <field name="name">Anteil für Konto Vollhafter 9820 </field>
@@ -15282,7 +15282,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9581" model="account.account.template">
       <field name="code">9581</field>
       <field name="name">Anteil für Konto Vollhafter 9821</field>
@@ -15291,7 +15291,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9582" model="account.account.template">
       <field name="code">9582</field>
       <field name="name">Anteil für Konto Vollhafter 9822</field>
@@ -15300,7 +15300,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9583" model="account.account.template">
       <field name="code">9583</field>
       <field name="name">Anteil für Konto Vollhafter 9823</field>
@@ -15309,7 +15309,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9584" model="account.account.template">
       <field name="code">9584</field>
       <field name="name">Anteil für Konto Vollhafter 9824</field>
@@ -15318,7 +15318,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9585" model="account.account.template">
       <field name="code">9585</field>
       <field name="name">Anteil für Konto Vollhafter 9825</field>
@@ -15327,7 +15327,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9586" model="account.account.template">
       <field name="code">9586</field>
       <field name="name">Anteil für Konto Vollhafter 9826</field>
@@ -15336,7 +15336,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9587" model="account.account.template">
       <field name="code">9587</field>
       <field name="name">Anteil für Konto Vollhafter 9827</field>
@@ -15345,7 +15345,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9588" model="account.account.template">
       <field name="code">9588</field>
       <field name="name">Anteil für Konto Vollhafter 9828</field>
@@ -15354,7 +15354,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9589" model="account.account.template">
       <field name="code">9589</field>
       <field name="name">Anteil für Konto Vollhafter 9829</field>
@@ -15363,7 +15363,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9590" model="account.account.template">
       <field name="code">9590</field>
       <field name="name">Anteil für Konto Teilhafter 0080 </field>
@@ -15372,7 +15372,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9591" model="account.account.template">
       <field name="code">9591</field>
       <field name="name">Anteil für Konto Teilhafter 0081</field>
@@ -15381,7 +15381,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9592" model="account.account.template">
       <field name="code">9592</field>
       <field name="name">Anteil für Konto Teilhafter 0082</field>
@@ -15390,7 +15390,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9593" model="account.account.template">
       <field name="code">9593</field>
       <field name="name">Anteil für Konto Teilhafter 0083</field>
@@ -15399,7 +15399,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9594" model="account.account.template">
       <field name="code">9594</field>
       <field name="name">Anteil für Konto Teilhafter 0084</field>
@@ -15408,7 +15408,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9595" model="account.account.template">
       <field name="code">9595</field>
       <field name="name">Anteil für Konto Teilhafter 0085</field>
@@ -15417,7 +15417,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9596" model="account.account.template">
       <field name="code">9596</field>
       <field name="name">Anteil für Konto Teilhafter 0086</field>
@@ -15426,7 +15426,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9597" model="account.account.template">
       <field name="code">9597</field>
       <field name="name">Anteil für Konto Teilhafter 0087</field>
@@ -15435,7 +15435,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9598" model="account.account.template">
       <field name="code">9598</field>
       <field name="name">Anteil für Konto Teilhafter 0088</field>
@@ -15444,7 +15444,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9599" model="account.account.template">
       <field name="code">9599</field>
       <field name="name">Anteil für Konto Teilhafter 0089</field>
@@ -15453,7 +15453,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9600" model="account.account.template">
       <field name="code">9600</field>
       <field name="name">Name des Gesellschafters Vollhafter</field>
@@ -15462,7 +15462,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9610" model="account.account.template">
       <field name="code">9610</field>
       <field name="name">Tätigkeitsvergütung Vollhafter</field>
@@ -15471,7 +15471,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9620" model="account.account.template">
       <field name="code">9620</field>
       <field name="name">Tantieme Vollhafter</field>
@@ -15480,7 +15480,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9630" model="account.account.template">
       <field name="code">9630</field>
       <field name="name">Darlehensverzinsung Vollhafter</field>
@@ -15489,7 +15489,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9640" model="account.account.template">
       <field name="code">9640</field>
       <field name="name">Gebrauchsüberlassung Vollhafter</field>
@@ -15498,7 +15498,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9650" model="account.account.template">
       <field name="code">9650</field>
       <field name="name">Sonstige Vergütungen Vollhafter</field>
@@ -15507,7 +15507,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9690" model="account.account.template">
       <field name="code">9690</field>
       <field name="name">Restanteil Vollhafter</field>
@@ -15516,7 +15516,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9700" model="account.account.template">
       <field name="code">9700</field>
       <field name="name">Name des Gesellschafters Teillhafter</field>
@@ -15525,7 +15525,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9710" model="account.account.template">
       <field name="code">9710</field>
       <field name="name">Tätigkeitsvergütung Teillhafter</field>
@@ -15534,7 +15534,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9720" model="account.account.template">
       <field name="code">9720</field>
       <field name="name">Tantieme Teillhafter</field>
@@ -15543,7 +15543,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9730" model="account.account.template">
       <field name="code">9730</field>
       <field name="name">Darlehensverzinsung Teillhafter</field>
@@ -15552,7 +15552,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9740" model="account.account.template">
       <field name="code">9740</field>
       <field name="name">Gebrauchsüberlassung Teillhafter</field>
@@ -15561,7 +15561,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9750" model="account.account.template">
       <field name="code">9750</field>
       <field name="name">Sonstige Vergütungen Teillhafter</field>
@@ -15570,7 +15570,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9780" model="account.account.template">
       <field name="code">9780</field>
       <field name="name">Anteil für Konto 9840-49 Teilhafter</field>
@@ -15579,7 +15579,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9790" model="account.account.template">
       <field name="code">9790</field>
       <field name="name">Restanteil Teillhafter</field>
@@ -15588,7 +15588,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9800" model="account.account.template">
       <field name="code">9800</field>
       <field name="name">Lösch- und Korrekturschlüssel</field>
@@ -15597,7 +15597,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9801" model="account.account.template">
       <field name="code">9801</field>
       <field name="name">Lösch- und Korrekturschlüssel</field>
@@ -15606,7 +15606,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSd" model="account.account.template">
       <field name="code">K9VKSd</field>
       <field name="name">Kapital Personenhandelsgesellschaft Vollhafter</field>
@@ -15614,7 +15614,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9810" model="account.account.template">
       <field name="code">9810</field>
       <field name="name">Gesellschafter-Darlehen</field>
@@ -15623,7 +15623,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9820" model="account.account.template">
       <field name="code">9820</field>
       <field name="name">Verlust-/ Vortragskonto</field>
@@ -15632,7 +15632,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9830" model="account.account.template">
       <field name="code">9830</field>
       <field name="name">Verrechnungskonto für Einzahlungsverpflichtungen</field>
@@ -15641,7 +15641,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSe" model="account.account.template">
       <field name="code">K9VKSe</field>
       <field name="name">Kapital Personenhandelsgesellschaft Teilhafter</field>
@@ -15649,7 +15649,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9840" model="account.account.template">
       <field name="code">9840</field>
       <field name="name">Gesellschafter-Darlehen</field>
@@ -15658,7 +15658,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9850" model="account.account.template">
       <field name="code">9850</field>
       <field name="name">Verrechnungskonto für Einzahlungsverpflichtungen</field>
@@ -15667,7 +15667,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSf" model="account.account.template">
       <field name="code">K9VKSf</field>
       <field name="name">Einzahlungsverpflichtungen im Bereich der Forderungen</field>
@@ -15675,7 +15675,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9860" model="account.account.template">
       <field name="code">9860</field>
       <field name="name">Einzahlungsverpflichtungen persönlich haftender Gesellschafter</field>
@@ -15684,7 +15684,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9870" model="account.account.template">
       <field name="code">9870</field>
       <field name="name">Einzahlungsverpflichtungen Kommanditisten</field>
@@ -15693,7 +15693,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSg" model="account.account.template">
       <field name="code">K9VKSg</field>
       <field name="name">Ausgleichsposten für aktivierte eigene Anteile und Bilanzierungshilfen</field>
@@ -15701,7 +15701,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9880" model="account.account.template">
       <field name="code">9880</field>
       <field name="name">Ausgleichsposten für aktivierte eigene Anteile </field>
@@ -15710,7 +15710,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9882" model="account.account.template">
       <field name="code">9882</field>
       <field name="name">Ausgleichsposten für aktivierte Bilanzierungshilfen</field>
@@ -15719,7 +15719,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSh" model="account.account.template">
       <field name="code">K9VKSh</field>
       <field name="name">Nicht durch Vermögenseinlagen gedeckte Entnahmen</field>
@@ -15727,7 +15727,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9883" model="account.account.template">
       <field name="code">9883</field>
       <field name="name">Nicht durch Vermögenseinlagen gedeckte Entnahmen persönlich haftender Gesellschafter</field>
@@ -15736,7 +15736,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9884" model="account.account.template">
       <field name="code">9884</field>
       <field name="name">Nicht durch Vermögenseinlagen gedeckte Entnahmen Kommanditisten</field>
@@ -15745,7 +15745,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSi" model="account.account.template">
       <field name="code">K9VKSi</field>
       <field name="name">Verrechnungskonto für nicht durch Vermögenseinlagen gedeckte Entnahmen</field>
@@ -15753,7 +15753,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9885" model="account.account.template">
       <field name="code">9885</field>
       <field name="name">Verrechnungskonto für nicht durch Vermögenseinlagen gedeckte Entnahmen persönlich haftender Gesellschafter</field>
@@ -15762,7 +15762,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9886" model="account.account.template">
       <field name="code">9886</field>
       <field name="name">Verrechnungskonto für nicht durch Vermögenseinlagen gedeckte Entnahmen Kommanditisten</field>
@@ -15771,7 +15771,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSj" model="account.account.template">
       <field name="code">K9VKSj</field>
       <field name="name">Steueraufwand der Gesellschafter</field>
@@ -15779,7 +15779,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9887" model="account.account.template">
       <field name="code">9887</field>
       <field name="name">Steueraufwand der Gesellschafter </field>
@@ -15788,7 +15788,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9889" model="account.account.template">
       <field name="code">9889</field>
       <field name="name">Gegenkonto zu 9887</field>
@@ -15797,7 +15797,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSk" model="account.account.template">
       <field name="code">K9VKSk</field>
       <field name="name">Statistische Konten für Gewinnzuschlag</field>
@@ -15805,7 +15805,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9890" model="account.account.template">
       <field name="code">9890</field>
       <field name="name">Statistische Konten für den Gewinnzuschlag nach §§ 6b- 6c und 7g EStG (Haben-Buchung)</field>
@@ -15814,7 +15814,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9891" model="account.account.template">
       <field name="code">9891</field>
       <field name="name">Statistische Konten für den Gewinnzuschlag- Gegenkonto zu 9890</field>
@@ -15823,7 +15823,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSl" model="account.account.template">
       <field name="code">K9VKSl</field>
       <field name="name">Vorsteuer-/Umsatzsteuerkonten zur Korrektur der Forderungen/ Verbindlichkeiten (EüR)</field>
@@ -15831,7 +15831,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9893" model="account.account.template">
       <field name="code">9893</field>
       <field name="name">Umsatzsteuer in den Forderungen zum allgemeinen Umsatzsteuersatz (EüR)</field>
@@ -15840,7 +15840,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9894" model="account.account.template">
       <field name="code">9894</field>
       <field name="name">Umsatzsteuer in den Forderungen zum ermäßigten Umsatzsteuersatz (EüR)</field>
@@ -15849,7 +15849,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9895" model="account.account.template">
       <field name="code">9895</field>
       <field name="name">Gegenkonto 9893-9894 für die Aufteilung der Umsatzsteuersatz (EüR)</field>
@@ -15858,7 +15858,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9896" model="account.account.template">
       <field name="code">9896</field>
       <field name="name">Vorsteuer in den Verbindlichkeiten zum allgemeinen Umsatzsteuersatz (EüR)</field>
@@ -15867,7 +15867,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9897" model="account.account.template">
       <field name="code">9897</field>
       <field name="name">Vorsteuer in den Verbindlichkeiten zum ermäßigten Umsatzsteuersatz (EüR)</field>
@@ -15876,7 +15876,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9899" model="account.account.template">
       <field name="code">9899</field>
       <field name="name">Gegenkonto 9896-9897 für die Aufteilung der Vorsteuer (EüR)</field>
@@ -15885,7 +15885,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9900" model="account.account.template">
       <field name="code">9900</field>
       <field name="name">SO Commitment</field>
@@ -15894,7 +15894,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSm" model="account.account.template">
       <field name="code">K9VKSm</field>
       <field name="name">Statistische Konten zu § 4 (4a) EStG</field>
@@ -15902,7 +15902,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9910" model="account.account.template">
       <field name="code">9910</field>
       <field name="name">Gegenkonto zur Minderung der Entnahmen §4 (4a) EStG</field>
@@ -15911,7 +15911,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9911" model="account.account.template">
       <field name="code">9911</field>
       <field name="name">Minderung der Entnahmen §4 (4a) EStG (Haben)</field>
@@ -15920,7 +15920,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9912" model="account.account.template">
       <field name="code">9912</field>
       <field name="name">Erhöhung der Entnahmen §4 (4a) EStG</field>
@@ -15929,7 +15929,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9913" model="account.account.template">
       <field name="code">9913</field>
       <field name="name">Gegenkonto zur Erhöhung der Entnahmen §4 (4a) EStG (Haben)</field>
@@ -15938,7 +15938,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSn" model="account.account.template">
       <field name="code">K9VKSn</field>
       <field name="name">Statistische konten für Kinderbetreuungskosten</field>
@@ -15946,7 +15946,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9918" model="account.account.template">
       <field name="code">9918</field>
       <field name="name">Kinderbetreuungskosten (wie Betriebsausgaben steuerlich anzusetzender Betrag)</field>
@@ -15955,7 +15955,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9919" model="account.account.template">
       <field name="code">9919</field>
       <field name="name">Gegenkonto zu 9918 (Haben)</field>
@@ -15964,7 +15964,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_K9VKSo" model="account.account.template">
       <field name="code">K9VKSo</field>
       <field name="name">Statistische Konten für den GuV-Ausweis in "Gutschrift bzw. Belastung auf Verbindlichkeitskonten" bei den Zuordnungstabellen für PersHG nach KapCoRiLiG</field>
@@ -15972,7 +15972,7 @@
       <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
-    
+
     <record id="chart_skr04_9980" model="account.account.template">
       <field name="code">9980</field>
       <field name="name">Anteil für Verbindlichkeitskonten</field>
@@ -15981,7 +15981,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account.account_type_other"/>
     </record>
-    
+
     <record id="chart_skr04_9981" model="account.account.template">
       <field name="code">9981</field>
       <field name="name">Verrechnungskonto für Anteil Verbindlichkeitskonten</field>
diff --git a/addons/l10n_de/account_types_skr03.xml b/addons/l10n_de/account_types_skr03.xml
index 5967999b601..3c3da6eb67f 100644
--- a/addons/l10n_de/account_types_skr03.xml
+++ b/addons/l10n_de/account_types_skr03.xml
@@ -8,28 +8,28 @@
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_income" >
+	    <record model="account.account.type" id="account.data_account_type_income" >
 	      <field name="name">Erfolgskonten - Erlöse</field>
 	      <field name="code">income</field>
               <field name="report_type">income</field>
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_expense">
+	    <record model="account.account.type" id="account.data_account_type_expense">
 	      <field name="name">Erfolgskonten - Aufwendungen</field>
 	      <field name="code">expense</field>
               <field name="report_type">expense</field>
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_asset">
+	    <record model="account.account.type" id="account.data_account_type_asset">
 	      <field name="name">Bilanzkonten - Aktiva - Vermögenskonten</field>
 	      <field name="code">balance asset</field>
               <field name="report_type">asset</field>
 	      <field name="close_method">balance</field>
 	    </record>
 
-	   <record model="account.account.type" id="account.account_type_liability">
+	   <record model="account.account.type" id="account.data_account_type_liability">
 	      <field name="name">Bilanzkonten - Passiva - Kapitalkonten</field>
 	      <field name="code">balance liability</field>
               <field name="report_type">liability</field>
diff --git a/addons/l10n_de/account_types_skr04.xml b/addons/l10n_de/account_types_skr04.xml
index 5967999b601..3c3da6eb67f 100644
--- a/addons/l10n_de/account_types_skr04.xml
+++ b/addons/l10n_de/account_types_skr04.xml
@@ -8,28 +8,28 @@
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_income" >
+	    <record model="account.account.type" id="account.data_account_type_income" >
 	      <field name="name">Erfolgskonten - Erlöse</field>
 	      <field name="code">income</field>
               <field name="report_type">income</field>
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_expense">
+	    <record model="account.account.type" id="account.data_account_type_expense">
 	      <field name="name">Erfolgskonten - Aufwendungen</field>
 	      <field name="code">expense</field>
               <field name="report_type">expense</field>
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_asset">
+	    <record model="account.account.type" id="account.data_account_type_asset">
 	      <field name="name">Bilanzkonten - Aktiva - Vermögenskonten</field>
 	      <field name="code">balance asset</field>
               <field name="report_type">asset</field>
 	      <field name="close_method">balance</field>
 	    </record>
 
-	   <record model="account.account.type" id="account.account_type_liability">
+	   <record model="account.account.type" id="account.data_account_type_liability">
 	      <field name="name">Bilanzkonten - Passiva - Kapitalkonten</field>
 	      <field name="code">balance liability</field>
               <field name="report_type">liability</field>
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index f3dbf88289b..9dd81606036 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -18,7 +18,7 @@
 #
 ##############################################################################
 {
-    'name': 'Ecuador - Accounting Chart',
+    'name': 'Ecuador - Accounting',
     'version': '1.1',
     'category': 'Localization/Account Charts',
     'description': """
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index e2f5ad3402d..4da526f4b76 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -22,7 +22,7 @@
 ##############################################################################
 
 {
-    "name" : "Spanish Charts of Accounts (PGCE 2008)",
+    "name" : "Spanish - Accounting (PGCE 2008)",
     "version" : "3.0",
     "author" : "Spanish Localization Team",
     'website' : 'https://launchpad.net/openerp-spain',
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 1bcb659c322..daccb5120c3 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -26,7 +26,7 @@
 #
 ##############################################################################
 {
-    "name" : "France - Plan Comptable Général",
+    "name" : "France - Accounting",
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
@@ -37,7 +37,7 @@ This is the module to manage the accounting chart for France in OpenERP.
 
 Credits: Sistheo Zeekom CrysaLEAD
 """,
-    "depends" : ['base', 'account', 'account_chart', 'base_vat'],
+    "depends" : ['base_iban', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'],
     "init_xml" : [],
     "update_xml" : [
         "fr_report_demo.xml",
diff --git a/addons/l10n_fr/security/ir.model.access.csv b/addons/l10n_fr/security/ir.model.access.csv
index 13405e7ce76..3642d709040 100644
--- a/addons/l10n_fr/security/ir.model.access.csv
+++ b/addons/l10n_fr/security/ir.model.access.csv
@@ -1,5 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_l10n_fr_report_manager","l10n_fr.report account manager","model_l10n_fr_report","account.group_account_manager",1,1,1,1
-"access_l10n_fr_report_user","l10n_fr_report account user","model_l10n_fr_report","account.group_account_user",1,1,1,1
-"access_l10n_fr_line_manager","l10n_fr_line account manager","model_l10n_fr_line","account.group_account_manager",1,1,1,1
-"access_l10n_fr_line_user","l10n_fr.l10n_fr_line_account user","model_l10n_fr_line","account.group_account_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_l10n_fr_report_user,l10n_fr_report account user,model_l10n_fr_report,account.group_account_user,1,1,1,1
+access_l10n_fr_line_user,l10n_fr.l10n_fr_line_account user,model_l10n_fr_line,account.group_account_user,1,1,1,1
diff --git a/addons/l10n_fr_rib/__openerp__.py b/addons/l10n_fr_rib/__openerp__.py
index 16d26995dc4..072f8f5c1ac 100644
--- a/addons/l10n_fr_rib/__openerp__.py
+++ b/addons/l10n_fr_rib/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'French RIB Bank Details',
     'version': '1.0',
-    "category": 'Accounting & Finance',
+    "category": 'Hidden/Dependency',
     'description': '''
 This module lets users enter the banking details of Partners in the RIB format (French standard for bank accounts details).
 RIB Bank Accounts can be entered in the "Accounting" tab of the Partner form by specifying the account type "RIB". The four standard RIB fields will then become mandatory:
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index 72b1d2c7cc4..0ad042b3b28 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    "name" : "Greece - Normal Plan",
+    "name" : "Greece - Accounting",
     "version" : "0.2",
     "author" : "P. Christeas, OpenERP SA.",
     "website": "http://openerp.hellug.gr/",
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index d80c1fa80a7..f05bbdaaff1 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -33,7 +33,7 @@
 #
 
 {
-    'name': 'Guatemala - Plan contable general',
+    'name': 'Guatemala - Accounting',
     'version': '3.0',
     'category': 'Localization/Account Charts',
     'description': """
diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py
index 31d9344cb65..af8bb4cfa1d 100644
--- a/addons/l10n_hn/__openerp__.py
+++ b/addons/l10n_hn/__openerp__.py
@@ -33,7 +33,7 @@
 #
 
 {
-    'name': 'Honduras - Plan contable general',
+    'name': 'Honduras - Accounting',
     'version': '0.1',
     'category': 'Localization/Account Charts',
     'description': """Agrega una nomenclatura contable para Honduras. También incluye impuestos y la moneda Lempira. -- Adds accounting chart for Honduras.  It also includes taxes and the Lempira currency""",
@@ -49,6 +49,5 @@
     ],
     'demo_xml': [],
     'installable': True,
-    'certificate': '', 
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 9aaec061319..2c54ca256fc 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Indian Chart of Account",
+    "name": "India - Accounting",
     "version": "1.0",
     "description": """
 Indian Accounting : Chart of Account.
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 2c5811a6915..b531db26c99 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -28,7 +28,7 @@
 ##############################################################################
 
 {
-    "name" : "Italy - Generic Chart of Accounts",
+    "name" : "Italy - Accounting",
     "version" : "0.1",
     "depends" : ['base_vat','account_chart','base_iban'],
     "author" : "OpenERP Italian Community",
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 7a4436e31c1..68c2e7ac76b 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Luxembourg - Plan Comptable Minimum Normalise',
+    'name': 'Luxembourg - Accounting',
     'version': '1.0',
     'category': 'Localization/Account Charts',
     'description': """
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index a9bd7ce557e..69fd801e1dc 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Maroc - Plan Comptable Général",
+    "name" : "Maroc - Accounting",
     "version" : "1.0",
     "author" : "kazacube",
     "category" : "Localization/Account Charts",
diff --git a/addons/l10n_ma/security/ir.model.access.csv b/addons/l10n_ma/security/ir.model.access.csv
index da5da5f48a2..2c89d1d3692 100644
--- a/addons/l10n_ma/security/ir.model.access.csv
+++ b/addons/l10n_ma/security/ir.model.access.csv
@@ -1,5 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_l10n_ma_report_manager","l10n_ma.report account manager","model_l10n_ma_report","account.group_account_manager",1,1,1,1
-"access_l10n_ma_report_user","l10n_ma_report account user","model_l10n_ma_report","account.group_account_user",1,1,1,1
-"access_l10n_ma_line_manager","l10n_ma_line account manager","model_l10n_ma_line","account.group_account_manager",1,1,1,1
-"access_l10n_ma_line_user","l10n_ma.l10n_ma_line_account user","model_l10n_ma_line","account.group_account_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_l10n_ma_report_user,l10n_ma_report account user,model_l10n_ma_report,account.group_account_user,1,1,1,1
+access_l10n_ma_line_user,l10n_ma.l10n_ma_line_account user,model_l10n_ma_line,account.group_account_user,1,1,1,1
diff --git a/addons/l10n_multilang/__init__.py b/addons/l10n_multilang/__init__.py
new file mode 100644
index 00000000000..446f3beb668
--- /dev/null
+++ b/addons/l10n_multilang/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account
+import l10n_multilang
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_multilang/__openerp__.py b/addons/l10n_multilang/__openerp__.py
new file mode 100644
index 00000000000..f7c3b4db1d7
--- /dev/null
+++ b/addons/l10n_multilang/__openerp__.py
@@ -0,0 +1,43 @@
+# -*- 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" : "Multi Language Chart of Accounts",
+    "version" : "1.1",
+    "author" : "OpenERP SA",
+    "category": 'Hidden/Dependency',
+    "description": """
+    * Multi language support for Chart of Accounts, Taxes, Tax Codes , Journals, Accounting Templates,
+        Analytic Chart of Accounts and Analytic Journals.
+    * Setup wizard changes
+        - Copy translations for COA, Tax, Tax Code and Fiscal Position from templates to target objects.
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    "depends" : ['account_accountant'],
+    'update_xml': [
+                ],
+    'demo_xml': [
+                ],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_multilang/account.py b/addons/l10n_multilang/account.py
new file mode 100644
index 00000000000..162abb0447f
--- /dev/null
+++ b/addons/l10n_multilang/account.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
+from tools.translate import _
+
+
+#in this file, we mostly add the tag translate=True on existing fields that we now want to be translated
+
+class account_account_template(osv.osv):
+    _inherit = 'account.account.template'
+    _columns = {
+        'name': fields.char('Name', size=128, required=True, select=True, translate=True),
+    }
+account_account_template()
+
+class account_tax(osv.osv):
+    _inherit = 'account.tax'
+    _columns = {
+        'name': fields.char('Tax Name', size=128, required=True, select=True, translate=True),
+    }
+account_tax()
+
+
+class account_tax_template(osv.osv):
+    _inherit = 'account.tax.template'
+    _columns = {
+        'name': fields.char('Tax Name', size=128, required=True, select=True, translate=True),
+    }
+account_tax_template()
+
+
+class account_tax_code_template(osv.osv):
+    _inherit = 'account.tax.code.template'
+    _columns = {
+        'name': fields.char('Tax Case Name', size=64, required=True, translate=True),
+    }
+account_tax_code_template()
+
+
+class account_chart_template(osv.osv):
+    _inherit = 'account.chart.template'
+    _columns={
+        'name': fields.char('Name', size=64, required=True, translate=True),
+        'spoken_languages': fields.char('Spoken Languages', size=64, help="State here the languages for which the translations of templates could be loaded at the time of installation of this localization module and copied in the final object when generating them from templates. You must provide the language codes separated by ';'"),
+    }
+    _order = 'name'
+account_chart_template()
+
+
+class account_fiscal_position(osv.osv):
+    _inherit = 'account.fiscal.position'
+    _columns = {
+        'name': fields.char('Fiscal Position', size=64, required=True, translate=True),
+    }
+account_fiscal_position()
+
+
+class account_fiscal_position_template(osv.osv):
+    _inherit = 'account.fiscal.position.template'
+    _columns = {
+        'name': fields.char('Fiscal Position Template', size=64, required=True, translate=True),
+    }
+account_fiscal_position_template()
+
+
+class account_journal(osv.osv):
+    _inherit = 'account.journal'
+    _columns = {
+        'name': fields.char('Journal Name', size=64, required=True, translate=True),
+    }
+account_journal()
+
+
+class account_analytic_account(osv.osv):
+    _inherit = 'account.analytic.account'
+    _columns = {
+        'name': fields.char('Account Name', size=128, required=True, translate=True),
+    }
+account_analytic_account()
+
+
+class account_analytic_journal(osv.osv):
+    _inherit = 'account.analytic.journal'
+    _columns = {
+        'name': fields.char('Journal Name', size=64, required=True, translate=True),
+    }
+account_analytic_journal()
diff --git a/addons/l10n_multilang/l10n_multilang.py b/addons/l10n_multilang/l10n_multilang.py
new file mode 100644
index 00000000000..c4130f2761d
--- /dev/null
+++ b/addons/l10n_multilang/l10n_multilang.py
@@ -0,0 +1,156 @@
+# -*- 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 os
+from tools.translate import _
+import netsvc
+logger=netsvc.Logger()
+
+class wizard_multi_charts_accounts(osv.osv_memory):
+    """
+    Change wizard that a new account chart for a company.
+        * Add option to install languages during the setup
+        * Copy translations for COA, Tax, Tax Code and Fiscal Position from templates to target objects.
+    """
+    _inherit = 'wizard.multi.charts.accounts'
+
+    def process_translations(self, cr, uid, langs, in_obj, in_field, in_ids, out_obj, out_ids, force_write=False, context=None):
+        """
+        This method copies translations values of templates into new Accounts/Taxes/Journals for languages selected
+
+        :param cr: A database cursor
+        :param uid: ID of the user currently logged in
+        :param langs: List of languages to load for new records
+        :param in_field: Name of the translatable field of source templates
+        :param in_obj: Name of source object of templates.
+        :param in_ids: List of ids of source object
+        :param out_obj: Destination object for which translation is to be copied
+        :param out_ids: List of ids of destination object
+        :param force_write: boolean that depicts if we need to create a translation OR simply replace the actual value
+            with the translation in the uid's language by doing a write (in case it's TRUE)
+        :param context: usual context information. May contain the key 'lang', which is the language of the user running
+            the wizard, that will be used if force_write is True
+
+        :return: True
+        """
+        if context is None:
+            context = {}
+        src = {}
+        xlat_obj = self.pool.get('ir.translation')
+        #find the source from Account Template
+        for x in in_obj.browse(cr, uid, in_ids):
+            src.update({x.id: x.name})
+        for lang in langs:
+            #find the value from Translation
+            value = xlat_obj._get_ids(cr, uid, in_obj._name + ',' + in_field, 'model', lang, in_ids)
+            for j in range(len(in_ids)):
+                in_id = in_ids[j]
+                if value[in_id]:
+                    if not force_write:
+                        #copy Translation from Source to Destination object
+                        xlat_obj.create(cr, uid, {
+                          'name': out_obj._name + ',' + in_field,
+                          'type': 'model',
+                          'res_id': out_ids[j],
+                          'lang': lang,
+                          'src': src[in_id],
+                          'value': value[in_id],
+                    })
+                    else:
+                        #replace the value in the destination object only if it's the user lang
+                        if context.get('lang') == lang:
+                            self.pool.get(out_obj._name).write(cr, uid, out_ids[j], {in_field: value[in_id]})
+                else:
+                    logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING,
+                             'Language: %s. Translation from template: there is no translation available for %s!' %(lang,  src[in_id]))#out_obj._name))
+        return True
+
+    def execute(self, cr, uid, ids, context=None):
+        res = super(wizard_multi_charts_accounts, self).execute(cr, uid, ids, context=context)
+
+        obj_multi = self.browse(cr, uid, ids[0], context=context)
+        company_id = obj_multi.company_id.id
+
+        # load languages
+        langs = []
+        res_lang_obj = self.pool.get('res.lang')
+        installed_lang_ids = res_lang_obj.search(cr, uid, [])
+        installed_langs = [x.code for x in res_lang_obj.browse(cr, uid, installed_lang_ids, context=context)]
+        if obj_multi.chart_template_id.spoken_languages:
+            for lang in obj_multi.chart_template_id.spoken_languages.split(';'):
+                if lang not in installed_langs:
+                    # the language is not installed, so we don't need to load its translations
+                    continue
+                else: 
+                    # the language was already installed, so the po files have been loaded at the installation time
+                    # and now we need to copy the translations of templates to the right objects
+                    langs.append(lang)
+        if langs:
+            # write account.account translations in the real COA
+            self._process_accounts_translations(cr, uid, obj_multi, company_id, langs, 'name', context=context)
+
+            # copy account.tax.code translations
+            self._process_tax_codes_translations(cr, uid, obj_multi, company_id, langs, 'name', context=context)
+
+            # copy account.tax translations
+            self._process_taxes_translations(cr, uid, obj_multi, company_id, langs, 'name', context=context)
+
+            # copy account.fiscal.position translations
+            self._process_fiscal_pos_translations(cr, uid, obj_multi, company_id, langs, 'name', context=context)
+
+        return res
+
+    def _process_accounts_translations(self, cr, uid, obj_multi, company_id, langs, field, context=None):
+        obj_acc_template = self.pool.get('account.account.template')
+        obj_acc = self.pool.get('account.account')
+        acc_template_root_id = obj_multi.chart_template_id.account_root_id.id
+        acc_root_id = obj_acc.search(cr, uid, [('company_id', '=', company_id), ('parent_id', '=', None)])[0]
+        in_ids = obj_acc_template.search(cr, uid, [('id', 'child_of', [acc_template_root_id])], order='id')[1:]
+        out_ids = obj_acc.search(cr, uid, [('id', 'child_of', [acc_root_id])], order='id')[1:]
+        return self.process_translations(cr, uid, langs, obj_acc_template, field, in_ids, obj_acc, out_ids, force_write=True, context=context)
+
+    def _process_tax_codes_translations(self, cr, uid, obj_multi, company_id, langs, field, context=None):
+        obj_tax_code_template = self.pool.get('account.tax.code.template')
+        obj_tax_code = self.pool.get('account.tax.code')
+        tax_code_template_root_id = obj_multi.chart_template_id.tax_code_root_id.id
+        tax_code_root_id = obj_tax_code.search(cr, uid, [('company_id', '=', company_id), ('parent_id', '=', None)])[0]
+        in_ids = obj_tax_code_template.search(cr, uid, [('id', 'child_of', [tax_code_template_root_id])], order='id')[1:]
+        out_ids = obj_tax_code.search(cr, uid, [('id', 'child_of', [tax_code_root_id])], order='id')[1:]
+        return self.process_translations(cr, uid, langs, obj_tax_code_template, field, in_ids, obj_tax_code, out_ids, force_write=False, context=context)
+
+    def _process_taxes_translations(self, cr, uid, obj_multi, company_id, langs, field, context=None):
+        obj_tax_template = self.pool.get('account.tax.template')
+        obj_tax = self.pool.get('account.tax')
+        in_ids = sorted([x.id for x in obj_multi.chart_template_id.tax_template_ids])
+        out_ids = obj_tax.search(cr, uid, [('company_id', '=', company_id)], order='id')
+        return self.process_translations(cr, uid, langs, obj_tax_template, field, in_ids, obj_tax, out_ids, force_write=False, context=context)
+
+    def _process_fiscal_pos_translations(self, cr, uid, obj_multi, company_id, langs, field, context=None):
+        obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
+        obj_fiscal_position = self.pool.get('account.fiscal.position')
+        in_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)], order='id')
+        out_ids = obj_fiscal_position.search(cr, uid, [('company_id', '=', company_id)], order='id')
+        return self.process_translations(cr, uid, langs, obj_fiscal_position_template, field, in_ids, obj_fiscal_position, out_ids, force_write=False, context=context)
+
+wizard_multi_charts_accounts()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index d56d5f570b1..aa21d1a6356 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    "name" : "Mexico - Chart of Account",
+    "name" : "Mexico - Accounting",
     "version" : "1.0",
     "author" : "RelTek Mexico",
     "category" : "Localization/Account Charts",
diff --git a/addons/l10n_mx/account_chart.xml b/addons/l10n_mx/account_chart.xml
index 9a86600101f..146ebd7b95e 100644
--- a/addons/l10n_mx/account_chart.xml
+++ b/addons/l10n_mx/account_chart.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data noupdate="1">
-	
-		
+
+
 	<!-- Account Types -->
 
 	<record model="account.account.type" id="account_type_receivable" >
@@ -59,7 +59,7 @@
       <field name="report_type">liability</field>
       <field name="close_method">balance</field>
     </record>
-	
+
 	<!-- Account Templates -->
 	<record id="chart0" model="account.account.template">
 		<field name="code">0</field>
@@ -67,7 +67,7 @@
 		<field name="type">view</field>
 		<field name="user_type" ref="account_type_view"/>
 	</record>
-	
+
 	<record id="chart1000" model="account.account.template">
 		<field name="code">1000</field>
 		<field name="reconcile" eval="False"/>
@@ -421,10 +421,10 @@
 
 	<record id="mx_a_recv" model="account.account.template">
 		<field name="code">4450</field>
-		<field name="reconcile" eval="False"/>
+		<field name="reconcile" eval="True"/>
 		<field name="parent_id" ref="chart0"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account_type_income"/>
+		<field name="type">receivable</field>
+		<field name="user_type" ref="account_type_receivable"/>
 		<field name="name">Ganancia en Paridad Cambiaria</field>
 	</record>
 
@@ -575,12 +575,12 @@
 	<record id="chart5530" model="account.account.template">
 		<field name="code">5530</field>
 		<field name="reconcile" eval="False"/>
-	
+
 		<field name="parent_id" ref="chart0"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account_type_expense"/>
 		<field name="name">Derecho de Frente</field>
-	
+
 	</record>
 
 	<record id="chart5600" model="account.account.template">
@@ -702,10 +702,10 @@
 
 	<record id="mx_a_pay" model="account.account.template">
 		<field name="code">5810</field>
-		<field name="reconcile" eval="False"/>
+		<field name="reconcile" eval="True"/>
 		<field name="parent_id" ref="chart0"/>
-		<field name="type">other</field>
-		<field name="user_type" ref="account_type_expense"/>
+		<field name="type">payable</field>
+		<field name="user_type" ref="account_type_payable"/>
 		<field name="name">Pérdidas Paridad Cambiaria</field>
 	</record>
 
@@ -721,6 +721,6 @@
         <field name="property_account_expense_categ" ref="mx_a_expense"/>
         <field name="property_account_income_categ" ref="mx_a_income"/>
 	</record>
-	
+
 </data>
 </openerp>
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 5635e16d6c3..562fd0ab876 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -86,7 +86,7 @@
 #   Changed naming of 7020 and 7030 to Kostprijs omzet xxxx
 
 {
-    "name" : "Netherlands - Grootboek en BTW rekeningen",
+    "name" : "Netherlands - Accounting",
     "version" : "1.5",
     "category": "Localization/Account Charts",
     "description": """
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index 0ec97ab7cb6..de1784009b5 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -21,7 +21,7 @@
 #
 ##############################################################################
 {
-    "name" : "Poland - Chart of Accounts",
+    "name" : "Poland - Accounting",
     "version" : "1.0",
     "author" : "Grzegorz Grzelak (Cirrus)",
     "website": "http://www.cirrus.pl",
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index 647b4b35449..df441869d72 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    "name" : "Romania - Chart of Accounts",
+    "name" : "Romania - Accounting",
     "version" : "1.1",
     "author" : "filsys",
     "website": "http://www.filsystem.ro",
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
index 0fa4631b1f1..7b258a04507 100644
--- a/addons/l10n_syscohada/__openerp__.py
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "OHADA - The accounting chart ",
+    "name" : "OHADA - Accounting",
     "version" : "1.0",
     "author" : "Baamtu Senegal",
     "category" : "Localization/Account Charts",
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index 4ab8f7d355c..c1534787721 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Thailand - Thai Chart of Accounts',
+    'name': 'Thailand - Accounting',
     'version': '1.0',
     'category': 'Localization/Account Charts',
     'description': """
diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index f6e253fffc2..f6e8212aed0 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -20,7 +20,7 @@
 
 
 {
-    'name': 'UK Chart of Accounts - latest (Smartode/CT600)',
+    'name': 'UK - Accounting',
     'version': '1.0',
     'category': 'Localization/Account Charts',
     'description': """This is the latest UK OpenERP localisation necesary to run OpenERP accounting for UK SME's with:
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index 45ac68fc105..ce44be32771 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -23,7 +23,7 @@
 #
 ##############################################################################
 {
-    "name" : "Venezuela -Chart of Account",
+    "name" : "Venezuela - Accounting",
     "version" : "1.0",
     "author" : ['OpenERP SA', "Netquatro"],
     "category" : "Localization/Account Charts",
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 02092ffd366..363b0b3a2c2 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -33,7 +33,7 @@
     """,
     "version": "0.1",
     "depends": ["base_tools"],
-    "category" : "Human Resources",
+    "category" : "Tools",
     'description': """
     The base module to manage lunch
 
@@ -55,7 +55,6 @@
     "demo_xml": ['lunch_demo.xml'],
     "test": ['test/test_lunch.yml', 'test/lunch_report.yml'],
     "installable": True,
-    'application': True,
     "certificate" : "001292377792581874189",
     'images': ['images/cash_moves.jpeg','images/lunch_orders.jpeg','images/products.jpeg'],
 }
diff --git a/addons/lunch/i18n/hr.po b/addons/lunch/i18n/hr.po
new file mode 100644
index 00000000000..8cc6d00bcd2
--- /dev/null
+++ b/addons/lunch/i18n/hr.po
@@ -0,0 +1,540 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 17:25+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Reset cashbox"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
+msgid "Lunch Orders"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7 Dana    "
+
+#. module: lunch
+#: model:ir.module.module,description:lunch.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage lunch\n"
+"\n"
+"    keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+"    Apply Different Category for the product.\n"
+"    "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+msgid "Today"
+msgstr "Danas"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "March"
+msgstr "Ožujak"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr "Ukupno :"
+
+#. module: lunch
+#: field:report.lunch.amount,day:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr "Dan"
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_id_cancel
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Cancel Order"
+msgstr "Otkaži narudžbu"
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+#: field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form
+#: view:lunch.product:0
+msgid "Products"
+msgstr "Proizvodi"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: view:lunch.cashmove:0
+#: field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "Potvrđen"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.module,shortdesc:lunch.module_meta_information
+msgid "Lunch Module"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.lunch_order_confirm
+#: wizard_button:lunch.order.confirm,init,go:0
+msgid "Confirm Order"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "July"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Box"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,zero:0
+msgid "Set to Zero"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "September"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "December"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,month:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: lunch
+#: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
+msgid "Name of box"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,cancel:0
+msgid "Yes"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category
+#: view:lunch.category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,end:0
+msgid "No"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.order.confirm,init:0
+msgid "Orders Confirmation"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "August"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "June"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0
+msgid "User Name"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch
+msgid "Lunch"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.order:0
+msgid "User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,date:0
+msgid "Date"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "November"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "October"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,active:0
+#: field:lunch.product,active:0
+msgid "Active"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
+msgid "Set CashBox to Zero"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,box:0
+#: field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,end:0
+#: wizard_button:lunch.order.confirm,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "May"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "February"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,name:0
+#: field:lunch.cashmove,name:0
+#: field:lunch.category,name:0
+#: rml:lunch.order:0
+#: field:lunch.product,name:0
+msgid "Name"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category related to Products"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
+#: view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+#: rml:lunch.order:0
+#: view:lunch.order:0
+msgid "Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch
+#: report:lunch.order:0
+msgid "Lunch Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+msgid "Cash Position by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,year:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index 59670a8d1b1..72c06cceb2b 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -1,8 +1,8 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_tool_user",1,1,1,1
-"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_tool_user",1,1,1,1
-"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_tool_manager",1,1,1,1
-"access_lunch_category_manager","lunch.category.user","model_lunch_category","base.group_tool_user",1,1,1,1
-"access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_tool_manager",1,1,1,1
-"access_lunch_product_user","lunch.product user","model_lunch_product","base.group_tool_user",1,1,1,1
-"access_lunch_cashbox_user","lunch.cashbox user","model_lunch_cashbox","base.group_tool_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_lunch_order_user,lunch.order user,model_lunch_order,base.group_tool_user,1,1,1,1
+access_lunch_cashmove_user,lunch.cashmove user,model_lunch_cashmove,base.group_tool_user,1,1,1,1
+access_report_lunch_amount_manager,report.lunch.amount manager,model_report_lunch_amount,base.group_tool_manager,1,1,1,1
+access_lunch_category_manager,lunch.category.user,model_lunch_category,base.group_tool_user,1,1,1,1
+access_report_lunch_order_manager,report.lunch.order manager,model_report_lunch_order,base.group_tool_manager,1,1,1,1
+access_lunch_product_user,lunch.product user,model_lunch_product,base.group_tool_user,1,1,1,1
+access_lunch_cashbox_user,lunch.cashbox user,model_lunch_cashbox,base.group_tool_user,1,1,1,1
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index e84cdb41c0d..7d665c96435 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record model="res.groups" id="base.group_tool_user">
-        <field name="name">Tools / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_tools"/>
     </record>
     <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Tools / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
     </record>
 
diff --git a/addons/lunch/static/src/img/icon.png b/addons/lunch/static/src/img/icon.png
new file mode 100644
index 00000000000..7493a3c7f4e
Binary files /dev/null and b/addons/lunch/static/src/img/icon.png differ
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 94f2361d05d..8f4833c294f 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Emails Management',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'complexity': "easy",
     'description': """
 A generic email subsystem with message storage and queuing
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 159259f151d..fd00135816e 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -380,12 +380,16 @@ class mail_message(osv.osv):
 
         if 'To' in fields:
             msg['to'] = decode(msg_txt.get('To'))
+
         if 'Delivered-To' in fields:
             msg['to'] = decode(msg_txt.get('Delivered-To'))
 
         if 'CC' in fields:
             msg['cc'] = decode(msg_txt.get('CC'))
 
+        if 'Cc' in fields:
+            msg['cc'] = decode(msg_txt.get('Cc'))
+
         if 'Reply-To' in fields:
             msg['reply'] = decode(msg_txt.get('Reply-To'))
 
@@ -455,6 +459,7 @@ class mail_message(osv.osv):
         msg['sub_type'] = msg['subtype'] or 'plain'
         return msg
 
+
     def send(self, cr, uid, ids, auto_commit=False, context=None):
         """Sends the selected emails immediately, ignoring their current
            state (mails that have already been sent should not be passed
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c8f7da9a5bb..70b536296bf 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -58,6 +58,14 @@ class mail_thread(osv.osv):
         'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', readonly=True),
     }
 
+    def message_capable_models(self, cr, uid, context=None):
+        ret_dict = {}
+        for model_name in self.pool.obj_list():
+            model = self.pool.get(model_name)
+            if 'mail.thread' in getattr(model, '_inherit', []):
+                ret_dict[model_name] = model._description        
+        return ret_dict
+
     def message_thread_followers(self, cr, uid, ids, context=None):
         """Returns a list of email addresses of the people following
            this thread, including the sender of each mail, and the
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index b508cd68d83..42c70da9f19 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mail_message","mail.message","model_mail_message",,1,0,0,0
-"access_mail_thread","mail.thread","model_mail_thread",,1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mail_message,mail.message,model_mail_message,,1,0,0,0
+access_mail_thread,mail.thread,model_mail_thread,,1,0,0,0
diff --git a/addons/mail_gateway/i18n/hr.po b/addons/mail_gateway/i18n/hr.po
new file mode 100644
index 00000000000..a4defe9e56c
--- /dev/null
+++ b/addons/mail_gateway/i18n/hr.po
@@ -0,0 +1,356 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 17:26+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID resursa"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Bilješka"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Greška ! Ne možete kreirati rekurzivne pridružene članove."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Detalji"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr ""
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 1f1995c52da..31d50dc61ac 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.1",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category": 'Marketing',
+    "category": 'Hidden/Dependency',
     'complexity': "expert",
     "description": """
 Menu for Marketing.
diff --git a/addons/marketing/i18n/hr.po b/addons/marketing/i18n/hr.po
new file mode 100644
index 00000000000..d0bfe8ed764
--- /dev/null
+++ b/addons/marketing/i18n/hr.po
@@ -0,0 +1,111 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 17:28+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid ""
+"Helps you to manage marketing campaigns and automate actions and "
+"communication steps."
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "title"
+msgstr "naslov"
+
+#. module: marketing
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure Your Marketing Application"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,email_template:0
+msgid ""
+"Helps you to design templates of emails and integrate them in your different "
+"processes."
+msgstr ""
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr ""
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: marketing
+#: field:marketing.installer,crm_profiling:0
+msgid "Profiling Tools"
+msgstr "Alati za profiliranje"
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid ""
+"OpenERP provides Addons to better manage your sales and marketing processes. "
+"Select the ones you would be interested in."
+msgstr ""
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Marketing Application Configuration"
+msgstr "Postave aplikacije Marketing"
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,marketing_campaign:0
+msgid "Marketing Campaigns"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation of partners and design segmentation "
+"questionnaires"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure"
+msgstr "Postavke"
diff --git a/addons/marketing/security/ir.model.access.csv b/addons/marketing/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/marketing/security/ir.model.access.csv
+++ b/addons/marketing/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index 344e562eb67..d04473da8bf 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -2,11 +2,13 @@
 <openerp>
 <data>
     <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">Marketing / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_marketing"/>
     </record>
 
     <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Marketing / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_marketing"/>
         <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
     </record>
 
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 61492300c97..44646a07ead 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -58,9 +58,12 @@ Note: If you need demo data, you can install the marketing_campaign_crm_demo mod
         "security/ir.model.access.csv"
     ],
     'demo_xml': [
+        'marketing_campaign_demo.xml',
     ],
+    'test': [
+        'test/marketing_campaign.yml',
+     ],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate' : '00421723279617928365',
     'images': ['images/campaign.png', 'images/campaigns.jpeg','images/email_account.jpeg','images/email_templates.jpeg','images/segments.jpeg'],
diff --git a/addons/marketing_campaign/i18n/hr.po b/addons/marketing_campaign/i18n/hr.po
new file mode 100644
index 00000000000..185fd14fd09
--- /dev/null
+++ b/addons/marketing_campaign/i18n/hr.po
@@ -0,0 +1,1054 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 17:31+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr "Ručni način"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr "Prethodna aktivnost"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:772
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.transition:0
+msgid "The To/From Activity of transition must be of the same Campaign "
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:144
+#, python-format
+msgid ""
+"The campaign cannot be started: it doesn't have any starting activity (or "
+"any activity with a signal and no previous activity)"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "Vrijeme"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Custom Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:139
+#, python-format
+msgid ""
+"The campaign cannot be started: the email account is missing in email "
+"activity '%s'"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,revenue:0
+msgid ""
+"Set an expected revenue if you consider that every campaign item that has "
+"reached this point has generated a certain revenue. You can get revenue "
+"statistics in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr "Okidač"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr "# akcija"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign.workitem:0
+msgid "Today"
+msgstr "Danas"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr "Ožujak"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines an additional criterion to add to the filter when selecting new "
+"records to inject in the campaign."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+"   - activity: the campaign activity\n"
+"   - workitem: the campaign workitem\n"
+"   - resource: the resource object this campaign item represents\n"
+"   - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr "Postavi na nacrt"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr "Slijedeće aktivnosti"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr "Sinkronizacija"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Year"
+msgstr "Ova godina"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:772
+#, python-format
+msgid "No preview"
+msgstr "Bez pregleda"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launch Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,day:0
+msgid "Day"
+msgstr "Dan"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr "Izlazne tranzicije"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr "Resetiraj"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Last Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr "Godina(e)"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:209
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_last_date:0
+msgid ""
+"Date on which this segment was synchronized last time (automatically or "
+"manually)"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_run:0
+msgid "Initial start date of this segment."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself leave this field empty."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Cost / Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"The type of action to execute when an item enters this activity, such as:\n"
+"   - Email: send an email using a predefined email template\n"
+"   - Report: print an existing Report defined on the resource item and save "
+"it into a specific directory\n"
+"   - Custom Action: execute a predefined action, e.g. to modify the fields "
+"of the resource record\n"
+"  "
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_next_sync:0
+msgid "Next time the synchronization job is scheduled to run automatically"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Don't delete workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "State"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Synchronization mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_done:0
+msgid "Date this segment was last closed or cancelled."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+msgid "Campaigns"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Report"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,variable_cost:0
+msgid ""
+"Set a variable cost if you consider that every campaign item that has "
+"reached this point has entailed a certain cost. You can get cost statistics "
+"in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid ""
+"By activating this option, workitems that aren't executed because the "
+"condition is not met are marked as cancelled instead of being deleted."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Modified"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
+msgid "Campaign Follow-up"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,email_template_id:0
+msgid "The e-mail to send when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records modified after last sync (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
+msgid "Campaign Statistics"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: model:ir.model,name:marketing_campaign.model_campaign_analysis
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
+msgid "Campaign Analysis"
+msgstr ""
+
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr ""
+
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.module.module,description:marketing_campaign.module_meta_information
+msgid ""
+"\n"
+"This module provides leads automation through marketing campaigns (campaigns "
+"can in fact be defined on any resource, not just CRM Leads).\n"
+"         The campaigns are dynamic and multi-channels. The process is as "
+"follows:\n"
+"          * Design marketing campaigns like workflows, including email "
+"templates to send, reports to print and send by email, custom actions, etc.\n"
+"          * Define input segments that will select the items that should "
+"enter the campaign (e.g leads from certain countries, etc.)\n"
+"          * Run you campaign in simulation mode to test it real-time or "
+"accelerated, and fine-tune it\n"
+"          * You may also start the real campaign in manual mode, where each "
+"action requires manual validation\n"
+"          * Finally launch your campaign live, and watch the statistics as "
+"the campaign does everything fully automatically. \n"
+"          While the campaign runs you can of course continue to fine-tune "
+"the parameters, input segments, workflow, etc.\n"
+"          \n"
+"          Note: If you need demo data, you can install the "
+"marketing_campaign_crm_demo module, but this will also install the CRM "
+"application as it depends on CRM Leads.\n"
+"    "
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Created"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,date:0
+#: view:marketing.campaign.workitem:0
+msgid "Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:141
+#, python-format
+msgid ""
+"The campaign cannot be started: the email account is not approved in email "
+"activity '%s'"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "Email Template"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:125
+#: code:addons/marketing_campaign/marketing_campaign.py:139
+#: code:addons/marketing_campaign/marketing_campaign.py:141
+#: code:addons/marketing_campaign/marketing_campaign.py:144
+#: code:addons/marketing_campaign/marketing_campaign.py:154
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,server_action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:488
+#, python-format
+msgid "Automatic transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
+msgid "marketing_campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:490
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"A marketing campaign is an event or activity that will help you manage and "
+"reach your partners with specific messages. A campaign can have many "
+"activities that will be triggered from a specific situation. One action "
+"could be sending an email template that has previously been created in the "
+"system."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:209
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.segment:0
+msgid "Model of filter must be same as resource model of Campaign "
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize Manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:154
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are done"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Campaign Step"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
+#: view:marketing.campaign.segment:0
+msgid "Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+msgid "All Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "E-mail"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:489
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+msgid "Marketing Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,res_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for running this campaign. You may also specify variable cost and "
+"revenue on each campaign activity. Cost and Revenue statistics are included "
+"in Campaign Reporting."
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:746
+#, python-format
+msgid "Email Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:125
+#, python-format
+msgid "The campaign cannot be started: there are no activities in it"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem has to be run manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.activity:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,ir_filter_id:0
+msgid ""
+"Filter to select the matching resource records that belong to this segment. "
+"New filters can be created and saved using the advanced search on the list "
+"view of the Resource. If no filter is set, all records are selected without "
+"filtering. The synchronization mode may also add a criterion to the filter."
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
+msgid "Campaign Followup"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_next_sync:0
+msgid "Next Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "All"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records created after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+#: view:marketing.campaign:0
+msgid "Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 82832134c27..4e6f6a5227e 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -164,11 +164,12 @@ Normal - the campaign runs normally and automatically sends all emails and repor
         self.write(cr, uid, ids, {'state': 'cancelled'})
         return True
 
-
+    # dead code
     def signal(self, cr, uid, model, res_id, signal, run_existing=True, context=None):
         record = self.pool.get(model).browse(cr, uid, res_id, context)
         return self._signal(cr, uid, record, signal, run_existing, context)
 
+    #dead code
     def _signal(self, cr, uid, record, signal, run_existing=True, context=None):
         if not signal:
             raise ValueError('signal cannot be False')
@@ -461,6 +462,7 @@ class marketing_campaign_activity(osv.osv):
         return super(marketing_campaign_activity, self).search(cr, uid, args,
                                            offset, limit, order, context, count)
 
+    #dead code
     def _process_wi_report(self, cr, uid, activity, workitem, context=None):
         service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
         (report_data, format) = service.create(cr, uid, [], {}, {})
@@ -481,6 +483,7 @@ class marketing_campaign_activity(osv.osv):
                                             activity.email_template_id.id,
                                             workitem.res_id, context=context)
 
+    #dead code
     def _process_wi_action(self, cr, uid, activity, workitem, context=None):
         if context is None:
             context = {}
@@ -670,7 +673,7 @@ class marketing_campaign_workitem(osv.osv):
 
     def _process_one(self, cr, uid, workitem, context=None):
         if workitem.state != 'todo':
-            return
+            return False
 
         activity = workitem.activity_id
         proxy = self.pool.get(workitem.object_id.model)
@@ -707,7 +710,7 @@ class marketing_campaign_workitem(osv.osv):
 
             if result:
                 # process _chain
-                workitem = workitem.browse(context)[0] # reload
+                workitem = workitem.browse(context=context)[0] # reload
                 date = datetime.strptime(workitem.date, DT_FMT)
 
                 for transition in activity.to_ids:
@@ -784,11 +787,7 @@ class marketing_campaign_workitem(osv.osv):
         res = {}
         wi_obj = self.browse(cr, uid, ids[0], context=context)
         if wi_obj.activity_id.type == 'email':
-            data_obj = self.pool.get('ir.model.data')
-            data_id = data_obj._get_id(cr, uid, 'email_template', 'email_template_preview_form')
-            view_id = 0
-            if data_id:
-                view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+            view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'email_template', 'email_template_preview_form')
             res = {
                 'name': _('Email Preview'),
                 'view_type': 'form',
@@ -796,7 +795,7 @@ class marketing_campaign_workitem(osv.osv):
                 'res_model': 'email_template.preview',
                 'view_id': False,
                 'context': context,
-                'views': [(view_id, 'form')],
+                'views': [(view_id and view_id[1] or 0, 'form')],
                 'type': 'ir.actions.act_window',
                 'target': 'new',
                 'nodestroy':True,
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
new file mode 100644
index 00000000000..aaf5a98c6bc
--- /dev/null
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <!-- Email tempalte -->
+        <record id="email_template_1" model="email.template">
+            <field name="name">Template for New Partner</field>
+            <field name="email_from">info@tinyerp.com</field>
+            <field name="subject">Welcome in OpenERP Partner Channel!</field>
+            <field name="email_to">${object.email or ''}</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="body_text">Hello, We are very happy to send Welcome message.</field>
+        </record>
+        <record id="email_template_2" model="email.template">
+            <field name="name">Template for Silver Partner</field>
+            <field name="email_from">info@tinyerp.com</field>
+            <field name="subject">Congratulation! You become now our Silver Partner.</field>
+            <field name="email_to">${object.email or ''}</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="body_text">Hello, We are happy to announce that you now become our Silver Partner.</field>
+        </record>
+
+        <record id="email_template_3" model="email.template">
+            <field name="name">Template for Gold Partner</field>
+            <field name="email_from">info@tinyerp.com</field>
+            <field name="subject">Congratulation! You become our Gold Partner.</field>
+            <field name="email_to">${object.email or ''}</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="body_text">Hello, We are happy to announce that you become our Gold Partner.</field>
+        </record>
+
+
+
+    <!-- Campaign -->
+        <record id="marketing_campaign_openerppartnerchannel" model="marketing.campaign">
+            <field name="name">OpenERP Partner Channel</field>
+            <field name="object_id" ref="base.model_res_partner"/>
+            <field name="mode">active</field>
+        </record>
+
+            <!-- Activity -->
+
+        <record id="marketing_campaign_activity_0" model="marketing.campaign.activity">
+            <field name="name">New Partner</field>
+            <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+            <field name="email_template_id" ref="email_template_1"/>
+            <field name="condition">object.credit_limit &lt; 10000</field>
+            <field name="keep_if_condition_not_met">True</field>
+            <field eval="1" name="start"/>
+        </record>
+        <record id="marketing_campaign_activity_1" model="marketing.campaign.activity">
+            <field name="name">Silver Partner</field>
+            <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+            <field name="condition">object.credit_limit &gt;= 10000 and object.credit_limit &lt; 50000</field>
+            <field name="keep_if_condition_not_met">True</field>
+            <field name="email_template_id" ref="email_template_2"/>
+        </record>
+
+        <record id="marketing_campaign_activity_2" model="marketing.campaign.activity">
+            <field name="name">Gold Partner</field>
+            <field name="condition">object.credit_limit &gt;= 100000</field>
+            <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+            <field name="keep_if_condition_not_met">True</field>
+            <field name="email_template_id" ref="email_template_3"/>
+        </record>
+
+
+    <!-- Tranisition -->
+        <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+        </record>
+
+        <record id="marketing_campaign_transition_1" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_1"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/>
+        </record>
+
+    <!-- Segment -->
+        <record id="filter0" model="ir.filters">
+            <field name="name">Partners</field>
+            <field name="domain">[('name','like','Agrolait')]</field>
+            <field name="model_id">res.partner</field>
+        </record>
+        <record id="marketing_campaign_segment0" model="marketing.campaign.segment">
+            <field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/>
+            <field name="name">OpenERP Partner</field>
+            <field name="sync_mode">create_date</field>
+            <field name="ir_filter_id" ref="filter0"></field>
+            <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index a60b3943a41..c44459e4148 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -38,9 +38,9 @@
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
                     <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
-                    <button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
+                    <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
                     <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
-                    <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
+                    <button name="state_done_set" string="Done" states="running" icon="terp-dialog-close"/>
                 </group>
               </form>
         </field>
diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv
index b0157b76c51..9e54e06c5b1 100644
--- a/addons/marketing_campaign/security/ir.model.access.csv
+++ b/addons/marketing_campaign/security/ir.model.access.csv
@@ -1,21 +1,21 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
-"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,0,0
-"access_email_template_account_user","ir.mail_server","base.model_ir_mail_server","marketing.group_marketing_user",1,1,0,0
-"access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
-"access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
-"access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0
-"access_marketing_campaign_manager","marketing.campaign","model_marketing_campaign","marketing.group_marketing_manager",1,1,1,1
-"access_marketing_campaign_segment_campaign_manager","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_manager",1,1,1,1
-"access_marketing_campaign_activity_campaign_manager","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_manager",1,1,1,1
-"access_marketing_campaign_workitem_campaign_manager","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_manager",1,1,1,1
-"access_marketing_campaign_transition_campaign_manager","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_manager",1,1,1,1
-"access_marketing_campaign_analysis_campaign_manager","campaign.analysis","model_campaign_analysis","marketing.group_marketing_manager",1,1,1,1
-"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1
-"access_email_template_account_manager","ir.mail_server","base.model_ir_mail_server","marketing.group_marketing_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_marketing_campaign_admin,marketing.campaign,model_marketing_campaign,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_segment_campaignadmin,marketing.campaign.segment,model_marketing_campaign_segment,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_activity_campaignadmin,marketing.campaign.activity,model_marketing_campaign_activity,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_workitem_campaignadmin,marketing.campaign.workitem,model_marketing_campaign_workitem,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_transition_campaignadmin,marketing.campaign.transition,model_marketing_campaign_transition,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_analysis_campaignadmin,campaign.analysis,model_campaign_analysis,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_workitem_all,marketing.campaign.workitem,model_marketing_campaign_workitem,base.group_user,1,0,0,0
+access_email_template_user,email.template,model_email_template,marketing.group_marketing_user,1,1,0,0
+access_email_template_account_user,ir.mail_server,base.model_ir_mail_server,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_system,marketing.campaign system,model_marketing_campaign,base.group_system,1,0,0,0
+access_marketing_campaign_segment_system,marketing.campaign.segment system,model_marketing_campaign_segment,base.group_system,1,0,0,0
+access_marketing_campaign_workitem_system,marketing.campaign.workitem system,model_marketing_campaign_workitem,base.group_system,1,0,0,0
+access_marketing_campaign_manager,marketing.campaign,model_marketing_campaign,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_segment_campaign_manager,marketing.campaign.segment,model_marketing_campaign_segment,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_activity_campaign_manager,marketing.campaign.activity,model_marketing_campaign_activity,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_workitem_campaign_manager,marketing.campaign.workitem,model_marketing_campaign_workitem,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_transition_campaign_manager,marketing.campaign.transition,model_marketing_campaign_transition,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_analysis_campaign_manager,campaign.analysis,model_campaign_analysis,marketing.group_marketing_manager,1,1,1,1
+access_email_template_manager,email.template,model_email_template,marketing.group_marketing_manager,1,1,1,1
+access_email_template_account_manager,ir.mail_server,base.model_ir_mail_server,marketing.group_marketing_manager,1,1,1,1
diff --git a/addons/marketing_campaign/test/marketing_campaign.yml b/addons/marketing_campaign/test/marketing_campaign.yml
new file mode 100644
index 00000000000..1b7a7fa2ae3
--- /dev/null
+++ b/addons/marketing_campaign/test/marketing_campaign.yml
@@ -0,0 +1,151 @@
+-
+  In order to test process of compaign, I start compaign.
+-
+  !workflow {model: marketing.campaign, action: state_running_set, ref: marketing_campaign_openerppartnerchannel}
+-
+  I check the campaign on Running mode after started.
+-
+  !assert {model: marketing.campaign, id: marketing_campaign_openerppartnerchannel}:
+    - state == 'running'
+-
+  I start this segment after assinged campaign.
+-
+  !workflow {model: marketing.campaign.segment, action: state_running_set, ref: marketing_campaign_segment0}
+-
+  I check the segment on Running mode after started.
+-
+  !assert {model: marketing.campaign.segment, id: marketing_campaign_segment0}:
+    - state == 'running'
+-
+  I synchronized segment manually to see all step of activity and process covered on this campaign.
+-
+  !python {model: marketing.campaign.segment}: |
+    segment_id = self.browse(cr ,uid ,ref("marketing_campaign_segment0") ,context)
+    assert segment_id.date_next_sync, 'Next Synchronization date is not calculated.'
+    self.synchroniz(cr, uid, [ref("marketing_campaign_segment0")])
+-
+  I cancel Marketing Workitems.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel'))])
+    self.button_cancel(cr, uid, ids)
+    record = self.browse(cr, uid, ids[0])
+    assert record.state == 'cancelled' or record.state == 'done' , 'Marketing Workitem shoud be in cancel state.'
+-
+  I set Marketing Workitems in draft state.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel'))])
+    self.button_draft(cr, uid, ids)
+    record = self.browse(cr, uid, ids[0])
+    assert record.state == 'todo' or record.state == 'done' , 'Marketing Workitem shoud be in draft state.'
+-
+  I check followup detail of first activity.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_0'))])
+    assert ids, 'Followup item is not created for first activity.'
+    work_item_id = self.browse(cr ,uid ,ids[0] ,context)
+    assert work_item_id.res_name, 'Resource Name is not defined.'
+-
+  I process followup of first activity.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_0'))])
+    self.process(cr, uid, ids)
+    record = self.browse(cr, uid, ids)[0]
+    assert record.state == "done", "Followup item should be closed after process."
+-
+  I check followup detail of second activity after process of first activity.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_1'))])
+    assert ids, 'Followup item is not created for second activity.'
+-
+  Now I increase credit limit of customer
+-
+  !python {model: res.partner}: |
+    self.write(cr, uid, [ref("base.res_partner_agrolait")], {'credit_limit':41000}, context=context)
+-
+  I process followup of second activity after set draft.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_1'))])
+    self.button_draft(cr, uid, ids, context=context)
+    self.process(cr, uid, ids, context=context)
+    record = self.browse(cr, uid, ids[0], context=context)
+    assert record.state == "done", "Followup item should be closed after process."
+-
+  I check followup detail of third activity after process of second activity.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_2'))])
+    assert ids, 'Followup item is not created for third activity.'
+-
+  Now I increase credit limit of customer
+-
+  !python {model: res.partner}: |
+    self.write(cr, uid, [ref("base.res_partner_agrolait")], {'credit_limit':151000}, context=context)
+-
+  I process followup of third activity after set draft.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_2'))])
+    self.button_draft(cr, uid, ids, context=context)
+    self.process(cr, uid, ids, context=context)
+    record = self.browse(cr, uid, ids[0], context=context)
+    assert record.state == "done", "Followup item should be closed after process."
+-
+  I print workitem report.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_2'))])
+    self.preview(cr, uid, ids)
+-
+  I cancel segmentation because of some activity.
+-
+  !workflow {model: marketing.campaign.segment, action: state_cancel_set, ref: marketing_campaign_segment0}
+-
+  I check the segmentation is canceled.
+-
+  !assert {model: marketing.campaign.segment, id: marketing_campaign_segment0}:
+    - state == 'cancelled'
+-
+  I reopen the segmentation.
+-
+  !workflow {model: marketing.campaign.segment, action: state_draft_set, ref: marketing_campaign_segment0}
+-
+  !workflow {model: marketing.campaign.segment, action: state_running_set, ref: marketing_campaign_segment0}
+-
+  I check the segment on Running mode after started.
+-
+  !assert {model: marketing.campaign.segment, id: marketing_campaign_segment0}:
+    - state == 'running'
+-
+  I close segmentation After completion of all activity.
+-
+  !workflow {model: marketing.campaign.segment, action: state_done_set, ref: marketing_campaign_segment0}
+-
+  I check the segmentation is done.
+-
+  !assert {model: marketing.campaign.segment, id: marketing_campaign_segment0}:
+    - state == 'done'
+-
+  I close this campaing.
+-
+  !workflow {model: marketing.campaign.segment, action: state_done_set, ref: marketing_campaign_openerppartnerchannel}
+-
+  I check the campaing is done.
+-
+  !assert {model: marketing.campaign.segment, id: marketing_campaign_openerppartnerchannel}:
+    - state == 'done'
+
diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
index d394088aca5..a47ac040656 100644
--- a/addons/marketing_campaign_crm_demo/__openerp__.py
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name" : "Marketing Campaign, demo data",
+    "name" : "Marketing Campaign - Demo",
     "version" : "1.0",
     "depends" : ["marketing_campaign",
                  "crm",
diff --git a/addons/marketing_campaign_crm_demo/i18n/hr.po b/addons/marketing_campaign_crm_demo/i18n/hr.po
new file mode 100644
index 00000000000..a5fc1793d25
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/hr.po
@@ -0,0 +1,166 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 17:32+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
+msgid "Marketing campaign demo report"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_1
+msgid ""
+"Hello,Thanks for generous interest you have shown in the "
+"openERP.Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+msgid ""
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr "Hvala što ste kupili OpenERP knjigu"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  offering Gold partnership.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "Partner :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+msgid ""
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr "Organizacija :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our gold partners,We are arranging free technical training "
+"on june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_3
+msgid ""
+"Hello,Thanks for showing intrest and for subscribing to the OpenERP "
+"Discovery Day.\n"
+"             If any further information required kindly revert back.\n"
+"             I really appreciate your co-operation on this.\n"
+"             Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr ""
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index abf29f2c011..989d11e6ffd 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -58,7 +58,7 @@
             <field name="name">For OpenERP Discovery Day on May 2010</field>
         </record>
 
-            <record id="email_template_3" model="email.template">
+        <record id="email_template_3" model="email.template">
             <field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
             <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
@@ -72,7 +72,7 @@
             <field name="name">For OpenERP Discovery Day</field>
         </record>
 
-             <record id="email_template_4" model="email.template">
+        <record id="email_template_4" model="email.template">
             <field name="subject">Thanks for buying the OpenERP book</field>
             <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
@@ -91,7 +91,6 @@
             <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
-            <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
             <field name="body_text">Hello, We have very good offer that might suit you.
             For our gold partners,We are arranging free technical training on june,2010.
@@ -157,6 +156,7 @@
         <record id="marketing_campaign_openerpondemandfreetrial0" model="marketing.campaign">
             <field name="name">OpenERP OnDemand Free Trial 2010</field>
             <field name="object_id" ref="crm.model_crm_lead"/>
+            <field name="mode">active</field>
             <field name="partner_field_id" ref="crm.field_crm_lead_partner_id"/>
         </record>
 
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index 3e78b4775ab..0012ec2d0b4 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Membership',
+    'name': 'Membership Management',
     'version': '0.1',
     'category': 'Association',
     'description': """
diff --git a/addons/membership/i18n/hr.po b/addons/membership/i18n/hr.po
index 0ca00c8ee80..afa7853cedc 100644
--- a/addons/membership/i18n/hr.po
+++ b/addons/membership/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-12-19 17:33+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:59+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -37,12 +37,12 @@ msgstr ""
 #: view:report.membership:0
 #: view:res.partner:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr ""
+msgstr "# Plaćenih"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
@@ -57,7 +57,7 @@ msgstr ""
 #. module: membership
 #: selection:report.membership,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_setassociation0
@@ -74,7 +74,7 @@ msgstr ""
 #: view:report.membership:0
 #: field:report.membership,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Organizacija"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
@@ -94,12 +94,12 @@ msgstr ""
 #. module: membership
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Dobavljači"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All Members"
-msgstr ""
+msgstr "Svi članovi"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv
index f3d91646c44..d53e57a5151 100644
--- a/addons/membership/security/ir.model.access.csv
+++ b/addons/membership/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,1,1,1
-"access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0
-"access_report_membership","report.membership","model_report_membership","base.group_partner_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_membership_membership_line_partner_manager,membership.membership_line partner_manager,model_membership_membership_line,base.group_partner_manager,1,1,1,1
+access_membership_membership_line,membership.membership_line,model_membership_membership_line,,1,0,0,0
+access_report_membership,report.membership,model_report_membership,base.group_partner_manager,1,0,0,0
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index c9311b701a2..b1f5a549c44 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name" : "Manufacturing Resource Planning",
+    "name" : "MRP",
     "version" : "1.1",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
@@ -92,13 +92,9 @@ Dashboard provided by this module:
          'mrp_demo.xml',
     ],
     'test': [
-         'test/mrp_procurement.yml',
-         'test/mrp_packs.yml',
-         'test/mrp_phantom_bom.yml',
-         'test/mrp_production_order.yml',
-         'test/mrp_production_cancel.yml',
-         'test/mrp_report.yml',
-
+         'test/order_demo.yml',
+         'test/order_process.yml', 
+         'test/cancel_order.yml',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index ea6d44026ab..9956aae4ffe 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -9,11 +9,10 @@
                 <form string="Manufacturing board">
                     <board style="2-1">
                         <column>
-                            <action name="%(mrp.mrp_production_action2)d" string="Next Production Orders" creatable="true"/>
                             <action name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
+                            <action name="%(mrp.mrp_production_action2)d" string="Next Production Orders" creatable="true"/>
                         </column>
                         <column>
-                            <action name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center Future Load"/> <!--groups="base.group_extended"-->
                             <action name="%(mrp.action_report_in_out_picking_tree)d" string="Stock Value Variation"/>
                         </column>
                     </board>
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index feee2db4426..4600dbaa8c6 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-03 08:21+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 09:28+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-07 04:51+0000\n"
-"X-Generator: Launchpad (build 14435)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -31,6 +31,11 @@ msgid ""
 "raw materials (stock decrease) and the production of the finished products "
 "(stock increase) when the order is processed."
 msgstr ""
+"Manufacturing Orders are usually proposed automatically by OpenERP based on "
+"the bill of materials and the procurement rules, but you can also create "
+"manufacturing orders manually. OpenERP will handle the consumption of the "
+"raw materials (stock decrease) and the production of the finished products "
+"(stock increase) when the order is processed."
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
@@ -40,22 +45,22 @@ msgstr "Mjesto gdje sistem traži komponente"
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr "Iskorištenje Radnih Centara"
+msgstr "Iskorištenost radnih centara"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr "Slijed Radnih Centara"
+msgstr "Radni centri usmjeravanja"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr ""
+msgstr "Planiranje resursa proizvodnje"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr "Br. Ciklusa"
+msgstr "Br. ciklusa"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
@@ -68,12 +73,14 @@ msgid ""
 "The 'Minimum stock rule' allows the system to create procurement orders "
 "automatically as soon as the minimum stock is reached."
 msgstr ""
+"'Pravilo minimalne zalihe' omogućuje automatsko kreiranje naloga nabave kada "
+"nivo zalihe dostigne definirani minimum."
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
 msgid "Picking list"
-msgstr ""
+msgstr "Skladišnica"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -90,7 +97,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr "Otpad"
+msgstr "Otpis proizvoda"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -102,22 +109,22 @@ msgstr "Dan"
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
 msgid "Routings"
-msgstr ""
+msgstr "Usmjeravanja"
 
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "Proizvod radnog centra"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
-msgstr "Pretraži Listu Materijala"
+msgstr "Traži sastavnice"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr ""
+msgstr "For stockable products and consumables"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
@@ -130,6 +137,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
+"Number of iterations this work center has to do in the specified operation "
+"of the routing."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -137,18 +146,18 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,name:0
 msgid "Reference"
-msgstr "Referenca"
+msgstr "Vezna oznaka"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Finished Products"
-msgstr "Gotovi Proizvodi"
+msgstr "Gototvi proizvodi"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr "Za Kupiti"
+msgstr "Za nabaviti"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -165,17 +174,17 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "The system launches automatically a RFQ to the preferred supplier."
-msgstr ""
+msgstr "Sustav automatski pokreče RFQ na preferiranog dobavljača."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr "Proizvodi za Završiti"
+msgstr "Proizvodi za završiti"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "Set / Pack"
-msgstr "Set / Pakovanje"
+msgstr "Set / Paket"
 
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
@@ -188,12 +197,12 @@ msgstr "MRP Podproizvodi"
 #: view:mrp.production.order:0
 #: field:mrp.production.order,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Stanje"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
 msgid "Cost per hour"
-msgstr "Trošak po Stu"
+msgstr "Trošak po satu"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduction0
@@ -201,7 +210,7 @@ msgid ""
 "In case the Supply method of the product is Produce, the system creates a "
 "production order."
 msgstr ""
-"U slučaju da je metoda nabave proizvoda Proizvodnja, sistem kreira nalog za "
+"Kada je metoda nabave proizvoda Proizvodnja, sistem kreira nalog za "
 "proizvodnju."
 
 #. module: mrp
@@ -217,7 +226,7 @@ msgstr "JM"
 #: field:mrp.production.order,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
-msgstr "Količina proizvoda"
+msgstr "Količina"
 
 #. module: mrp
 #: help:mrp.workcenter,product_id:0
@@ -225,6 +234,8 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
+"Ispunite ovaj proizvod kako b jednostavno  pratili troškove proizvodnje  "
+"unutar analitike računovodstva."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -244,7 +255,7 @@ msgstr "Izvještavanje"
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
 msgid "Cycle Account"
-msgstr "Račun Ciklusa"
+msgstr "Konto ciklusa"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -260,7 +271,7 @@ msgstr "["
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procurement of services"
-msgstr "Nabava servisa"
+msgstr "Nabava usluga"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -270,7 +281,7 @@ msgstr "Informacija o kapacitetu"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Destination Location"
-msgstr "Odredišna Lokacija"
+msgstr "Odredišna lokacija"
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -280,7 +291,7 @@ msgstr "naslov"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
 msgid "Master Data"
-msgstr "Matični Podaci"
+msgstr "Glavni podaci"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
@@ -288,11 +299,13 @@ msgid ""
 "The system waits for the products to be available in the stock. These "
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
+"The system waits for the products to be available in the stock. These "
+"products are typically procured manually or through a minimum stock rule."
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
-msgstr "Referenca Parnera"
+msgstr "Oznaka partnera"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
@@ -337,7 +350,7 @@ msgstr "Lipanj"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr "Proizvedi Proizvod"
+msgstr "Proizvedi proizvod"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -353,12 +366,12 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr "Nabava skladištivog Proizvoda"
+msgstr "Nabava uskladištivog proizvoda"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default UOM"
-msgstr "Predefinirana JM"
+msgstr "Uobičajena JM"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -377,7 +390,7 @@ msgstr "Broj sati"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Confirm Production"
-msgstr "Potvrdi Proizvodnju"
+msgstr "Potvrdi proizvodnju"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduct0
@@ -385,6 +398,8 @@ msgid ""
 "The system creates an order (production or purchased) depending on the sold "
 "quantity and the products parameters."
 msgstr ""
+"Sistem kreira nalog (za proizvodnju ili nabavu) prema prodanim količinama i "
+"parametrima proizvoda."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -392,6 +407,8 @@ msgid ""
 "This is used in case of a service without any impact in the system, a "
 "training session for instance."
 msgstr ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
 
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
@@ -411,7 +428,7 @@ msgstr "Radno vrijeme"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
 msgid "Weekly Stock Value Variation"
-msgstr "Tjedna Varijacija Vrijednosti Zalihe"
+msgstr "Tjedna varijacija vrijednosti zalihe"
 
 #. module: mrp
 #: help:mrp.installer,mrp_repair:0
@@ -425,12 +442,12 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,date_planned:0
 msgid "Scheduled Date"
-msgstr "Planirani Datum"
+msgstr "Planirani datum"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr "Lista Materijala"
+msgstr "Sastavnica"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -439,21 +456,24 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
 
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr ""
+msgstr "Stock Value Variation"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr "Struktura Liste Materijala"
+msgstr "Struktura sastavnice"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr "Tip proizvoda je servis"
+msgstr "Tip proizvoda je usluga"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
@@ -461,16 +481,18 @@ msgid ""
 "Define specific property groups that can be assigned to the properties of "
 "your bill of materials."
 msgstr ""
+"Define specific property groups that can be assigned to the properties of "
+"your bill of materials."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Dekompozicija proizvodnje"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr "Za Servise"
+msgstr "Za usluge."
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -484,6 +506,8 @@ msgid ""
 "Complete this only if you want automatic analytic accounting entries on "
 "production orders."
 msgstr ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
@@ -494,7 +518,7 @@ msgstr "Broj ciklusa"
 #: model:process.node,note:mrp.process_node_orderrfq0
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "Request for Quotation."
-msgstr "Zahtjev za Ponudu"
+msgstr "Zahtjev za ponudom"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -502,32 +526,34 @@ msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
 msgstr ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
 
 #. module: mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Pogreška: Nevažeći EAN kod"
+msgstr "Greška: Neispravan barkod!"
 
 #. module: mrp
 #: view:mrp.routing:0
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
-msgstr ""
+msgstr "Lokacija proizvodnje"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Change Qty"
-msgstr ""
+msgstr "Promjeni kol."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Force Reservation"
-msgstr ""
+msgstr "Force Reservation"
 
 #. module: mrp
 #: field:mrp.bom.revision,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: mrp
 #: field:report.mrp.inout,value:0
@@ -537,12 +563,12 @@ msgstr "Vrijednost Zalihe"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr ""
+msgstr "Proizvod BoM Struktura"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Search Production"
-msgstr "Pretraži Proizvodnju"
+msgstr "Traži proizvodnju"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -558,36 +584,36 @@ msgstr "Ožujak"
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr ""
+msgstr "BoM Hierarchy"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
 #: view:mrp.product.produce:0
 #: view:mrp.production:0
 msgid "Produce"
-msgstr ""
+msgstr "Produce"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Work Center per cycle."
-msgstr ""
+msgstr "Trošak radnog centra po ciklusu."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Skladišna iznimka"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr ""
+msgstr "BoM Lines"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
 msgid "Time before prod."
-msgstr ""
+msgstr "Time before prod."
 
 #. module: mrp
 #: help:mrp.routing,active:0
@@ -595,11 +621,13 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr ""
+msgstr "Usmjeravanje materijala"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -607,7 +635,7 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,consumed_products:0
 msgid "Consumed Products"
-msgstr "Utrošeni Proizvodi"
+msgstr "Utrošeni proizvodi"
 
 #. module: mrp
 #: constraint:mrp.bom:0
@@ -619,7 +647,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_workcenter_load
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr "Opterećenje Radnog Centra"
+msgstr "Opterećenje radnog centra"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:45
@@ -631,7 +659,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Material Components"
-msgstr "Komponente Liste Materijala"
+msgstr "Komponente sastavnice"
 
 #. module: mrp
 #: field:mrp.production.order,nbr:0
@@ -656,16 +684,20 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"plannification."
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
-msgstr ""
+msgstr "Vrijeme u satima za jedan ciklus."
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr ""
+msgstr "Ozn. sastavnice"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -678,7 +710,7 @@ msgstr "U proizvodnji"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
 msgid "Master Bill of Materials"
-msgstr ""
+msgstr "Glavna sastavnica"
 
 #. module: mrp
 #: help:mrp.bom,product_uos:0
@@ -686,6 +718,7 @@ msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
 msgstr ""
+"JP proizvoda (Jedinica Prodaje) je mjerna jedinica za fakturiranje prodaje."
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -697,7 +730,7 @@ msgstr "Ispis"
 #: view:mrp.bom:0
 #: view:mrp.workcenter:0
 msgid "Type"
-msgstr "Tip"
+msgstr "Vrsta"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:150
@@ -709,7 +742,7 @@ msgstr "Ukupni Trošak "
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
-msgstr ""
+msgstr "Vezano na 'Pravilo minimalne zalihe' metodu nabave."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -727,7 +760,7 @@ msgstr ""
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
-msgstr "Ime Proizvoda"
+msgstr "Naziv proizvoda"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:491
@@ -738,7 +771,7 @@ msgstr "Pogrešna akcija !"
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
-msgstr ""
+msgstr "A factor of 0.9 means a loss of 10% within the production process."
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -756,12 +789,12 @@ msgstr "Datum ispisa"
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr ""
+msgstr "ZZP (RFQ)"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Procurement rule"
-msgstr ""
+msgstr "Pravilo nabave"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -790,6 +823,9 @@ msgid ""
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
 msgstr ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -800,12 +836,12 @@ msgstr "Hitno"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr ""
+msgstr "Work Center Usage"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
 msgid "Manufacturing Order"
-msgstr "Nalog za Proizvodnju"
+msgstr "Nalog proizvodnje"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
@@ -823,19 +859,19 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,cycle_total:0
 msgid "Total Cycles"
-msgstr "Ukupno Ciklusa"
+msgstr "Ukupno ciklusa"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Ready to Produce"
-msgstr "Spremno za Proizvodnju"
+msgstr "Spremno za proizvodnju"
 
 #. module: mrp
 #: field:mrp.bom.revision,name:0
 msgid "Modification name"
-msgstr "Ime promjene"
+msgstr "Naziv promjene"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -847,7 +883,7 @@ msgstr "Datum"
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr ""
+msgstr "BoM Type"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -865,7 +901,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: view:mrp.property:0
 msgid "Search"
-msgstr "Traži"
+msgstr "Search"
 
 #. module: mrp
 #: field:report.workcenter.load,cycle:0
@@ -875,30 +911,30 @@ msgstr "Broj Ciklusa"
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
 msgid "Companies"
-msgstr "Tvrtke"
+msgstr "Organizacije"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr ""
+msgstr "Minimalna zaliha"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
 msgid "Dashboard"
-msgstr "Kontrolna ploča"
+msgstr "Kokpit"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Work Center Future Load"
-msgstr "Buduće Opterećenje Radnog Centra"
+msgstr "Buduće opterećenje radnog centra"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
 #: model:process.process,name:mrp.process_process_stockableproductprocess0
 msgid "Stockable Product"
-msgstr "Uskladištivi proizvod"
+msgstr "Stockable Product"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -914,7 +950,7 @@ msgstr "Šifra"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Hours"
-msgstr "Br. Sati"
+msgstr "Br. sati"
 
 #. module: mrp
 #: field:mrp.installer,mrp_jit:0
@@ -925,7 +961,7 @@ msgstr ""
 #: view:mrp.property:0
 #: view:mrp.property.group:0
 msgid "Property Group"
-msgstr "Grupa Svojstava"
+msgstr "Grupa svojstava"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -935,7 +971,7 @@ msgstr "Kol."
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Manufacturing Plan."
-msgstr "Plan Proizvodnje"
+msgstr "Plan proizvodnje."
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -957,7 +993,7 @@ msgstr ""
 #: view:mrp.production:0
 #: view:mrp.workcenter.load:0
 msgid "Cancel"
-msgstr "Otkaži"
+msgstr "Odustani"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -970,6 +1006,8 @@ msgid ""
 "Number of operations this Work Center can do in parallel. If this Work "
 "Center represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
+"Number of operations this Work Center can do in parallel. If this Work "
+"Center represents a team of 5 workers, the capacity per cycle is 5."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
@@ -977,11 +1015,13 @@ msgid ""
 "If the service has a 'Buy' supply method, this creates a RFQ, a "
 "subcontracting demand for instance."
 msgstr ""
+"Ako je usluga koristi način opskrbe \"Kupovina\", stvara se RFQ, "
+"podugovaranje potražnje za primjer"
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
 msgid "Move product"
-msgstr "Premjesti Proizvod"
+msgstr "Premjesti proizvod"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -991,7 +1031,7 @@ msgstr "Kasni"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
 msgid "Make to stock"
-msgstr ""
+msgstr "Sa skladišta (MTS)"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
@@ -1002,28 +1042,28 @@ msgstr ""
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr ""
+msgstr "BOM Name"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Start Production"
-msgstr "Pokreni Proizvodnju"
+msgstr "Pokreni proizvodnju"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr "Upravljačka ploča proizvodnje"
+msgstr "Kokpit proizvodnje"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr ""
+msgstr "Lok. izvora"
 
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Reference"
-msgstr "Interna Referenca"
+msgstr "Interna oznaka"
 
 #. module: mrp
 #: help:mrp.installer,stock_location:0
@@ -1035,7 +1075,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Product's structure"
-msgstr "Struktura Proizvoda"
+msgstr "Struktura proizvoda"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -1064,7 +1104,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.product.produce,mode:0
 msgid "Mode"
-msgstr "Način"
+msgstr "Mode"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1074,7 +1114,7 @@ msgstr "]"
 #. module: mrp
 #: field:mrp.workcenter.load,measure_unit:0
 msgid "Amount measuring unit"
-msgstr ""
+msgstr "Mjerna jedinica iznosa"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
@@ -1086,6 +1126,12 @@ msgid ""
 "materials have been defined, OpenERP is capable of automatically deciding on "
 "the manufacturing route depending on the needs of the company."
 msgstr ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each production stage. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP is capable of automatically deciding on "
+"the manufacturing route depending on the needs of the company."
 
 #. module: mrp
 #: constraint:mrp.production:0
@@ -1095,7 +1141,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr "Nalozi za Proizvodnju u Radu"
+msgstr "Nalozi proizvodnje u tijeku"
 
 #. module: mrp
 #: model:ir.module.module,description:mrp.module_meta_information
@@ -1139,7 +1185,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
-msgstr "Nalozi za Proizvodnju koji čekaju Proizvode"
+msgstr "Nalozi proizvodnje koji čekaju proizvode"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1160,19 +1206,19 @@ msgstr "Trašak Ciklusa"
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in cycles"
-msgstr "Količina u ciklusima"
+msgstr "Iznos u ciklusima"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
 #: view:mrp.production.order:0
 #: field:mrp.production.order,location_dest_id:0
 msgid "Finished Products Location"
-msgstr "Lokacija Završenih Proizvoda"
+msgstr "Lokacija gotovih proizvoda"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
 msgid "Resources"
-msgstr "Resursi"
+msgstr "Sredstva"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1184,7 +1230,7 @@ msgstr "Dnevnik analitike"
 #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr "Radni Centri"
+msgstr "Radni centri"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1199,6 +1245,10 @@ msgid ""
 "They are attached to bills of materials that will define the required raw "
 "materials."
 msgstr ""
+"Routings allow you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
 
 #. module: mrp
 #: field:report.workcenter.load,hour:0
@@ -1208,7 +1258,7 @@ msgstr "Broj Sati"
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Work Center Operations"
-msgstr "Operacije Radnih Centara"
+msgstr "Operacije radnog centra"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1222,7 +1272,7 @@ msgstr "Bilješke"
 #: field:mrp.production.order,bom_id:0
 #: model:process.node,name:mrp.process_node_billofmaterial0
 msgid "Bill of Material"
-msgstr "Lista Materijala"
+msgstr "Sastavnica"
 
 #. module: mrp
 #: view:mrp.workcenter.load:0
@@ -1237,7 +1287,7 @@ msgstr "Opterećenje radnog centra"
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr ""
+msgstr "Lokacija gotovih proizvoda"
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -1245,6 +1295,8 @@ msgid ""
 "This is the Internal Picking List that brings the finished product to the "
 "production plan"
 msgstr ""
+"This is the Internal Picking List that brings the finished product to the "
+"production plan"
 
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
@@ -1254,7 +1306,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
 msgid "Stock Move"
-msgstr "Prijenos Zaliha"
+msgstr "Skladišni prijenosi"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1263,11 +1315,14 @@ msgid ""
 "maxi quantity. It's available in the Inventory management menu and "
 "configured by product."
 msgstr ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
 msgid "Day by day"
-msgstr ""
+msgstr "Dan po dan"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1288,7 +1343,7 @@ msgstr "Prioritet"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
-msgstr "Lista odabira"
+msgstr "Skladišni dokument"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1304,7 +1359,7 @@ msgstr "Nalog za Proizvodnju '%s' je planiran za %s."
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Production Order N° :"
-msgstr ""
+msgstr "Production Order N° :"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:630
@@ -1315,19 +1370,19 @@ msgstr "Nalog za Proizvodnju '%s' je spreman za proizvodnju."
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr ""
+msgstr "Production Scheduled Product"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
 msgid "Security days for each manufacturing operation."
-msgstr ""
+msgstr "Rezervni dani za svaku operaciju proizvodnje"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_mts0
 #: model:process.transition,name:mrp.process_transition_servicemts0
 #: model:process.transition,name:mrp.process_transition_stockmts0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Sa skladišta (MTS)"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -1343,24 +1398,29 @@ msgid ""
 "product needs. You can either create a bill of materials to define specific "
 "production steps or define a single multi-level bill of materials."
 msgstr ""
+"Master Bills of Materials allow you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoMs to automatically propose manufacturing orders according to "
+"product needs. You can either create a bill of materials to define specific "
+"production steps or define a single multi-level bill of materials."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockrfq0
 msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
-msgstr ""
+msgstr "Kada je Metoda nabave \"Kupi\", sistem kreira nalog za nabavu."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Procurement"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
 #: view:mrp.product_price:0
 msgid "Product Cost Structure"
-msgstr ""
+msgstr "Struktura troška proizvoda"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -1376,7 +1436,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "Radni centri proizvodnje"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1393,28 +1453,28 @@ msgstr ""
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr ""
+msgstr "Search for mrp workcenter"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr ""
+msgstr "BoM Structure"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
 #: field:mrp.production.order,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
-msgstr ""
+msgstr "Hour Account"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
-msgstr ""
+msgstr "Odredišna lokacija"
 
 #. module: mrp
 #: field:mrp.production.order,product_id2:0
@@ -1424,24 +1484,24 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Pending"
-msgstr ""
+msgstr "Na čekanju"
 
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
 msgid "Procure Products"
-msgstr ""
+msgstr "Procure Products"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 #: view:report.workcenter.load:0
 msgid "Work Center Loads"
-msgstr ""
+msgstr "Opterećenje radnog centra"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1452,13 +1512,13 @@ msgstr ""
 #: view:procurement.order:0
 #: field:procurement.order,property_ids:0
 msgid "Properties"
-msgstr ""
+msgstr "Svojstva"
 
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
 "Reference of the document that generated this production order request."
-msgstr ""
+msgstr "Dokument koji je generirao ovaj nalog za proizvodnju."
 
 #. module: mrp
 #: sql_constraint:mrp.bom:0
@@ -1467,21 +1527,24 @@ msgid ""
 "You should install the mrp_subproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Extra Information"
-msgstr "Dodatne Informacije"
+msgstr "Dodatni Podaci"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Promijeni količine proizvoda"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr ""
+msgstr "Upravlja nalozima nabave za sirovine."
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1491,19 +1554,19 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Konto glavne knjige"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "SO Number"
-msgstr ""
+msgstr "SO Number"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_change_standard_price
@@ -1515,13 +1578,13 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Izvorni dokument"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Not urgent"
-msgstr ""
+msgstr "Not urgent"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1533,7 +1596,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr "Naloz za Proizvodnju Za Pokrenuti"
+msgstr "Ne pokrenuti nalozi proizvodnje"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:491
@@ -1548,12 +1611,12 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr ""
+msgstr "Radni centar"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
-msgstr ""
+msgstr "Kapacitet po ciklusu"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_product_product
@@ -1566,30 +1629,30 @@ msgstr ""
 #: field:mrp.production.order,product_id:0
 #: field:mrp.production.product.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,hour_total:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Uk. sati"
 
 #. module: mrp
 #: field:mrp.production,location_src_id:0
 #: field:mrp.production.order,location_src_id:0
 msgid "Raw Materials Location"
-msgstr ""
+msgstr "Lokacija sirovina"
 
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr ""
+msgstr "Print Cost Structure of Product."
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
 #: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "JP Proizvoda"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
@@ -1602,7 +1665,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Utroši proizvode"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -1610,14 +1673,14 @@ msgstr ""
 #: field:mrp.production.order,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "JM proizvoda"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr ""
+msgstr "Po narudžbi (MTO)"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
@@ -1634,29 +1697,29 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products"
-msgstr ""
+msgstr "Proizvodnja proizvoda"
 
 #. module: mrp
 #: field:mrp.production,date_finished:0
 #: field:mrp.production.order,date_finished:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurs"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
 #: help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
-msgstr ""
+msgstr "Valjanost Bom ili komponente. Držite prazno ako je uvijek valjan."
 
 #. module: mrp
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "JP Proizvoda"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1667,7 +1730,7 @@ msgstr ""
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Very Urgent"
-msgstr ""
+msgstr "Very Urgent"
 
 #. module: mrp
 #: help:mrp.bom,routing_id:0
@@ -1677,37 +1740,41 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"planning."
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "Odobri"
 
 #. module: mrp
 #: view:mrp.property.group:0
 msgid "Properties categories"
-msgstr ""
+msgstr "Properties categories"
 
 #. module: mrp
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
-msgstr ""
+msgstr "Definira poredak radnih naloga u popisu."
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Source Location"
-msgstr ""
+msgstr "Izvorna lokacija"
 
 #. module: mrp
 #: view:mrp.production:0
 #: view:mrp.production.product.line:0
 msgid "Scheduled Products"
-msgstr "Planirani Proizvodi"
+msgstr "Planirani proizvodi"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products Consommation"
-msgstr ""
+msgstr "Production Products Consommation"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
@@ -1716,7 +1783,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 #: view:mrp.production:0
 msgid "Manufacturing Orders"
-msgstr "Nalozi za Proizvodnju"
+msgstr "Nalozi za proizvodnju"
 
 #. module: mrp
 #: help:mrp.product.produce,mode:0
@@ -1727,29 +1794,34 @@ msgid ""
 "the quantity selected and it will finish the production order when total "
 "ordered quantities are produced."
 msgstr ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
 
 #. module: mrp
 #: view:mrp.production:0
 #: report:mrp.production.order:0
 msgid "Work Orders"
-msgstr "Radni Nalozi"
+msgstr "Radni nalozi"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
 msgid "Cost per cycle"
-msgstr ""
+msgstr "Cost per cycle"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service"
-msgstr ""
+msgstr "Service"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1761,6 +1833,7 @@ msgstr ""
 msgid ""
 "UoM (Unit of Measure) is the unit of measurement for the inventory control"
 msgstr ""
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1769,6 +1842,9 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1779,12 +1855,12 @@ msgstr ""
 #: field:mrp.routing.workcenter,company_id:0
 #: view:mrp.workcenter:0
 msgid "Company"
-msgstr ""
+msgstr "Organizacija"
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
 msgid "Time for 1 cycle (hour)"
-msgstr ""
+msgstr "Time for 1 cycle (hour)"
 
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
@@ -1793,50 +1869,50 @@ msgstr ""
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
-msgstr ""
+msgstr "Production Order"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Automatic procurement rule"
-msgstr ""
+msgstr "Pravilo automatske nabave"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Compute Data"
-msgstr ""
+msgstr "Compute Data"
 
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Qty"
-msgstr ""
+msgstr "Količina JP"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
 #: view:mrp.bom:0
 #, python-format
 msgid "Components"
-msgstr ""
+msgstr "Components"
 
 #. module: mrp
 #: report:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
-msgstr ""
+msgstr "BOM Struktura"
 
 #. module: mrp
 #: field:mrp.bom,date_stop:0
 msgid "Valid Until"
-msgstr ""
+msgstr "Valid Until"
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
 msgid "Valid From"
-msgstr ""
+msgstr "Valid From"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Normal BoM"
-msgstr ""
+msgstr "Normal BoM"
 
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
@@ -1847,7 +1923,7 @@ msgstr "Pripremno vrijeme proizvodnje"
 #: field:mrp.bom,product_uos_qty:0
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Qty"
-msgstr ""
+msgstr "Količina JP"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
@@ -1856,21 +1932,24 @@ msgid ""
 "linked to manufacturing activities, receptions of products and delivery "
 "orders."
 msgstr ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
 
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
 
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
-msgstr "Efikasnost Proizvodnje"
+msgstr "Efikasnost proizvodnje"
 
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -1878,17 +1957,19 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
-msgstr ""
+msgstr "Zaokruživanje decimala"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr ""
+msgstr "Radni nalog"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -1900,12 +1981,12 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr ""
+msgstr "Samo za utrošiti"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Recreate Picking"
-msgstr ""
+msgstr "Ponovo kreiraj prijenos"
 
 #. module: mrp
 #: help:mrp.bom,type:0
@@ -1916,11 +1997,16 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
+"If a sub-product is used in several products, it can be useful to create its "
+"own BoM. Though if you don't want separated production orders for this sub-"
+"product, select Set/Phantom as BoM type. If a Phantom BoM is used for a root "
+"product, it will be sold and shipped as a set of components, instead of "
+"being produced."
 
 #. module: mrp
 #: field:mrp.bom,method:0
 msgid "Method"
-msgstr ""
+msgstr "Metoda"
 
 #. module: mrp
 #: help:mrp.production,state:0
@@ -1933,62 +2019,68 @@ msgid ""
 " When the production gets started then the state is set to 'In Production'.\n"
 " When the production is over, the state is set to 'Done'."
 msgstr ""
+"Nakon kreiranja nalog za proizvodnju je u stanju 'Nacrt'.\n"
+" Potvrđeni nalozi su u stanju 'Na čekanju' (materijala).\n"
+" U slučaju iznimki stanje je 'Skladišna iznimka'. \n"
+" Ako je zaliha dostatna za proizvodnju stanje je 'Spremno za proizvodnju'.\n"
+" Kad je proizvodnja pokrenuta stanje je  'U proizvodnji'.\n"
+" Izvršeni nalozi su u stanju 'Izvršen'."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Order"
-msgstr ""
+msgstr "Na nalogu"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Postava"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
 msgid "Time after prod."
-msgstr ""
+msgstr "Vrijeme nakon prod."
 
 #. module: mrp
 #: field:mrp.workcenter.load,time_unit:0
 msgid "Type of period"
-msgstr ""
+msgstr "Type of period"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Total Qty"
-msgstr ""
+msgstr "Ukupna kol."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,hour_nbr:0
 msgid "Number of Hours"
-msgstr ""
+msgstr "Broj sati"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Costing Information"
-msgstr ""
+msgstr "Costing Information"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
 msgid "Procurement Orders"
-msgstr ""
+msgstr "Nalozi za nabavu"
 
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr ""
+msgstr "Zaokruživanje se primjenjuje na količinu proizvoda."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Prijenos iz proizvodnje ili naloga za nabavu."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
 msgid "Parent Routing"
-msgstr ""
+msgstr "Nadređeno usmjeravanje"
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -1998,7 +2090,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
 msgid "Time in hours for the setup."
-msgstr ""
+msgstr "Vrijeme u satima za pripremu."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2014,7 +2106,7 @@ msgstr ""
 #: field:mrp.bom.revision,bom_id:0
 #: field:procurement.order,bom_id:0
 msgid "BoM"
-msgstr ""
+msgstr "BoM"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
@@ -2026,25 +2118,25 @@ msgstr "Varijacija vrijednosti Zalihe"
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr ""
+msgstr "Dodjela sa skladišta"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "Waiting Goods"
 
 #. module: mrp
 #: field:mrp.bom.revision,last_indice:0
 msgid "last indice"
-msgstr ""
+msgstr "last indice"
 
 #. module: mrp
 #: field:mrp.bom,revision_ids:0
 #: view:mrp.bom.revision:0
 msgid "BoM Revisions"
-msgstr ""
+msgstr "BoM Revisions"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -2056,7 +2148,7 @@ msgstr ""
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
 msgid "Week"
-msgstr "Tjedni"
+msgstr "Week"
 
 #. module: mrp
 #: field:mrp.installer,progress:0
@@ -2067,24 +2159,24 @@ msgstr ""
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normalan"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr "Koraci Proizvodnje"
+msgstr "Koraci proizvodnje"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:136
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "Cost Structure"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr ""
+msgstr "Utroši i proizvedi"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2094,7 +2186,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,bom_id:0
 msgid "Parent BoM"
-msgstr ""
+msgstr "Nadređena sastavnica"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
@@ -2103,6 +2195,9 @@ msgid ""
 "master bills of materials. Use this menu to search in which BoM a specific "
 "component is used."
 msgstr ""
+"Bills of materials components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM a specific "
+"component is used."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2112,7 +2207,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr ""
+msgstr "Product type is Stockable or Consumable."
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:591
@@ -2125,7 +2220,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Odaberi količinu"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2133,7 +2228,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
 #: field:product.product,bom_ids:0
 msgid "Bill of Materials"
-msgstr ""
+msgstr "Sastavnica"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,routing_id:0
@@ -2142,22 +2237,25 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
+"Routing indicates all the Work Centers used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (Work Centers) "
+"will be automatically pre-completed."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of Material Revision"
-msgstr ""
+msgstr "Revizija sastavnice"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 #: view:mrp.workcenter:0
 msgid "General Information"
-msgstr ""
+msgstr "Opći podaci"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Productions"
-msgstr ""
+msgstr "Proizvodnja"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:194
@@ -2171,6 +2269,8 @@ msgid ""
 "Description of the Work Center. Explain here what's a cycle according to "
 "this Work Center."
 msgstr ""
+"Description of the Work Center. Explain here what's a cycle according to "
+"this Work Center."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
@@ -2182,7 +2282,7 @@ msgstr ""
 #: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr ""
+msgstr "Usmjeravanje"
 
 #. module: mrp
 #: field:mrp.installer,mrp_operations:0
@@ -2192,12 +2292,12 @@ msgstr "Proizvodne Operacije"
 #. module: mrp
 #: field:mrp.production,date_planned:0
 msgid "Scheduled date"
-msgstr ""
+msgstr "Zakazani datum"
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_action
@@ -2208,27 +2308,32 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the the needs."
 msgstr ""
+"The Properties in OpenERP are used to select the right bill of materials for "
+"manufacturing a product when you have different ways of building the same "
+"product. You can assign several properties to each Bill of Materials. When a "
+"sales person creates a sales order, he can relate it to several properties "
+"and OpenERP will automatically select the BoM to use according the the needs."
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
 msgid "Production"
-msgstr ""
+msgstr "Proizvodnja"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Nabave s iznimkama"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr ""
+msgstr "'Minimum stock rule' material"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Cijena proizvoda"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
@@ -2238,18 +2343,18 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Split in Production lots"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "Promjeni količinu"
 
 #. module: mrp
 #: view:change.production.qty:0
 #: model:ir.actions.act_window,name:mrp.action_change_production_qty
 msgid "Change Product Qty"
-msgstr ""
+msgstr "Promjeni kol. proizvoda"
 
 #. module: mrp
 #: view:mrp.bom.revision:0
@@ -2262,7 +2367,7 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2272,12 +2377,12 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr "Ploča proizvodnje"
+msgstr "Kokpit proizvodnje"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
-msgstr ""
+msgstr "Planirani datum završetka"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
@@ -2286,11 +2391,14 @@ msgid ""
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
 msgstr ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "Način nabave ovisi o vrsti proizvoda"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
@@ -2300,7 +2408,7 @@ msgstr "Proizvodnja"
 #. module: mrp
 #: view:board.board:0
 msgid "Next Production Orders"
-msgstr ""
+msgstr "Next Production Orders"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2311,7 +2419,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Groups"
-msgstr ""
+msgstr "Grupe svojstava"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2324,16 +2432,18 @@ msgid ""
 "Depending on the chosen method to supply the stockable products, the "
 "procurement order creates a RFQ, a production order, ... "
 msgstr ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
 msgid "Time in hours for the cleaning."
-msgstr ""
+msgstr "Završno vrijeme u satima za čišćenje."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Automatic RFQ"
-msgstr ""
+msgstr "Automatski ZZP (zahtjev za ponudom)"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
@@ -2341,6 +2451,8 @@ msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
 msgstr ""
+"Ako je metoda nabave usluge 'Proizvedi' kreirati će zadatak u modulu "
+"upravljanja projektima."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@@ -2349,6 +2461,9 @@ msgid ""
 "production order creates as much procurement orders as components listed in "
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -2356,11 +2471,13 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
 msgstr ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this quantity."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Stock"
-msgstr ""
+msgstr "Na skladištu"
 
 #. module: mrp
 #: field:mrp.bom,sequence:0
@@ -2368,17 +2485,17 @@ msgstr ""
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Odsustva resursa"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
-msgstr ""
+msgstr "Daje poredak u prikazu sastavnica."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2386,7 +2503,7 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,products_to_consume:0
 msgid "Products to Consume"
-msgstr ""
+msgstr "Proizvodi za utrošiti"
 
 #. module: mrp
 #: view:mrp.production.order:0
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index dea664f6fd6..c8f0b6b7e21 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -62,8 +62,6 @@ class mrp_workcenter(osv.osv):
      }
 
     def on_change_product_cost(self, cr, uid, ids, product_id, context=None):
-        if context is None:
-            context = {}
         value = {}
 
         if product_id:
@@ -253,8 +251,7 @@ class mrp_bom(osv.osv):
                 all_prod.append(bom.product_id.id)
                 lines = bom.bom_lines
                 if lines:
-                    newboms = [a for a in lines if a not in boms]
-                    res = res and check_bom(newboms)
+                    res = res and check_bom([bom_id for bom_id in lines if bom_id not in boms])
             return res
         return check_bom(boms)
 
@@ -269,14 +266,9 @@ class mrp_bom(osv.osv):
         @param product_id: Changed product_id
         @return:  Dictionary of changed values
         """
-        if context is None:
-            context = {}
-            context['lang'] = self.pool.get('res.users').browse(cr,uid,uid).context_lang
-            
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            v = {'name': prod.name, 'product_uom': prod.uom_id.id}
-            return {'value': v}
+            return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id}}
         return {}
 
     def _bom_find(self, cr, uid, product_id, product_uom, properties=[]):
@@ -320,6 +312,7 @@ class mrp_bom(osv.osv):
         phantom = False
         if bom.type == 'phantom' and not bom.bom_lines:
             newbom = self._bom_find(cr, uid, bom.product_id.id, bom.product_uom.id, properties)
+            
             if newbom:
                 res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor*bom.product_qty, properties, addthis=True, level=level+10)
                 result = result + res[0]
@@ -361,8 +354,6 @@ class mrp_bom(osv.osv):
     def copy_data(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
-        if context is None:
-            context = {}
         bom_data = self.read(cr, uid, id, [], context=context)
         default.update({'name': bom_data['name'] + ' ' + _('Copy'), 'bom_id':False})
         return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context)
@@ -497,8 +488,7 @@ class mrp_production(osv.osv):
     _order = 'priority desc, date_planned asc';
 
     def _check_qty(self, cr, uid, ids, context=None):
-        orders = self.browse(cr, uid, ids, context=context)
-        for order in orders:
+        for order in self.browse(cr, uid, ids, context=context):
             if order.product_qty <= 0:
                 return False
         return True
@@ -508,14 +498,10 @@ class mrp_production(osv.osv):
     ]
 
     def unlink(self, cr, uid, ids, context=None):
-        productions = self.read(cr, uid, ids, ['state'])
-        unlink_ids = []
-        for s in productions:
-            if s['state'] in ['draft','cancel']:
-                unlink_ids.append(s['id'])
-            else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a manufacturing order in the state \'%s\'!') % s['state'])
-        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+        for production in self.browse(cr, uid, ids, context=context):
+            if production.state not in ('draft', 'cancel'):
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a manufacturing order in state \'%s\'') % production.state)
+        return super(mrp_production, self).unlink(cr, uid, ids, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
@@ -577,8 +563,7 @@ class mrp_production(osv.osv):
             return {'value': {
                 'routing_id': False
             }}
-        bom_pool = self.pool.get('mrp.bom')
-        bom_point = bom_pool.browse(cr, uid, bom_id, context=context)
+        bom_point = self.pool.get('mrp.bom').browse(cr, uid, bom_id, context=context)
         routing_id = bom_point.routing_id.id or False
         result = {
             'routing_id': routing_id
@@ -592,7 +577,7 @@ class mrp_production(osv.osv):
         self.write(cr, uid, ids, {'state': 'picking_except'})
         return True
 
-    def action_compute(self, cr, uid, ids, properties=[]):
+    def action_compute(self, cr, uid, ids, properties=[], context=None):
         """ Computes bills of material of a product.
         @param properties: List containing dictionaries of properties.
         @return: No. of products.
@@ -747,7 +732,7 @@ class mrp_production(osv.osv):
                         # if qtys we have to consume is more than qtys available to consume
                         prod_name = scheduled.product_id.name_get()[0][1]
                         raise osv.except_osv(_('Warning!'), _('You are going to consume total %s quantities of "%s".\nBut you can consume upto total %s quantities.' % (qty, prod_name, qty_avail)))
-                    if qty < 0.0:
+                    if qty <= 0.0:
                         # we already have more qtys consumed than we need 
                         continue
 
@@ -855,119 +840,169 @@ class mrp_production(osv.osv):
     def _get_auto_picking(self, cr, uid, production):
         return True
 
-    def action_confirm(self, cr, uid, ids):
-        """ Confirms production order.
-        @return: Newly generated picking Id.
-        """
-        picking_id = False
-        proc_ids = []
-        seq_obj = self.pool.get('ir.sequence')
-        pick_obj = self.pool.get('stock.picking')
-        move_obj = self.pool.get('stock.move')
-        proc_obj = self.pool.get('procurement.order')
+    def _make_production_line_procurement(self, cr, uid, production_line, shipment_move_id, context=None):
         wf_service = netsvc.LocalService("workflow")
-        for production in self.browse(cr, uid, ids):
-            if not production.product_lines:
-                self.action_compute(cr, uid, [production.id])
-                production = self.browse(cr, uid, [production.id])[0]
-            routing_loc = None
-            pick_type = 'internal'
-            address_id = False
-            if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
-                routing_loc = production.bom_id.routing_id.location_id
-                if routing_loc.usage <> 'internal':
-                    pick_type = 'out'
-                address_id = routing_loc.address_id and routing_loc.address_id.id or False
-                routing_loc = routing_loc.id
-            pick_name = seq_obj.get(cr, uid, 'stock.picking.' + pick_type)
-            picking_id = pick_obj.create(cr, uid, {
-                'name': pick_name,
-                'origin': (production.origin or '').split(':')[0] + ':' + production.name,
-                'type': pick_type,
-                'move_type': 'one',
-                'state': 'auto',
-                'address_id': address_id,
-                'auto_picking': self._get_auto_picking(cr, uid, production),
-                'company_id': production.company_id.id,
-            })
-
-            source = production.product_id.product_tmpl_id.property_stock_production.id
-            data = {
-                'name':'PROD:' + production.name,
-                'date': production.date_planned,
-                'product_id': production.product_id.id,
-                'product_qty': production.product_qty,
-                'product_uom': production.product_uom.id,
-                'product_uos_qty': production.product_uos and production.product_uos_qty or False,
-                'product_uos': production.product_uos and production.product_uos.id or False,
-                'location_id': source,
-                'location_dest_id': production.location_dest_id.id,
-                'move_dest_id': production.move_prod_id.id,
-                'state': 'waiting',
-                'company_id': production.company_id.id,
-            }
-            res_final_id = move_obj.create(cr, uid, data)
-
-            self.write(cr, uid, [production.id], {'move_created_ids': [(6, 0, [res_final_id])]})
-            moves = []
-            for line in production.product_lines:
-                move_id = False
-                newdate = production.date_planned
-                if line.product_id.type in ('product', 'consu'):
-                    res_dest_id = move_obj.create(cr, uid, {
-                        'name':'PROD:' + production.name,
-                        'date': production.date_planned,
-                        'product_id': line.product_id.id,
-                        'product_qty': line.product_qty,
-                        'product_uom': line.product_uom.id,
-                        'product_uos_qty': line.product_uos and line.product_uos_qty or False,
-                        'product_uos': line.product_uos and line.product_uos.id or False,
-                        'location_id': routing_loc or production.location_src_id.id,
-                        'location_dest_id': source,
-                        'move_dest_id': res_final_id,
-                        'state': 'waiting',
-                        'company_id': production.company_id.id,
-                    })
-                    moves.append(res_dest_id)
-                    move_id = move_obj.create(cr, uid, {
-                        'name':'PROD:' + production.name,
-                        'picking_id':picking_id,
-                        'product_id': line.product_id.id,
-                        'product_qty': line.product_qty,
-                        'product_uom': line.product_uom.id,
-                        'product_uos_qty': line.product_uos and line.product_uos_qty or False,
-                        'product_uos': line.product_uos and line.product_uos.id or False,
-                        'date': newdate,
-                        'move_dest_id': res_dest_id,
-                        'location_id': production.location_src_id.id,
-                        'location_dest_id': routing_loc or production.location_src_id.id,
-                        'state': 'waiting',
-                        'company_id': production.company_id.id,
-                    })
-                proc_id = proc_obj.create(cr, uid, {
-                    'name': (production.origin or '').split(':')[0] + ':' + production.name,
-                    'origin': (production.origin or '').split(':')[0] + ':' + production.name,
-                    'date_planned': newdate,
-                    'product_id': line.product_id.id,
-                    'product_qty': line.product_qty,
-                    'product_uom': line.product_uom.id,
-                    'product_uos_qty': line.product_uos and line.product_qty or False,
-                    'product_uos': line.product_uos and line.product_uos.id or False,
-                    'location_id': production.location_src_id.id,
-                    'procure_method': line.product_id.procure_method,
-                    'move_id': move_id,
+        procurement_order = self.pool.get('procurement.order')
+        production = production_line.production_id
+        location_id = production.location_src_id.id
+        date_planned = production.date_planned
+        procurement_name = (production.origin or '').split(':')[0] + ':' + production.name
+        procurement_id = procurement_order.create(cr, uid, {
+                    'name': procurement_name,
+                    'origin': procurement_name,
+                    'date_planned': date_planned,
+                    'product_id': production_line.product_id.id,
+                    'product_qty': production_line.product_qty,
+                    'product_uom': production_line.product_uom.id,
+                    'product_uos_qty': production_line.product_uos and production_line.product_qty or False,
+                    'product_uos': production_line.product_uos and production_line.product_uos.id or False,
+                    'location_id': location_id,
+                    'procure_method': production_line.product_id.procure_method,
+                    'move_id': shipment_move_id,
                     'company_id': production.company_id.id,
                 })
-                wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
-                proc_ids.append(proc_id)
-            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-            self.write(cr, uid, [production.id], {'picking_id': picking_id, 'move_lines': [(6,0,moves)], 'state':'confirmed'})
+        wf_service.trg_validate(uid, procurement_order._name, procurement_id, 'button_confirm', cr)
+        return procurement_id
+
+    def _make_production_internal_shipment_line(self, cr, uid, production_line, shipment_id, parent_move_id, destination_location_id=False, context=None):
+        stock_move = self.pool.get('stock.move')
+        production = production_line.production_id
+        date_planned = production.date_planned
+        # Internal shipment is created for Stockable and Consumer Products
+        if production_line.product_id.type not in ('product', 'consu'):
+            return False
+        move_name = _('PROD: %s') % production.name
+        source_location_id = production.location_src_id.id
+        if not destination_location_id:
+            destination_location_id = source_location_id
+        return stock_move.create(cr, uid, {
+                        'name': move_name,
+                        'picking_id': shipment_id,
+                        'product_id': production_line.product_id.id,
+                        'product_qty': production_line.product_qty,
+                        'product_uom': production_line.product_uom.id,
+                        'product_uos_qty': production_line.product_uos and production_line.product_uos_qty or False,
+                        'product_uos': production_line.product_uos and production_line.product_uos.id or False,
+                        'date': date_planned,
+                        'move_dest_id': parent_move_id,
+                        'location_id': source_location_id,
+                        'location_dest_id': destination_location_id,
+                        'state': 'waiting',
+                        'company_id': production.company_id.id,
+                })
+          
+    def _make_production_internal_shipment(self, cr, uid, production, context=None):
+        ir_sequence = self.pool.get('ir.sequence')
+        stock_picking = self.pool.get('stock.picking')
+        routing_loc = None
+        pick_type = 'internal'
+        address_id = False
+        
+        # Take routing address as a Shipment Address.
+        # If usage of routing location is a internal, make outgoing shipment otherwise internal shipment
+        if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
+            routing_loc = production.bom_id.routing_id.location_id
+            if routing_loc.usage <> 'internal':
+                pick_type = 'out'
+            address_id = routing_loc.address_id and routing_loc.address_id.id or False
+
+        # Take next Sequence number of shipment base on type
+        pick_name = ir_sequence.get(cr, uid, 'stock.picking.' + pick_type)
+
+        picking_id = stock_picking.create(cr, uid, {
+            'name': pick_name,
+            'origin': (production.origin or '').split(':')[0] + ':' + production.name,
+            'type': pick_type,
+            'move_type': 'one',
+            'state': 'auto',
+            'address_id': address_id,
+            'auto_picking': self._get_auto_picking(cr, uid, production),
+            'company_id': production.company_id.id,
+        })
+        production.write({'picking_id': picking_id}, context=context)
+        return picking_id
+
+    def _make_production_produce_line(self, cr, uid, production, context=None):
+        stock_move = self.pool.get('stock.move')
+        source_location_id = production.product_id.product_tmpl_id.property_stock_production.id
+        destination_location_id = production.location_dest_id.id
+        move_name = _('PROD: %s') + production.name 
+        data = {
+            'name': move_name,
+            'date': production.date_planned,
+            'product_id': production.product_id.id,
+            'product_qty': production.product_qty,
+            'product_uom': production.product_uom.id,
+            'product_uos_qty': production.product_uos and production.product_uos_qty or False,
+            'product_uos': production.product_uos and production.product_uos.id or False,
+            'location_id': source_location_id,
+            'location_dest_id': destination_location_id,
+            'move_dest_id': production.move_prod_id.id,
+            'state': 'waiting',
+            'company_id': production.company_id.id,
+        }
+        move_id = stock_move.create(cr, uid, data, context=context)
+        production.write({'move_created_ids': [(6, 0, [move_id])]}, context=context)
+        return move_id
+
+    def _make_production_consume_line(self, cr, uid, production_line, parent_move_id, source_location_id=False, context=None):
+        stock_move = self.pool.get('stock.move')
+        production = production_line.production_id
+        # Internal shipment is created for Stockable and Consumer Products
+        if production_line.product_id.type not in ('product', 'consu'):
+            return False
+        move_name = _('PROD: %s') % production.name
+        destination_location_id = production.product_id.product_tmpl_id.property_stock_production.id
+        if not source_location_id:
+            source_location_id = production.location_src_id.id
+        move_id = stock_move.create(cr, uid, {
+            'name': move_name,
+            'date': production.date_planned,
+            'product_id': production_line.product_id.id,
+            'product_qty': production_line.product_qty,
+            'product_uom': production_line.product_uom.id,
+            'product_uos_qty': production_line.product_uos and production_line.product_uos_qty or False,
+            'product_uos': production_line.product_uos and production_line.product_uos.id or False,
+            'location_id': source_location_id,
+            'location_dest_id': destination_location_id,
+            'move_dest_id': parent_move_id,
+            'state': 'waiting',
+            'company_id': production.company_id.id,
+        })
+        production.write({'move_lines': [(4, move_id)]}, context=context)
+        return move_id
+
+    def action_confirm(self, cr, uid, ids, context=None):
+        """ Confirms production order.
+        @return: Newly generated Shipment Id.
+        """
+        shipment_id = False
+        wf_service = netsvc.LocalService("workflow")
+        uncompute_ids = filter(lambda x:x, [not x.product_lines and x.id or False for x in self.browse(cr, uid, ids, context=context)])
+        self.action_compute(cr, uid, uncompute_ids, context=context)
+        for production in self.browse(cr, uid, ids, context=context):
+            shipment_id = self._make_production_internal_shipment(cr, uid, production, context=context)
+            produce_move_id = self._make_production_produce_line(cr, uid, production, context=context)
+            
+            # Take routing location as a Source Location.
+            source_location_id = production.location_src_id.id
+            if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
+                source_location_id = production.bom_id.routing_id.location_id.id
+
+            for line in production.product_lines:
+                consume_move_id = self._make_production_consume_line(cr, uid, line, produce_move_id, source_location_id=source_location_id, context=context)
+                shipment_move_id = self._make_production_internal_shipment_line(cr, uid, line, shipment_id, consume_move_id,\
+                                 destination_location_id=source_location_id, context=context)
+                self._make_production_line_procurement(cr, uid, line, shipment_move_id, context=context)
+                    
+            wf_service.trg_validate(uid, 'stock.picking', shipment_id, 'button_confirm', cr)
+            production.write({'state':'confirmed'}, context=context)
             message = _("Manufacturing order '%s' is scheduled for the %s.") % (
                 production.name,
                 datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y'),
             )
             self.log(cr, uid, production.id, message)
-        return picking_id
+        return shipment_id
 
     def force_production(self, cr, uid, ids, *args):
         """ Assigns products.
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index d19a99a12ca..547bf298315 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -5,6 +5,32 @@
         <record id="base.user_demo" model="res.users">
             <field eval="[(4, ref('group_mrp_user'))]" name="groups_id"/>
         </record>
+
+        <record id="account_assembly_hours" model="account.analytic.account">
+            <field name="type">normal</field>
+            <field name="code">ASML - HOUR</field>
+            <field name="name">Costing Account For Hours of Assembly.</field>
+        </record>
+    
+        <record id="account_assembly_cycle" model="account.analytic.account">
+            <field name="type">normal</field>
+            <field name="code">ASML - Cycle</field>
+            <field name="name">Costing Account For Cycle of Assembly.</field>
+        </record>
+
+        <record id="product.product_category_assembly" model="product.category">
+            <field name="parent_id" ref="product.product_category_services"/>
+            <field name="name">Assembly Service</field>
+        </record>
+
+        <record id="product.product_assembly" model="product.product">
+            <field name="standard_price">0.1</field>
+            <field name="uom_id" ref="product.uom_hour"/>
+            <field name="uom_po_id" ref="product.uom_hour"/>
+            <field name="type">service</field>
+            <field name="name">Assembly Service Cost</field>
+            <field name="categ_id" ref="product.product_category_assembly"/>
+        </record>
         
         
         <!--
@@ -14,10 +40,25 @@
         <record id="mrp_workcenter_0" model="mrp.workcenter">
             <field name="name">Assembly workshop</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="capacity_per_cycle">5</field>
+            <field name="time_cycle">1</field>
+            <field name="time_start">0.1</field>
+            <field name="time_stop">0.1</field>
+            <field name="time_efficiency">0.87</field>
+            <field name="product_id" ref="product.product_assembly"/>
+            <field name="costs_hour">0.1</field>
+            <field name="costs_hour_account_id" ref="account_assembly_hours"/>
+            <field name="costs_cycle">0.05</field>
+            <field name="costs_cycle_account_id" ref="account_assembly_cycle"/>
+            <field name="costs_journal_id" ref="account.expenses_journal"/>
+            <field name="costs_general_account_id" ref="account.a_expense"/>
+            <field name="costs_general_account_id" ref="account.a_expense"/>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
         <record id="mrp_workcenter_1" model="mrp.workcenter">
             <field name="name">Repairs workshop</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="time_cycle">1</field>
         </record>
       <!--
     Resource: res.company
@@ -133,15 +174,12 @@
     -->
 
         <record id="mrp_routing_0" model="mrp.routing">
-            <field name="workcenter_lines">[1]</field>
             <field name="name">Assembly Line 1</field>
         </record>
         <record id="mrp_routing_1" model="mrp.routing">
-            <field name="workcenter_lines">[2]</field>
             <field name="name">Custom Assembly Line</field>
         </record>
         <record id="mrp_routing_2" model="mrp.routing">
-            <field name="workcenter_lines">[3]</field>
             <field name="name">Component Manufacturing</field>
         </record>
 
@@ -154,18 +192,38 @@
             <field name="workcenter_id" ref="mrp_workcenter_0"/>
             <field name="name">Short time assembly</field>
             <field name="hour_nbr">2</field>
+            <field name="sequence">5</field>
         </record>
         <record id="mrp_routing_workcenter_1" model="mrp.routing.workcenter">
             <field name="routing_id" ref="mrp_routing_1"/>
             <field name="workcenter_id" ref="mrp_workcenter_0"/>
             <field name="name">long time assembly</field>
             <field name="hour_nbr">5</field>
+            <field name="cycle_nbr">2</field>
+            <field name="sequence">15</field>
         </record>
+        <record id="mrp_routing_workcenter_3" model="mrp.routing.workcenter">
+            <field name="routing_id" ref="mrp_routing_1"/>
+            <field name="workcenter_id" ref="mrp_workcenter_0"/>
+            <field name="name">Testing</field>
+            <field name="hour_nbr">1</field>
+            <field name="sequence">10</field>
+        </record>
+        
+        <record id="mrp_routing_workcenter_4" model="mrp.routing.workcenter">
+            <field name="routing_id" ref="mrp_routing_1"/>
+            <field name="workcenter_id" ref="mrp_workcenter_1"/>
+            <field name="name">Packing</field>
+            <field name="hour_nbr">0.5</field>
+            <field name="sequence">5</field>
+        </record>
+
         <record id="mrp_routing_workcenter_2" model="mrp.routing.workcenter">
             <field name="routing_id" ref="mrp_routing_2"/>
             <field name="workcenter_id" ref="mrp_workcenter_0"/>
             <field name="cycle_nbr">0.5</field>
             <field name="hour_nbr">3</field>
+            <field name="sequence">5</field>
             <field name="name">assembly main + processor + fan</field>
         </record>
 
@@ -214,7 +272,7 @@
             <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_5" model="mrp.bom">
-            <field name="name">RAM on demand</field>
+            <field name="name">RAM512 on demand</field>
             <field name="sequence">18</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
@@ -254,12 +312,12 @@
             <field model="product.product" name="product_id" ref="product.product_product_23"/>
         </record>
         <record id="mrp_bom_11" model="mrp.bom">
-            <field name="name">RAM on demand</field>
+            <field name="name">RAM256 on demand</field>
             <field name="sequence">36</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" ref="product.product_product_23"/>
+            <field model="product.product" name="product_id" ref="product.product_product_21"/>
         </record>
 
         <record id="mrp_bom_13" model="mrp.bom">
@@ -267,42 +325,28 @@
             <field name="sequence">38</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
+            <field name="routing_id" ref="mrp_routing_1"/>
             <field model="product.product" name="product_id" ref="product.product_product_cpu3"/>
         </record>
 
-        <record id="mrp_bom_kit" model="mrp.bom">
+        <record id="mrp_bom_kit3" model="mrp.bom">
             <field name="code">KIT</field>
-            <field name="name">Kit Mouse</field>
+            <field name="name">Kit Keyboard + Mouse</field>
             <field name="sequence">40</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field name="type">normal</field>
+            <field name="type">phantom</field>
             <field name="bom_id" ref="mrp_bom_10"/>
-            <field model="product.product" name="product_id" ref="product.product_product_25"/>
-        </record>
-        <record id="mrp_bom_clavier" model="mrp.bom">
-            <field name="name">Keyboard</field>
-            <field name="sequence">42</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">1.0</field>
-            <field name="bom_id" ref="mrp_bom_kit"/>
-            <field model="product.product" name="product_id" ref="product.product_product_24"/>
-        </record>
-        <record id="mrp_bom_mouse" model="mrp.bom">
-            <field name="name">Mouse</field>
-            <field name="sequence">44</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">1.0</field>
-            <field name="bom_id" ref="mrp_bom_kit"/>
-            <field model="product.product" name="product_id" ref="product.product_product_25"/>
+            <field model="product.product" name="product_id" ref="product.product_product_26"/>
         </record>
+
         <record id="mrp_bom_16" model="mrp.bom">
             <field name="name">Moon PC</field>
             <field name="sequence">45</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_10"/>
-            <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc2"/>
         </record>
         <record id="mrp_bom_18" model="mrp.bom">
             <field name="name">Mainboard ASUStek A7N8X</field>
@@ -502,6 +546,35 @@
             <field name="bom_id" ref="mrp_bom_0"/>
             <field model="product.product" name="product_id" ref="product.product_product_ram"/>
         </record>
+
+        <record id="mrp_bom_kit1" model="mrp.bom">
+            <field name="code">KIT</field>
+            <field name="sequence">15</field>
+            <field name="name">Kit Keyboard + Mouse</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_qty">1.0</field>
+            <field name="type">normal</field>
+            <field model="product.product" name="product_id" ref="product.product_product_26"/>
+        </record>
+
+        <record id="mrp_bom_mouse2" model="mrp.bom">
+            <field name="name">Mouse</field>
+            <field name="sequence">121</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_qty">1.0</field>
+            <field name="bom_id" ref="mrp_bom_kit1"/>
+            <field model="product.product" name="product_id" ref="product.product_product_25"/>
+        </record>
+
+        <record id="mrp_bom_clavier2" model="mrp.bom">
+            <field name="name">Keyboard</field>
+            <field name="sequence">123</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_qty">1.0</field>
+            <field name="bom_id" ref="mrp_bom_kit1"/>
+            <field model="product.product" name="product_id" ref="product.product_product_24"/>
+        </record>
+        
         <record id="mrp_bom_41" model="mrp.bom">
             <field name="name">Regular processor config</field>
             <field name="sequence">111</field>
@@ -536,176 +609,496 @@
             <field name="name">Kit Keyboard + Mouse</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field name="type">normal</field>
+            <field name="type">phantom</field>
             <field name="bom_id" ref="mrp_bom_9"/>
             <field model="product.product" name="product_id" ref="product.product_product_26"/>
         </record>
-        <record id="mrp_bom_mouse2" model="mrp.bom">
-            <field name="name">Mouse</field>
-            <field name="sequence">121</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">1.0</field>
-            <field name="bom_id" ref="mrp_bom_kit2"/>
-            <field model="product.product" name="product_id" ref="product.product_product_25"/>
-        </record>
-        <record id="mrp_bom_clavier2" model="mrp.bom">
-            <field name="name">Keyboard</field>
-            <field name="sequence">123</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">1.0</field>
-            <field name="bom_id" ref="mrp_bom_kit2"/>
-            <field model="product.product" name="product_id" ref="product.product_product_24"/>
-        </record>
-
+        
         <!--
     Resource: mrp.bom new EVV
     -->
+    
     <record id="mrp_bom_defaultbomforshelfofcm0" model="mrp.bom">
         <field name="name">Default BOM for Shelf of 100cm</field>
         <field name="code">SHE100</field>
-            <field name="sequence">129</field>
+        <field name="sequence">10</field>
         <field name="product_id" ref="product.product_product_shelfofcm0"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">1.0</field>
+        <field name="product_qty">1.0</field>
+        <field name="routing_id" ref="mrp.mrp_routing_1"/>
+    </record>
+
+    <!-- BoMs for 1 Shelf 100cm
+            Product Ref. 	Qty 	UoM 	Type of BoM
+                SIDEPAN 	 2 	    PCE 	normal
+                PROFIL 	     4 	    PCE 	phantom
+                RPAN100 	 1 	    PCE 	phantom
+                RCK100 	     3 	    PCE 	phantom
+    -->
+
+    <record id="mrp_bom_sidepanel0" model="mrp.bom">
+        <field name="name">Side Panel</field>
+        <field name="sequence">101</field>
+        <field name="product_id" ref="product.product_product_sidepanel0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
+        <field name="product_qty">2.0</field>
+        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
     </record>
 
     <record id="mrp_bom_assemblysection0" model="mrp.bom">
         <field name="name">Assembly Section</field>
-            <field name="sequence">123</field>
+        <field name="sequence">102</field>
         <field name="product_id" ref="product.product_product_assemblysection0"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">4.0</field>
-        <field model="mrp.bom" name="bom_id" search="[('name', '=', u'Default BOM for Shelf of 100cm')]"/>
-    </record>
-    
-    <record id="mrp_bom_sidepanel0" model="mrp.bom">
-        <field name="name">Side Panel</field>
-            <field name="sequence">125</field>
-        <field name="product_id" ref="product.product_product_sidepanel0"/>
-        <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">2.0</field>
-        <field model="mrp.bom" name="bom_id" search="[('name', '=', u'Default BOM for Shelf of 100cm')]"/>
-    </record>
-
-    <record id="mrp_bom_metalcleats0" model="mrp.bom">
-        <field name="name">Metal Cleats</field>
-            <field name="sequence">127</field>
-        <field name="product_id" ref="product.product_product_metalcleats0"/>
-        <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">12.0</field>
-        <field model="mrp.bom" name="bom_id" search="[('name', '=', u'Default BOM for Shelf of 100cm')]"/>
+        <field name="product_qty">4.0</field>
+        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
+        <field name="type">phantom</field>
     </record>
 
     <record id="mrp_bom_rearpanelarm0" model="mrp.bom">
-           <field name="sequence">131</field>
+       <field name="sequence">103</field>
        <field name="product_id" ref="product.product_product_rearpanelarm0"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
-           <field name="product_qty">1.0</field>
+       <field name="product_qty">1.0</field>
        <field name="name">Rear panel SHE100</field>
+       <field name="type">phantom</field> 
     </record>
 
     <record id="mrp_bom_shelf0" model="mrp.bom">
-           <field name="sequence">133</field>
+       <field name="sequence">104</field>
        <field name="product_id" ref="product.product_product_shelf0"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
-           <field name="product_qty">3.0</field>
-       <field name="name">Shelf 100</field>
+       <field name="product_qty">3.0</field>
+       <field name="name">RCK100</field>
+       <field name="type">phantom</field> 
+    </record>
+
+    <!--
+        BOMs for 1 RCK100 PCE 
+                    Product Ref     Qty	UoM  Type of BoM
+                    SPAN100 	    1 	PCE  phantom
+                    METC000 	    4 	PCE  normal
+    -->
+    <record id="mrp_bom_shelf1" model="mrp.bom">
+       <field name="sequence">133</field>
+       <field name="product_id" ref="product.product_product_shelf0"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
+       <field name="product_qty">1.0</field>
+       <field name="name">RCK100</field>
+    </record>
+    <record id="mrp_bom_shelf0_span100" model="mrp.bom">
+       <field name="sequence">1331</field>
+       <field name="product_id" ref="product.product_product_span100"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
+       <field name="bom_id" ref="mrp_bom_shelf1"/>
+       <field name="product_qty">1.0</field>
+       <field name="type">phantom</field> <!-- It should be phantom -->
+       <field name="name">SPAN100</field>
+    </record>
+    <record id="mrp_bom_shelf0_metalcleats0" model="mrp.bom">
+       <field name="sequence">1332</field>
+       <field name="product_id" ref="product.product_product_metalcleats0"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
+       <field name="bom_id" ref="mrp_bom_shelf1"/>
+       <field name="product_qty">4.0</field>
+       <field name="name">METC000</field>
+    </record>
+    <!--
+    Bill of Materials for 1 SPAN100 PCE 
+                    Product Code 	Quantity 	Unit of Measure
+                    WOOD010 	    0.083 	    m
+    -->
+    <record id="mrp_bom_span100" model="mrp.bom">
+       <field name="sequence">135</field>
+       <field name="product_id" ref="product.product_product_span100"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
+       <field name="product_qty">1.0</field>
+       <field name="name">SPAN100</field>
+    </record>
+    <record id="mrp_bom_span100_wood010" model="mrp.bom">
+       <field name="sequence">1351</field>
+       <field name="product_id" ref="product.product_product_woodmm10"/>
+       <field name="product_uom" ref="product.product_uom_meter"/>
+       <field name="bom_id" ref="mrp_bom_span100"/>
+       <field name="product_qty">0.083</field>
+       <field name="name">WOOD010</field>
+    </record>
+    <!-- BoMs for 1 Assembly Section PCE
+            Product Ref. 	Qty 	UoM 	
+                LIN40 	     0.25 	    Meter 	
+                
+    -->
+    <record id="mrp_bom_assemblysection1" model="mrp.bom">
+        <field name="name">Assembly Section</field>
+        <field name="sequence">123</field>
+        <field name="product_id" ref="product.product_product_assemblysection0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
+        <field name="product_qty">1.0</field>
+        <field name="routing_id" ref="mrp.mrp_routing_0"/>
+        
     </record>
 
     <record id="mrp_bom_woodlintelm0" model="mrp.bom">
-           <field name="sequence">135</field>
+       <field name="sequence">1231</field>
        <field name="product_id" ref="product.product_product_woodlintelm0"/>
        <field name="product_uom" ref="product.product_uom_meter"/>
-       <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
-           <field name="product_qty">1.0</field>
-       <field model="mrp.bom" name="bom_id" search="[('name', '=', u'Assembly Section')]"/>
-       <field name="name">Wood Lintel 4m</field>
+       <field name="product_qty">0.25</field>
+       <field name="bom_id" ref="mrp_bom_assemblysection1"/>
+       <field name="name">Wood Lintel 0.25m</field>
     </record>
+    <!--
+    Bill of Materials for 1 RPAN100 PCE 
+                    Product Code 	Quantity 	Unit of Measure
+                    WOOD002 	    0.25 	    m
+    -->
+    <record id="mrp_bom_rearpanelarm1" model="mrp.bom">
+       <field name="sequence">131</field>
+       <field name="product_id" ref="product.product_product_rearpanelarm0"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
+       <field name="product_qty">1.0</field>
+       <field name="name">Rear panel SHE100</field>
+        <field name="routing_id" ref="mrp.mrp_routing_0"/>
+    </record>
+    <record id="mrp_bom_rearpanelarm1_wood002" model="mrp.bom">
+       <field name="sequence">1311</field>
+       <field name="product_id" ref="product.product_product_woodmm0"/>
+       <field name="product_uom" ref="product.product_uom_meter"/>
+       <field name="bom_id" ref="mrp_bom_rearpanelarm1"/>
+       <field name="product_qty">0.25</field>
+       <field name="name">WOOD002 0.25m</field>
+    </record>
+
 
     <record id="mrp_bom_defaultbomforshelfofcm1" model="mrp.bom">
         <field name="name">Default BOM for Shelf of 200cm</field>
         <field name="code">SHE200</field>
-            <field name="sequence">137</field>
-        <field name="product_id" ref="product.product_product_shelfofcm0"/>
+        <field name="sequence">137</field>
+        <field name="product_id" ref="product.product_product_shelfofcm1"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">1.0</field>
-    </record>
-
-    <record id="mrp_bom_defaultbomforkitshelfofcm0" model="mrp.bom">
-        <field name="name">Default BOM for KIT Shelf of 100cm</field>
-        <field name="code">SHE100KIT</field>
-            <field name="sequence">139</field>
-        <field name="product_id" ref="product.product_product_kitshelfofcm0"/>
-        <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">1.0</field>
-        <field name="type">phantom</field>
-    </record>
-
-    <record id="mrp_bom_assemblysection2" model="mrp.bom">
-        <field name="name">Assembly Section</field>
-            <field name="sequence">143</field>
-        <field name="product_id" ref="product.product_product_assemblysection0"/>
-        <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">4.0</field>
-        <field name="bom_id" ref="mrp_bom_defaultbomforkitshelfofcm0"/>
-    </record>
-
-    <record id="mrp_bom_sidepanel2" model="mrp.bom">
-        <field name="name">Side Panel</field>
-            <field name="sequence">145</field>
-        <field name="product_id" ref="product.product_product_sidepanel0"/>
-        <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">2.0</field>
-        <field name="bom_id" ref="mrp_bom_defaultbomforkitshelfofcm0"/>
+        <field name="product_qty">1.0</field>
     </record>
 
+    <!--Defining BoMs of Shelf 200cm
+            Product Ref. 	Qty 	UoM 	Type of BoM
+             RPAN200 	     1 	    PCE 	normal
+             PROFIL          4      PCE     normal
+             SIDEPAN         2      PCE     normal
+             METC000         12     PCE     normal 
+             RCK200 	     3 	    PCE 	normal   
+    -->
     <record id="mrp_bom_rearpanelarm2" model="mrp.bom">
-           <field name="sequence">147</field>
-       <field name="product_id" ref="product.product_product_rearpanelarm0"/>
+       <field name="sequence">147</field>
+       <field name="product_id" ref="product.product_product_rearpanelarm1"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
-           <field name="product_qty">1.0</field>
+       <field name="product_qty">1.0</field>
        <field name="name">Rear panel SHE200</field>
     </record>
 
     <record id="mrp_bom_assemblysection3" model="mrp.bom">
         <field name="name">Assembly Section</field>
-            <field name="sequence">149</field>
+        <field name="sequence">149</field>
         <field name="product_id" ref="product.product_product_assemblysection0"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">4.0</field>
+        <field name="product_qty">4.0</field>
         <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
     </record>
 
     <record id="mrp_bom_sidepanel3" model="mrp.bom">
         <field name="name">Side Panel</field>
-            <field name="sequence">151</field>
+        <field name="sequence">151</field>
         <field name="product_id" ref="product.product_product_sidepanel0"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">2.0</field>
+        <field name="product_qty">2.0</field>
         <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
     </record>
 
     <record id="mrp_bom_shelf2" model="mrp.bom">
-           <field name="sequence">153</field>
+       <field name="sequence">153</field>
        <field name="product_id" ref="product.product_product_shelf1"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
-           <field name="product_qty">3.0</field>
+       <field name="product_qty">3.0</field>
        <field name="name">Shelf 200</field>
     </record>
 
     <record id="mrp_bom_metalcleats3" model="mrp.bom">
         <field name="name">Metal Cleats</field>
-            <field name="sequence">155</field>
+        <field name="sequence">155</field>
         <field name="product_id" ref="product.product_product_metalcleats0"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">12.0</field>
+        <field name="product_qty">12.0</field>
         <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
     </record>
+
+    <record id="mrp_bom_defaultbomforkitshelfofcm0" model="mrp.bom">
+        <field name="name">Default BOM for KIT Shelf of 100cm</field>
+        <field name="code">SHE100KIT</field>
+        <field name="sequence">139</field>
+        <field name="product_id" ref="product.product_product_kitshelfofcm0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
+        <field name="product_qty">1.0</field>
+        <field name="type">phantom</field>
+    </record>
+
+    <!--Defining BoMs of KIT Shelf 100cm
+            Product Ref. 	Qty 	UoM 	Type of BoM
+                PROFIL	     4 	    PCE 	normal
+                SIDEPAN      2      PCE     normal
+    -->
+
+    <record id="mrp_bom_assemblysection2" model="mrp.bom">
+        <field name="name">Assembly Section</field>
+        <field name="sequence">143</field>
+        <field name="product_id" ref="product.product_product_assemblysection0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
+        <field name="product_qty">4.0</field>
+        <field name="bom_id" ref="mrp_bom_defaultbomforkitshelfofcm0"/>
+    </record>
+
+    <record id="mrp_bom_sidepanel2" model="mrp.bom">
+        <field name="name">Side Panel</field>
+        <field name="sequence">145</field>
+        <field name="product_id" ref="product.product_product_sidepanel0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
+        <field name="product_qty">2.0</field>
+        <field name="bom_id" ref="mrp_bom_defaultbomforkitshelfofcm0"/>
+    </record>
+
     
+
+   <record id="product.product_uom_dozen" model="product.uom">
+            <field name="category_id" ref="product.product_uom_categ_unit"/>
+            <field name="name">Dozen</field>
+            <field name="factor" eval="0.083"/>
+            <field name="uom_type">bigger</field>
+    </record>
+
+
+    <record id="mrp_production_shelf100cm" model="mrp.production">
+        <field name="product_id" ref="product.product_product_shelfofcm0"/>
+        <field name="product_uom" ref="product.product_uom_dozen"/>
+        <field name="product_qty">3</field>
+        <field name="location_src_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
+    </record>
+
+    
+
+   <record id="product_uom_categ_fluid" model="product.uom.categ">
+        <field name="name">Fluid</field>
+   </record>
+   <record id="product_uom_litre" model="product.uom">
+        <field name="name">Litre</field>
+        <field name="category_id" ref="product_uom_categ_fluid"/>
+        <field name="factor">1.0</field>
+   </record>
+    <record id="product_orangejuice" model="product.product">
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="name">Orange Juice</field>
+        <field name="procure_method">make_to_order</field>
+        <field name="supply_method">produce</field>
+        <field name="type">product</field>
+        <field name="uom_id" ref="product_uom_litre"/>
+        <field name="uom_po_id" ref="product_uom_litre"/>
+    </record>
+    <record id="product_orange" model="product.product">
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="name">Orange</field>
+        <field name="procure_method">make_to_stock</field>
+        <field name="supply_method">buy</field>
+        <field name="type">product</field>
+        <field name="uom_id" ref="product.product_uom_kgm"/>
+        <field name="uom_po_id" ref="product.product_uom_kgm"/>
+    </record>
+    <record id="orange_supplier_asus" model="product.supplierinfo">
+        <field name="product_id" ref="product_orange"/>
+        <field name="name" ref="base.res_partner_asus"/>
+        <field name="min_qty">1.0</field>
+        <field name="product_uom" ref="product.product_uom_kgm"/>
+    </record>
+    <record id="product_sugar" model="product.product">
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="name">Sugar</field>
+        <field name="procure_method">make_to_stock</field>
+        <field name="supply_method">buy</field>
+        <field name="type">product</field>
+        <field name="uom_id" ref="product.product_uom_kgm"/>
+        <field name="uom_po_id" ref="product.product_uom_kgm"/>
+    </record>
+    <record id="sugar_supplier_desertic" model="product.supplierinfo">
+        <field name="product_id" ref="product_sugar"/>
+        <field name="name" ref="base.res_partner_desertic_hispafuentes"/>
+        <field name="product_uom" ref="product.product_uom_kgm"/>
+        <field name="min_qty">2.0</field>
+    </record>
+    <record id="product_water" model="product.product">
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="name">Water</field>
+        <field name="procure_method">make_to_order</field>
+        <field name="supply_method">buy</field>
+        <field name="type">consu</field>
+        <field name="uom_id" ref="product_uom_litre"/>
+        <field name="uom_po_id" ref="product_uom_litre"/>
+    </record>
+    <record id="water_supplier_agrolait" model="product.supplierinfo">
+        <field name="product_id" ref="product_water"/>
+        <field name="name" ref="base.res_partner_agrolait"/>
+        <field name="product_uom" ref="product_uom_litre"/>
+        <field name="min_qty">2.0</field>
+    </record>
+
+    <record id="mrp_bom_orangejuice" model="mrp.bom">
+       <field name="sequence">200</field>
+       <field name="product_id" ref="product_orangejuice"/>
+       <field name="product_uom" ref="product_uom_litre"/>
+       <field name="product_qty">1.0</field>
+       <field name="name">Orange Juice</field>
+       <field name="type">phantom</field>
+    </record>
+
+    <record id="raw_orangejuice_orange" model="mrp.bom">
+       <field name="sequence">201</field>
+       <field name="product_id" ref="product_orange"/>
+       <field name="product_uom" ref="product.product_uom_kgm"/>
+       <field name="product_qty">0.5</field>
+       <field name="name">Orange</field>
+       <field name="type">normal</field>
+       <field name="bom_id" ref="mrp_bom_orangejuice"/>
+    </record>
+    <record id="raw_orangejuice_sugar" model="mrp.bom">
+       <field name="sequence">202</field>
+       <field name="product_id" ref="product_sugar"/>
+       <field name="product_uom" ref="product.product_uom_kgm"/>
+       <field name="product_qty">0.02</field>
+       <field name="name">Sugar</field>
+       <field name="type">normal</field>
+       <field name="bom_id" ref="mrp_bom_orangejuice"/>
+    </record>
+    <record id="raw_orangejuice_water" model="mrp.bom">
+       <field name="sequence">203</field>
+       <field name="product_id" ref="product_water"/>
+       <field name="product_uom" ref="product_uom_litre"/>
+       <field name="product_qty">0.80</field>
+       <field name="name">Water</field>
+       <field name="type">normal</field>
+       <field name="bom_id" ref="mrp_bom_orangejuice"/>
+    </record>
+    <record id="stock_rule_orange" model="stock.warehouse.orderpoint">
+       <field name="product_id" ref="product_orange"/>
+       <field name="product_uom" ref="product.product_uom_kgm"/>
+       <field name="product_max_qty">10.0</field>
+       <field name="product_min_qty">5.0</field>
+       <field name="qty_multiple">1</field>
+       <field name="warehouse_id" ref="stock.warehouse0"/>
+       <field name="location_id" ref="stock.stock_location_stock"/>
+        
+    </record>
+    <record id="stock_rule_sugar" model="stock.warehouse.orderpoint">
+       <field name="product_id" ref="product_sugar"/>
+       <field name="product_uom" ref="product.product_uom_kgm"/>
+       <field name="product_max_qty">4.0</field>
+       <field name="product_min_qty">2.0</field>
+       <field name="qty_multiple">1</field>
+       <field name="logic">max</field>
+       <field name="warehouse_id" ref="stock.warehouse0"/>
+       <field name="location_id" ref="stock.stock_location_stock"/>
+    </record>
+    <record id="mrp_production_orangejuice" model="mrp.production">
+        <field name="product_id" ref="product_orangejuice"/>
+        <field name="product_uom" ref="product_uom_litre"/>
+        <field name="location_src_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="bom_id" ref="mrp_bom_orangejuice"/>
+        <field name="product_qty">100.00</field>
+    </record>
+    
+    <record id="product_shirt" model="product.product">
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="name">Shirt</field>
+        <field name="procure_method">make_to_stock</field>
+        <field name="supply_method">produce</field>
+        <field name="type">product</field>
+        <field name="uom_id" ref="product.product_uom_unit"/>
+        <field name="uom_po_id" ref="product.product_uom_unit"/>
+    </record>
+    <record id="product_cloth" model="product.product">
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="name">Cloth</field>
+        <field name="procure_method">make_to_order</field>
+        <field name="supply_method">buy</field>
+        <field name="type">product</field>
+        <field name="uom_id" ref="product.product_uom_unit"/>
+        <field name="uom_po_id" ref="product.product_uom_unit"/>
+    </record>
+    <record id="cloth_supplier_maxtor" model="product.supplierinfo">
+        <field name="product_id" ref="product_cloth"/>
+        <field name="name" ref="base.res_partner_maxtor"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
+        <field name="min_qty">300.0</field>
+    </record>
+    <record id="product_buttons" model="product.product">
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="name">Shirt Buttons</field>
+        <field name="procure_method">make_to_stock</field>
+        <field name="supply_method">buy</field>
+        <field name="type">product</field>
+        <field name="uom_id" ref="product.product_uom_unit"/>
+        <field name="uom_po_id" ref="product.product_uom_unit"/>
+    </record>
+    <record id="buttons_supplier_asus" model="product.supplierinfo">
+        <field name="product_id" ref="product_buttons"/>
+        <field name="name" ref="base.res_partner_asus"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
+        <field name="min_qty">100.0</field>
+    </record>
+    <record id="mrp_bom_shirt" model="mrp.bom">
+       <field name="sequence">300</field>
+       <field name="product_id" ref="product_shirt"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
+       <field name="product_qty">1.0</field>
+       <field name="name">Shirt</field>
+    </record>
+
+    <record id="raw_shirt_cloth" model="mrp.bom">
+       <field name="sequence">301</field>
+       <field name="product_id" ref="product_cloth"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
+       <field name="product_qty">1.0</field>
+       <field name="name">Cloth</field>
+       <field name="type">normal</field>
+       <field name="bom_id" ref="mrp_bom_shirt"/>
+    </record>
+    <record id="raw_shirt_buttons" model="mrp.bom">
+       <field name="sequence">302</field>
+       <field name="product_id" ref="product_buttons"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
+       <field name="product_qty">8.0</field>
+       <field name="name">Shirt Buttons</field>
+       <field name="type">normal</field>
+       <field name="bom_id" ref="mrp_bom_shirt"/>
+    </record>
+      
+    <record id="stock_shirt_buttons" model="stock.warehouse.orderpoint">
+       <field name="product_id" ref="product_buttons"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
+       <field name="product_max_qty">50.0</field>
+       <field name="product_min_qty">10.0</field>
+       <field name="qty_multiple">1</field>
+       <field name="logic">max</field>
+       <field name="warehouse_id" ref="stock.warehouse0"/>
+       <field name="location_id" ref="stock.stock_location_stock"/>
+    </record>
+    <record id="mrp_production_shirt" model="mrp.production">
+        <field name="product_id" ref="product_shirt"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
+        <field name="location_src_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="bom_id" ref="mrp_bom_shirt"/>
+    </record>
     <record id="mrp_production_order1" model="mrp.production">
         <field name="product_id" ref="product.product_product_pc1"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
@@ -714,11 +1107,9 @@
         <field name="bom_id" ref="mrp.mrp_bom_9"/>
         <field name="routing_id" ref="mrp.mrp_routing_0"/>
     </record>
-    
     <workflow action="button_confirm" model="mrp.production" ref="mrp_production_order1"/>
     
     <!-- Run Scheduler -->
     <function model="procurement.order" name="run_scheduler"/>
-
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index dafe399b583..30496701c1c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -100,7 +100,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_mrp_property_search"/>
-            <field name="help">The Properties in OpenERP are used to select the right bill of materials for manufacturing a product when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will automatically select the BoM to use according the the needs.</field>
+            <field name="help">The Properties in OpenERP are used to select the right bill of materials for manufacturing a product when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will automatically select the BoM to use according the needs.</field>
         </record>
         <menuitem name="Master Bill of Materials"
             id="menu_mrp_property"
@@ -317,7 +317,7 @@
             <field name="arch" type="xml">
                 <form string="Bill of Material">
                     <group colspan="4" col="6">
-                        <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" select="1"/>
                         <field name="name" select="1"/>
                         <field name="code" select="1" string="Reference" groups="base.group_extended"/>
                         <newline/>
@@ -407,7 +407,7 @@
                             <field name="product_efficiency" groups="base.group_extended"/>
                             <separator string="Properties" colspan="4"/>
                             <newline/>
-                            <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
+                            <field colspan="4" name="property_ids" nolabel="1" groups="base.group_extended"/>
                         </page>
                     </notebook>
                 </form>
@@ -522,6 +522,7 @@
             <field name="res_model">mrp.bom</field>
             <field name="domain">[('id','=',active_id)]</field>
             <field name="view_type">tree</field>
+            <field name="view_mode">tree</field>
             <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
         <record id="ir_BOM_structure" model="ir.values">
@@ -776,7 +777,7 @@
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Extra Information">
-                            <field name="user_id"/> 
+                            <field name="user_id"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="priority" groups="base.group_extended"/>
                             <newline/>
@@ -972,7 +973,7 @@
                </data>
             </field>
         </record>
-        
+
         <act_window
             context="{'search_default_product_id': [active_id]}"
             id="act_product_manufacturing_open"
@@ -980,13 +981,14 @@
             view_id="mrp_production_tree_view"
             res_model="mrp.production"
             src_model="product.product"/>
-            
+
         <act_window
             id="action_product_bom_structure"
             name="Product BoM Structure"
             domain="[('product_id', '=', active_id),('bom_id','=',False)]"
             context="{'default_product_id': active_id}"
             view_type="tree"
+            view_mode="tree"
             view_id="mrp_bom_tree_view"
             res_model="mrp.bom"
             src_model="product.product"
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 3a8ec11b353..365c1195c44 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -136,7 +136,7 @@
             <field name="signal">subflow.cancel</field>
         </record>
         
-        <record id="trans_produce_make_done" model="workflow.transition">
+        <record id="procurement.trans_produce_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce"/>
             <field name="act_to" ref="procurement.act_make_done"/>
             <field name="signal">subflow.done</field>
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index c3f9ee855df..1bc3bb749ce 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -25,37 +25,9 @@ from tools.translate import _
 
 class product_product(osv.osv):
     _inherit = "product.product"    
-
-    def get_product_accounts(self, cr, uid, product_id, context=None):
-        """ To get the stock input account, stock output account and stock journal related to product.
-        @param product_id: product id            
-        @return: dictionary which contains information regarding stock input account, stock output account and stock journal
-        """
-        product_obj = self.pool.get('product.product').browse(cr, uid, product_id, False)
-        res = super(product_product,self).get_product_accounts(cr, uid, product_id, context=context)
-        stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False 
-        if not stock_input_acc:
-            stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
-        
-        stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
-        if not stock_output_acc:
-            stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
-
-        journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
-        
-        res.update({'stock_account_input': stock_input_acc})
-        res.update({'stock_account_output': stock_output_acc})
-        res.update({'stock_journal': journal_id})  
-        
-        return res
-    
-
     _columns = {
         "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials'),
     }
-    
-#    Removed do_change_standard_price for the fix of lp:747056
-
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 09e15ebf39f..b7e51dd7cf0 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -41,14 +41,6 @@
                 </search>
             </field>
         </record>
-        <record id="action_report_workcenter_load_tree" model="ir.actions.act_window">
-            <field name="name">Work Center Loads</field>
-            <field name="res_model">report.workcenter.load</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="search_view_id" ref="view_workcenter_load_search"/>
-            <field name="help">Work Center Loads gives you a projection of work center loads over a specified period. It is expressed in number of hours and machine related cycles.</field>
-        </record>
         <menuitem id="next_id_77" name="Reporting"
             parent="base.menu_mrp_root" sequence="49"/>
 
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index c072b821196..fc32eeeed9e 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -41,6 +41,7 @@ class report_custom(report_rml):
         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
+        company_currency_symbol = company_currency.symbol or company_currency.name
         def process_bom(bom, currency_id, factor=1):
             xml = '<row>'
             sum = 0
@@ -62,7 +63,7 @@ class report_custom(report_rml):
                         'uom': prod.uom_po_id.id,
                         'date': time.strftime('%Y-%m-%d'),
                         })[pricelist.id]
-                main_sp_price = """<b>"""+rml_obj.formatLang(price)+' '+ company_currency.symbol+"""</b>\r\n"""
+                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'
@@ -75,11 +76,11 @@ class report_custom(report_rml):
                         'uom': prod.uom_po_id.id,
                         'date': time.strftime('%Y-%m-%d'),
                         })[pricelist.id]
-                sellers_price += """<i>"""+rml_obj.formatLang(price) +' '+ company_currency.symbol +"""</i>\r\n"""
+                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'>"""+ rml_obj.formatLang(float(main_strd_price)) +' '+ (company_currency_symbol) +"""</col>
                     <col f='yes'>""" + main_sp_price + sellers_price + """</col>'"""
 
             xml += '</row>'
@@ -93,9 +94,9 @@ class report_custom(report_rml):
             xml = '<row>'
             xml += "<col para='yes'>" + to_xml(workcenter.name) + '</col>'
             xml += "<col/>"
-            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 += """<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
@@ -159,8 +160,8 @@ class report_custom(report_rml):
                     <col> """ + _('Total Cost of %s %s') % (str(number), product_uom_name) + """: </col>
                     <col/>
                     <col f='yes'/>
-                    <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
-                    <col t='yes'>"""+ rml_obj.formatLang(total, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ (company_currency_symbol) + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total, digits=purchase_price_digits) +' '+ (company_currency_symbol) + """</col>
                     </row></lines>'"""
             else:
                 bom = bom_pool.browse(cr, uid, bom_id, context=context)
@@ -186,7 +187,7 @@ class report_custom(report_rml):
                     <col> """ + _('Components Cost of %s %s') % (str(number), product_uom_name) + """: </col>
                     <col/>
                     <col t='yes'/>
-                    <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ (company_currency_symbol) + """</col>
                     <col t='yes'></col>
                     </row></lines>'"""
 
@@ -204,13 +205,13 @@ class report_custom(report_rml):
                     <col/>
                     <col/>
                     <col/>
-                    <col t='yes'>"""+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +"""</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ (company_currency_symbol) +"""</col>
                     </row></lines>'"""
                 xml += """<lines style='total'> <row>
                     <col> """ + _('Total Cost of %s %s') % (str(number), product_uom_name) + """: </col>
                     <col/>
                     <col t='yes'/>
-                    <col t='yes'>"""+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ (company_currency_symbol) + """</col>
                     <col t='yes'></col>
                     </row></lines>'"""
 
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 1d93fb460b5..4289010d165 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,94 +1,83 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0
-"access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,0,0,0
-"access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
-"access_mrp_production","mrp.production user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
-"access_mrp_production_salesman","mrp.production salesman","model_mrp_production","base.group_sale_salesman",1,1,1,0
-"access_mrp_production_product_line_salesman","mrp.production.product.line salesman","model_mrp_production_product_line","base.group_sale_salesman",1,0,1,0
-"access_mrp_production_workcenter_line_salesman","mrp.production.workcenter.line salesman","model_mrp_production_workcenter_line","base.group_sale_salesman",1,0,1,0
-"access_mrp_property_group","mrp.property.group","procurement.model_mrp_property_group","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_property","mrp.property","procurement.model_mrp_property","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
-"access_procurement","procurement.order","model_procurement_order","mrp.group_mrp_user",1,1,1,1
-"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1
-"access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0
-"access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,0
-"access_stock_picking_mrp_worker","stock.picking mrp_worker","stock.model_stock_picking","mrp.group_mrp_user",1,1,1,1
-"access_stock_warehouse","stock.warehouse mrp_worker","stock.model_stock_warehouse","mrp.group_mrp_user",1,0,0,0
-"access_account_analytic_journal_mrp_worker","account.analytic.journal mrp_worker","account.model_account_analytic_journal","mrp.group_mrp_user",1,0,0,0
-"access_account_account","account.account mrp_worker","account.model_account_account","mrp.group_mrp_user",1,0,0,0
-"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,0,0,0
-"access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
-"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_manager","resource.model_resource_calendar","mrp.group_mrp_manager",1,1,1,1
-"access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
-"access_procurement_user","procurement.order.user","model_procurement_order","base.group_user",1,1,1,1
-"access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
-"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,1,1,1
-"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,1,1,1
-"access_product_product_manager","product.product manager","product.model_product_product","mrp.group_mrp_manager",1,0,0,0
-"access_ir_property_manager","ir.property manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
-"access_account_sequence_fiscalyear","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_user",1,1,1,1
-"access_product_product_user","product.product user","product.model_product_product","mrp.group_mrp_user",1,0,0,0
-"access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,0,0,0
-"access_product_uom_user","product.uom user","product.model_product_uom","mrp.group_mrp_user",1,0,0,0
-"access_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","mrp.group_mrp_user",1,1,1,1
-"access_res_partner_address","res.partner.address","base.model_res_partner_address","mrp.group_mrp_user",1,0,0,0
-"access_stock_tracking","stock.tracking","stock.model_stock_tracking","mrp.group_mrp_user",1,1,1,0
-"access_res_partner","res.partner","base.model_res_partner","mrp.group_mrp_user",1,0,0,0
-"access_workcenter_user","mrp.production.workcenter.line.user","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
-"access_resource_calendar_leaves_user","mrp.resource.calendar.leaves.user","resource.model_resource_calendar_leaves","mrp.group_mrp_user",1,1,1,1
-"access_resource_calendar_leaves_manager","mrp.resource.calendar.leaves.manager","resource.model_resource_calendar_leaves","mrp.group_mrp_manager",1,0,0,0
-"access_resource_calendar_attendance_manager","mrp.resource.calendar.attendance.manager","resource.model_resource_calendar_attendance","mrp.group_mrp_manager",1,1,1,1
-"access_product_puom_categ","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_user",1,0,0,0
-"access_resource_resource","resource.resource","resource.model_resource_resource","mrp.group_mrp_user",1,0,0,0
-"access_board_board_user","mrp.board.board","board.model_board_board","mrp.group_mrp_user",1,0,0,0
-"access_account_sequence_fiscalyear_manager","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
-"access_product_template_manager","product.template mgr","product.model_product_template","mrp.group_mrp_manager",1,0,0,0
-"access_product_uom_manager","product.uom user","product.model_product_uom","mrp.group_mrp_manager",1,0,0,0
-"access_product_supplierinfo_manager","product.supplierinfo user","product.model_product_supplierinfo","mrp.group_mrp_manager",1,0,0,0
-"access_res_partner_address_manager","res.partner.address","base.model_res_partner_address","mrp.group_mrp_manager",1,0,0,0
-"access_stock_tracking_manager","stock.tracking","stock.model_stock_tracking","mrp.group_mrp_manager",1,0,0,0
-"access_res_partner_manager","res.partner","base.model_res_partner","mrp.group_mrp_manager",1,0,0,0
-"access_product_puom_categ_manager","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_manager",1,0,0,0
-"access_resource_resource_manager","resource.resource","resource.model_resource_resource","mrp.group_mrp_manager",1,0,0,0
-"access_board_board_manager","mrp.board.board","board.model_board_board","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_production_manager","mrp.production manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
-"access_procurement_manager","procurement.order","model_procurement_order","mrp.group_mrp_manager",1,0,0,0
-"access_workcenter_manager","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
-"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_production_product_line_manager","mrp.production.product.line manager","model_mrp_production_product_line","mrp.group_mrp_manager",1,0,0,0
-"access_account_sequence_fiscalyear_system","account.sequence.fiscalyear.system","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
-"access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
-"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint","procurement.model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,0,0,0
-"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0
-"access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
-"access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom_salesman","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0
-"access_mrp_bom_stockuser","mrp.bom","model_mrp_bom","stock.group_stock_user",1,0,0,0
-"access_product_uom_categ_mrp_manager","product.uom.categ mrp_manager","product.model_product_uom_categ","mrp.group_mrp_manager",1,1,1,1
-"access_product_uom_mrp_manager","product.uom mrp_manager","product.model_product_uom","mrp.group_mrp_manager",1,1,1,1
-"access_product_ul_mrp_manager","product.ul mrp_manager","product.model_product_ul","mrp.group_mrp_manager",1,1,1,1
-"access_product_category_mrp_manager","product.category mrp_manager","product.model_product_category","mrp.group_mrp_manager",1,1,1,1
-"access_product_template_mrp_manager","product.template mrp_manager","product.model_product_template","mrp.group_mrp_manager",1,1,1,1
-"access_product_product_mrp_manager","product.product mrp_manager","product.model_product_product","mrp.group_mrp_manager",1,1,1,1
-"access_product_packaging_mrp_manager","product.packaging mrp_manager","product.model_product_packaging","mrp.group_mrp_manager",1,1,1,1
-"access_product_supplierinfo_mrp_manager","product.supplierinfo mrp_manager","product.model_product_supplierinfo","mrp.group_mrp_manager",1,1,1,1
-"access_pricelist_partnerinfo_mrp_manager","pricelist.partnerinfo mrp_manager","product.model_pricelist_partnerinfo","mrp.group_mrp_manager",1,1,1,1
-"access_product_price_type_mrp_manager","product.price.type mrp_manager","product.model_product_price_type","mrp.group_mrp_manager",1,1,1,1
-"access_product_pricelist_type_mrp_manager","product.pricelist.type mrp_manager","product.model_product_pricelist_type","mrp.group_mrp_manager",1,1,1,1
-"access_product_pricelist_mrp_manager","product.pricelist mrp_manager","product.model_product_pricelist","mrp.group_mrp_manager",1,1,1,1
-"access_ir_property_group_product_mrp_manager","ir_property group_product_mrp_manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
-"access_product_group_res_partner_mrp_manager","res_partner group_mrp_manager","base.model_res_partner","mrp.group_mrp_manager",1,1,1,0
-"access_product_pricelist_version_mrp_manager","product.pricelist.version mrp_manager","product.model_product_pricelist_version","mrp.group_mrp_manager",1,1,1,1
-"access_product_pricelist_item_mrp_manager","product.pricelist.item mrp_manager","product.model_product_pricelist_item","mrp.group_mrp_manager",1,1,1,1
-"access_resource_calendar_manufacturinguser","resource.calendar manufacturing.user","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
-"access_account_account_mrp_manager","account.account mrp manager","account.model_account_account","mrp.group_mrp_manager",1,0,0,0
-"access_account_journal_mrp_manager","account.journal mrp manager","account.model_account_journal","mrp.group_mrp_manager",1,0,0,0
-"access_stock_location_mrp_manager","stock.location product mrp manager","stock.model_stock_location","mrp.group_mrp_manager",1,0,0,0
-"access_purchase_order_stock_user","purchase.order stock user","purchase.model_purchase_order","stock.group_stock_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mrp_workcenter,mrp.workcenter,model_mrp_workcenter,mrp.group_mrp_user,1,0,0,0
+access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
+access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
+access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,0
+access_mrp_bom_revision,mrp.bom.revision,model_mrp_bom_revision,group_mrp_user,1,0,0,0
+access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
+access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,0
+access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,base.group_sale_salesman,1,0,1,0
+access_mrp_production_workcenter_line_salesman,mrp.production.workcenter.line salesman,model_mrp_production_workcenter_line,base.group_sale_salesman,1,0,1,0
+access_mrp_property_group,mrp.property.group,procurement.model_mrp_property_group,mrp.group_mrp_manager,1,1,1,1
+access_mrp_property,mrp.property,procurement.model_mrp_property,mrp.group_mrp_manager,1,1,1,1
+access_mrp_production_product_line,mrp.production.product.line,model_mrp_production_product_line,mrp.group_mrp_user,1,1,1,1
+access_procurement,procurement.order,model_procurement_order,mrp.group_mrp_user,1,1,1,1
+access_mrp_workcenter_manager,mrp.workcenter.manager,model_mrp_workcenter,mrp.group_mrp_manager,1,1,1,1
+access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_manager,1,1,1,1
+access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_manager,1,1,1,1
+access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_manager,1,1,1,1
+access_mrp_bom_revision_manager,mrp.bom.revision.manager,model_mrp_bom_revision,mrp.group_mrp_manager,1,1,1,1
+access_stock_location_mrp_worker,stock.location mrp_worker,stock.model_stock_location,mrp.group_mrp_user,1,0,0,0
+access_stock_move_mrp_worker,stock.move mrp_worker,stock.model_stock_move,mrp.group_mrp_user,1,1,1,0
+access_stock_picking_mrp_worker,stock.picking mrp_worker,stock.model_stock_picking,mrp.group_mrp_user,1,1,1,1
+access_stock_warehouse,stock.warehouse mrp_worker,stock.model_stock_warehouse,mrp.group_mrp_user,1,0,0,0
+access_account_analytic_journal_mrp_worker,account.analytic.journal mrp_worker,account.model_account_analytic_journal,mrp.group_mrp_user,1,0,0,0
+access_account_account,account.account mrp_worker,account.model_account_account,mrp.group_mrp_user,1,0,0,0
+access_purchase_order_mrp_worker,purchase.order mrp_worker,purchase.model_purchase_order,mrp.group_mrp_user,1,0,0,0
+access_purchase_order_line_mrp_worker,purchase.order.line mrp_worker,purchase.model_purchase_order_line,mrp.group_mrp_user,1,0,0,0
+access_hr_timesheet_group_mrp_worker,resource.calendar mrp_manager,resource.model_resource_calendar,mrp.group_mrp_manager,1,1,1,1
+access_procurement_stock_worker,procurement.order stock_worker,model_procurement_order,stock.group_stock_user,1,1,1,1
+access_procurement_user,procurement.order.user,model_procurement_order,base.group_user,1,1,1,1
+access_mrp_production_stock_worker,mrp.production stock_worker,model_mrp_production,stock.group_stock_user,1,0,0,0
+access_report_workcenter_load,report.workcenter.load,model_report_workcenter_load,mrp.group_mrp_manager,1,1,1,1
+access_report_mrp_inout,report.mrp.inout,model_report_mrp_inout,mrp.group_mrp_manager,1,1,1,1
+access_ir_property_manager,ir.property manager,base.model_ir_property,mrp.group_mrp_manager,1,1,1,1
+access_account_sequence_fiscalyear,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,mrp.group_mrp_user,1,1,1,1
+access_product_product_user,product.product user,product.model_product_product,mrp.group_mrp_user,1,0,0,0
+access_product_template_user,product.template user,product.model_product_template,mrp.group_mrp_user,1,0,0,0
+access_product_uom_user,product.uom user,product.model_product_uom,mrp.group_mrp_user,1,0,0,0
+access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,mrp.group_mrp_user,1,1,1,1
+access_res_partner_address,res.partner.address,base.model_res_partner_address,mrp.group_mrp_user,1,0,0,0
+access_stock_tracking,stock.tracking,stock.model_stock_tracking,mrp.group_mrp_user,1,1,1,0
+access_res_partner,res.partner,base.model_res_partner,mrp.group_mrp_user,1,0,0,0
+access_workcenter_user,mrp.production.workcenter.line.user,model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1
+access_resource_calendar_leaves_user,mrp.resource.calendar.leaves.user,resource.model_resource_calendar_leaves,mrp.group_mrp_user,1,1,1,1
+access_resource_calendar_leaves_manager,mrp.resource.calendar.leaves.manager,resource.model_resource_calendar_leaves,mrp.group_mrp_manager,1,0,0,0
+access_resource_calendar_attendance_manager,mrp.resource.calendar.attendance.manager,resource.model_resource_calendar_attendance,mrp.group_mrp_manager,1,1,1,1
+access_product_puom_categ,product.uom.categ,product.model_product_uom_categ,mrp.group_mrp_user,1,0,0,0
+access_resource_resource,resource.resource,resource.model_resource_resource,mrp.group_mrp_user,1,0,0,0
+access_board_board_user,mrp.board.board,board.model_board_board,mrp.group_mrp_user,1,0,0,0
+access_account_sequence_fiscalyear_manager,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,mrp.group_mrp_manager,1,0,0,0
+access_product_supplierinfo_manager,product.supplierinfo user,product.model_product_supplierinfo,mrp.group_mrp_manager,1,0,0,0
+access_stock_tracking_manager,stock.tracking,stock.model_stock_tracking,mrp.group_mrp_manager,1,0,0,0
+access_mrp_production_manager,mrp.production manager,model_mrp_production,mrp.group_mrp_manager,1,0,0,0
+access_procurement_manager,procurement.order,model_procurement_order,mrp.group_mrp_manager,1,0,0,0
+access_workcenter_manager,mrp.production.workcenter.line,model_mrp_production_workcenter_line,mrp.group_mrp_manager,1,0,0,0
+access_stock_move_mrp_manager,stock.move mrp_manager,stock.model_stock_move,mrp.group_mrp_manager,1,0,0,0
+access_mrp_production_product_line_manager,mrp.production.product.line manager,model_mrp_production_product_line,mrp.group_mrp_manager,1,0,0,0
+access_account_sequence_fiscalyear_system,account.sequence.fiscalyear.system,account.model_account_sequence_fiscalyear,mrp.group_mrp_manager,1,0,0,0
+access_stock_production_lot_user,stock.production.lot,stock.model_stock_production_lot,mrp.group_mrp_user,1,1,1,1
+access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,mrp.group_mrp_manager,1,0,0,0
+access_stock_picking_mrp_manager,stock.picking mrp_manager,stock.model_stock_picking,mrp.group_mrp_manager,1,0,0,0
+access_report_mrp_inout_user,report.mrp.inout user,model_report_mrp_inout,mrp.group_mrp_user,1,0,0,0
+access_report_workcenter_load_user,report.workcenter.load.user,model_report_workcenter_load,mrp.group_mrp_user,1,0,0,0
+access_mrp_bom_salesman,mrp.bom,model_mrp_bom,base.group_sale_salesman,1,0,0,0
+access_mrp_bom_stockuser,mrp.bom,model_mrp_bom,stock.group_stock_user,1,0,0,0
+access_product_uom_categ_mrp_manager,product.uom.categ mrp_manager,product.model_product_uom_categ,mrp.group_mrp_manager,1,1,1,1
+access_product_uom_mrp_manager,product.uom mrp_manager,product.model_product_uom,mrp.group_mrp_manager,1,1,1,1
+access_product_ul_mrp_manager,product.ul mrp_manager,product.model_product_ul,mrp.group_mrp_manager,1,1,1,1
+access_product_category_mrp_manager,product.category mrp_manager,product.model_product_category,mrp.group_mrp_manager,1,1,1,1
+access_product_template_mrp_manager,product.template mrp_manager,product.model_product_template,mrp.group_mrp_manager,1,1,1,1
+access_product_product_mrp_manager,product.product mrp_manager,product.model_product_product,mrp.group_mrp_manager,1,1,1,1
+access_product_packaging_mrp_manager,product.packaging mrp_manager,product.model_product_packaging,mrp.group_mrp_manager,1,1,1,1
+access_pricelist_partnerinfo_mrp_manager,pricelist.partnerinfo mrp_manager,product.model_pricelist_partnerinfo,mrp.group_mrp_manager,1,1,1,1
+access_product_price_type_mrp_manager,product.price.type mrp_manager,product.model_product_price_type,mrp.group_mrp_manager,1,1,1,1
+access_product_pricelist_type_mrp_manager,product.pricelist.type mrp_manager,product.model_product_pricelist_type,mrp.group_mrp_manager,1,1,1,1
+access_product_pricelist_mrp_manager,product.pricelist mrp_manager,product.model_product_pricelist,mrp.group_mrp_manager,1,1,1,1
+access_ir_property_group_product_mrp_manager,ir_property group_product_mrp_manager,base.model_ir_property,mrp.group_mrp_manager,1,1,1,1
+access_product_group_res_partner_mrp_manager,res_partner group_mrp_manager,base.model_res_partner,mrp.group_mrp_manager,1,1,1,0
+access_product_pricelist_version_mrp_manager,product.pricelist.version mrp_manager,product.model_product_pricelist_version,mrp.group_mrp_manager,1,1,1,1
+access_product_pricelist_item_mrp_manager,product.pricelist.item mrp_manager,product.model_product_pricelist_item,mrp.group_mrp_manager,1,1,1,1
+access_resource_calendar_manufacturinguser,resource.calendar manufacturing.user,resource.model_resource_calendar,mrp.group_mrp_user,1,0,0,0
+access_account_journal_mrp_manager,account.journal mrp manager,account.model_account_journal,mrp.group_mrp_manager,1,0,0,0
+access_purchase_order_stock_user,purchase.order stock user,purchase.model_purchase_order,stock.group_stock_user,1,1,1,0
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index fb83f8c4a62..b4b79d6f606 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record id="group_mrp_user" model="res.groups">
-        <field name="name">Manufacturing / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_manufacturing"/>
     </record>
     <record id="group_mrp_manager" model="res.groups">
-        <field name="name">Manufacturing / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_manufacturing"/>
         <field name="implied_ids" eval="[(4, ref('group_mrp_user'))]"/>
     </record>
 
diff --git a/addons/mrp/static/src/img/icon.png b/addons/mrp/static/src/img/icon.png
new file mode 100644
index 00000000000..89f504a656a
Binary files /dev/null and b/addons/mrp/static/src/img/icon.png differ
diff --git a/addons/mrp/test/cancel_order.yml b/addons/mrp/test/cancel_order.yml
new file mode 100644
index 00000000000..d10b8c1780b
--- /dev/null
+++ b/addons/mrp/test/cancel_order.yml
@@ -0,0 +1,25 @@
+-
+  I first confirm order for shirt.
+-
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_shirt}
+-
+  In order to cancel the production order, I first cancel its picking.
+-
+  !function {model: stock.picking, name: action_cancel}:
+    - model: mrp.production
+      eval: "[obj(ref('mrp_production_shirt')).picking_id.id]"
+-
+  Now I cancel the production order.
+-
+  !workflow {model: mrp.production, action: button_cancel, ref: mrp_production_shirt}
+-
+  Now I check that the production order is cancelled.
+-
+  !assert {model: mrp.production, id: mrp_production_shirt}:
+    - state == 'cancel'
+-
+  I remove cancelled production order.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_shirt"), context=context)
+    self.unlink(cr, uid, [order.id])
diff --git a/addons/mrp/test/mrp_packs.yml b/addons/mrp/test/mrp_packs.yml
deleted file mode 100644
index 800d4f56476..00000000000
--- a/addons/mrp/test/mrp_packs.yml
+++ /dev/null
@@ -1,103 +0,0 @@
--
-  In order to test the Packs in OpenERP, we will try to sell a "Pack of 24
-  beers" which is composed of 24 "Beers" and a "Beers Pack".
--
-  I start by creating the Beers product.
-- 
-  !record {model: product.product, id: product_product_beers0}:
-    categ_id: product.cat1
-    name: Beers
-    procure_method: make_to_stock
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_agrolait
-        min_qty: 2.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  I create the "Beers Pack" product.
-- 
-  !record {model: product.product, id: product_product_beerspack0}:
-    categ_id: product.cat1
-    name: Beers Pack
-    procure_method: make_to_stock
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_asus
-        min_qty: 2.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  I create the "Pack of 24 beers" product
-- 
-  !record {model: product.product, id: product_product_packofbeers0}:
-    categ_id: product.cat1
-    name: Pack of 24 Beers
-    procure_method: make_to_order
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  I define the Phantom Bill of Material for the "Pack of 24 beers"
-- 
-  !record {model: mrp.bom, id: mrp_bom_packofbeers0}:
-    bom_lines:
-      - company_id: base.main_company
-        name: Beers
-        product_id: product_product_beers0
-        product_qty: 24.0
-        product_uom: product.product_uom_unit
-        type: normal
-      - company_id: base.main_company
-        name: Beers Pack
-        product_id: product_product_beerspack0
-        product_qty: 1.0
-        product_uom: product.product_uom_unit
-        type: normal
-    name: Pack of 24 Beers
-    product_id: product_product_packofbeers0
-    product_qty: 1.0
-    product_uom: product.product_uom_unit
-    type: phantom
--
-  As all my data are created, I will create an outgoing order picking for a
-  "Pack of 24 Beers"
--
-  !record {model: stock.picking, id: picking_out}:
-    address_id: base.res_partner_address_tang
-    company_id: base.main_company
-    invoice_state: none
-    move_lines:
-      - company_id: base.main_company
-        location_dest_id: stock.stock_location_customers
-        location_id: stock.stock_location_stock
-        name: Pack of 24 Beers
-        product_id: product_product_packofbeers0
-        product_qty: 2.0
-        product_uom: product.product_uom_unit
-    move_type: direct
-    type: out
--
-  I validate the newly created picking.
--
-  !python {model: stock.picking}: |
-    self.draft_validate(cr, uid, [ref("picking_out")], {
-        "active_ids": [ref("stock.menu_action_picking_tree")],
-        "active_id": ref("stock.menu_action_picking_tree"), }
-    )
--
-  I check that my Picking of a "Pack of 24 beers" has been automatically
-  converted to a picking of 24 beers and a pack of beer, so that my
-  stock of beers remains exact.
--
-  !assert {model: stock.picking, id: picking_out, string: pack_of_beer_splitted}:
-    - len(move_lines) >= 2
-    - move_lines[0].product_id.id <> move_lines[1].product_id.id
-    - move_lines[0].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
-    - move_lines[1].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
-    
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
deleted file mode 100644
index ca29b24ea23..00000000000
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ /dev/null
@@ -1,273 +0,0 @@
--
-  In order to test the mrp phantom bom type in OpenERP, I will create products
-  and then I will create Phantom bom structure for those products.
--
-  I create BOM category fluid for Orange Juice
--
-  !record {model: product.uom.categ, id: product_uom_categ_fluid}:
-    name: Fluid
--
-  I create the products required to produce some orange juices with Oranges, Sugar and Water.
--
-  !record {model: product.uom, id: product_uom_litre0}:
-    category_id: product_uom_categ_fluid
-    factor: 1.0
-    name: Litre
-    rounding: 0.01
--
-  I create record for product Orange Juice.
--
-  !record {model: product.product, id: product_product_orangejuice0}:
-    categ_id: product.cat1
-    name: Orange Juice
-    procure_method: make_to_order
-    supply_method: produce
-    type: product
-    uom_id: product_uom_litre0
-    uom_po_id: product_uom_litre0
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
--
-  I create record for product Orange.
--
-  !record {model: product.product, id: product_product_orange0}:
-    categ_id: product.cat1
-    name: Orange
-    procure_method: make_to_stock
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_asus
-        min_qty: 1.0
-        product_uom: product.product_uom_kgm
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_kgm
-    uom_po_id: product.product_uom_kgm
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
--
-  I create record for product Sugar.
--
-  !record {model: product.product, id: product_product_sugar0}:
-    categ_id: product.cat1
-    name: Sugar
-    procure_method: make_to_stock
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_desertic_hispafuentes
-        min_qty: 2.0
-        product_uom: product.product_uom_kgm
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_kgm
-    uom_po_id: product.product_uom_kgm
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
--
-  I create record for product Water.
--
-  !record {model: product.product, id: product_product_water0}:
-    categ_id: product.cat1
-    name: Water
-    procure_method: make_to_order
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_agrolait
-        product_uom: product_uom_litre0
-        min_qty: 2.0
-    supply_method: buy
-    type: consu
-    uom_id: product_uom_litre0
-    uom_po_id: product_uom_litre0
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
--
-  I define the BoM to produce an orange juice.
--
-  !record {model: mrp.bom, id: mrp_bom_orangejuice0}:
-    company_id: base.main_company
-    name: Orange Juice
-    product_efficiency: 1.0
-    product_id: product_product_orangejuice0
-    product_qty: 1.0
-    product_uom: product_uom_litre0
-    type: phantom
--
- changes UOM and name if product change.
--
-  !python {model: mrp.bom}: |
-    production_id = self.browse(cr, uid, [ref('mrp_bom_orangejuice0')], context=context)[0]
-    self.onchange_product_id(cr, uid, [ref('mrp_bom_orangejuice0')], production_id.product_id.id, False)
--
-  I create bom lines for BoM for Orange Juice.
--
-  !record {model: mrp.bom, id: mrp_bom_orangejuice0}:
-    bom_lines:
-      - bom_id: mrp_bom_orangejuice0
-        company_id: base.main_company
-        name: Orange
-        product_efficiency: 1.0
-        product_id: product_product_orange0
-        product_qty: 0.5
-        product_uom: product.product_uom_kgm
-        type: normal
-      - bom_id: mrp_bom_orangejuice0
-        company_id: base.main_company
-        name: Sugar
-        product_efficiency: 1.0
-        product_id: product_product_sugar0
-        product_qty: 0.02
-        product_uom: product.product_uom_kgm
-        type: normal
-      - bom_id: mrp_bom_orangejuice0
-        company_id: base.main_company
-        name: Water
-        product_efficiency: 1.0
-        product_id: product_product_water0
-        product_qty: 0.80000000000000004
-        product_uom: product_uom_litre0
-        type: normal
--
-  I define Minimum stock rules for my stockable product "Orange".
--
-  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
-    company_id: base.main_company
-    location_id: stock.stock_location_stock
-    logic: max
-    name: OP/00002
-    product_id: product_product_orange0
-    product_max_qty: 10.0
-    product_min_qty: 5.0
-    product_uom: product.product_uom_kgm
-    qty_multiple: 1
-    warehouse_id: stock.warehouse0
--
-  I define Minimum stock rules for my stockable product "Sugar".
--
-  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op1}:
-    company_id: base.main_company
-    location_id: stock.stock_location_stock
-    logic: max
-    name: OP/00003
-    product_id: product_product_sugar0
-    product_max_qty: 4.0
-    product_min_qty: 2.0
-    product_uom: product.product_uom_kgm
-    qty_multiple: 1
-    warehouse_id: stock.warehouse0
--
-  I want to produce 100 litres of Orange juice. I am creating a manufacturing order for this.
-  I want to see how much quantities of sub products I need, to produce the Orange juice.
--
-  I compute the data. I get the bill of material of Orange juice and list of
-  scheduled products according to my bom.
--
-  !record {model: mrp.production, id: mrp_production_mo0}:
-    company_id: base.main_company
-    date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    location_dest_id: stock.stock_location_output
-    location_src_id: stock.stock_location_stock
-    product_id: product_product_orangejuice0
-    product_qty: 100.0
-    product_uom: product_uom_litre0
--
-  Creating an mrp.production record. Computing Bills of materials.
--
-  !record {model: mrp.production, id: mrp_production_mo0}:
-    bom_id: mrp.mrp_bom_orangejuice0
-    date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    location_dest_id: stock.stock_location_output
-    location_src_id: stock.stock_location_stock
-    product_id: mrp.product_product_orangejuice0
-    product_lines:
-      - name: Orange
-        product_id: mrp.product_product_orange0
-        product_qty: 50.0
-        product_uom: product.product_uom_kgm
-        production_id: mrp_production_mo0
-      - name: Sugar
-        product_id: mrp.product_product_sugar0
-        product_qty: 2.0
-        product_uom: product.product_uom_kgm
-        production_id: mrp_production_mo0
-      - name: Water
-        product_id: mrp.product_product_water0
-        product_qty: 80.0
-        product_uom: mrp.product_uom_litre0
-        production_id: mrp_production_mo0
-    product_qty: 100.0
-    product_uom: mrp.product_uom_litre0
--
-  I confirm the order.
--
-  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo0}
--
-  I am checking Procurement orders. There are 3 orders generated for Oranges, Sugar and Water.
--
-  !python {model: procurement.order}: |
-    proc_ids = self.search(cr, uid, [('product_id','in',[ref('product_product_orange0'),ref('product_product_sugar0'),ref('product_product_water0')])])
-    assert proc_ids, 'No Procurements!'
--
-  The scheduler runs.
--
-  !function {model: procurement.order, name: run_scheduler}:
-    - model: procurement.order
-      search: "[]"
--
-  I am checking Internal picking. I see one picking for Orange juice and its
-  stock moves for Oranges, Sugar and Water made correctly.
--
-  !python {model: stock.picking}: |
-    pick_ids = self.search(cr, uid, [('type','=','internal')])
-    assert pick_ids, 'No Internal Pickings!'
--
-  According to minimum stock rules. I have 2 purchase orders for
-  Sugar with 6 Kg from Axelor and Orange 60 Kg from ASUStek.
--
-  I confirm the purchase order of Sugar and Orange.
--
-  !python {model: purchase.order}: |
-    import netsvc
-    purch_ids = self.search(cr, uid, [('state','=','draft')])
-    assert purch_ids, 'No Purchase Orders were made!'
-    wf_service = netsvc.LocalService("workflow")
-    for p_id in purch_ids:
-        wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
--
-  I see two incoming pickings for Orange and Sugar, and receive them.
--
-  !python {model: stock.picking}: |
-    pick_ids = self.search(cr, uid, [('type','=','in')])
-    assert pick_ids, 'No Incoming Shipments found!'
-    stock_partial_picking = self.pool.get('stock.partial.picking')
-    for pick_id in pick_ids:
-        partial_id = stock_partial_picking.create(cr, uid, {},
-                context={'active_model': 'stock.picking',
-                         'active_ids': [pick_id]})
-        stock_partial_picking.do_partial(cr, uid, [partial_id])
--
-  Again the scheduler runs.
--
-  !function {model: procurement.order, name: run_scheduler}:
-    - model: procurement.order
-      search: "[]"
--
-  I check my internal picking of "Orange Juice" is done.
--
-  !python {model: stock.picking}: |
-    pick_ids = self.search(cr, uid, [('type','=','internal'),('state','=','done')])
-    assert pick_ids, 'Internal Picking is not done yet!'
--
-  I check my manufacturing order for "Orange Juice" is ready or not.
--
-  !python {model: mrp.production}: |
-    prod_ids = self.search(cr, uid, [('state','=','ready'),('id','=',ref('mrp_production_mo0'))])
-    assert prod_ids, 'Manufacturing order is not ready!'
--
-  I start the production order.
--
-  !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
deleted file mode 100644
index f5bcf4f767a..00000000000
--- a/addons/mrp/test/mrp_procurement.yml
+++ /dev/null
@@ -1,278 +0,0 @@
--
-  In order to test the flow of procurement orders. I will put some orders with
-  different procurement methods. I have installed sale, mrp and purchase modules.
--
-  I am creating products.
--
-  I create record for product Shirt.
--
-  !record {model: product.product, id: product_product_shirt0}:
-    categ_id: product.cat1
-    cost_method: standard
-    list_price: 350.0
-    mes_type: fixed
-    name: Shirt
-    procure_method: make_to_stock
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
-    seller_delay: '1'
-    standard_price: 300.0
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
--
-  I create record for product Cloth.
--
-  !record {model: product.product, id: product_product_cloth0}:
-    categ_id: product.cat1
-    cost_method: standard
-    mes_type: fixed
-    name: Cloth
-    procure_method: make_to_order
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
-    seller_delay: '1'
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_maxtor
-        product_uom: product.product_uom_unit
-        min_qty: 300.0
-    standard_price: 1.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
--
-  I create record for product Buttons.
--
-  !record {model: product.product, id: product_product_buttons0}:
-    categ_id: product.cat1
-    cost_method: standard
-    mes_type: fixed
-    name: Buttons
-    procure_method: make_to_stock
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
-    seller_delay: '1'
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_asus
-        product_uom: product.product_uom_kgm
-        min_qty: 100.0
-    standard_price: 1.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_kgm
-    uom_po_id: product.product_uom_kgm
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
--
-  I am creating bills of material for 'Shirt'.
--
-  I create bills of material for Shirt.
--
-  !record {model: mrp.bom, id: mrp_bom_shirt0}:
-    bom_lines:
-      - company_id: base.main_company
-        name: Cloth
-        product_efficiency: 1.0
-        product_id: product_product_cloth0
-        product_qty: 1.0
-        product_uom: product.product_uom_unit
-        product_uos_qty: 0.0
-        sequence: 0.0
-        type: normal
-      - company_id: base.main_company
-        name: Buttons
-        product_efficiency: 1.0
-        product_id: product_product_buttons0
-        product_qty: 8.0
-        product_uom: product.product_uom_kgm
-        product_uos_qty: 0.0
-        sequence: 0.0
-        type: normal
-    company_id: base.main_company
-    name: Shirt
-    product_efficiency: 1.0
-    product_id: product_product_shirt0
-    product_qty: 1.0
-    product_uom: product.product_uom_unit
-    product_uos_qty: 0.0
-    sequence: 0.0
-    type: normal
--
-  I create minimum stock rule for product Buttons
--
-  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
-    company_id: base.main_company
-    location_id: stock.stock_location_stock
-    logic: max
-    name: OP/00007
-    product_id: mrp.product_product_buttons0
-    product_max_qty: 50.0
-    product_min_qty: 10.0
-    product_uom: product.product_uom_kgm
-    qty_multiple: 1
-    warehouse_id: stock.warehouse0
--
-  I create a procurement order for product Shirt.
--
-  !record {model: procurement.order, id: procurement_order_shirt0}:
-    name: 'PROC: Shirt'
-    product_id: product_product_shirt0
-    product_qty: 5.00
-    location_id: stock.stock_location_stock
-    product_uom: product.product_uom_unit
--
-  I confirm the procurement order.
--
-  !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_shirt0}
--
-  I run the procurement.
--
-  !workflow {model: procurement.order, action: button_check, ref: procurement_order_shirt0}
--
-  I see that there is a manufacturing order for Shirt.
--
-  !python {model: mrp.production}: |
-    from tools.translate import _
-    order_ids = self.search(cr, uid, [('product_id','=',ref('product_product_shirt0'))])
-    assert order_ids, 'No Manufacturing Order.'
--
-  I also check that there are two more procurement orders for sub products Cloth and Buttons.
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    proc_ids = self.search(cr, uid, [('product_id','in',[ref('product_product_cloth0'),ref('product_product_buttons0')])])
-    assert proc_ids, 'No Procurements.'
--
-  The scheduler runs.
--
-  !function {model: procurement.order, name: run_scheduler}:
-    - model: procurement.order
-      search: "[]"
--
-  I check that there is one purchase order for Cloth.
--
-  !python {model: purchase.order}: |
-    purch_ids = self.search(cr, uid, [('partner_id.name','=','Maxtor')])
-    assert purch_ids, 'No Purchase Orders.'
--
-  I confirm purchase order for Cloth.
--
-  !python {model: purchase.order}: |
-    import netsvc
-    purch_ids = self.search(cr, uid, [('partner_id.name','=','Maxtor')])
-    wf_service = netsvc.LocalService("workflow")
-    for p_id in purch_ids:
-        wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
-
--
-  I confirm purchase order for Buttons.
--
-  !python {model: purchase.order}: |
-    import netsvc
-    purch_ids = self.search(cr, uid, [('partner_id.name','=','ASUStek')])
-    wf_service = netsvc.LocalService("workflow")
-    for p_id in purch_ids:
-        wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
-
--
-  I Check incoming shipments for cloth. And receive products.
--
-  !python {model: stock.picking}: |
-    pick_ids = self.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
-    assert pick_ids, 'No Incoming Shipments found!'
-    stock_partial_picking = self.pool.get('stock.partial.picking')
-    for pick_id in pick_ids:
-        partial_id = stock_partial_picking.create(cr, uid, {},
-                context={'active_model': 'stock.picking',
-                         'active_ids': [pick_id]})
-        stock_partial_picking.do_partial(cr, uid, [partial_id])
--
-  I Check incoming shipments for buttons and receive products.
--
-  !python {model: stock.picking}: |
-    pick_ids = self.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
-    assert pick_ids, 'No Incoming Shipments found!'
-    stock_partial_picking = self.pool.get('stock.partial.picking')
-    for pick_id in pick_ids:
-        partial_id = stock_partial_picking.create(cr, uid, {},
-                context={'active_model': 'stock.picking',
-                         'active_ids': [pick_id]})
-        stock_partial_picking.do_partial(cr, uid, [partial_id])
--
-  Run scheduler again.
--
-  !function {model: procurement.order, name: run_scheduler}:
-    - model: procurement.order
-      search: "[]"
--
-  Check state of manufacturing order for Shirt.
--
-  !python {model: mrp.production}: |
-    from tools.translate import _
-    order_ids = self.search(cr, uid, [('product_id','=',ref('product_product_shirt0')),('state','=','ready')])
-    assert order_ids, 'No Manufacturing Order in Ready state.'
--
-  I start production order for Shirt.
--
-  !python {model: mrp.production}: |
-    from tools.translate import _
-    import netsvc
-    prod_ids = self.search(cr, uid, [('state','=','ready')])
-    assert prod_ids, _('No Ready Manufacturing Orders found!')
-    wf_service = netsvc.LocalService("workflow")
-    for p_id in prod_ids:
-        wf_service.trg_validate(uid, 'mrp.production', p_id, 'button_produce', cr)
--
-  I create record for producing products with quantity 5.00.
--
-  !record {model: mrp.product.produce, id: mrp_product_produce0}:
-    product_qty: 2.00
-    mode: 'consume_produce'
--
-  I produce 2 products with 5.00 quantities each.
--
-  !python {model: mrp.product.produce}: |
-    prod_obj = self.pool.get('mrp.production')
-    prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
-    self.do_produce(cr, uid, [ref('mrp_product_produce0')], context={'active_ids': prod_ids})
--
-  I create record for remaining products with quantity 35.00.
--
-  !record {model: stock.move.consume, id: stock_move_consume0}:
-    product_id: product_product_buttons0
-    product_qty: 35.00
-    product_uom: product.product_uom_unit
-    location_id: stock.stock_location_stock
--
-  I produce remaining product Buttons with 35.00 quantity.
--
-  !python {model: stock.move.consume}: |
-    from tools.translate import _
-    stock_obj = self.pool.get('stock.move')
-    stock_ids = stock_obj.search(cr, uid, [('product_id.name','=','Buttons')])
-    self.do_move_consume(cr, uid, [ref('stock_move_consume0')], context={'active_ids': stock_ids})
--
-  And finally production order is done.
--
-  !python {model: mrp.product.produce}: |
-    prod_obj = self.pool.get('mrp.production')
-    prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
-    self.do_produce(cr, uid, [ref('mrp_product_produce0')], context={'active_ids': prod_ids})
-
diff --git a/addons/mrp/test/mrp_production_cancel.yml b/addons/mrp/test/mrp_production_cancel.yml
deleted file mode 100644
index 1dc20a215d1..00000000000
--- a/addons/mrp/test/mrp_production_cancel.yml
+++ /dev/null
@@ -1,29 +0,0 @@
--
-  In order to test the manufacturing order in Openerp,
-  I am creating one manufacturing order
--
-  !record {model: mrp.production, id: mrp_production_mo1}:
-    company_id: base.main_company
-    date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    location_dest_id: stock.stock_location_stock
-    location_src_id: stock.stock_location_stock
-    product_id: product.product_product_pc1
-    name: MO/01234
-    product_qty: 5.0
-    product_uom: product.product_uom_unit
-    product_uos_qty: 0.0
--
-  I confirm the order.
--
-  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1}
--
-  In order to cancel the MO, I first cancel its picking.
--
-  !python {model: stock.picking}: |
-    mrp_obj = self.pool.get('mrp.production')
-    mo = mrp_obj.browse(cr, uid, ref("mrp_production_mo1"))
-    self.action_cancel(cr, uid, [mo.picking_id.id], context=None)
--
-  Then I Cancel the production order and related stock moves.
--
-  !workflow {model: mrp.production, action: button_cancel, ref: mrp_production_mo1}
\ No newline at end of file
diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
deleted file mode 100644
index 57d75e1c1a5..00000000000
--- a/addons/mrp/test/mrp_production_order.yml
+++ /dev/null
@@ -1,119 +0,0 @@
--
-  In order to test the manufacturing order working with procurements I will use
-  some products with different supply method and procurement method, also check
-  the bills of material for the products.
--
-  I am creating one manufacturing order.
--
-  !record {model: mrp.production, id: mrp_production_mo1}:
-    company_id: base.main_company
-    date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    location_dest_id: stock.stock_location_stock
-    location_src_id: stock.stock_location_stock
-    product_id: product.product_product_pc1
-    name: MO/0123
-    product_qty: 5.0
-    product_uom: product.product_uom_unit
-    product_uos_qty: 0.0
--
-  I compute the data.
--
-  !python {model: mrp.production}: |
-    self.action_compute(cr, uid, [ref("mrp_production_mo1")])
--
-  I confirm the order.
--
-  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1}
--
-  I create record for changing production quantity to 6.00
--
-  !record {model: change.production.qty, id: mrp_production_qty}:
-    product_qty: 6.0
--
-  Changes the Quantity of Product.
--
-  !python {model: change.production.qty}: |
-    context = {"lang": 'en_US', "active_model":"mrp.production", "active_ids": [ref("mrp_production_mo1")], "tz": False, "active_id":ref('mrp_production_mo1')}
-    self.default_get(cr, uid, ["product_qty"], context)
-    self.change_prod_qty(cr, uid, [ref("mrp_production_qty")], context=context)
--
-  I check now quantity of the production order is 6 or not.
--
-  !assert {model: mrp.production, id: mrp_production_mo1}:
-    - product_qty == 6
--
-  I am checking Procurement orders for components of PC1.
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    production_obj = self.pool.get('mrp.production')
-    production = production_obj.browse(cr, uid, ref('mrp_production_mo1'))
-    product_ids = map(lambda x:x.product_id.id, production.move_lines)
-    proc_ids = self.search(cr, uid, [('product_id','in',product_ids)])
-    assert proc_ids, _('No Procurements!')
--
-  The scheduler runs.
--
-  !function {model: procurement.order, name: run_scheduler}:
-    - model: procurement.order
-      search: "[]"
--
-  I am checking Internal picking.
--
-  !python {model: stock.picking}: |
-    from tools.translate import _
-    pick_ids = self.search(cr, uid, [('type','=','internal')])
-    assert pick_ids, _('No Internal Pickings!')
--
-  I see that there is a manufacturing order for the sub product CPU_GEN with ready state and I start production of it.
--
-  !python {model: mrp.production}: |
-    from tools.translate import _
-    order_ids = self.search(cr, uid, [('state','=','ready'), ('product_id', '=', ref('product.product_product_cpu_gen'))])
-    assert order_ids, _('No manufacturing order in Ready state!')
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    for order in order_ids:
-        wf_service.trg_validate(uid, 'mrp.production', order, 'button_produce', cr)
--
-  I create record for producing products with quantity 1.00.
--
-  !record {model: mrp.product.produce, id: mrp_product_produce0}:
-    product_qty: 1.00
-    mode: 'consume_produce'
--
-  I produce the product.
--
-  !python {model: mrp.product.produce}: |
-    prod_obj = self.pool.get('mrp.production')
-    prod_ids = prod_obj.search(cr, uid, [('state','=','in_production'), ('product_id', '=', ref('product.product_product_cpu_gen'))])
-    self.do_produce(cr, uid, [ref('mrp_product_produce0')], context={'active_ids': prod_ids})
--
-  Now the manufacturing order for subproduct CPU_GEN is done and manufacturing
-  order for PC1 is in ready state.
--
-  !python {model: mrp.production}: |
-    from tools.translate import _
-    prod_ids = self.search(cr, uid, [('state','=','done'), ('product_id', '=', ref('product.product_product_cpu_gen'))])
-    assert prod_ids, _('Manufacturing order for CPU_GEN is yet not done!')
--
-  I start producing the product PC1.
--
-  !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo1}
--
-  I create record for producing products with quantity 6.00.
--
-  !record {model: mrp.product.produce, id: mrp_product_produce1}:
-    product_qty: 6.00
-    mode: 'consume_produce'
--
-  Finally my production order is done.
--
-  !python {model: mrp.product.produce}: |
-    context = {"lang": 'en_US', "active_model":"mrp.production", "active_ids": [ref("mrp_production_mo1")], "tz": False, "active_id":ref('mrp_production_mo1')}
-    self.do_produce(cr, uid, [ref('mrp_product_produce1')], context=context)
--
-  I check now the production order for PC1 is done.
--
-  !assert {model: mrp.production, id: mrp_production_mo1}:
-    - state == 'done'
diff --git a/addons/mrp/test/mrp_report.yml b/addons/mrp/test/mrp_report.yml
deleted file mode 100644
index 48126b5edcd..00000000000
--- a/addons/mrp/test/mrp_report.yml
+++ /dev/null
@@ -1,38 +0,0 @@
--
-  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_structure_report.'+format), 'wb+').write(data)
-
--
-  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_report.'+format), 'wb+').write(data)
-
--
-  Print Product Price Report through the wizard
--
-  !python {model: product.product}: |
-    ctx={}
-    ctx.update({'model': 'product.product','active_ids': [1,2,3,5]})
-    data_dict = {'number': 1}
-    from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_view_mrp_product_price_wizard',wiz_data=data_dict, context=ctx, our_module='mrp')
-
--
-  Print  Work Center Load Report through the wizard
--
-  !python {model: mrp.workcenter}: |
-    ctx={}
-    ctx.update({'model': 'mrp.workcenter','active_ids': [ref('mrp_workcenter_0'),ref('mrp_workcenter_1')]})
-    data_dict = {'time_unit': 'day', 'measure_unit': 'hours'}
-    from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_mrp_workcenter_load_wizard',wiz_data=data_dict, context=ctx, our_module='mrp')
-
diff --git a/addons/mrp/test/order_demo.yml b/addons/mrp/test/order_demo.yml
new file mode 100644
index 00000000000..9c7b8720904
--- /dev/null
+++ b/addons/mrp/test/order_demo.yml
@@ -0,0 +1,27 @@
+-
+  In order to test process of production order, I create Bill of material of Shelf 100cm.
+-
+  !record {model: mrp.bom, id: mrp_bom_defaultbomforshelfofcm0}:
+    product_id: product.product_product_shelfofcm0
+-
+  !record {model: mrp.bom, id: mrp_bom_assemblysection1}:
+    routing_id: mrp.mrp_routing_0
+-
+  !record {model: mrp.bom, id: mrp_bom_rearpanelarm1}:
+    routing_id: mrp.mrp_routing_0
+-
+  I create Production Order of Shelf 100cm to produce 5.0 Dozen PCE.
+-
+  !record {model: mrp.production, id: mrp_production_shelf100cm}:
+    location_src_id: stock.stock_location_stock
+    location_dest_id: stock.stock_location_output
+    product_id: product.product_product_shelfofcm0
+    bom_id: mrp_bom_defaultbomforshelfofcm0
+    routing_id: mrp.mrp_routing_1
+    product_uom: product.product_uom_dozen
+    product_qty: 5.0
+-
+  !record {model: mrp.workcenter, id: mrp_workcenter_0}:
+    product_id: product.product_assembly
+
+
diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
new file mode 100644
index 00000000000..0c970d7d196
--- /dev/null
+++ b/addons/mrp/test/order_process.yml
@@ -0,0 +1,309 @@
+-
+  I compute the production order.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"), context=context)
+    order.action_compute(context=context)
+-
+  I check production lines after compute.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"), context=context)
+    assert len(order.product_lines) == 5, "Production lines are not generated proper."
+    factor = 12.0*5.0
+    sidepanel = False
+    woodlintelm = False
+    woodmm0 = False
+    woodmm10 = False
+    metalcleats = False
+    for line in order.product_lines:
+        if line.product_id.id == ref('product.product_product_sidepanel0'):                         #SIDEPAN 	 2 	    PCE
+            assert not sidepanel, "Production line is already generated for SIDEPAN."
+            assert line.product_qty == (2.0*factor), "Qty is not correspond."
+            assert line.product_uom.id == ref('product.product_uom_unit'), "UOM is not correspond"
+            sidepanel = True
+        elif line.product_id.id == ref('product.product_product_woodlintelm0'):                     #LIN40 	     4*0.25 Meter 	
+            assert not woodlintelm, "Production line is already generated for LIN40."            
+            assert line.product_qty == (4*0.25*factor), "Qty is not correspond."
+            assert line.product_uom.id == ref('product.product_uom_meter'), "UOM is not correspond"
+            woodlintelm = True
+        elif line.product_id.id == ref('product.product_product_woodmm0'):                          #WOOD002 	 0.25 	    m
+            assert not woodmm0, "Production line is already generated for WOOD002."
+            assert line.product_qty == (0.25*factor), "Qty is not correspond."
+            assert line.product_uom.id == ref('product.product_uom_meter'), "UOM is not correspond"
+            woodmm0 = True
+        elif line.product_id.id == ref('product.product_product_metalcleats0'):                     #METC000      4*3      PCE  
+            assert not metalcleats, "Production line is already generated for METC000."
+            assert line.product_qty == (4*3*factor), "Qty is not correspond."
+            assert line.product_uom.id == ref('product.product_uom_unit'), "UOM is not correspond"
+            metalcleats = True
+        elif line.product_id.id == ref('product.product_product_woodmm10'):                         #WOOD010 	 0.083*3 	m
+            assert not woodmm10, "Production line is already generated for WOOD010."
+            assert line.product_qty == (0.083*3*factor), "Qty is not correspond."
+            assert line.product_uom.id == ref('product.product_uom_meter'), "UOM is not correspond"
+            woodmm10 = True
+        else:
+            raise AssertionError('unknown order line: %s' % line)
+    assert sidepanel, "Production line is not generated for SIDEPAN."
+    assert woodlintelm, "Production line is not generated for LIN40."
+    assert woodmm0, "Production line is not generated for WOOD002."
+    assert metalcleats, "Production line is not generated for METC000."
+    assert woodmm10, "Production line is not generated for WOOD010."
+
+-
+  Now I check workcenter lines.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"), context=context)
+    assert len(order.workcenter_lines), "Workcenter lines are not generated proper."
+    for line in order.workcenter_lines:
+        wc = line.workcenter_id
+        hours = ((wc.time_start or 0.0)+(wc.time_stop or 0.0)+line.cycle*(wc.time_cycle or 0.0)) * (wc.time_efficiency or 1.0)
+        factor = 5*12
+        d, m = divmod(factor, wc.capacity_per_cycle)
+        cycle = (d + (m and 1.0 or 0.0))
+        if line.name == "Short time assembly - Assembly Section":
+            assert line.sequence, "Sequence is not correspond: %s" % (line.name)
+            assert line.cycle == (4*cycle), "Cycle is not correspond: %s" % (line.name)
+            assert line.hour == (2*cycle*4 + hours), "Hours is not correspond: %s"% (line.name)
+        elif line.name == "Short time assembly - Rear Panel SHE100":
+            assert line.sequence, "Sequence is not correspond: %s" % (line.name)
+            assert line.cycle == (1*cycle), "Cycle is not correspond: %s" % (line.name)
+            assert line.hour == (2*cycle + hours), "Hours is not correspond: %s"% (line.name)
+        elif line.name == "long time assembly - Shelf of 100cm":
+            assert line.sequence, "Sequence is not correspond: %s" % (line.name)
+            assert line.cycle == (2*cycle), "Cycle is not correspond: %s" % (line.name)
+            assert line.hour == (5*cycle + hours), "Hours is not correspond: %s"% (line.name)
+        elif line.name == "Testing - Shelf of 100cm":
+            assert line.sequence, "Sequence is not correspond: %s" % (line.name)
+            assert line.cycle == (1*cycle), "Cycle is not correspond: %s" % (line.name)
+            assert line.hour == (1*cycle + hours), "Hours is not correspond: %s"% (line.name)
+        elif line.name == "Packing - Shelf of 100cm":
+            assert line.sequence, "Sequence is not correspond: %s" % (line.name)
+            assert line.cycle == (1*cycle), "Cycle is not correspond: %s" % (line.name)
+            assert line.hour == (0.5*cycle + hours), "Hours is not correspond: %s"% (line.name)
+        else:
+            raise AssertionError('unknown workcenter line: %s' % line)
+-
+  I confirm the Production Order.
+-
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_shelf100cm}
+-
+  I check details of Produce Move of Production Order to trace Final Product.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
+    assert order.state == 'confirmed', "Production order should be confirmed."
+    assert order.move_created_ids, "Trace Record is not created for Final Product."
+    move = order.move_created_ids[0]
+    source_location_id = order.product_id.product_tmpl_id.property_stock_production.id
+    assert move.date == order.date_planned, "Planned date is not correspond."
+    assert move.product_id.id == order.product_id.id, "Product is not correspond."
+    assert move.product_uom.id == order.product_uom.id, "UOM is not correspond."
+    assert move.product_qty == order.product_qty, "Qty is not correspond."
+    assert move.product_uos_qty == order.product_uos and order.product_uos_qty or order.product_qty, "UOS qty is not correspond."
+    if order.product_uos:
+        assert move.product_uos.id == order.product_uos.id, "UOS is not correspond."
+    assert move.location_id.id == source_location_id, "Source Location is not correspond."
+    assert move.location_dest_id.id == order.location_dest_id.id, "Destination Location is not correspond."
+    routing_loc = None
+    if order.bom_id.routing_id and order.bom_id.routing_id.location_id:
+        routing_loc = order.bom_id.routing_id.location_id.id
+    date_planned = order.date_planned    
+    for move_line in order.move_lines:
+        for order_line in order.product_lines:
+            if move_line.product_id.type not in ('product', 'consu'):
+                continue
+            if move_line.product_id.id == order_line.product_id.id:
+                assert move_line.date == date_planned, "Planned date is not correspond in 'To consume line'."
+                assert move_line.product_qty == order_line.product_qty, "Qty is not correspond in 'To consume line'."
+                assert move_line.product_uom.id == order_line.product_uom.id, "UOM is not correspond in 'To consume line'."
+                assert move_line.product_uos_qty == order_line.product_uos and order_line.product_uos_qty or order_line.product_qty, "UOS qty is not correspond in 'To consume line'."
+                if order_line.product_uos:
+                    assert move_line.product_uos.id == order_line.product_uos.id, "UOS is not correspond in 'To consume line'."
+                assert move_line.location_id.id == routing_loc or order.location_src_id.id, "Source location is not correspond in 'To consume line'."
+                assert move_line.location_dest_id.id == source_location_id, "Destination Location is not correspond in 'To consume line'."
+
+-
+  I check details of an Internal Shipment after confirmed production order to bring components in Raw Materials Location.
+-
+  !python {model: mrp.production}: |
+    procurement = self.pool.get('procurement.order')
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
+    assert order.picking_id, 'Internal Shipment should be created!'
+    
+    routing_loc = None
+    pick_type = 'internal'
+    address_id = False
+    if order.bom_id.routing_id and order.bom_id.routing_id.location_id:
+        routing_loc = order.bom_id.routing_id.location_id
+        if routing_loc.usage <> 'internal':
+            pick_type = 'out'
+        address_id = routing_loc.address_id and routing_loc.address_id.id or False
+        routing_loc = routing_loc.id
+    assert order.picking_id.type == pick_type, "Shipment should be Internal."
+    assert order.picking_id.address_id.id ==  address_id, "Shipment Address is not correspond with Adderss of Routing Location."
+    date_planned = order.date_planned
+    for move_line in order.picking_id.move_lines:
+        for order_line in order.product_lines:
+            if move_line.product_id.type not in ('product', 'consu'):
+                continue
+            if move_line.product_id.id == order_line.product_id.id:
+                assert move_line.date == date_planned, "Planned date is not correspond."
+                assert move_line.product_qty == order_line.product_qty, "Qty is not correspond."
+                assert move_line.product_uom.id == order_line.product_uom.id, "UOM is not correspond."
+                assert move_line.product_uos_qty == order_line.product_uos and order_line.product_uos_qty or order_line.product_qty, "UOS qty is not correspond."
+                if order_line.product_uos:
+                    assert move_line.product_uos.id == order_line.product_uos.id, "UOS is not correspond."
+                assert move_line.location_id.id == order.location_src_id.id, "Source location is not correspond."
+                assert move_line.location_dest_id.id == routing_loc or order.location_src_id.id, "Destination Location is not correspond."
+                procurement_ids = procurement.search(cr, uid, [('move_id','=',move_line.id)])
+                assert procurement_ids, "Procurement should be created for shipment line of raw materials."
+                shipment_procurement = procurement.browse(cr, uid, procurement_ids[0], context=context)
+                assert shipment_procurement.date_planned == date_planned, "Planned date is not correspond in procurement."
+                assert shipment_procurement.product_id.id == order_line.product_id.id, "Product is not correspond in procurement."
+                assert shipment_procurement.product_qty == order_line.product_qty, "Qty is not correspond in procurement."
+                assert shipment_procurement.product_uom.id == order_line.product_uom.id, "UOM is not correspond in procurement."
+                assert shipment_procurement.product_uos_qty == order_line.product_uos and order_line.product_uos_qty or order_line.product_qty, "UOS qty is not correspond in procurement."
+                if order_line.product_uos:
+                    assert shipment_procurement.product_uos.id == order_line.product_uos.id, "UOS is not correspond in procurement."
+                assert shipment_procurement.location_id.id == order.location_src_id.id, "Location is not correspond in procurement."
+                assert shipment_procurement.procure_method == order_line.product_id.procure_method, "Procure method is not correspond in procurement."
+   
+-
+  I change production qty with 3 Dozen Shelf 100cm.
+-
+  !python {model: change.production.qty}: |
+    context.update({'active_id': ref('mrp_production_shelf100cm')})
+-
+  !record {model: change.production.qty, id: mrp_production_qty}:
+    product_qty: 3.0
+-
+  !python {model: change.production.qty}: |
+    self.change_prod_qty(cr, uid, [ref("mrp_production_qty")], context=context)
+-
+  I check qty after changed in production order.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
+    assert order.product_qty == 3, "Qty is not changed in order."
+    move = order.move_created_ids[0]
+    assert move.product_qty == order.product_qty, "Qty is not changed in move line."
+-  
+  I run scheduler.
+-
+  !python {model: procurement.order}: |
+    self.run_scheduler(cr, uid)
+-
+  The production order is Waiting Goods, I forcefully done internal shipment.
+-
+  !python {model: mrp.production}: |
+    self.force_production(cr, uid, [ref("mrp_production_shelf100cm")])
+-
+  I check that production order in ready state after forcefully done internal shipment.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
+    assert order.state == 'ready', 'Production order should be in Ready State.'
+    assert order.picking_id.state == 'done', 'Internal shipment should be done.'
+-
+  Now I start production.
+-
+  !workflow {model: mrp.production, action: button_produce, ref: mrp_production_shelf100cm}
+-
+  I check that production order in production state after start production.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
+    assert order.state == 'in_production', 'Production order should be in production State.'
+-
+  I consume raw materials and put one material in scrap location due to waste it.
+-
+  !python {model: mrp.production}: |
+    scrap_location_ids = self.pool.get('stock.location').search(cr, uid, [('scrap_location','=',True)])
+    scrap_location_id = scrap_location_ids[0]
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
+    for move in order.move_lines:
+        move.action_consume(move.product_qty)
+        if move.product_id.id == ref("product.product_product_metalcleats0"): 
+            move.action_scrap(5.0, scrap_location_id)
+-
+  I produce product.
+-
+  !python {model: mrp.product.produce}: |
+    context.update({'active_id': ref('mrp_production_shelf100cm')})
+-
+  !record {model: mrp.product.produce, id: mrp_product_produce1}:
+    mode: 'consume_produce'
+-
+  !python {model: mrp.product.produce}: |
+    self.do_produce(cr, uid, [ref('mrp_product_produce1')], context=context)
+-
+  I check production order after produced.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
+    assert order.state == 'done', "Production order should be closed."
+- 
+  I check Total Costs at End of Production. 
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
+    account_analytic_line = self.pool.get('account.analytic.line')
+    def rounding(f, r):
+        import math
+        if not r:
+            return f
+        return math.ceil(f / r) * r
+
+    for wc_line in order.workcenter_lines:
+        wc = wc_line.workcenter_id
+        accounts = [wc.costs_hour_account_id, wc.costs_cycle_account_id]
+        cost_per_cyle = wc_line.cycle * wc.costs_cycle
+        cost_per_hours = wc_line.hour * wc.costs_hour
+        if accounts and wc.costs_journal_id and wc.costs_general_account_id and (cost_per_cyle or cost_per_hours):
+            line_ids = account_analytic_line.search(cr, uid, [('name','ilike',wc_line.name)])
+            assert line_ids, 'Costs lines are not generated.'
+            for line in account_analytic_line.browse(cr, uid, line_ids, context=context):
+                if wc.costs_hour_account_id and line.account_id.id == wc.costs_hour_account_id.id:
+                    assert rounding(line.unit_amount, 3) == rounding(wc_line.hour, 3), "Cost Unit Amount is not correspond."
+                    assert rounding(line.amount, 3) == rounding(cost_per_hours, 3), "Cost amount is not correspond."
+                elif wc.costs_cycle_account_id and line.account_id.id == wc.costs_cycle_account_id.id:
+                    assert rounding(line.unit_amount, 3) == rounding(wc_line.cycle, 3), "Cost Unit Amount is not correspond."
+                    assert rounding(line.amount, 3) == rounding(cost_per_cyle, 3), "Cost Amount is not correspond."
+                else:
+                    raise AssertionError('unknown cost line: %s' % line)
+                assert line.general_account_id.id == wc.costs_general_account_id.id, "General Account is not correspond."
+                assert line.journal_id.id == wc.costs_journal_id.id, "Account Journal is not correspond."
+                assert line.product_id.id == wc.product_id.id, "Product is not correspond."
+                assert line.product_uom_id.id == wc.product_id.uom_id.id, "UOM is not correspond."
+            
+-
+  I print a "BOM Structure".
+-
+  !python {model: mrp.production}: |
+    import netsvc, tools, os
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
+    (data, format) = netsvc.LocalService('report.bom.structure').create(cr, uid, [order.bom_id.id], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-bom_structure_report.'+format), 'wb+').write(data)
+
+-
+  I print "Production Order".
+-
+  !python {model: mrp.production}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.mrp.production.order').create(cr, uid, [ref("mrp_production_shelf100cm")], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'mrp-production_order_report.'+format), 'wb+').write(data)
+
+-
+  I print  "Work Center Load Report".
+-
+  !python {model: mrp.workcenter}: |
+    ctx = context.copy()
+    ctx.update({'model': 'mrp.workcenter','active_ids': [ref('mrp_workcenter_0'),ref('mrp_workcenter_1')]})
+    data_dict = {'time_unit': 'day', 'measure_unit': 'hours'}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_mrp_workcenter_load_wizard',wiz_data=data_dict, context=ctx, our_module='mrp')
+
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index dc9a235ff63..db4d6e77691 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -60,22 +60,11 @@ class mrp_product_produce(osv.osv_memory):
     }
 
     def do_produce(self, cr, uid, ids, context=None):
-        """ To check the product type
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: the ID or list of IDs if we want more than one
-        @param context: A standard dictionary
-        @return:
-        """
-        if context is None:
-            context = {}
-        prod_obj = self.pool.get('mrp.production')
-        move_ids = context.get('active_ids', [])
-        for data in self.browse(cr, uid, ids, context=context):
-            for move_id in move_ids:
-                prod_obj.action_produce(cr, uid, move_id,
-                                    data.product_qty, data.mode, context=context)
+        production_id = context.get('active_id', False)
+        assert production_id, "Production Id should be specified in context as a Active ID"
+        data = self.browse(cr, uid, ids[0], context=context)
+        self.pool.get('mrp.production').action_produce(cr, uid, production_id,
+                            data.product_qty, data.mode, context=context)
         return {}
 
 mrp_product_produce()
diff --git a/addons/mrp_jit/i18n/hr.po b/addons/mrp_jit/i18n/hr.po
index 6c845797ba4..9f965c216ea 100644
--- a/addons/mrp_jit/i18n/hr.po
+++ b/addons/mrp_jit/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-12-22 12:16+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 08:29+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -46,3 +46,22 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
+"\n"
+"    Ovaj modul omogućuje Just in Time izračun naloga za nabavu.\n"
+"\n"
+"    Ako instalirate ovaj modul nećete više morati pokretati normalni planer "
+"\n"
+"    zahtjeva u nabavi (ali i dalje ćete morati pokrenuti planer pravila "
+"minimalne točke \n"
+"    naručivanja, ili ga postaviti da se npr. pokreće dnevno)\n"
+"    Svi zahtjevi za nabavom će se procesirati odmah, što može u nekim "
+"slučajevima\n"
+"    utjecati na brzinu rada.\n"
+"\n"
+"    Također može povećati veličinu vaših zaliha jer se artikli naručuju čim "
+"je to \n"
+"    moguće i raspon vremena planiranja se više ne uzima u obzir.\n"
+"    u tom slučaju ne možete koristiti prioritete kod različitih prijenosa.\n"
+"    \n"
+"    \n"
+"    "
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index caa33cc6556..10d82cfb8c4 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -65,8 +65,11 @@ So that we can compare the theoretic delay and real delay.
         'process/mrp_operation_process.xml',
         'mrp_operations_workflow_instance.xml'
     ],
-    'demo_xml': ['mrp_operation_data.xml'],
-    'test': ['test/mrp_operations.yml', 'test/mrp_operations_report.yml','test/mrp_operation_test.yml'],
+    'demo_xml': ['mrp_operation_data.xml', 
+                 'mrp_operations_demo.yml'],
+    'test': [ 
+             'test/workcenter_operations.yml',
+    ],
     'installable': True,
     'active': False,
     'certificate': '0056233813133',
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index e9745098516..7a6d5bd3c42 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-10-15 09:07+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 10:24+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -23,17 +23,17 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Work Orders"
-msgstr ""
+msgstr "Radni nalozi"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Cancel the operation."
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
 msgid "mrp_operations.operation.code"
-msgstr ""
+msgstr "mrp_operations.operation.code"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
@@ -45,76 +45,76 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr ""
+msgstr "Information from the routing definition."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
 msgid "Work Centers"
-msgstr ""
+msgstr "Radni centri"
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Resume"
-msgstr ""
+msgstr "Resume"
 
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Product to Produce"
-msgstr ""
+msgstr "Product to Produce"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Production Operation"
-msgstr ""
+msgstr "Production Operation"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
-msgstr ""
+msgstr "Free Serialisation"
 
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr ""
+msgstr "Mrp operacije"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
 msgid "Production Order"
-msgstr ""
+msgstr "Production Order"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Skladišna iznimka"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr ""
+msgstr "Creation of the work order"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:463
@@ -132,7 +132,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
-msgstr ""
+msgstr "The work orders are created on the basis of the production order."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
@@ -149,28 +149,28 @@ msgstr ""
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
 msgid "Confirmed Work Orders"
-msgstr ""
+msgstr "Potvrđeni radni nalozi"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
 #: view:mrp.production.workcenter.line:0
 msgid "Operations"
-msgstr ""
+msgstr "Operations"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Skladišni prijenosi"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# linija"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -178,7 +178,7 @@ msgstr ""
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -191,13 +191,13 @@ msgstr "U proizvodnji"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
 #: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
 msgid "Work Order"
-msgstr ""
+msgstr "Radni nalog"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
@@ -205,11 +205,13 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
+"Tu je 1 radni nalog po radnom centru. Podaci o broju ciklusa ili vrijeme "
+"ciklusa."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Month -1"
-msgstr ""
+msgstr "Month -1"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,state:0
@@ -232,7 +234,7 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Planiran datum"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:479
@@ -244,22 +246,22 @@ msgstr ""
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Količina"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
 msgid "Operation Name"
-msgstr ""
+msgstr "Operation Name"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,start_stop:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
@@ -270,16 +272,20 @@ msgid ""
 "different impacts on the costs of manufacturing and planning depending on "
 "the available workload."
 msgstr ""
+"Za proizvodnju ili sastavljanje proizvoda, i korištenje sirovina i gotovih "
+"proizvoda morate upravljatii proizvodnim operacijama. Proizvodne operacije "
+"često se nazivaju radnim nalozima. Različite operacije će imati različite "
+"utjecaje na troškove proizvodnje i planiranje, ovisno o raspoloživosti posla."
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum naloga"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
 msgid "Future Work Orders"
-msgstr ""
+msgstr "Future Work Orders"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:459
@@ -292,50 +298,50 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Operation Cancelled"
-msgstr ""
+msgstr "Operation Cancelled"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation
 msgid "mrp_operations.operation"
-msgstr ""
+msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
 msgid "Work Order Report"
-msgstr ""
+msgstr "Work Order Report"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
 #: field:mrp.production.workcenter.line,date_start_date:0
 #: field:mrp_operations.operation,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "Waiting Goods"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -351,53 +357,53 @@ msgstr "Pauza"
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "In Progress"
-msgstr "U Tijeku"
+msgstr "In Progress"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Nalog proizvodnje"
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Start"
-msgstr ""
+msgstr "Start"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Calendar View"
-msgstr ""
+msgstr "Calendar View"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
 msgid ""
 "When the operation needs to be cancelled, you can do it in the work order "
 "form."
-msgstr ""
+msgstr "Operaciju je moguće otkazati na kartici radnog naloga."
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Set Draft"
-msgstr ""
+msgstr "Set Draft"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_cycles:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "Ukupno ciklusa"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Pending"
-msgstr ""
+msgstr "Na čekanju"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
 msgid "Production Operation Code"
-msgstr ""
+msgstr "Šifra operacije proizvodnje"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:467
@@ -408,12 +414,12 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr ""
+msgstr "Započeto"
 
 #. module: mrp_operations
 #: model:ir.module.module,description:mrp_operations.module_meta_information
@@ -451,7 +457,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:482
@@ -462,28 +468,28 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Ready to Produce"
-msgstr ""
+msgstr "Spremno za proizvodnju"
 
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
 msgid "Children Moves"
-msgstr ""
+msgstr "Children Moves"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
 msgid "Work Orders Planning"
-msgstr ""
+msgstr "Work Orders Planning"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
@@ -493,22 +499,22 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "Search"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "Završi operacije."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:452
@@ -519,7 +525,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr ""
+msgstr "Information from the production order."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:452
@@ -533,13 +539,13 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Current"
-msgstr ""
+msgstr "Trenutno"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
 #: field:mrp_operations.operation.code,code:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:475
@@ -555,35 +561,35 @@ msgstr ""
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operation Codes"
-msgstr ""
+msgstr "Operation Codes"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Kol."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr ""
+msgstr "Operacija izvršena"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 #: view:mrp.workorder:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
 msgid "Start/Stop Barcode"
-msgstr ""
+msgstr "Start/Stop Barcode"
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_form
@@ -594,36 +600,41 @@ msgid ""
 "latest operation of a manufacturing order, the MO is automatically done and "
 "the related products are produced."
 msgstr ""
+"Work Orders is the list of operations to be performed for each manufacturing "
+"order. Once you start the first work order of a manufacturing order, the "
+"manufacturing order is automatically marked as started. Once you finish the "
+"latest operation of a manufacturing order, the MO is automatically done and "
+"the related products are produced."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
-msgstr "pokreni operaciju"
+msgstr "Pokreni operaciju"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Information"
-msgstr "Obavijest"
+msgstr "Informacija"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr ""
+msgstr "Work Centers Barcode"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr ""
+msgstr "Kasni"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
 msgid "Delay"
-msgstr ""
+msgstr "Kašnjenje"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -631,41 +642,41 @@ msgstr ""
 #: field:mrp.workorder,production_id:0
 #: field:mrp_operations.operation,production_id:0
 msgid "Production"
-msgstr ""
+msgstr "Proizvodnja"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Search Work Orders"
-msgstr ""
+msgstr "Search Work Orders"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
 #: model:process.node,name:mrp_operations.process_node_workorder0
 msgid "Work Center"
-msgstr ""
+msgstr "Radni centar"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Real"
-msgstr ""
+msgstr "Realan"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planirani datum"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Uk. sati"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
@@ -673,16 +684,18 @@ msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
 msgstr ""
+"Provjerite mogućnost nezavisnog izvršavanja radnih naloga, bez izvršavanja "
+"ovisnih."
 
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
 msgid "Work Order Analysis"
-msgstr ""
+msgstr "Work Order Analysis"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -690,59 +703,59 @@ msgstr ""
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "Finished"
-msgstr ""
+msgstr "Dovršeno"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
 msgid "UOM"
-msgstr ""
+msgstr "JM"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr ""
+msgstr "Hours by Work Center"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Radno vrijeme(od-do)"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr ""
+msgstr "Operacija otkazana"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr ""
+msgstr "Start the operation."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr ""
+msgstr "Operation done"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "#Line Orders"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
@@ -750,32 +763,34 @@ msgid ""
 "When the operation is finished, the operator updates the system by finishing "
 "the work order."
 msgstr ""
+"When the operation is finished, the operator updates the system by finishing "
+"the work order."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Details of the work order"
-msgstr ""
+msgstr "Detalji radnog naloga"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr ""
+msgstr "Stanje proizvodnje"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Duration"
-msgstr ""
+msgstr "Trajanje"
 
 #. module: mrp_operations
 #: constraint:mrp.production:0
@@ -785,7 +800,7 @@ msgstr ""
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Pokušavate pridružiti lot koji nije iz istog proizvoda"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index e6f5aa00f28..7bdb883e98e 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -350,6 +350,7 @@ class mrp_production(osv.osv):
                     if l.production_id and (l.production_id.date_start < po.date_finished):
                         self.write(cr, uid, [l.production_id.id], {'date_start': po.date_finished})
                         break
+        return True
 
 
     def write(self, cr, uid, ids, vals, context=None, update=True, mini=True):
@@ -371,13 +372,13 @@ class mrp_production(osv.osv):
                 pass
         return result
 
-    def action_compute(self, cr, uid, ids, properties=[]):
+    def action_compute(self, cr, uid, ids, properties=[], context=None):
         """ Computes bills of material of a product and planned date of work order.
         @param properties: List containing dictionaries of properties.
         @return: No. of products.
         """
-        result = super(mrp_production, self).action_compute(cr, uid, ids, properties=properties)
-        self._compute_planned_workcenter(cr, uid, ids, context={})
+        result = super(mrp_production, self).action_compute(cr, uid, ids, properties=properties, context=context)
+        self._compute_planned_workcenter(cr, uid, ids, context=context)
         return result
 
 mrp_production()
diff --git a/addons/mrp_operations/mrp_operations_demo.yml b/addons/mrp_operations/mrp_operations_demo.yml
new file mode 100644
index 00000000000..7bfef8a4c7b
--- /dev/null
+++ b/addons/mrp_operations/mrp_operations_demo.yml
@@ -0,0 +1,24 @@
+-
+  !record {model: mrp.production, id: mrp_production_op}:
+    location_src_id: stock.stock_location_stock
+    product_id: product.product_product_cpu3
+    product_qty: 5.0
+    allow_reorder: True
+-
+  !record {model: mrp.production, id: mrp_production_op1}:
+    location_src_id: stock.stock_location_stock
+    product_id: product.product_product_cpu3
+    product_qty: 2.0
+-
+  !function {model: mrp.production, name: action_compute, id: mrp_production_op1}:
+  - model: mrp.production
+    eval: "[obj(ref('mrp_production_op1')).id]"
+-
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_op1}
+-
+  !record {model: mrp.production, id: mrp_production_mo1}:
+    location_src_id: stock.stock_location_stock
+    product_id: product.product_product_cpu_gen
+    product_qty: 5.0
+-
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1}
diff --git a/addons/mrp_operations/security/ir.model.access.csv b/addons/mrp_operations/security/ir.model.access.csv
index c27d8fd66e5..54bfe482edb 100644
--- a/addons/mrp_operations/security/ir.model.access.csv
+++ b/addons/mrp_operations/security/ir.model.access.csv
@@ -1,10 +1,10 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_operations_operation_code","operations.operation.code","model_mrp_operations_operation_code","mrp.group_mrp_user",1,1,1,1
-"access_mrp_operations_operation_code_manager","operations.operation.code.manager","model_mrp_operations_operation_code","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_operations_operation","operations.operation","model_mrp_operations_operation","mrp.group_mrp_user",1,1,1,1
-"access_mrp_operations_operation_manager","operations.operation.manager","model_mrp_operations_operation","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_production_user","mrp_production_user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
-"access_mrp_production_manager","mrp_production_manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_production_workcenter_line","mrp.production.workcenter.line","mrp.model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
-"access_mrp_production_workcenter_line_manager","mrp.production.workcenter.line.manager","mrp.model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_workorder_manager","mrp.workorder.manager","model_mrp_workorder","mrp.group_mrp_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mrp_operations_operation_code,operations.operation.code,model_mrp_operations_operation_code,mrp.group_mrp_user,1,1,1,1
+access_mrp_operations_operation_code_manager,operations.operation.code.manager,model_mrp_operations_operation_code,mrp.group_mrp_manager,1,0,0,0
+access_mrp_operations_operation,operations.operation,model_mrp_operations_operation,mrp.group_mrp_user,1,1,1,1
+access_mrp_operations_operation_manager,operations.operation.manager,model_mrp_operations_operation,mrp.group_mrp_manager,1,0,0,0
+access_mrp_production_user,mrp_production_user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
+access_mrp_production_manager,mrp_production_manager,model_mrp_production,mrp.group_mrp_manager,1,0,0,0
+access_mrp_production_workcenter_line,mrp.production.workcenter.line,mrp.model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1
+access_mrp_production_workcenter_line_manager,mrp.production.workcenter.line.manager,mrp.model_mrp_production_workcenter_line,mrp.group_mrp_manager,1,0,0,0
+access_mrp_workorder_manager,mrp.workorder.manager,model_mrp_workorder,mrp.group_mrp_manager,1,1,1,1
diff --git a/addons/mrp_operations/test/mrp_operation_test.yml b/addons/mrp_operations/test/mrp_operation_test.yml
deleted file mode 100644
index 9cb81abebde..00000000000
--- a/addons/mrp_operations/test/mrp_operation_test.yml
+++ /dev/null
@@ -1,56 +0,0 @@
--
-  In order to test mrp_operations module in OpenERP,
-  I create a production order.
--
-  !record {model: mrp.production, id: mrp_production_mo1}:
-    company_id: base.main_company
-    date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    location_dest_id: stock.stock_location_stock
-    location_src_id: stock.stock_location_stock
-    name: MO/01234567
-    product_id: product.product_product_pc1
-    product_qty: 5.0
-    product_uom: product.product_uom_unit
-    product_uos_qty: 5.0
--
-  Now I confirm the production order.
--
-  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1}
--
-  I check that there is one Work order generated related to the production order.
--
-  !python {model: mrp.production.workcenter.line}: |
-    from tools.translate import _
-    order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo1')),('state','=','draft')])
-    assert order_id, _('No work order defined for this production order!')
--
-  The scheduler runs.
--
-  !function {model: procurement.order, name: run_scheduler}:
-    - model: procurement.order
-      search: "[('state','=','confirmed')]"
--
-  I am checking Internal picking.
--
-  !python {model: mrp.production}: |
-    from tools.translate import _
-    pick_ids = self.browse(cr, uid, ref("mrp_production_mo1"))
-    assert pick_ids.picking_id.id, _('No Internal Picking generated!')
--
-  In order to cancel the MO, first cancel its picking
--
-  !python {model: stock.picking}: |
-    mrp_obj = self.pool.get('mrp.production')
-    mo = mrp_obj.browse(cr, uid, ref("mrp_production_mo1"))
-    self.action_cancel(cr, uid, [mo.picking_id.id], context=None)
--
-  Then cancel The Manufacturing order.
--
-  !workflow {model: mrp.production, action: button_cancel, ref: mrp_production_mo1}
--
-  I check that there is one Work order generated related to the production order that is cancelled or not.
--
-  !python {model: mrp.production.workcenter.line}: |
-    from tools.translate import _
-    order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo1')),('state','=','cancel')])
-    assert order_id, _('Work order is not cancelled for this production order!')
diff --git a/addons/mrp_operations/test/mrp_operations.yml b/addons/mrp_operations/test/mrp_operations.yml
deleted file mode 100644
index ce6aac5cdbf..00000000000
--- a/addons/mrp_operations/test/mrp_operations.yml
+++ /dev/null
@@ -1,158 +0,0 @@
--
-  In order to test mrp_operations module in OpenERP I will put a Production order
-  and check its effects on Work orders.
--
-  I create a production order.
--
-  !record {model: mrp.production, id: mrp_production_mo0}:
-    company_id: base.main_company
-    date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    location_dest_id: stock.stock_location_stock
-    location_src_id: stock.stock_location_stock
-    name: MO/0123456
-    product_id: product.product_product_pc1
-    product_qty: 5.0
-    product_uom: product.product_uom_unit
-    product_uos_qty: 5.0
-    allow_reorder: True
--
-  I am computing the data.
--
-  !python {model: mrp.production}: |
-    self.action_compute(cr, uid, [ref("mrp_production_mo0")], {"lang": "en_US", "tz":
-      False, "search_default_current": 1, "active_model": "ir.ui.menu", "active_ids":
-      [ref("mrp.menu_mrp_production_action")], "active_id": ref("mrp.menu_mrp_production_action"),
-      })
--
-  Now I confirm my production order.
--
-  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo0}
--
-  I check that there is one Work order generated related to my production order.
--
-  !python {model: mrp.production.workcenter.line}: |
-    from tools.translate import _
-    order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo0')),('state','=','draft')])
-    assert order_id, _('No Work order define for this production order!')
--
-  The scheduler runs.
--
-  !function {model: procurement.order, name: run_scheduler}:
-    - model: procurement.order
-      search: "[('state','=','confirmed')]"
--
-  I am checking Internal picking.
--
-  !python {model: stock.picking}: |
-    from tools.translate import _
-    pick_ids = self.search(cr, uid, [('state','!=','done'),('type','=','internal')])
-    assert pick_ids, _('No Internal Pickings!')
--
-  I see that there is a manufacturing order for the sub product CPU_GEN of PC1 with ready state.
--
-  !python {model: mrp.production}: |
-    from tools.translate import _
-    order_ids = self.search(cr, uid, [('state','=','ready'),('origin','like','%MO/0123456')])
-    assert order_ids, _('No new manufacturing order!')
--
-  I check that there one more work order created for new production order.
--
-  !python {model: mrp.production.workcenter.line}: |
-    from tools.translate import _
-    prod_obj = self.pool.get('mrp.production')
-    prod_order_ids = prod_obj.search(cr, uid, [('state','=','ready'),('origin','like','%MO/0123456')])
-    workorder_id = self.search(cr, uid, [('production_id','=', prod_order_ids[0]),('state','=','draft')])
-    assert workorder_id, _('No Work order define for this production order!')
--
-  I start the second production order of the CPU_GEN product.
--
-  !python {model: mrp.production}: |
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    prod_order_ids = self.search(cr, uid, [('state','=','ready'),('origin','like','%MO/0123456')])
-    for po in prod_order_ids:
-        wf_service.trg_validate(uid, 'mrp.production', po, 'button_produce', cr)
--
-  I am creating a mrp.product.produce record
--
-  !record {model: mrp.product.produce, id: mrp_product_produce_0}:
-    mode: consume_produce
-    product_qty: 5.0
--
-  I produce the product CPU_GEN.
--
-  !python {model: mrp.product.produce}: |
-    prod_obj = self.pool.get('mrp.production')
-    prod_order_ids = prod_obj.search(cr, uid, [('origin','like','%MO/0123456')])
-    self.do_produce(cr, uid, [ref("mrp_product_produce_0")], {"lang": "en_US", "tz":
-      False, "search_default_current": 1, "active_model": "mrp.production", "active_ids":
-      prod_order_ids, "active_id": prod_order_ids[0], })
--
-  I check that my production order and its related work order is in done state.
--
-  !python {model: mrp.production.workcenter.line}: |
-    from tools.translate import _
-    prod_obj = self.pool.get('mrp.production')
-    prod_order_ids = prod_obj.search(cr, uid, [('origin','like','%MO/0123456')])
-    assert prod_order_ids, _('Workorder not found')
-    workorder_id = self.search(cr, uid, [('production_id','=', prod_order_ids[0])])
-    workorder_bro = self.browse(cr, uid, workorder_id[0])
-    assert workorder_bro.state == 'done', _('Work order is not done! It is %s') % workorder_bro.state
--
-  Now I check my original production order is now ready.
--
-  !python {model: mrp.production}: |
-    from tools.translate import _
-    prod_ids = self.search(cr, uid, [('id','=',ref('mrp_production_mo0')),('state','=','ready')])
-    assert prod_ids, _('Production order is not ready!')
--
-  I check that both internal pickings are done.
--
-  !python {model: stock.picking}: |
-    from tools.translate import _
-    pick_ids = self.search(cr, uid, [('state','=','done'),('type','=','internal')])
-    assert pick_ids, _('Internal pickings are not done!')
--
-  Now I start my first production order.
--
-  !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
--
-  I check that the related work order is in progress state.
--
-  !python {model: mrp.production.workcenter.line}: |
-    from tools.translate import _
-    order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo0')),('state','=','startworking')])
-    assert order_id, _('Work order not started yet!')
--
-  I am creating a mrp.product.produce record.
--
-  !record {model: mrp.product.produce, id: mrp_product_produce_0}:
-    mode: consume_produce
-    product_qty: 5.0
--
-  I produce the product PC1.
--
-  !python {model: mrp.product.produce}: |
-    prod_obj = self.pool.get('mrp.production')
-    prod_order_ids = prod_obj.search(cr, uid, [('state','=','in_production')])
-    self.do_produce(cr, uid, [ref("mrp_product_produce_0")], {"lang": "en_US", "tz":
-      False, "search_default_current": 1, "active_model": "mrp.production", "active_ids":
-      [ref("mrp_production_mo0")], "active_id": ref("mrp_production_mo0"), })
--
-  I check the related work order is done.
--
-  !python {model: mrp.production.workcenter.line}: |
-    from tools.translate import _
-    order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo0')),('state','=','done')])
-    assert order_id, _('Work order not done yet!')
--
-  Calculates start date for stock moves finding interval from resource calendar.
--
-  !python {model: mrp.production}: |
-    self._move_pass(cr, uid, [ref('mrp_production_mo0')], context=None)
--
-  Calculates planned end date of production order.
--
-  !python {model: mrp.production}: |
-    mo = self.browse(cr, uid, ref("mrp_production_mo0"))
-    self._production_date_end(cr, uid, [ref("mrp_production_mo0")], mo.date_planned, False, context=None)
diff --git a/addons/mrp_operations/test/mrp_operations_report.yml b/addons/mrp_operations/test/mrp_operations_report.yml
deleted file mode 100644
index f0a646adf4e..00000000000
--- a/addons/mrp_operations/test/mrp_operations_report.yml
+++ /dev/null
@@ -1,17 +0,0 @@
--
-  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-barcode_report.'+format), 'wb+').write(data)
-
--
-  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_operations-workcenter_barcode_report.'+format), 'wb+').write(data)
diff --git a/addons/mrp_operations/test/workcenter_operations.yml b/addons/mrp_operations/test/workcenter_operations.yml
new file mode 100644
index 00000000000..23fbe15c37d
--- /dev/null
+++ b/addons/mrp_operations/test/workcenter_operations.yml
@@ -0,0 +1,120 @@
+-
+  I compute the production order.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp.mrp_production_shelf100cm"), context=context)
+    order.action_compute(context=context)
+-
+  I check planned date in workcenter lines of production order.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp.mrp_production_shelf100cm"), context=context)
+    for line in order.workcenter_lines:
+        #TODO: to check start date of next line should be end of date of previous line.
+        assert line.date_planned, "Planned Start date is not computed: %s" %(line)
+        assert line.date_planned_end, "Planned End date is not computed: %s" %(line)
+
+-
+  I confirm the Production Order.
+-
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp.mrp_production_shelf100cm}
+-  
+  I run scheduler.
+-
+  !python {model: procurement.order}: |
+    self.run_scheduler(cr, uid)
+-
+  I forcefully close internal shipment.
+-
+  !python {model: mrp.production}: |
+    self.force_production(cr, uid, [ref("mrp.mrp_production_shelf100cm")])
+-
+  I start production.
+-
+  !workflow {model: mrp.production, action: button_produce, ref: mrp.mrp_production_shelf100cm}
+- 
+  Production start on first work center, so I start work operation on first work center.
+-
+  !python {model: mrp.production}: |
+    import netsvc
+    order = self.browse(cr, uid, ref("mrp.mrp_production_shelf100cm"), context=context)
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'mrp.production.workcenter.line', order.workcenter_lines[0].id, 'button_start_working', cr)
+-
+  Now I pause first work operation due to technical fault of work center.
+-
+  !python {model: mrp.production}: |
+    import netsvc
+    order = self.browse(cr, uid, ref("mrp.mrp_production_shelf100cm"), context=context)
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'mrp.production.workcenter.line', order.workcenter_lines[0].id, 'button_pause', cr)
+    wf_service.trg_validate(uid, 'mrp.production.workcenter.line', order.workcenter_lines[0].id, 'button_resume', cr)
+-
+  I resume first work operation.
+-
+  !python {model: mrp.production}: |
+    import netsvc
+    order = self.browse(cr, uid, ref("mrp.mrp_production_shelf100cm"), context=context)
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'mrp.production.workcenter.line', order.workcenter_lines[0].id, 'button_resume', cr)
+    
+-
+  I cancel first work operation.
+-
+  !python {model: mrp.production}: |
+    import netsvc
+    order = self.browse(cr, uid, ref("mrp.mrp_production_shelf100cm"), context=context)
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'mrp.production.workcenter.line', order.workcenter_lines[0].id, 'button_cancel', cr)
+-
+  I reset first work operation and start after resolve techninal fault of work center.
+-
+  !python {model: mrp.production}: |
+    import netsvc
+    order = self.browse(cr, uid, ref("mrp.mrp_production_shelf100cm"), context=context)
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'mrp.production.workcenter.line', order.workcenter_lines[0].id, 'button_draft', cr)
+    wf_service.trg_validate(uid, 'mrp.production.workcenter.line', order.workcenter_lines[0].id, 'button_start_working', cr)
+-
+  Now Finished work of first work operation so I close that operation.
+-
+  !python {model: mrp.production}: |
+    import netsvc
+    order = self.browse(cr, uid, ref("mrp.mrp_production_shelf100cm"), context=context)
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'mrp.production.workcenter.line', order.workcenter_lines[0].id, 'button_done', cr)
+-
+  Now I close other operations after start one by one.
+-
+  !python {model: mrp.production}: |
+    import netsvc
+    order = self.browse(cr, uid, ref("mrp.mrp_production_shelf100cm"), context=context)
+    wf_service = netsvc.LocalService("workflow")
+    for work_line in order.workcenter_lines[1:]:
+        wf_service.trg_validate(uid, 'mrp.production.workcenter.line', work_line.id, 'button_start_working', cr)
+        wf_service.trg_validate(uid, 'mrp.production.workcenter.line', work_line.id, 'button_done', cr)
+
+-
+  I check that the production order is now done.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp.mrp_production_shelf100cm"), context=context)
+    print order.state
+    assert order.state == 'done', "Production should be closed after finished all operations."
+-
+  I print a Barcode Report of Operation line.
+-
+  !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-barcode_report.'+format), 'wb+').write(data)
+
+-
+  I 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_operations-workcenter_barcode_report.'+format), 'wb+').write(data)
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index cf141b61978..39f5a51e92c 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -51,7 +51,6 @@ The aim is to have a complete module to manage all products repairs. The followi
     'demo_xml': [],
     'test': ['test/test_mrp_repair.yml', 'test/mrp_repair_report.yml','test/mrp_repair_cancel.yml'],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate': '0060814381277',
 }
diff --git a/addons/mrp_repair/i18n/hr.po b/addons/mrp_repair/i18n/hr.po
index f70205f2e7f..3a3a089e0bf 100644
--- a/addons/mrp_repair/i18n/hr.po
+++ b/addons/mrp_repair/i18n/hr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-12-12 12:24+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:39+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees Line"
-msgstr ""
+msgstr "Fees Line"
 
 #. module: mrp_repair
 #: help:mrp.repair,state:0
@@ -35,11 +35,18 @@ msgid ""
 "* The 'Done' state is set when repairing is completed.            \n"
 "* The 'Cancelled' state is used when user cancel repair order."
 msgstr ""
+" * 'Nacrt' je početno stanje naloga.  \n"
+"* 'Potvrđen' je slijedeće stanje     \n"
+"* 'U tijeku' označava početak aktivnosti na popravku. \n"
+"* 'Za fakturiranje' stanje koje se koristi za generiranje računa prije ili "
+"poslije izvršenja naloga za popravak.  \n"
+"* 'Izvršen' nalog za popravak je izvršen  \n"
+"* 'Otkazan' nalog za popravak je otkazan."
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
 msgid "Inventory Move"
-msgstr ""
+msgstr "Skladišni prijenos"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
@@ -50,16 +57,21 @@ msgid ""
 "date on the production lot in order to know if whether the repair should be "
 "invoiced to the customer or not."
 msgstr ""
+"Nalozi za popravak olakšavaju upravljanje post-prodajnim aktivnostima "
+"popravaka i servisa unutar i nakon jamstvenog roka. U nalogu za popravak "
+"navodite komponente koje treba odbaciti, dodati ili zamijeniti, bilježite "
+"vrijeme potrebno za popravak. Nalog koristi datume jamstva kako bi znao "
+"treba li fakturirati nalog kupcu ili ne."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Recreate Invoice"
-msgstr ""
+msgstr "Ponovo izradi račun"
 
 #. module: mrp_repair
 #: help:mrp.repair,deliver_bool:0
@@ -69,28 +81,32 @@ msgid ""
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
 msgstr ""
+"Check this box if you want to manage the delivery once the product is "
+"repaired. If cheked, it will create a picking with selected product. Note "
+"that you can select the locations in the Info tab, if you have the extended "
+"view."
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
 #: view:mrp.repair.cancel:0
 msgid "Cancel Repair Order"
-msgstr ""
+msgstr "Otkaži nalog za popravak"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
 #: field:mrp.repair.line,to_invoice:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Za fakturiranje"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Printing Date"
 
 #. module: mrp_repair
 #: field:mrp.repair.make_invoice,group:0
 msgid "Group by partner invoice address"
-msgstr ""
+msgstr "Grupiraj po adresi računa"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:430
@@ -101,45 +117,45 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi na nacrt"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Iznimka računa"
 
 #. module: mrp_repair
 #: field:mrp.repair,address_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "Adresa dostave"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
 #: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice
 #: view:mrp.repair:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Kreiraj račun"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_subtotal:0
 #: field:mrp.repair.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Podzbroj"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Invoice address :"
-msgstr ""
+msgstr "Adresa računa :"
 
 #. module: mrp_repair
 #: field:mrp.repair,guarantee_limit:0
 msgid "Guarantee limit"
-msgstr ""
+msgstr "Limit jamstva"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: mrp_repair
 #: model:ir.module.module,description:mrp_repair.module_meta_information
@@ -160,12 +176,12 @@ msgstr ""
 #: field:mrp.repair.fee,tax_id:0
 #: field:mrp.repair.line,tax_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Porezi"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Net Total :"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:430
@@ -176,17 +192,17 @@ msgstr ""
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "VAT"
-msgstr ""
+msgstr "PDV"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Operations"
-msgstr ""
+msgstr "Operations"
 
 #. module: mrp_repair
 #: field:mrp.repair,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Temeljnica"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:365
@@ -198,28 +214,28 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_order
 msgid "Repair Orders"
-msgstr ""
+msgstr "Nalozi za popravak"
 
 #. module: mrp_repair
 #: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
 msgid "Quotation / Order"
-msgstr ""
+msgstr "Ponuda / Nalog"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatni podaci"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Reference"
-msgstr ""
+msgstr "Nalog za popravak br."
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:379
@@ -232,49 +248,49 @@ msgstr ""
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repairs order"
-msgstr ""
+msgstr "Nalozi za popravak"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Repair Order N° :"
-msgstr ""
+msgstr "Nalog za popravak N° :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
 #: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
-msgstr ""
+msgstr "Lot Number"
 
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
-msgstr ""
+msgstr "Fees Lines"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,type:0
 msgid "Type"
-msgstr ""
+msgstr "Vrsta"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Fees Line(s)"
-msgstr ""
+msgstr "Fees Line(s)"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "Za fakturiranje"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Shipping address :"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:379
@@ -287,7 +303,7 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "Količina (JM)"
 
 #. module: mrp_repair
 #: help:mrp.repair.line,state:0
@@ -300,11 +316,17 @@ msgid ""
 "                  \n"
 "* The 'Cancelled' state is set automatically when user cancel repair order."
 msgstr ""
+" * Stanje 'Nacrt' se postavlja automatski prilikom upisa/inicijalnog "
+"kreiranja naloga za popravak. \n"
+"* Stanje 'Potvrđen' označava nalog koji treba izvršiti.  \n"
+"* Izvršeni nalozi su u stanju 'Izvršen' .                        \n"
+"* Nalozi u stanju 'Otkazan' se neće izvršavati i ostaju u sistemu radi "
+"evidencije."
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
@@ -312,17 +334,19 @@ msgid ""
 "This operation will cancel the Repair process, but will not cancel it's "
 "Invoice. Do you want to continue?"
 msgstr ""
+"Ova operacija će otkazati proces popravka, ali neće otkazati pripadajući "
+"račun. Nastaviti?"
 
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Pricelist"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,quotation_notes:0
 msgid "Quotation Notes"
-msgstr ""
+msgstr "Quotation Notes"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
@@ -333,34 +357,34 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
-msgstr ""
+msgstr "Search Reair Orders"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "(Add)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
 #: view:mrp.repair:0
 msgid "Repair Line"
-msgstr ""
+msgstr "Stavka popravka"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_method:0
 msgid "Invoice Method"
-msgstr ""
+msgstr "Metoda računa"
 
 #. module: mrp_repair
 #: field:mrp.repair,repaired:0
 msgid "Repaired"
-msgstr ""
+msgstr "Popravljeno"
 
 #. module: mrp_repair
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
@@ -371,145 +395,145 @@ msgstr ""
 #: field:mrp.repair.fee,invoice_line_id:0
 #: field:mrp.repair.line,invoice_line_id:0
 msgid "Invoice Line"
-msgstr ""
+msgstr "Stavka računa"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "Before Repair"
-msgstr ""
+msgstr "Prije popravka"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_id:0
 msgid "Current Location"
-msgstr ""
+msgstr "Trenutna lokacija"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoiced:0
 #: field:mrp.repair.fee,invoiced:0
 #: field:mrp.repair.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturirano"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Kreiraj račune"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "(Remove)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Kreirati račun(e) ?"
 
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Reference"
-msgstr ""
+msgstr "Popravak br."
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repair Order"
-msgstr ""
+msgstr "Nalog za popravak"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Under Repair"
-msgstr ""
+msgstr "U popravku"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Ready To Repair"
-msgstr ""
+msgstr "Spremno za popravak"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Osnovica"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
-msgstr ""
+msgstr "Guarantee Limit"
 
 #. module: mrp_repair
 #: field:mrp.repair,default_address_id:0
 msgid "unknown"
-msgstr ""
+msgstr "nepoznato"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
 #: report:repair.order:0
 msgid "Product to Repair"
-msgstr ""
+msgstr "Proizvodi za popravak"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
-msgstr ""
+msgstr "N° :"
 
 #. module: mrp_repair
 #: help:mrp.repair,pricelist_id:0
 msgid "The pricelist comes from the selected partner, by default."
-msgstr ""
+msgstr "Cjenik odabranog partnera."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr ""
+msgstr "Stavka naknade popravka"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Quotation"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Compute"
-msgstr ""
+msgstr "Izračunaj"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Confirm Repair"
-msgstr ""
+msgstr "Potvrdi popravak"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Repair Quotation"
-msgstr ""
+msgstr "Ponuda za popravak"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "End Repair"
-msgstr ""
+msgstr "Završi popravak"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:408
@@ -521,43 +545,43 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quotations"
-msgstr ""
+msgstr "Ponude"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
 #: report:repair.order:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Start Repair"
-msgstr ""
+msgstr "Pokreni popravak"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Qty"
-msgstr ""
+msgstr "Kol."
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_unit:0
 #: field:mrp.repair.line,price_unit:0
 #: report:repair.order:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: mrp_repair
 #: help:mrp.repair,guarantee_limit:0
@@ -567,42 +591,46 @@ msgid ""
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
 msgstr ""
+"Jamstveni limit se računa kao: datum zadnjeg prijenosa + jamstvo definirano "
+"na proizvodu. Ako je trenutni datum unutar jamstva svaka operacija i naknada "
+"koju dodate biti će označena sa 'nije za fakturiranje'. Naravno, to možete "
+"ručno promijeniti prema potrebi."
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees"
-msgstr ""
+msgstr "Fees"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: view:mrp.repair.make_invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
-msgstr ""
+msgstr "Lokacija isporuke"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Operation Line(s)"
-msgstr ""
+msgstr "Stavka(e) operacije"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "History"
-msgstr ""
+msgstr "Povijest"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_dest_id:0
 msgid "Delivery Location"
-msgstr ""
+msgstr "Lokacija isporuke"
 
 #. module: mrp_repair
 #: help:mrp.repair,invoice_method:0
@@ -611,71 +639,73 @@ msgid ""
 "selected is different from 'No Invoice', it also allow you to select the "
 "pricelist and invoicing address."
 msgstr ""
+"Ako odaberete različito od 'Ne fakturirati', možete odabrati cjenik i adresu "
+"računa."
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Kreiraj račun"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
 #: field:mrp.repair.line,name:0
 #: report:repair.order:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: mrp_repair
 #: field:mrp.repair,operations:0
 msgid "Operation Lines"
-msgstr ""
+msgstr "Stavke operacije"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr ""
+msgstr "fakturirano"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair.fee,product_id:0
 #: field:mrp.repair.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoice Corrected"
-msgstr ""
+msgstr "Račun korigiran"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Price"
-msgstr ""
+msgstr "Cijena"
 
 #. module: mrp_repair
 #: field:mrp.repair,deliver_bool:0
 msgid "Deliver"
-msgstr ""
+msgstr "Isporuči"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,internal_notes:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne bilješke"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Porezi:"
 
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "Skladišnice"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Iznos bez poreza"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:41
@@ -692,75 +722,75 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Total amount"
-msgstr ""
+msgstr "Ukupni iznos"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "UoM"
-msgstr ""
+msgstr "JM"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 msgid "Remove"
-msgstr ""
+msgstr "Remove"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom:0
 #: field:mrp.repair.line,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "JM Proizvoda"
 
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
-msgstr ""
+msgstr "Adresa za račun"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "After Repair"
-msgstr ""
+msgstr "Poslije popravka"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_id:0
 msgid "Source Location"
-msgstr ""
+msgstr "Izvorna lokacija"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_cancel
 #: view:mrp.repair:0
 msgid "Cancel Repair"
-msgstr ""
+msgstr "Otkaži popravak"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "No Invoice"
-msgstr ""
+msgstr "Nema računa"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "States"
-msgstr ""
+msgstr "Stanja"
 
 #. module: mrp_repair
 #: help:mrp.repair,partner_id:0
 msgid ""
 "This field allow you to choose the parner that will be invoiced and delivered"
-msgstr ""
+msgstr "Odaberite partnera isporuke i računa"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Ready to Repair"
-msgstr ""
+msgstr "Spremno za popravak"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:365
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 098bc638110..fa0ff192f17 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -65,7 +65,8 @@
                                             <field name="invoiced"/>
                                         </group>
                                         <newline/>
-                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                                        <separator colspan="4" string="Taxes"/>
+                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
                                         <separator colspan="4" string="States"/>
                                         <field name="state"/>
                                     </page>
@@ -137,7 +138,8 @@
                                             <field name="invoiced"/>
                                         </group>
                                         <newline/>
-                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                                        <separator colspan="4" string="Taxes"/>
+                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
                                      </page>
                                      <page string="History" groups="base.group_extended">
                                         <field colspan="4" name="invoice_line_id" />
diff --git a/addons/mrp_repair/security/ir.model.access.csv b/addons/mrp_repair/security/ir.model.access.csv
index b7f0c156fb9..ae6e3e06292 100644
--- a/addons/mrp_repair/security/ir.model.access.csv
+++ b/addons/mrp_repair/security/ir.model.access.csv
@@ -1,29 +1,29 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_repair_user","MRP Repair user","model_mrp_repair","stock.group_stock_user",1,0,0,0
-"access_mrp_repair_manager","MRP Repair manager","model_mrp_repair","stock.group_stock_manager",1,1,1,1
-"access_mrp_repair_line_user","MRP Repair Line user","model_mrp_repair_line","stock.group_stock_user",1,0,0,0
-"access_mrp_repair_line_manager","MRP Repair Line manager","model_mrp_repair_line","stock.group_stock_manager",1,1,1,1
-"access_mrp_repair_fee_user","MRP Repair Fee user","model_mrp_repair_fee","stock.group_stock_user",1,1,1,1
-"access_mrp_repair_fee_manager","MRP Repair Fee manager","model_mrp_repair_fee","stock.group_stock_manager",1,0,0,0
-"access_mrp_repair_user","MRP Repair user","model_mrp_repair","mrp.group_mrp_user",1,1,1,1
-"access_mrp_repair_manager","MRP Repair manager","model_mrp_repair","mrp.group_mrp_manager",1,0,0,0
-"access_product_pricelist_manager","product.pricelist manager","product.model_product_pricelist","mrp.group_mrp_manager",1,0,0,0
-"access_product_pricelist_user","product.pricelist user","product.model_product_pricelist","mrp.group_mrp_user",1,1,1,1
-"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
-"access_stock_production_lot_manager","stock.production.lot manager","stock.model_stock_production_lot","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_repair_line_user","mrp.repair.line user","model_mrp_repair_line","mrp.group_mrp_user",1,1,1,1
-"access_mrp_repair_line_manager","mrp.repair.line manager","model_mrp_repair_line","mrp.group_mrp_manager",1,0,0,0
-"access_stock_production_lot_revision_manager","stock.production.lot.revision manager","stock.model_stock_production_lot_revision","mrp.group_mrp_manager",1,0,0,0
-"access_stock_production_lot_revision_user","stock.production.lot.revision user","stock.model_stock_production_lot_revision","mrp.group_mrp_user",1,1,1,1
-"access_product_price_type_manager","product.price.type manager","product.model_product_price_type","mrp.group_mrp_manager",1,0,0,0
-"access_product_price_type_user","product.price.type","product.model_product_price_type","mrp.group_mrp_user",1,1,1,1
-"access_account_tax_user","account.tax","account.model_account_tax","mrp.group_mrp_user",1,1,1,1
-"access_account_tax_manager","account.tax manager","account.model_account_tax","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_repair_fee_user_mrp","MRP Repair Fee user mrp","model_mrp_repair_fee","mrp.group_mrp_user",1,1,1,1
-"access_mrp_repair_fee_mgr","MRP Repair Fee mgr","model_mrp_repair_fee","mrp.group_mrp_manager",1,0,0,0
-"access_account_invoice_user","account.invoice","account.model_account_invoice","mrp.group_mrp_user",1,1,1,1
-"access_account_invoice_manager","account.invoice manager","account.model_account_invoice","mrp.group_mrp_manager",1,0,0,0
-"access_account_invoice_line_user","account.invoice.line","account.model_account_invoice_line","mrp.group_mrp_user",1,1,1,1
-"access_account_invoice_line_manager","account.invoice.line manager","account.model_account_invoice_line","mrp.group_mrp_manager",1,0,0,0
-"access_account_journal_user","account.journal","account.model_account_journal","mrp.group_mrp_user",1,1,1,1
-"access_account_journal_manager","account.journal manager","account.model_account_journal","mrp.group_mrp_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mrp_repair_user,MRP Repair user,model_mrp_repair,stock.group_stock_user,1,0,0,0
+access_mrp_repair_manager,MRP Repair manager,model_mrp_repair,stock.group_stock_manager,1,1,1,1
+access_mrp_repair_line_user,MRP Repair Line user,model_mrp_repair_line,stock.group_stock_user,1,0,0,0
+access_mrp_repair_line_manager,MRP Repair Line manager,model_mrp_repair_line,stock.group_stock_manager,1,1,1,1
+access_mrp_repair_fee_user,MRP Repair Fee user,model_mrp_repair_fee,stock.group_stock_user,1,1,1,1
+access_mrp_repair_fee_manager,MRP Repair Fee manager,model_mrp_repair_fee,stock.group_stock_manager,1,0,0,0
+access_mrp_repair_user,MRP Repair user,model_mrp_repair,mrp.group_mrp_user,1,1,1,1
+access_mrp_repair_manager,MRP Repair manager,model_mrp_repair,mrp.group_mrp_manager,1,0,0,0
+access_product_pricelist_manager,product.pricelist manager,product.model_product_pricelist,mrp.group_mrp_manager,1,0,0,0
+access_product_pricelist_user,product.pricelist user,product.model_product_pricelist,mrp.group_mrp_user,1,1,1,1
+access_stock_production_lot_user,stock.production.lot user,stock.model_stock_production_lot,mrp.group_mrp_user,1,1,1,1
+access_stock_production_lot_manager,stock.production.lot manager,stock.model_stock_production_lot,mrp.group_mrp_manager,1,0,0,0
+access_mrp_repair_line_user,mrp.repair.line user,model_mrp_repair_line,mrp.group_mrp_user,1,1,1,1
+access_mrp_repair_line_manager,mrp.repair.line manager,model_mrp_repair_line,mrp.group_mrp_manager,1,0,0,0
+access_stock_production_lot_revision_manager,stock.production.lot.revision manager,stock.model_stock_production_lot_revision,mrp.group_mrp_manager,1,0,0,0
+access_stock_production_lot_revision_user,stock.production.lot.revision user,stock.model_stock_production_lot_revision,mrp.group_mrp_user,1,1,1,1
+access_product_price_type_manager,product.price.type manager,product.model_product_price_type,mrp.group_mrp_manager,1,0,0,0
+access_product_price_type_user,product.price.type,product.model_product_price_type,mrp.group_mrp_user,1,1,1,1
+access_account_tax_user,account.tax,account.model_account_tax,mrp.group_mrp_user,1,1,1,1
+access_account_tax_manager,account.tax manager,account.model_account_tax,mrp.group_mrp_manager,1,0,0,0
+access_mrp_repair_fee_user_mrp,MRP Repair Fee user mrp,model_mrp_repair_fee,mrp.group_mrp_user,1,1,1,1
+access_mrp_repair_fee_mgr,MRP Repair Fee mgr,model_mrp_repair_fee,mrp.group_mrp_manager,1,0,0,0
+access_account_invoice_user,account.invoice,account.model_account_invoice,mrp.group_mrp_user,1,1,1,1
+access_account_invoice_manager,account.invoice manager,account.model_account_invoice,mrp.group_mrp_manager,1,0,0,0
+access_account_invoice_line_user,account.invoice.line,account.model_account_invoice_line,mrp.group_mrp_user,1,1,1,1
+access_account_invoice_line_manager,account.invoice.line manager,account.model_account_invoice_line,mrp.group_mrp_manager,1,0,0,0
+access_account_journal_user,account.journal,account.model_account_journal,mrp.group_mrp_user,1,1,1,1
+access_account_journal_manager,account.journal manager,account.model_account_journal,mrp.group_mrp_manager,1,0,0,0
diff --git a/addons/mrp_subproduct/i18n/hr.po b/addons/mrp_subproduct/i18n/hr.po
index fc2966f7950..8e50561f0a4 100644
--- a/addons/mrp_subproduct/i18n/hr.po
+++ b/addons/mrp_subproduct/i18n/hr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-08-03 08:08+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 10:52+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:38+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
 msgid "Product"
-msgstr "Proizvod"
+msgstr "Artikl"
 
 #. module: mrp_subproduct
 #: sql_constraint:mrp.bom:0
@@ -28,6 +28,9 @@ msgid ""
 "You should install the mrp_subproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"Sve količine artikala moraju biti veće od 0.\n"
+"Morate instalirati modul mrp_subproduct ako želite dodatne artikle na "
+"sastavnici !"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -37,13 +40,15 @@ msgstr "podproizvodi"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Nalog za proizvodnju"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
 msgid ""
 "MRP Sub Product - To produce several products from one production order"
 msgstr ""
+"MRP podproizvod - ZA proizvodnju više proizvoda iz jednog naloga za "
+"proizvodnju"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_qty:0
@@ -63,7 +68,7 @@ msgstr "Tip količine"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_bom
 msgid "Bill of Material"
-msgstr ""
+msgstr "Sastavnica"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,description:mrp_subproduct.module_meta_information
@@ -78,11 +83,20 @@ msgid ""
 "    A + B + C -> D + E\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul omogućuje proizvodnju više proizvoda iz jednog naloga za "
+"proizvodnju.\n"
+"Možete konfigurirati podproizvode u sastavnici.\n"
+"Bez ovog modula:\n"
+"    A + B + C -> D\n"
+"Sa ovim modulom:\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product UOM"
-msgstr "Jedinica mjere proizvoda"
+msgstr "JM proizvoda"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,bom_id:0
@@ -92,7 +106,7 @@ msgstr "Sastavnica"
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivne sastavnice."
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -102,22 +116,22 @@ msgstr "Podproizvodi"
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Variable"
-msgstr "Varijabla"
+msgstr "Promjenljiva"
 
 #. module: mrp_subproduct
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Količina na nalogu ne smije biti negativna ili nula!"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
 msgid "Sub Product"
-msgstr ""
+msgstr "Podproizvod"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
-msgstr "Određeno"
+msgstr "Fiksno"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_subproduct/security/ir.model.access.csv
index 307827265f2..7c012237dd6 100644
--- a/addons/mrp_subproduct/security/ir.model.access.csv
+++ b/addons/mrp_subproduct/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_subproduct_user","mrp.subproduct","model_mrp_subproduct","mrp.group_mrp_user",1,1,1,1
-"access_mrp_subproduct_manager","mrp.subproduct manager","model_mrp_subproduct","mrp.group_mrp_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mrp_subproduct_user,mrp.subproduct,model_mrp_subproduct,mrp.group_mrp_user,1,1,1,1
+access_mrp_subproduct_manager,mrp.subproduct manager,model_mrp_subproduct,mrp.group_mrp_manager,1,0,0,0
diff --git a/addons/multi_company/i18n/hr.po b/addons/multi_company/i18n/hr.po
index 024de2fcf48..04bc8914653 100644
--- a/addons/multi_company/i18n/hr.po
+++ b/addons/multi_company/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-01-26 11:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-12 12:48+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:41+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -40,6 +40,21 @@ msgid ""
 "%(company_name)s\n"
 "        "
 msgstr ""
+"\n"
+"Datum: %(date)s\n"
+"\n"
+"Dragi %(partner_name)s,\n"
+"\n"
+"U privitku se nalazi podsjetnik na sve vaše neplaćene račune sa dospijelim "
+"iznosom od:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Hvala,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
 
 #. module: multi_company
 #: model:product.category,name:multi_company.Odoo1
@@ -66,7 +81,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:multi_company.action_inventory_form
 #: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
 msgid "Default Company per Object"
-msgstr ""
+msgstr "Predefinirana organizacija po objektu"
 
 #. module: multi_company
 #: model:product.template,name:multi_company.product_product_odoo1_product_template
@@ -81,7 +96,7 @@ msgstr ""
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Condition"
-msgstr ""
+msgstr "Uvjet"
 
 #. module: multi_company
 #: model:ir.module.module,description:multi_company.module_meta_information
diff --git a/addons/multi_company/security/ir.model.access.csv b/addons/multi_company/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/multi_company/security/ir.model.access.csv
+++ b/addons/multi_company/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/outlook/README b/addons/outlook/README
deleted file mode 100644
index 93f735ac1f8..00000000000
--- a/addons/outlook/README
+++ /dev/null
@@ -1,29 +0,0 @@
-OpenERP Outlook PLUG-IN Installation Guide
-
-Pre requirements :
-======================================================================================
-    1.Python 2.6+ . python can be downloaded from http://www.python.org/download/releases/ .
-    2.Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python. It can be downloaded from 
-            http://sourceforge.net/projects/pywin32/  or
-            http://starship.python.net/crew/mhammond/win32/
-    3.If you are using MS Outlook 2007 than you are required to install "Microsoft Exchange Server MAPI Client and Collaboration Data Objects 1.2.1 (CDO 1.21)". It can be downloaded from 
-            http://www.microsoft.com/downloads/en/details.aspx?FamilyID=2714320D-C997-4DE1-986F-24F081725D36&displaylang=en
-      and With MS Outlook2003 Install inbuilt Collaboration Data Objects(CDO) while installing Outlook.
-        To read more regarding  Collaboration Data Objects(CDO) click following link:
-          + http://support.microsoft.com/kb/171440
-                   
-How to install openerp-outlook plug-in?
-======================================================================================
-    1. Save the executable plug-in file.
-    2. Close Outlook Application if Running.
-    3. Run executable plug-in file and the folllow the instruction.
-
-How to uninstall openerp-outlook plug-in?
-=====================================================================================
-    1. Go to Control Panel Click "Add/Remove Programmes"
-    2. You will entry, you will find entry named 'OpenERP Outlook Addin 1.0' select it and click Uninstall.
-
-Note : Plug In has been successfully tested with MS Office 2003 and MS Offcie 2007.
-
-Enjoy Archiving your Outlook E-mails to OpenERP.
-
diff --git a/addons/outlook/__openerp__.py b/addons/outlook/__openerp__.py
index beab5aca648..9d1c5a554f4 100644
--- a/addons/outlook/__openerp__.py
+++ b/addons/outlook/__openerp__.py
@@ -25,7 +25,7 @@
     'version' : '1.0',
     'author' : 'OpenERP SA',
     'website' : 'http://www.openerp.com/',
-    'depends' : ['base', 'mail'],
+    'depends' : ['base', 'mail','plugin'],
     'category' : 'Customer Relationship Management',
     'description': '''
 This module provides the Outlook Plug-in.
@@ -33,7 +33,7 @@ This module provides the Outlook Plug-in.
 Outlook plug-in allows you to select an object that you’d 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 archive selected
-mail into email.messages with attachments.
+mail into mail.message with attachments.
       ''',
     'init_xml' : [],
     'demo_xml' : [],
diff --git a/addons/outlook/i18n/hr.po b/addons/outlook/i18n/hr.po
new file mode 100644
index 00000000000..868034d8431
--- /dev/null
+++ b/addons/outlook/i18n/hr.po
@@ -0,0 +1,161 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 12:57+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Priručnik za instalaciju"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Outlook Plug-in"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Outlook Plug-In"
+msgstr "Outlook Plug-In"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Preskoči"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Sučelje za Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Naziv datoteke"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Outlook Plug-in "
+
+#. module: outlook
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid ""
+"\n"
+"      This module provide the Outlook plug-in. \n"
+"\n"
+"      Outlook plug-in allows you to select an object that you’d like to add\n"
+"      to your email and its attachments from MS Outlook. You can select a "
+"partner, a task,\n"
+"      a project, an analytical account, or any other object and Archived "
+"selected\n"
+"      mail in mailgate.messages with attachments.\n"
+"\n"
+"      "
+msgstr ""
+"\n"
+"      Ovaj modul omogućava Outlook plug-in. \n"
+"\n"
+"      Outlook plug-in omogućava vam da odaberete objekt koji bi željeli "
+"dodati\n"
+"      u vaš e-mail i njegove privitke iz MS Outlooka. Možete izabrati "
+"partnera, zadatak,\n"
+"      projekt, analitički konto,  ili bilo koi drugi objekt i arhivirati "
+"odabranu poruku sa privicima\n"
+"      u mailgate.messages.\n"
+"\n"
+"      "
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "Datoteka sa dokumentacijom :- kako instalirati Outlook Plug-in."
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.installer"
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+#: view:outlook.installer:0
+msgid "Outlook Plug-In Configuration"
+msgstr "Outlook Plug-In konfiguracija"
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid ""
+"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."
+msgstr ""
+"Ovaj plugin omogućuje vam povezivanje e-maila s OpenERP dokumentima. Možete "
+"ga dodati bilo kojem postojećem ili kreirati novi."
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Dozvoljava vam da odaberete objekt koji želite dodati vašoj elektroničkoj "
+"poruci i njegove privitke."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Zatvori"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Koraci instalacije i konfiguracije"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"outlook plug-in datoteka. Snimi kako ovu datoteku i instaliraj ovaj plugin u "
+"Outlook."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Podešavanje"
diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
index 061c27da5e5..547d0b18650 100644
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -32,7 +32,7 @@ class outlook_installer(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         data = super(outlook_installer, self).default_get(cr, uid, fields, context=context)
         data['doc_file'] = 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_outlook.html'
-        file = open(addons.get_module_resource('outlook','plugin','openerp-outlook-addin.exe'), 'r')
+        file = open(addons.get_module_resource('outlook','static','openerp-outlook-plugin','OpenERPOutlookPluginSetup','Release','OpenERPOutlookPluginSetup.msi'), 'r')
         data['plugin_file'] = base64.encodestring(file.read())
         return data
 
@@ -47,21 +47,18 @@ class outlook_installer(osv.osv_memory):
 
     _defaults = {
         'outlook' : True,
-        'name' : 'Openerp-Outlook-Addin.exe',
+        'name' : 'OpenERPOutlookPlugin.msi',
         'doc_name' : 'Installation Guide to OpenERP Outlook Plug-in.doc',
         'description' : """
 System requirements:
-    1.  Python 2.6+.
-    2.  Python for Windows extensions (PyWin32); this module must be installed for the appropriate version of Python.
-    3.1 With MS Outlook 2007, install the package Collaboration Data Objects, version 1.2.1, http://www.microsoft.com/downloads/en/details.aspx?FamilyID=2714320D-C997-4DE1-986F-24F081725D36
-    3.2 With MS Outlook 2003, install the builtin Collaboration Data Objects(CDO) while installing Outlook.
+    1.  MS Outlook 2005 or above.
+    2.  MS .Net Framework 3.5 .
+    
 
 Plugin installation:
-    1.  Save the executable plug-in file.
+    1.  Save the msi plug-in file.
     2.  Close the Outlook application if it is open.
-    3.  Run the executable plug-in file, and follow the given instructions.
-
-Please refer to the README file for dependencies (external link: openobject-addons/outlook/README).
+    3.  Run the executable plug-in file (OpenERPOutlookPlugin.msi).
 """
         }
 outlook_installer()
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index 7e2b7cd6d58..4cdb0127631 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -14,7 +14,9 @@
                         <attribute name="string">Install 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>
+                        <attribute name="string">This plug-in allows you to create new contact or link contact to an existing partner. 
+Also allows 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="replace">
                         <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
deleted file mode 100644
index aa3c0dac378..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-python addin.py
-pause
\ No newline at end of file
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
deleted file mode 100644
index 0f821974661..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-python addin.py --unregister
-pause
\ No newline at end of file
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
deleted file mode 100644
index c720c5e417d..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py
+++ /dev/null
@@ -1,301 +0,0 @@
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# -*- 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 win32com import universal
-from win32com.client import gencache, DispatchWithEvents
-import pythoncom
-from win32com.client import constants
-import sys
-import os
-from win32com.client import Dispatch
-import win32con
-sys.path.append(os.path.abspath(os.path.dirname(__file__)))    #outlook
-sys.path.append(os.path.abspath(__file__))                     #outlook/addin
-import manager
-from win32com.client import CastTo
-import win32ui
-from tiny_xmlrpc import XMLRpcConn
-import locale
-locale.setlocale(locale.LC_NUMERIC, "C")
-# Support for COM objects we use.
-gencache.EnsureModule('{00062FFF-0000-0000-C000-000000000046}', 0, 9, 0, bForDemand=True) # Outlook 9
-gencache.EnsureModule('{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}', 0, 2, 1, bForDemand=True) # Office 9
-# The TLB defiining the interfaces we implement
-universal.RegisterInterfaces('{AC0714F2-3D04-11D1-AE7D-00A0C90F26F4}', 0, 1, 0, ["_IDTExtensibility2"])
-global NewConn
-# Retrieves registered XMLRPC connection
-def GetConn():
-    d=Dispatch("Python.OpenERP.XMLRpcConn")
-    return d
-class Configuration:
-
-    def OnClick(self, button, cancel):
-        import win32ui
-        try:
-            mngr = manager.GetManager()
-            mngr.ShowManager()
-        except Exception,e:
-            win32ui.MessageBox("Fail to Initialize dialog.\n"+str(e),"OpenERP Configuration", win32con.MB_ICONERROR)
-        return cancel
-#
-class ViewPartners:
-    def OnClick(self, button, cancel):
-        from win32com.client import Dispatch
-        import win32con
-        mngr = manager.GetManager()
-        data = mngr.LoadConfig()
-        outlook = Dispatch("Outlook.Application")
-        ex = outlook.ActiveExplorer()
-        if ex:
-            is_login = str(data['login'])
-            if is_login == 'False':
-                win32ui.MessageBox("Please login to the database first", "OpenERP Connection", win32con.MB_ICONEXCLAMATION)
-            elif ex.Selection.Count == 1 or ex.Selection.Count == 0:
-                mngr = manager.GetManager()
-                mngr.ShowManager("IDD_VIEW_PARTNER_DIALOG")
-            elif ex.Selection.Count > 1:
-                win32ui.MessageBox("Multiple selection not allowed. Please select only one mail at a time.","Open Contact",win32con.MB_ICONINFORMATION)
-        return cancel
-#
-class OpenPartner:
-    def OnClick(self, button, cancel):
-        import win32ui
-        mngr = manager.GetManager()
-        data = mngr.LoadConfig()
-        outlook = Dispatch("Outlook.Application")
-        ex = outlook.ActiveExplorer()
-        if ex:
-            is_login = str(data['login'])
-            if is_login == 'False':
-                win32ui.MessageBox("Please login to the database first", "OpenERP Connection", win32con.MB_ICONEXCLAMATION)
-            elif ex.Selection.Count == 1:
-                mngr = manager.GetManager()
-                mngr.ShowManager("IDD_OPEN_PARTNER_DIALOG")
-            elif ex.Selection.Count == 0:
-                win32ui.MessageBox("No mail selected to push to OpenERP","Push to OpenERP",win32con.MB_ICONINFORMATION)
-            elif ex.Selection.Count > 1:
-                win32ui.MessageBox("Multiple selection not allowed. Please select only one mail at a time.","Push to OpenERP",win32con.MB_ICONINFORMATION)
-        return cancel
-#
-class OpenDocument:
-    def OnClick(self, button, cancel):
-        from win32com.client import Dispatch
-        import win32con
-        mngr = manager.GetManager()
-        data = mngr.LoadConfig()
-        outlook = Dispatch("Outlook.Application")
-        ex = outlook.ActiveExplorer()
-        if ex:
-            is_login = str(data['login'])
-            if is_login == 'False':
-                win32ui.MessageBox("Please login to the database first", "OpenERP Connection", win32con.MB_ICONEXCLAMATION)
-            elif ex.Selection.Count == 1 or ex.Selection.Count == 0:
-                mngr = manager.GetManager()
-                mngr.ShowManager("IDD_OPEN_DOCUEMNT_DIALOG")
-            elif ex.Selection.Count > 1:
-                win32ui.MessageBox("Multiple selection not allowed. Please select only one mail at a time.","Open Document",win32con.MB_ICONINFORMATION)
-        return cancel
-#
-class ArchiveEvent:
-    def OnClick(self, button, cancel):
-        from win32com.client import Dispatch
-        import win32con
-        mngr = manager.GetManager()
-        data=mngr.LoadConfig()
-        outlook = Dispatch("Outlook.Application")
-        ex = outlook.ActiveExplorer()
-        if ex:
-            is_login = str(data['login'])
-            if is_login == 'False':
-                win32ui.MessageBox("Please login to the database first", "OpenERP Connection", win32con.MB_ICONEXCLAMATION)
-            elif ex.Selection.Count == 1:
-                mngr = manager.GetManager()
-                mngr.ShowManager("IDD_SYNC")
-            elif ex.Selection.Count == 0:
-                win32ui.MessageBox("No mail selected to push to OpenERP","Push to OpenERP",win32con.MB_ICONINFORMATION)
-            elif ex.Selection.Count > 1:
-                win32ui.MessageBox("Multiple selection not allowed. Please select only one mail at a time.","Push to OpenERP",win32con.MB_ICONINFORMATION)
-        return cancel
-#
-class OutlookAddin:
-    _com_interfaces_ = ['_IDTExtensibility2']
-    _public_methods_ = ['OnConnection','GetAppDataPath']
-    _reg_clsctx_ = pythoncom.CLSCTX_INPROC_SERVER
-    _reg_clsid_ = "{0F47D9F3-598B-4d24-B7E3-92AC15ED27E8}"
-    _reg_progid_ = "Python.OpenERP.OutlookAddin"
-    _reg_policy_spec_ = "win32com.server.policy.EventHandlerPolicy"
-    def OnConnection(self, application, connectMode, addin, custom):
-        # ActiveExplorer may be none when started without a UI (eg, WinCE synchronisation)
-        activeExplorer = application.ActiveExplorer()
-        if activeExplorer is not None:
-            bars = activeExplorer.CommandBars
-            new_bar = bars.Add('Open ERP',0,0,0)
-
-            menu_bar = bars.Item("Menu Bar")
-
-            tools_menu = menu_bar.Controls(5)
-            tools_menu = CastTo(tools_menu, "CommandBarPopup")
-
-            item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-            # Hook events for the item
-            item = self.menu_bar_Button = DispatchWithEvents(item, Configuration)
-            item.Caption="Configuration"
-            item.TooltipText = "Click to configure OpenERP"
-            item.Enabled = True
-
-            item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-            # Hook events for the item
-            item = self.menu_bar_arch_Button = DispatchWithEvents(item, ArchiveEvent)
-            item.Caption="Push"
-            item.TooltipText = "Click to push to OpenERP"
-            item.Enabled = True
-
-            toolbar = bars.Item("Standard")
-            openerp_bar = bars.Item('Open ERP')
-
-            item = openerp_bar.Controls.Add(Type = constants.msoControlButton, Temporary = True)
-            item = self.toolbarButtonConfig = DispatchWithEvents(item, Configuration)
-            item.Caption = "Configuration"
-            item.TooltipText = "Click to configure OpenERP."
-            item.Enabled = True
-
-            item = openerp_bar.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-            # Hook events for the item
-            item = self.toolbarButton = DispatchWithEvents(item, ArchiveEvent)
-            item.Caption="Push"
-            item.TooltipText = "Click to push to OpenERP"
-            item.Enabled = True
-
-            # Adding Menu in Menu Bar to the Web Menu of the Outlook
-            toolbarweb = bars.Item("Web")
-
-            item = openerp_bar.Controls.Add(Type = constants.msoControlButton, Temporary = True)
-            item = self.toolbarButtonOpenPartner = DispatchWithEvents(item, OpenPartner)
-            item.Caption = "Partner"
-            item.TooltipText = "Click to Open OpenERP Partner Contact Information."
-            item.Enabled = True
-
-
-            item = openerp_bar.Controls.Add(Type = constants.msoControlButton, Temporary = True)
-            item = self.toolbarButtonOpenDocument = DispatchWithEvents(item, OpenDocument)
-            item.Caption = "Document"
-            item.TooltipText = "Click to Open Document that has been pushed to server."
-            item.Enabled = True
-
-            # Hook events for the item
-#            item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
-#            item = self.toolbarButtonPartner = DispatchWithEvents(item, ViewPartners)
-#            item.Caption = "Open Contact"
-#            item.TooltipText = "Click to Open OpenERP Partner Contact Information."
-#            item.Enabled = True
-
-
-#            item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-#            # Hook events for the item
-#            item = self.menu_bar_viewpartner_Button = DispatchWithEvents(item, ViewPartners)
-#            item.Caption = "Open Contact"
-#            item.TooltipText = "Click to Open Partner detail"
-#            item.Enabled = True
-
-            item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-            # Hook events for the item
-            item = self.menu_bar_openpartner_Button = DispatchWithEvents(item, OpenPartner)
-            item.Caption = "Partner"
-            item.TooltipText = "Click to Open Partner detail"
-            item.Enabled = True
-
-            item = tools_menu.Controls.Add(Type=constants.msoControlButton, Temporary=True)
-            # Hook events for the item
-            item = self.menu_bar_opendocument_Button = DispatchWithEvents(item, OpenDocument)
-            item.Caption = "Document"
-            item.TooltipText = "Click to Open Document that has been pushed to server."
-            item.Enabled = True
-
-    def OnDisconnection(self, mode, custom):
-        mngr = manager.GetManager()
-        mngr.config['login'] = False
-        mngr.SaveConfig()
-        self.item.close()
-        pass
-    def OnAddInsUpdate(self, custom):
-        pass
-    def OnStartupComplete(self, custom):
-        pass
-    def OnBeginShutdown(self, custom):
-        pass
-    def GetAppDataPath(self):
-        mngr = manager.GetManager()
-        return mngr.data_directory
-
-def RegisterAddin(klass):
-    import _winreg
-    key = _winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins")
-    subkey = _winreg.CreateKey(key, klass._reg_progid_)
-    _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0)
-    _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3)
-    _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, klass._reg_progid_)
-    _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, klass._reg_progid_)
-
-def UnregisterAddin(klass):
-    import _winreg
-    try:
-        _winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\" + klass._reg_progid_)
-    except:
-        pass
-
-def UnregisterXMLConn(klass):
-    import _winreg
-    try:
-        _winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\XMLConnection" + klass._reg_progid_)
-    except:
-        pass
-
-def RegisterXMLConn(klass):
-    import _winreg
-    key = _winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\XMLConnection")
-    subkey = _winreg.CreateKey(key, klass._reg_progid_)
-    _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0)
-    _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3)
-    _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, klass._reg_progid_)
-    _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, klass._reg_progid_)
-
-if __name__ == '__main__':
-    import win32com.server.register
-    NewConn=XMLRpcConn()
-    win32com.server.register.UseCommandLine(OutlookAddin)
-    win32com.server.register.UseCommandLine(NewConn)
-    if "--unregister" in sys.argv:
-        UnregisterAddin(OutlookAddin)
-        UnregisterXMLConn(NewConn)
-        print "\n \tPlug In Un-registered Successfully.\n\tThank You for Using PlugIn."
-    else:
-        RegisterAddin(OutlookAddin)
-        RegisterXMLConn(NewConn)
-        print "\n \tPlug In Registered Successfully.\n\tEnjoy Archiving with OpenERP.\n\tSee UserGuide for More. "
-
-#mngr = manager.GetManager()
-#mngr.ShowManager("IDD_MANAGER")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py b/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
deleted file mode 100644
index 3aa329807ef..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
+++ /dev/null
@@ -1,5609 +0,0 @@
-# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.38
-#
-# Do not make changes to this file unless you know what you are doing--modify
-# the SWIG interface file instead.
-# This file is compatible with both classic and new-style classes.
-
-from sys import version_info
-if version_info >= (2,6,0):
-    def swig_import_helper():
-        from os.path import dirname
-        import imp
-        try:
-            fp, pathname, description = imp.find_module('_chilkat', [dirname(__file__)])
-            _mod = imp.load_module('_chilkat', fp, pathname, description)
-        finally:
-            if fp is not None: fp.close()
-        return _mod
-    _chilkat = swig_import_helper()
-    del swig_import_helper
-else:
-    import _chilkat
-del version_info
-try:
-    _swig_property = property
-except NameError:
-    pass # Python < 2.2 doesn't have 'property'.
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'SwigPyObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static) or hasattr(self,name):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError(name)
-
-def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
-try:
-    _object = object
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
-
-
-
-def GetSwigProgLang():
-  return _chilkat.GetSwigProgLang()
-GetSwigProgLang = _chilkat.GetSwigProgLang
-class SYSTEMTIME(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SYSTEMTIME, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, SYSTEMTIME, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["wYear"] = _chilkat.SYSTEMTIME_wYear_set
-    __swig_getmethods__["wYear"] = _chilkat.SYSTEMTIME_wYear_get
-    if _newclass:wYear = _swig_property(_chilkat.SYSTEMTIME_wYear_get, _chilkat.SYSTEMTIME_wYear_set)
-    __swig_setmethods__["wMonth"] = _chilkat.SYSTEMTIME_wMonth_set
-    __swig_getmethods__["wMonth"] = _chilkat.SYSTEMTIME_wMonth_get
-    if _newclass:wMonth = _swig_property(_chilkat.SYSTEMTIME_wMonth_get, _chilkat.SYSTEMTIME_wMonth_set)
-    __swig_setmethods__["wDayOfWeek"] = _chilkat.SYSTEMTIME_wDayOfWeek_set
-    __swig_getmethods__["wDayOfWeek"] = _chilkat.SYSTEMTIME_wDayOfWeek_get
-    if _newclass:wDayOfWeek = _swig_property(_chilkat.SYSTEMTIME_wDayOfWeek_get, _chilkat.SYSTEMTIME_wDayOfWeek_set)
-    __swig_setmethods__["wDay"] = _chilkat.SYSTEMTIME_wDay_set
-    __swig_getmethods__["wDay"] = _chilkat.SYSTEMTIME_wDay_get
-    if _newclass:wDay = _swig_property(_chilkat.SYSTEMTIME_wDay_get, _chilkat.SYSTEMTIME_wDay_set)
-    __swig_setmethods__["wHour"] = _chilkat.SYSTEMTIME_wHour_set
-    __swig_getmethods__["wHour"] = _chilkat.SYSTEMTIME_wHour_get
-    if _newclass:wHour = _swig_property(_chilkat.SYSTEMTIME_wHour_get, _chilkat.SYSTEMTIME_wHour_set)
-    __swig_setmethods__["wMinute"] = _chilkat.SYSTEMTIME_wMinute_set
-    __swig_getmethods__["wMinute"] = _chilkat.SYSTEMTIME_wMinute_get
-    if _newclass:wMinute = _swig_property(_chilkat.SYSTEMTIME_wMinute_get, _chilkat.SYSTEMTIME_wMinute_set)
-    __swig_setmethods__["wSecond"] = _chilkat.SYSTEMTIME_wSecond_set
-    __swig_getmethods__["wSecond"] = _chilkat.SYSTEMTIME_wSecond_get
-    if _newclass:wSecond = _swig_property(_chilkat.SYSTEMTIME_wSecond_get, _chilkat.SYSTEMTIME_wSecond_set)
-    __swig_setmethods__["wMilliseconds"] = _chilkat.SYSTEMTIME_wMilliseconds_set
-    __swig_getmethods__["wMilliseconds"] = _chilkat.SYSTEMTIME_wMilliseconds_get
-    if _newclass:wMilliseconds = _swig_property(_chilkat.SYSTEMTIME_wMilliseconds_get, _chilkat.SYSTEMTIME_wMilliseconds_set)
-    def __init__(self): 
-        this = _chilkat.new_SYSTEMTIME()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_SYSTEMTIME
-    __del__ = lambda self : None;
-SYSTEMTIME_swigregister = _chilkat.SYSTEMTIME_swigregister
-SYSTEMTIME_swigregister(SYSTEMTIME)
-
-class CkString(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkString, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkString, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkString()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkString
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkString_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkString_put_Utf8(self, *args)
-    def loadFile(self, *args): return _chilkat.CkString_loadFile(self, *args)
-    def charAt(self, *args): return _chilkat.CkString_charAt(self, *args)
-    def intValue(self): return _chilkat.CkString_intValue(self)
-    def doubleValue(self): return _chilkat.CkString_doubleValue(self)
-    def clone(self): return _chilkat.CkString_clone(self)
-    def countCharOccurances(self, *args): return _chilkat.CkString_countCharOccurances(self, *args)
-    def appendCurrentDateRfc822(self): return _chilkat.CkString_appendCurrentDateRfc822(self)
-    def setStr(self, *args): return _chilkat.CkString_setStr(self, *args)
-    def endsWith(self, *args): return _chilkat.CkString_endsWith(self, *args)
-    def endsWithStr(self, *args): return _chilkat.CkString_endsWithStr(self, *args)
-    def beginsWithStr(self, *args): return _chilkat.CkString_beginsWithStr(self, *args)
-    def indexOf(self, *args): return _chilkat.CkString_indexOf(self, *args)
-    def indexOfStr(self, *args): return _chilkat.CkString_indexOfStr(self, *args)
-    def replaceAll(self, *args): return _chilkat.CkString_replaceAll(self, *args)
-    def replaceFirst(self, *args): return _chilkat.CkString_replaceFirst(self, *args)
-    def substring(self, *args): return _chilkat.CkString_substring(self, *args)
-    def matchesStr(self, *args): return _chilkat.CkString_matchesStr(self, *args)
-    def matches(self, *args): return _chilkat.CkString_matches(self, *args)
-    def getChar(self, *args): return _chilkat.CkString_getChar(self, *args)
-    def removeAll(self, *args): return _chilkat.CkString_removeAll(self, *args)
-    def removeFirst(self, *args): return _chilkat.CkString_removeFirst(self, *args)
-    def chopAtStr(self, *args): return _chilkat.CkString_chopAtStr(self, *args)
-    def urlDecode(self, *args): return _chilkat.CkString_urlDecode(self, *args)
-    def urlEncode(self, *args): return _chilkat.CkString_urlEncode(self, *args)
-    def base64Decode(self, *args): return _chilkat.CkString_base64Decode(self, *args)
-    def base64Encode(self, *args): return _chilkat.CkString_base64Encode(self, *args)
-    def qpDecode(self, *args): return _chilkat.CkString_qpDecode(self, *args)
-    def qpEncode(self, *args): return _chilkat.CkString_qpEncode(self, *args)
-    def hexDecode(self, *args): return _chilkat.CkString_hexDecode(self, *args)
-    def hexEncode(self, *args): return _chilkat.CkString_hexEncode(self, *args)
-    def entityDecode(self): return _chilkat.CkString_entityDecode(self)
-    def entityEncode(self): return _chilkat.CkString_entityEncode(self)
-    def appendUtf8(self, *args): return _chilkat.CkString_appendUtf8(self, *args)
-    def appendAnsi(self, *args): return _chilkat.CkString_appendAnsi(self, *args)
-    def clear(self): return _chilkat.CkString_clear(self)
-    def prepend(self, *args): return _chilkat.CkString_prepend(self, *args)
-    def appendInt(self, *args): return _chilkat.CkString_appendInt(self, *args)
-    def append(self, *args): return _chilkat.CkString_append(self, *args)
-    def appendChar(self, *args): return _chilkat.CkString_appendChar(self, *args)
-    def appendN(self, *args): return _chilkat.CkString_appendN(self, *args)
-    def appendStr(self, *args): return _chilkat.CkString_appendStr(self, *args)
-    def appendEnc(self, *args): return _chilkat.CkString_appendEnc(self, *args)
-    def getEnc(self, *args): return _chilkat.CkString_getEnc(self, *args)
-    def setString(self, *args): return _chilkat.CkString_setString(self, *args)
-    def setStringAnsi(self, *args): return _chilkat.CkString_setStringAnsi(self, *args)
-    def setStringUtf8(self, *args): return _chilkat.CkString_setStringUtf8(self, *args)
-    def getAnsi(self): return _chilkat.CkString_getAnsi(self)
-    def getUtf8(self): return _chilkat.CkString_getUtf8(self)
-    def compareStr(self, *args): return _chilkat.CkString_compareStr(self, *args)
-    def getString(self): return _chilkat.CkString_getString(self)
-    def getSizeUtf8(self): return _chilkat.CkString_getSizeUtf8(self)
-    def getSizeAnsi(self): return _chilkat.CkString_getSizeAnsi(self)
-    def getNumChars(self): return _chilkat.CkString_getNumChars(self)
-    def trim(self): return _chilkat.CkString_trim(self)
-    def trim2(self): return _chilkat.CkString_trim2(self)
-    def trimInsideSpaces(self): return _chilkat.CkString_trimInsideSpaces(self)
-    def replaceAllOccurances(self, *args): return _chilkat.CkString_replaceAllOccurances(self, *args)
-    def replaceFirstOccurance(self, *args): return _chilkat.CkString_replaceFirstOccurance(self, *args)
-    def toCRLF(self): return _chilkat.CkString_toCRLF(self)
-    def toLF(self): return _chilkat.CkString_toLF(self)
-    def eliminateChar(self, *args): return _chilkat.CkString_eliminateChar(self, *args)
-    def lastChar(self): return _chilkat.CkString_lastChar(self)
-    def shorten(self, *args): return _chilkat.CkString_shorten(self, *args)
-    def toLowerCase(self): return _chilkat.CkString_toLowerCase(self)
-    def toUpperCase(self): return _chilkat.CkString_toUpperCase(self)
-    def encodeXMLSpecial(self): return _chilkat.CkString_encodeXMLSpecial(self)
-    def decodeXMLSpecial(self): return _chilkat.CkString_decodeXMLSpecial(self)
-    def containsSubstring(self, *args): return _chilkat.CkString_containsSubstring(self, *args)
-    def containsSubstringNoCase(self, *args): return _chilkat.CkString_containsSubstringNoCase(self, *args)
-    def equals(self, *args): return _chilkat.CkString_equals(self, *args)
-    def equalsStr(self, *args): return _chilkat.CkString_equalsStr(self, *args)
-    def equalsIgnoreCase(self, *args): return _chilkat.CkString_equalsIgnoreCase(self, *args)
-    def equalsIgnoreCaseStr(self, *args): return _chilkat.CkString_equalsIgnoreCaseStr(self, *args)
-    def removeChunk(self, *args): return _chilkat.CkString_removeChunk(self, *args)
-    def removeCharOccurances(self, *args): return _chilkat.CkString_removeCharOccurances(self, *args)
-    def replaceChar(self, *args): return _chilkat.CkString_replaceChar(self, *args)
-    def chopAtFirstChar(self, *args): return _chilkat.CkString_chopAtFirstChar(self, *args)
-    def saveToFile(self, *args): return _chilkat.CkString_saveToFile(self, *args)
-    def split(self, *args): return _chilkat.CkString_split(self, *args)
-    def split2(self, *args): return _chilkat.CkString_split2(self, *args)
-    def tokenize(self, *args): return _chilkat.CkString_tokenize(self, *args)
-    def splitAtWS(self): return _chilkat.CkString_splitAtWS(self)
-    def beginsWith(self, *args): return _chilkat.CkString_beginsWith(self, *args)
-    def appendHexData(self, *args): return _chilkat.CkString_appendHexData(self, *args)
-CkString_swigregister = _chilkat.CkString_swigregister
-CkString_swigregister(CkString)
-
-class CkHtmlToXml(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkHtmlToXml, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkHtmlToXml, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkHtmlToXml()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkHtmlToXml
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkHtmlToXml_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkHtmlToXml_put_Utf8(self, *args)
-    def SetHtmlBytes(self, *args): return _chilkat.CkHtmlToXml_SetHtmlBytes(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkHtmlToXml_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkHtmlToXml_IsUnlocked(self)
-    def SaveLastError(self, *args): return _chilkat.CkHtmlToXml_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkHtmlToXml_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkHtmlToXml_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkHtmlToXml_LastErrorText(self, *args)
-    def get_Version(self, *args): return _chilkat.CkHtmlToXml_get_Version(self, *args)
-    def put_Nbsp(self, *args): return _chilkat.CkHtmlToXml_put_Nbsp(self, *args)
-    def get_Nbsp(self): return _chilkat.CkHtmlToXml_get_Nbsp(self)
-    def put_Html(self, *args): return _chilkat.CkHtmlToXml_put_Html(self, *args)
-    def get_Html(self, *args): return _chilkat.CkHtmlToXml_get_Html(self, *args)
-    def put_XmlCharset(self, *args): return _chilkat.CkHtmlToXml_put_XmlCharset(self, *args)
-    def get_XmlCharset(self, *args): return _chilkat.CkHtmlToXml_get_XmlCharset(self, *args)
-    def SetHtmlFromFile(self, *args): return _chilkat.CkHtmlToXml_SetHtmlFromFile(self, *args)
-    def ToXml(self, *args): return _chilkat.CkHtmlToXml_ToXml(self, *args)
-    def ReadFileToString(self, *args): return _chilkat.CkHtmlToXml_ReadFileToString(self, *args)
-    def WriteStringToFile(self, *args): return _chilkat.CkHtmlToXml_WriteStringToFile(self, *args)
-    def ConvertFile(self, *args): return _chilkat.CkHtmlToXml_ConvertFile(self, *args)
-    def DropTagType(self, *args): return _chilkat.CkHtmlToXml_DropTagType(self, *args)
-    def UndropTagType(self, *args): return _chilkat.CkHtmlToXml_UndropTagType(self, *args)
-    def DropTextFormattingTags(self): return _chilkat.CkHtmlToXml_DropTextFormattingTags(self)
-    def UndropTextFormattingTags(self): return _chilkat.CkHtmlToXml_UndropTextFormattingTags(self)
-    def put_DropCustomTags(self, *args): return _chilkat.CkHtmlToXml_put_DropCustomTags(self, *args)
-    def get_DropCustomTags(self): return _chilkat.CkHtmlToXml_get_DropCustomTags(self)
-    def lastErrorText(self): return _chilkat.CkHtmlToXml_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkHtmlToXml_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkHtmlToXml_lastErrorHtml(self)
-    def html(self): return _chilkat.CkHtmlToXml_html(self)
-    def xmlCharset(self): return _chilkat.CkHtmlToXml_xmlCharset(self)
-    def xml(self): return _chilkat.CkHtmlToXml_xml(self)
-    def version(self): return _chilkat.CkHtmlToXml_version(self)
-    def toXml(self): return _chilkat.CkHtmlToXml_toXml(self)
-    def readFileToString(self, *args): return _chilkat.CkHtmlToXml_readFileToString(self, *args)
-CkHtmlToXml_swigregister = _chilkat.CkHtmlToXml_swigregister
-CkHtmlToXml_swigregister(CkHtmlToXml)
-
-class CkUpload(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkUpload, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkUpload, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkUpload()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkUpload
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkUpload_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkUpload_put_Utf8(self, *args)
-    def get_Ssl(self): return _chilkat.CkUpload_get_Ssl(self)
-    def put_Ssl(self, *args): return _chilkat.CkUpload_put_Ssl(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkUpload_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkUpload_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkUpload_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkUpload_LastErrorText(self, *args)
-    def get_Version(self, *args): return _chilkat.CkUpload_get_Version(self, *args)
-    def SleepMs(self, *args): return _chilkat.CkUpload_SleepMs(self, *args)
-    def get_ChunkSize(self): return _chilkat.CkUpload_get_ChunkSize(self)
-    def put_ChunkSize(self, *args): return _chilkat.CkUpload_put_ChunkSize(self, *args)
-    def get_IdleTimeoutMs(self): return _chilkat.CkUpload_get_IdleTimeoutMs(self)
-    def put_IdleTimeoutMs(self, *args): return _chilkat.CkUpload_put_IdleTimeoutMs(self, *args)
-    def get_UploadInProgress(self): return _chilkat.CkUpload_get_UploadInProgress(self)
-    def get_UploadSuccess(self): return _chilkat.CkUpload_get_UploadSuccess(self)
-    def get_Login(self, *args): return _chilkat.CkUpload_get_Login(self, *args)
-    def put_Login(self, *args): return _chilkat.CkUpload_put_Login(self, *args)
-    def get_Password(self, *args): return _chilkat.CkUpload_get_Password(self, *args)
-    def put_Password(self, *args): return _chilkat.CkUpload_put_Password(self, *args)
-    def login(self): return _chilkat.CkUpload_login(self)
-    def password(self): return _chilkat.CkUpload_password(self)
-    def get_ProxyPort(self): return _chilkat.CkUpload_get_ProxyPort(self)
-    def put_ProxyPort(self, *args): return _chilkat.CkUpload_put_ProxyPort(self, *args)
-    def put_ProxyDomain(self, *args): return _chilkat.CkUpload_put_ProxyDomain(self, *args)
-    def get_ProxyDomain(self, *args): return _chilkat.CkUpload_get_ProxyDomain(self, *args)
-    def get_ProxyLogin(self, *args): return _chilkat.CkUpload_get_ProxyLogin(self, *args)
-    def put_ProxyLogin(self, *args): return _chilkat.CkUpload_put_ProxyLogin(self, *args)
-    def get_ProxyPassword(self, *args): return _chilkat.CkUpload_get_ProxyPassword(self, *args)
-    def put_ProxyPassword(self, *args): return _chilkat.CkUpload_put_ProxyPassword(self, *args)
-    def proxyLogin(self): return _chilkat.CkUpload_proxyLogin(self)
-    def proxyPassword(self): return _chilkat.CkUpload_proxyPassword(self)
-    def proxyDomain(self): return _chilkat.CkUpload_proxyDomain(self)
-    def AddCustomHeader(self, *args): return _chilkat.CkUpload_AddCustomHeader(self, *args)
-    def AddParam(self, *args): return _chilkat.CkUpload_AddParam(self, *args)
-    def AddFileReference(self, *args): return _chilkat.CkUpload_AddFileReference(self, *args)
-    def get_Port(self): return _chilkat.CkUpload_get_Port(self)
-    def put_Port(self, *args): return _chilkat.CkUpload_put_Port(self, *args)
-    def get_Hostname(self, *args): return _chilkat.CkUpload_get_Hostname(self, *args)
-    def put_Hostname(self, *args): return _chilkat.CkUpload_put_Hostname(self, *args)
-    def get_Path(self, *args): return _chilkat.CkUpload_get_Path(self, *args)
-    def put_Path(self, *args): return _chilkat.CkUpload_put_Path(self, *args)
-    def get_TotalUploadSize(self): return _chilkat.CkUpload_get_TotalUploadSize(self)
-    def get_NumBytesSent(self): return _chilkat.CkUpload_get_NumBytesSent(self)
-    def get_PercentUploaded(self): return _chilkat.CkUpload_get_PercentUploaded(self)
-    def get_ResponseStatus(self): return _chilkat.CkUpload_get_ResponseStatus(self)
-    def get_ResponseHeader(self, *args): return _chilkat.CkUpload_get_ResponseHeader(self, *args)
-    def get_ResponseBody(self, *args): return _chilkat.CkUpload_get_ResponseBody(self, *args)
-    def BlockingUpload(self): return _chilkat.CkUpload_BlockingUpload(self)
-    def BeginUpload(self): return _chilkat.CkUpload_BeginUpload(self)
-    def AbortUpload(self): return _chilkat.CkUpload_AbortUpload(self)
-    def UploadToMemory(self, *args): return _chilkat.CkUpload_UploadToMemory(self, *args)
-    def lastErrorText(self): return _chilkat.CkUpload_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkUpload_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkUpload_lastErrorHtml(self)
-    def hostname(self): return _chilkat.CkUpload_hostname(self)
-    def path(self): return _chilkat.CkUpload_path(self)
-    def responseHeader(self): return _chilkat.CkUpload_responseHeader(self)
-    def version(self): return _chilkat.CkUpload_version(self)
-CkUpload_swigregister = _chilkat.CkUpload_swigregister
-CkUpload_swigregister(CkUpload)
-
-class CkKeyContainer(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkKeyContainer, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkKeyContainer, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkKeyContainer()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkKeyContainer
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkKeyContainer_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkKeyContainer_put_Utf8(self, *args)
-    def get_IsOpen(self): return _chilkat.CkKeyContainer_get_IsOpen(self)
-    def get_IsMachineKeyset(self): return _chilkat.CkKeyContainer_get_IsMachineKeyset(self)
-    def get_ContainerName(self, *args): return _chilkat.CkKeyContainer_get_ContainerName(self, *args)
-    def GenerateUuid(self, *args): return _chilkat.CkKeyContainer_GenerateUuid(self, *args)
-    def CreateContainer(self, *args): return _chilkat.CkKeyContainer_CreateContainer(self, *args)
-    def OpenContainer(self, *args): return _chilkat.CkKeyContainer_OpenContainer(self, *args)
-    def DeleteContainer(self): return _chilkat.CkKeyContainer_DeleteContainer(self)
-    def CloseContainer(self): return _chilkat.CkKeyContainer_CloseContainer(self)
-    def GenerateKeyPair(self, *args): return _chilkat.CkKeyContainer_GenerateKeyPair(self, *args)
-    def GetPrivateKey(self, *args): return _chilkat.CkKeyContainer_GetPrivateKey(self, *args)
-    def GetPublicKey(self, *args): return _chilkat.CkKeyContainer_GetPublicKey(self, *args)
-    def ImportPublicKey(self, *args): return _chilkat.CkKeyContainer_ImportPublicKey(self, *args)
-    def ImportPrivateKey(self, *args): return _chilkat.CkKeyContainer_ImportPrivateKey(self, *args)
-    def FetchContainerNames(self, *args): return _chilkat.CkKeyContainer_FetchContainerNames(self, *args)
-    def GetNumContainers(self, *args): return _chilkat.CkKeyContainer_GetNumContainers(self, *args)
-    def GetContainerName(self, *args): return _chilkat.CkKeyContainer_GetContainerName(self, *args)
-    def getContainerName(self, *args): return _chilkat.CkKeyContainer_getContainerName(self, *args)
-    def containerName(self): return _chilkat.CkKeyContainer_containerName(self)
-    def generateUuid(self): return _chilkat.CkKeyContainer_generateUuid(self)
-    def SaveLastError(self, *args): return _chilkat.CkKeyContainer_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkKeyContainer_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkKeyContainer_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkKeyContainer_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkKeyContainer_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkKeyContainer_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkKeyContainer_lastErrorHtml(self)
-CkKeyContainer_swigregister = _chilkat.CkKeyContainer_swigregister
-CkKeyContainer_swigregister(CkKeyContainer)
-
-class CkPublicKey(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkPublicKey, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkPublicKey, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkPublicKey()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkPublicKey
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkPublicKey_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkPublicKey_put_Utf8(self, *args)
-    def LoadPkcs1Pem(self, *args): return _chilkat.CkPublicKey_LoadPkcs1Pem(self, *args)
-    def LoadRsaDerFile(self, *args): return _chilkat.CkPublicKey_LoadRsaDerFile(self, *args)
-    def LoadOpenSslDerFile(self, *args): return _chilkat.CkPublicKey_LoadOpenSslDerFile(self, *args)
-    def LoadOpenSslPemFile(self, *args): return _chilkat.CkPublicKey_LoadOpenSslPemFile(self, *args)
-    def LoadXmlFile(self, *args): return _chilkat.CkPublicKey_LoadXmlFile(self, *args)
-    def LoadOpenSslPem(self, *args): return _chilkat.CkPublicKey_LoadOpenSslPem(self, *args)
-    def LoadOpenSslDer(self, *args): return _chilkat.CkPublicKey_LoadOpenSslDer(self, *args)
-    def LoadRsaDer(self, *args): return _chilkat.CkPublicKey_LoadRsaDer(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkPublicKey_LoadXml(self, *args)
-    def SaveRsaDerFile(self, *args): return _chilkat.CkPublicKey_SaveRsaDerFile(self, *args)
-    def SaveOpenSslDerFile(self, *args): return _chilkat.CkPublicKey_SaveOpenSslDerFile(self, *args)
-    def SaveOpenSslPemFile(self, *args): return _chilkat.CkPublicKey_SaveOpenSslPemFile(self, *args)
-    def SaveXmlFile(self, *args): return _chilkat.CkPublicKey_SaveXmlFile(self, *args)
-    def GetRsaDer(self, *args): return _chilkat.CkPublicKey_GetRsaDer(self, *args)
-    def GetOpenSslDer(self, *args): return _chilkat.CkPublicKey_GetOpenSslDer(self, *args)
-    def GetOpenSslPem(self, *args): return _chilkat.CkPublicKey_GetOpenSslPem(self, *args)
-    def GetXml(self, *args): return _chilkat.CkPublicKey_GetXml(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkPublicKey_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkPublicKey_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkPublicKey_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkPublicKey_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkPublicKey_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkPublicKey_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkPublicKey_lastErrorHtml(self)
-    def getOpenSslPem(self): return _chilkat.CkPublicKey_getOpenSslPem(self)
-    def getXml(self): return _chilkat.CkPublicKey_getXml(self)
-CkPublicKey_swigregister = _chilkat.CkPublicKey_swigregister
-CkPublicKey_swigregister(CkPublicKey)
-
-class CkPrivateKey(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkPrivateKey, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkPrivateKey, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkPrivateKey()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkPrivateKey
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkPrivateKey_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkPrivateKey_put_Utf8(self, *args)
-    def LoadEncryptedPem(self, *args): return _chilkat.CkPrivateKey_LoadEncryptedPem(self, *args)
-    def LoadEncryptedPemFile(self, *args): return _chilkat.CkPrivateKey_LoadEncryptedPemFile(self, *args)
-    def LoadPkcs8Encrypted(self, *args): return _chilkat.CkPrivateKey_LoadPkcs8Encrypted(self, *args)
-    def LoadPkcs8EncryptedFile(self, *args): return _chilkat.CkPrivateKey_LoadPkcs8EncryptedFile(self, *args)
-    def GetPkcs8Encrypted(self, *args): return _chilkat.CkPrivateKey_GetPkcs8Encrypted(self, *args)
-    def GetPkcs8EncryptedPem(self, *args): return _chilkat.CkPrivateKey_GetPkcs8EncryptedPem(self, *args)
-    def getPkcs8EncryptedPem(self, *args): return _chilkat.CkPrivateKey_getPkcs8EncryptedPem(self, *args)
-    def SavePkcs8EncryptedFile(self, *args): return _chilkat.CkPrivateKey_SavePkcs8EncryptedFile(self, *args)
-    def SavePkcs8EncryptedPemFile(self, *args): return _chilkat.CkPrivateKey_SavePkcs8EncryptedPemFile(self, *args)
-    def LoadPvkFile(self, *args): return _chilkat.CkPrivateKey_LoadPvkFile(self, *args)
-    def LoadPvk(self, *args): return _chilkat.CkPrivateKey_LoadPvk(self, *args)
-    def LoadRsaDerFile(self, *args): return _chilkat.CkPrivateKey_LoadRsaDerFile(self, *args)
-    def LoadPkcs8File(self, *args): return _chilkat.CkPrivateKey_LoadPkcs8File(self, *args)
-    def LoadPemFile(self, *args): return _chilkat.CkPrivateKey_LoadPemFile(self, *args)
-    def LoadXmlFile(self, *args): return _chilkat.CkPrivateKey_LoadXmlFile(self, *args)
-    def LoadPem(self, *args): return _chilkat.CkPrivateKey_LoadPem(self, *args)
-    def LoadRsaDer(self, *args): return _chilkat.CkPrivateKey_LoadRsaDer(self, *args)
-    def LoadPkcs8(self, *args): return _chilkat.CkPrivateKey_LoadPkcs8(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkPrivateKey_LoadXml(self, *args)
-    def SaveRsaDerFile(self, *args): return _chilkat.CkPrivateKey_SaveRsaDerFile(self, *args)
-    def SavePkcs8File(self, *args): return _chilkat.CkPrivateKey_SavePkcs8File(self, *args)
-    def SaveRsaPemFile(self, *args): return _chilkat.CkPrivateKey_SaveRsaPemFile(self, *args)
-    def SavePkcs8PemFile(self, *args): return _chilkat.CkPrivateKey_SavePkcs8PemFile(self, *args)
-    def SaveXmlFile(self, *args): return _chilkat.CkPrivateKey_SaveXmlFile(self, *args)
-    def GetRsaDer(self, *args): return _chilkat.CkPrivateKey_GetRsaDer(self, *args)
-    def GetPkcs8(self, *args): return _chilkat.CkPrivateKey_GetPkcs8(self, *args)
-    def GetRsaPem(self, *args): return _chilkat.CkPrivateKey_GetRsaPem(self, *args)
-    def GetPkcs8Pem(self, *args): return _chilkat.CkPrivateKey_GetPkcs8Pem(self, *args)
-    def GetXml(self, *args): return _chilkat.CkPrivateKey_GetXml(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkPrivateKey_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkPrivateKey_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkPrivateKey_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkPrivateKey_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkPrivateKey_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkPrivateKey_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkPrivateKey_lastErrorHtml(self)
-    def getRsaPem(self): return _chilkat.CkPrivateKey_getRsaPem(self)
-    def getPkcs8Pem(self): return _chilkat.CkPrivateKey_getPkcs8Pem(self)
-    def getXml(self): return _chilkat.CkPrivateKey_getXml(self)
-CkPrivateKey_swigregister = _chilkat.CkPrivateKey_swigregister
-CkPrivateKey_swigregister(CkPrivateKey)
-
-class CkByteData(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkByteData, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkByteData, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkByteData()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkByteData
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkByteData_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkByteData_put_Utf8(self, *args)
-    def getRange(self, *args): return _chilkat.CkByteData_getRange(self, *args)
-    def getRangeStr(self, *args): return _chilkat.CkByteData_getRangeStr(self, *args)
-    def to_s(self): return _chilkat.CkByteData_to_s(self)
-    def appendInt(self, *args): return _chilkat.CkByteData_appendInt(self, *args)
-    def appendShort(self, *args): return _chilkat.CkByteData_appendShort(self, *args)
-    def getEncodedRange(self, *args): return _chilkat.CkByteData_getEncodedRange(self, *args)
-    def appendRange(self, *args): return _chilkat.CkByteData_appendRange(self, *args)
-    def ensureBuffer(self, *args): return _chilkat.CkByteData_ensureBuffer(self, *args)
-    def findBytes2(self, *args): return _chilkat.CkByteData_findBytes2(self, *args)
-    def findBytes(self, *args): return _chilkat.CkByteData_findBytes(self, *args)
-    def beginsWith2(self, *args): return _chilkat.CkByteData_beginsWith2(self, *args)
-    def beginsWith(self, *args): return _chilkat.CkByteData_beginsWith(self, *args)
-    def removeChunk(self, *args): return _chilkat.CkByteData_removeChunk(self, *args)
-    def byteSwap4321(self): return _chilkat.CkByteData_byteSwap4321(self)
-    def pad(self, *args): return _chilkat.CkByteData_pad(self, *args)
-    def unpad(self, *args): return _chilkat.CkByteData_unpad(self, *args)
-    def is7bit(self): return _chilkat.CkByteData_is7bit(self)
-    def clear(self): return _chilkat.CkByteData_clear(self)
-    def getSize(self): return _chilkat.CkByteData_getSize(self)
-    def appendEncoded(self, *args): return _chilkat.CkByteData_appendEncoded(self, *args)
-    def encode(self, *args): return _chilkat.CkByteData_encode(self, *args)
-    def getData(self): return _chilkat.CkByteData_getData(self)
-    def getBytes(self): return _chilkat.CkByteData_getBytes(self)
-    def getEncoded(self, *args): return _chilkat.CkByteData_getEncoded(self, *args)
-    def append(self, *args): return _chilkat.CkByteData_append(self, *args)
-    def appendStr(self, *args): return _chilkat.CkByteData_appendStr(self, *args)
-    def appendChar(self, *args): return _chilkat.CkByteData_appendChar(self, *args)
-    def getByte(self, *args): return _chilkat.CkByteData_getByte(self, *args)
-    def getChar(self, *args): return _chilkat.CkByteData_getChar(self, *args)
-    def getUInt(self, *args): return _chilkat.CkByteData_getUInt(self, *args)
-    def getInt(self, *args): return _chilkat.CkByteData_getInt(self, *args)
-    def getUShort(self, *args): return _chilkat.CkByteData_getUShort(self, *args)
-    def getShort(self, *args): return _chilkat.CkByteData_getShort(self, *args)
-    def loadFile(self, *args): return _chilkat.CkByteData_loadFile(self, *args)
-    def saveFile(self, *args): return _chilkat.CkByteData_saveFile(self, *args)
-    def appendFile(self, *args): return _chilkat.CkByteData_appendFile(self, *args)
-    def shorten(self, *args): return _chilkat.CkByteData_shorten(self, *args)
-CkByteData_swigregister = _chilkat.CkByteData_swigregister
-CkByteData_swigregister(CkByteData)
-
-class CkSocket(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSocket, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSocket, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSocket()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSocket
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSocket_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSocket_put_Utf8(self, *args)
-    def DnsLookup(self, *args): return _chilkat.CkSocket_DnsLookup(self, *args)
-    def dnsLookup(self, *args): return _chilkat.CkSocket_dnsLookup(self, *args)
-    def GetMyCert(self): return _chilkat.CkSocket_GetMyCert(self)
-    def GetSslServerCert(self): return _chilkat.CkSocket_GetSslServerCert(self)
-    def ReceiveToCRLF(self, *args): return _chilkat.CkSocket_ReceiveToCRLF(self, *args)
-    def receiveToCRLF(self): return _chilkat.CkSocket_receiveToCRLF(self)
-    def get_SessionLog(self, *args): return _chilkat.CkSocket_get_SessionLog(self, *args)
-    def sessionLog(self): return _chilkat.CkSocket_sessionLog(self)
-    def get_KeepSessionLog(self): return _chilkat.CkSocket_get_KeepSessionLog(self)
-    def put_KeepSessionLog(self, *args): return _chilkat.CkSocket_put_KeepSessionLog(self, *args)
-    def get_SessionLogEncoding(self, *args): return _chilkat.CkSocket_get_SessionLogEncoding(self, *args)
-    def sessionLogEncoding(self): return _chilkat.CkSocket_sessionLogEncoding(self)
-    def put_SessionLogEncoding(self, *args): return _chilkat.CkSocket_put_SessionLogEncoding(self, *args)
-    def ReceiveUntilByte(self, *args): return _chilkat.CkSocket_ReceiveUntilByte(self, *args)
-    def ClearSessionLog(self): return _chilkat.CkSocket_ClearSessionLog(self)
-    def ReceiveStringUntilByte(self, *args): return _chilkat.CkSocket_ReceiveStringUntilByte(self, *args)
-    def receiveStringUntilByte(self, *args): return _chilkat.CkSocket_receiveStringUntilByte(self, *args)
-    def ReceiveStringMaxN(self, *args): return _chilkat.CkSocket_ReceiveStringMaxN(self, *args)
-    def receiveStringMaxN(self, *args): return _chilkat.CkSocket_receiveStringMaxN(self, *args)
-    def get_SslProtocol(self, *args): return _chilkat.CkSocket_get_SslProtocol(self, *args)
-    def sslProtocol(self): return _chilkat.CkSocket_sslProtocol(self)
-    def put_SslProtocol(self, *args): return _chilkat.CkSocket_put_SslProtocol(self, *args)
-    def SetSslClientCert(self, *args): return _chilkat.CkSocket_SetSslClientCert(self, *args)
-    def get_ClientIpAddress(self, *args): return _chilkat.CkSocket_get_ClientIpAddress(self, *args)
-    def clientIpAddress(self): return _chilkat.CkSocket_clientIpAddress(self)
-    def put_ClientIpAddress(self, *args): return _chilkat.CkSocket_put_ClientIpAddress(self, *args)
-    def SendCount(self, *args): return _chilkat.CkSocket_SendCount(self, *args)
-    def ReceiveCount(self): return _chilkat.CkSocket_ReceiveCount(self)
-    def get_LastMethodFailed(self): return _chilkat.CkSocket_get_LastMethodFailed(self)
-    def ConvertToSsl(self): return _chilkat.CkSocket_ConvertToSsl(self)
-    def ConvertFromSsl(self): return _chilkat.CkSocket_ConvertFromSsl(self)
-    def get_SoSndBuf(self): return _chilkat.CkSocket_get_SoSndBuf(self)
-    def put_SoSndBuf(self, *args): return _chilkat.CkSocket_put_SoSndBuf(self, *args)
-    def get_SoRcvBuf(self): return _chilkat.CkSocket_get_SoRcvBuf(self)
-    def put_SoRcvBuf(self, *args): return _chilkat.CkSocket_put_SoRcvBuf(self, *args)
-    def get_ClientPort(self): return _chilkat.CkSocket_get_ClientPort(self)
-    def put_ClientPort(self, *args): return _chilkat.CkSocket_put_ClientPort(self, *args)
-    def get_LocalIpAddress(self, *args): return _chilkat.CkSocket_get_LocalIpAddress(self, *args)
-    def localIpAddress(self): return _chilkat.CkSocket_localIpAddress(self)
-    def get_LocalPort(self): return _chilkat.CkSocket_get_LocalPort(self)
-    def get_SocksPort(self): return _chilkat.CkSocket_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkSocket_put_SocksPort(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkSocket_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkSocket_put_SocksVersion(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkSocket_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkSocket_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkSocket_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkSocket_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkSocket_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkSocket_put_SocksPassword(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkSocket_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkSocket_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkSocket_put_SocksHostname(self, *args)
-    def CheckWriteable(self, *args): return _chilkat.CkSocket_CheckWriteable(self, *args)
-    def SetSslClientCertPfx(self, *args): return _chilkat.CkSocket_SetSslClientCertPfx(self, *args)
-    def get_TcpNoDelay(self): return _chilkat.CkSocket_get_TcpNoDelay(self)
-    def put_TcpNoDelay(self, *args): return _chilkat.CkSocket_put_TcpNoDelay(self, *args)
-    def get_BigEndian(self): return _chilkat.CkSocket_get_BigEndian(self)
-    def put_BigEndian(self, *args): return _chilkat.CkSocket_put_BigEndian(self, *args)
-    def PollDataAvailable(self): return _chilkat.CkSocket_PollDataAvailable(self)
-    def get_VerboseLogging(self): return _chilkat.CkSocket_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkSocket_put_VerboseLogging(self, *args)
-    def TakeSocket(self, *args): return _chilkat.CkSocket_TakeSocket(self, *args)
-    def SelectForReading(self, *args): return _chilkat.CkSocket_SelectForReading(self, *args)
-    def SelectForWriting(self, *args): return _chilkat.CkSocket_SelectForWriting(self, *args)
-    def get_SelectorIndex(self): return _chilkat.CkSocket_get_SelectorIndex(self)
-    def put_SelectorIndex(self, *args): return _chilkat.CkSocket_put_SelectorIndex(self, *args)
-    def get_SelectorReadIndex(self): return _chilkat.CkSocket_get_SelectorReadIndex(self)
-    def put_SelectorReadIndex(self, *args): return _chilkat.CkSocket_put_SelectorReadIndex(self, *args)
-    def get_SelectorWriteIndex(self): return _chilkat.CkSocket_get_SelectorWriteIndex(self)
-    def put_SelectorWriteIndex(self, *args): return _chilkat.CkSocket_put_SelectorWriteIndex(self, *args)
-    def get_NumSocketsInSet(self): return _chilkat.CkSocket_get_NumSocketsInSet(self)
-    def get_UserData(self, *args): return _chilkat.CkSocket_get_UserData(self, *args)
-    def userData(self): return _chilkat.CkSocket_userData(self)
-    def put_UserData(self, *args): return _chilkat.CkSocket_put_UserData(self, *args)
-    def StartTiming(self): return _chilkat.CkSocket_StartTiming(self)
-    def get_ElapsedSeconds(self): return _chilkat.CkSocket_get_ElapsedSeconds(self)
-    def ReceiveBytesToFile(self, *args): return _chilkat.CkSocket_ReceiveBytesToFile(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkSocket_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkSocket_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkSocket_put_HttpProxyUsername(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkSocket_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkSocket_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkSocket_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkSocket_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkSocket_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkSocket_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkSocket_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkSocket_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkSocket_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkSocket_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkSocket_put_HttpProxyPort(self, *args)
-    def get_NumSslAcceptableClientCAs(self): return _chilkat.CkSocket_get_NumSslAcceptableClientCAs(self)
-    def GetSslAcceptableClientCaDn(self, *args): return _chilkat.CkSocket_GetSslAcceptableClientCaDn(self, *args)
-    def getSslAcceptableClientCaDn(self, *args): return _chilkat.CkSocket_getSslAcceptableClientCaDn(self, *args)
-    def AddSslAcceptableClientCaDn(self, *args): return _chilkat.CkSocket_AddSslAcceptableClientCaDn(self, *args)
-    def get_ReceivedCount(self): return _chilkat.CkSocket_get_ReceivedCount(self)
-    def put_ReceivedCount(self, *args): return _chilkat.CkSocket_put_ReceivedCount(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkSocket_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkSocket_IsUnlocked(self)
-    def AsyncSendBytes(self, *args): return _chilkat.CkSocket_AsyncSendBytes(self, *args)
-    def AsyncSendString(self, *args): return _chilkat.CkSocket_AsyncSendString(self, *args)
-    def get_AsyncSendFinished(self): return _chilkat.CkSocket_get_AsyncSendFinished(self)
-    def AsyncSendAbort(self): return _chilkat.CkSocket_AsyncSendAbort(self)
-    def get_AsyncSendLog(self, *args): return _chilkat.CkSocket_get_AsyncSendLog(self, *args)
-    def get_AsyncSendSuccess(self): return _chilkat.CkSocket_get_AsyncSendSuccess(self)
-    def AsyncReceiveBytes(self): return _chilkat.CkSocket_AsyncReceiveBytes(self)
-    def AsyncReceiveBytesN(self, *args): return _chilkat.CkSocket_AsyncReceiveBytesN(self, *args)
-    def AsyncReceiveString(self): return _chilkat.CkSocket_AsyncReceiveString(self)
-    def AsyncReceiveToCRLF(self): return _chilkat.CkSocket_AsyncReceiveToCRLF(self)
-    def AsyncReceiveUntilMatch(self, *args): return _chilkat.CkSocket_AsyncReceiveUntilMatch(self, *args)
-    def get_AsyncReceiveFinished(self): return _chilkat.CkSocket_get_AsyncReceiveFinished(self)
-    def AsyncReceiveAbort(self): return _chilkat.CkSocket_AsyncReceiveAbort(self)
-    def get_AsyncReceiveLog(self, *args): return _chilkat.CkSocket_get_AsyncReceiveLog(self, *args)
-    def get_AsyncReceiveSuccess(self): return _chilkat.CkSocket_get_AsyncReceiveSuccess(self)
-    def get_AsyncReceivedString(self, *args): return _chilkat.CkSocket_get_AsyncReceivedString(self, *args)
-    def get_AsyncReceivedBytes(self, *args): return _chilkat.CkSocket_get_AsyncReceivedBytes(self, *args)
-    def asyncReceivedString(self): return _chilkat.CkSocket_asyncReceivedString(self)
-    def asyncReceiveLog(self): return _chilkat.CkSocket_asyncReceiveLog(self)
-    def asyncSendLog(self): return _chilkat.CkSocket_asyncSendLog(self)
-    def SleepMs(self, *args): return _chilkat.CkSocket_SleepMs(self, *args)
-    def Close(self, *args): return _chilkat.CkSocket_Close(self, *args)
-    def get_ObjectId(self): return _chilkat.CkSocket_get_ObjectId(self)
-    def SaveLastError(self, *args): return _chilkat.CkSocket_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSocket_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSocket_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSocket_LastErrorText(self, *args)
-    def get_Version(self, *args): return _chilkat.CkSocket_get_Version(self, *args)
-    def AsyncDnsStart(self, *args): return _chilkat.CkSocket_AsyncDnsStart(self, *args)
-    def get_AsyncDnsFinished(self): return _chilkat.CkSocket_get_AsyncDnsFinished(self)
-    def get_AsyncDnsResult(self, *args): return _chilkat.CkSocket_get_AsyncDnsResult(self, *args)
-    def AsyncDnsAbort(self): return _chilkat.CkSocket_AsyncDnsAbort(self)
-    def get_AsyncDnsLog(self, *args): return _chilkat.CkSocket_get_AsyncDnsLog(self, *args)
-    def get_AsyncDnsSuccess(self): return _chilkat.CkSocket_get_AsyncDnsSuccess(self)
-    def AsyncConnectStart(self, *args): return _chilkat.CkSocket_AsyncConnectStart(self, *args)
-    def get_AsyncConnectFinished(self): return _chilkat.CkSocket_get_AsyncConnectFinished(self)
-    def AsyncConnectAbort(self): return _chilkat.CkSocket_AsyncConnectAbort(self)
-    def get_AsyncConnectLog(self, *args): return _chilkat.CkSocket_get_AsyncConnectLog(self, *args)
-    def get_AsyncConnectSuccess(self): return _chilkat.CkSocket_get_AsyncConnectSuccess(self)
-    def get_MyIpAddress(self, *args): return _chilkat.CkSocket_get_MyIpAddress(self, *args)
-    def BindAndListen(self, *args): return _chilkat.CkSocket_BindAndListen(self, *args)
-    def Connect(self, *args): return _chilkat.CkSocket_Connect(self, *args)
-    def AcceptNextConnection(self, *args): return _chilkat.CkSocket_AcceptNextConnection(self, *args)
-    def get_Ssl(self): return _chilkat.CkSocket_get_Ssl(self)
-    def put_Ssl(self, *args): return _chilkat.CkSocket_put_Ssl(self, *args)
-    def InitSslServer(self, *args): return _chilkat.CkSocket_InitSslServer(self, *args)
-    def get_ConnectFailReason(self): return _chilkat.CkSocket_get_ConnectFailReason(self)
-    def get_HeartbeatMs(self): return _chilkat.CkSocket_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkSocket_put_HeartbeatMs(self, *args)
-    def get_MaxSendIdleMs(self): return _chilkat.CkSocket_get_MaxSendIdleMs(self)
-    def put_MaxSendIdleMs(self, *args): return _chilkat.CkSocket_put_MaxSendIdleMs(self, *args)
-    def get_MaxReadIdleMs(self): return _chilkat.CkSocket_get_MaxReadIdleMs(self)
-    def put_MaxReadIdleMs(self, *args): return _chilkat.CkSocket_put_MaxReadIdleMs(self, *args)
-    def get_StringCharset(self, *args): return _chilkat.CkSocket_get_StringCharset(self, *args)
-    def put_StringCharset(self, *args): return _chilkat.CkSocket_put_StringCharset(self, *args)
-    def get_DebugDnsDelayMs(self): return _chilkat.CkSocket_get_DebugDnsDelayMs(self)
-    def put_DebugDnsDelayMs(self, *args): return _chilkat.CkSocket_put_DebugDnsDelayMs(self, *args)
-    def get_DebugConnectDelayMs(self): return _chilkat.CkSocket_get_DebugConnectDelayMs(self)
-    def put_DebugConnectDelayMs(self, *args): return _chilkat.CkSocket_put_DebugConnectDelayMs(self, *args)
-    def get_IsConnected(self): return _chilkat.CkSocket_get_IsConnected(self)
-    def get_RemotePort(self): return _chilkat.CkSocket_get_RemotePort(self)
-    def get_RemoteIpAddress(self, *args): return _chilkat.CkSocket_get_RemoteIpAddress(self, *args)
-    def AsyncAcceptStart(self, *args): return _chilkat.CkSocket_AsyncAcceptStart(self, *args)
-    def get_AsyncAcceptFinished(self): return _chilkat.CkSocket_get_AsyncAcceptFinished(self)
-    def AsyncAcceptAbort(self): return _chilkat.CkSocket_AsyncAcceptAbort(self)
-    def get_AsyncAcceptLog(self, *args): return _chilkat.CkSocket_get_AsyncAcceptLog(self, *args)
-    def get_AsyncAcceptSuccess(self): return _chilkat.CkSocket_get_AsyncAcceptSuccess(self)
-    def AsyncAcceptSocket(self): return _chilkat.CkSocket_AsyncAcceptSocket(self)
-    def BuildHttpGetRequest(self, *args): return _chilkat.CkSocket_BuildHttpGetRequest(self, *args)
-    def get_SendPacketSize(self): return _chilkat.CkSocket_get_SendPacketSize(self)
-    def put_SendPacketSize(self, *args): return _chilkat.CkSocket_put_SendPacketSize(self, *args)
-    def get_ReceivePacketSize(self): return _chilkat.CkSocket_get_ReceivePacketSize(self)
-    def put_ReceivePacketSize(self, *args): return _chilkat.CkSocket_put_ReceivePacketSize(self, *args)
-    def SendString(self, *args): return _chilkat.CkSocket_SendString(self, *args)
-    def SendBytes(self, *args): return _chilkat.CkSocket_SendBytes(self, *args)
-    def ReceiveString(self, *args): return _chilkat.CkSocket_ReceiveString(self, *args)
-    def ReceiveUntilMatch(self, *args): return _chilkat.CkSocket_ReceiveUntilMatch(self, *args)
-    def ReceiveBytes(self, *args): return _chilkat.CkSocket_ReceiveBytes(self, *args)
-    def ReceiveBytesN(self, *args): return _chilkat.CkSocket_ReceiveBytesN(self, *args)
-    def stringCharset(self): return _chilkat.CkSocket_stringCharset(self)
-    def remoteIpAddress(self): return _chilkat.CkSocket_remoteIpAddress(self)
-    def asyncAcceptLog(self): return _chilkat.CkSocket_asyncAcceptLog(self)
-    def buildHttpGetRequest(self, *args): return _chilkat.CkSocket_buildHttpGetRequest(self, *args)
-    def receiveString(self): return _chilkat.CkSocket_receiveString(self)
-    def receiveUntilMatch(self, *args): return _chilkat.CkSocket_receiveUntilMatch(self, *args)
-    def lastErrorText(self): return _chilkat.CkSocket_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSocket_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSocket_lastErrorHtml(self)
-    def asyncDnsResult(self): return _chilkat.CkSocket_asyncDnsResult(self)
-    def asyncDnsLog(self): return _chilkat.CkSocket_asyncDnsLog(self)
-    def asyncConnectLog(self): return _chilkat.CkSocket_asyncConnectLog(self)
-    def myIpAddress(self): return _chilkat.CkSocket_myIpAddress(self)
-    def version(self): return _chilkat.CkSocket_version(self)
-CkSocket_swigregister = _chilkat.CkSocket_swigregister
-CkSocket_swigregister(CkSocket)
-
-class CkOmaDrm(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkOmaDrm, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkOmaDrm, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkOmaDrm()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkOmaDrm
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkOmaDrm_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkOmaDrm_put_Utf8(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkOmaDrm_UnlockComponent(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkOmaDrm_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkOmaDrm_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkOmaDrm_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkOmaDrm_LastErrorText(self, *args)
-    def LoadDcfFile(self, *args): return _chilkat.CkOmaDrm_LoadDcfFile(self, *args)
-    def LoadDcfData(self, *args): return _chilkat.CkOmaDrm_LoadDcfData(self, *args)
-    def get_Base64Key(self, *args): return _chilkat.CkOmaDrm_get_Base64Key(self, *args)
-    def put_Base64Key(self, *args): return _chilkat.CkOmaDrm_put_Base64Key(self, *args)
-    def get_DrmContentVersion(self): return _chilkat.CkOmaDrm_get_DrmContentVersion(self)
-    def get_ContentType(self, *args): return _chilkat.CkOmaDrm_get_ContentType(self, *args)
-    def put_ContentType(self, *args): return _chilkat.CkOmaDrm_put_ContentType(self, *args)
-    def get_ContentUri(self, *args): return _chilkat.CkOmaDrm_get_ContentUri(self, *args)
-    def put_ContentUri(self, *args): return _chilkat.CkOmaDrm_put_ContentUri(self, *args)
-    def get_Headers(self, *args): return _chilkat.CkOmaDrm_get_Headers(self, *args)
-    def put_Headers(self, *args): return _chilkat.CkOmaDrm_put_Headers(self, *args)
-    def get_IV(self, *args): return _chilkat.CkOmaDrm_get_IV(self, *args)
-    def put_IV(self, *args): return _chilkat.CkOmaDrm_put_IV(self, *args)
-    def get_EncryptedData(self, *args): return _chilkat.CkOmaDrm_get_EncryptedData(self, *args)
-    def get_DecryptedData(self, *args): return _chilkat.CkOmaDrm_get_DecryptedData(self, *args)
-    def SaveDecrypted(self, *args): return _chilkat.CkOmaDrm_SaveDecrypted(self, *args)
-    def GetHeaderField(self, *args): return _chilkat.CkOmaDrm_GetHeaderField(self, *args)
-    def LoadUnencryptedData(self, *args): return _chilkat.CkOmaDrm_LoadUnencryptedData(self, *args)
-    def LoadUnencryptedFile(self, *args): return _chilkat.CkOmaDrm_LoadUnencryptedFile(self, *args)
-    def SetEncodedIV(self, *args): return _chilkat.CkOmaDrm_SetEncodedIV(self, *args)
-    def CreateDcfFile(self, *args): return _chilkat.CkOmaDrm_CreateDcfFile(self, *args)
-    def lastErrorText(self): return _chilkat.CkOmaDrm_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkOmaDrm_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkOmaDrm_lastErrorHtml(self)
-    def base64Key(self): return _chilkat.CkOmaDrm_base64Key(self)
-    def contentType(self): return _chilkat.CkOmaDrm_contentType(self)
-    def contentUri(self): return _chilkat.CkOmaDrm_contentUri(self)
-    def headers(self): return _chilkat.CkOmaDrm_headers(self)
-    def getHeaderField(self, *args): return _chilkat.CkOmaDrm_getHeaderField(self, *args)
-CkOmaDrm_swigregister = _chilkat.CkOmaDrm_swigregister
-CkOmaDrm_swigregister(CkOmaDrm)
-
-class CkXmp(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkXmp, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkXmp, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkXmp()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkXmp
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkXmp_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkXmp_put_Utf8(self, *args)
-    def lastErrorText(self): return _chilkat.CkXmp_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkXmp_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkXmp_lastErrorHtml(self)
-    def getSimpleStr(self, *args): return _chilkat.CkXmp_getSimpleStr(self, *args)
-    def getStructValue(self, *args): return _chilkat.CkXmp_getStructValue(self, *args)
-    def simpleStr(self, *args): return _chilkat.CkXmp_simpleStr(self, *args)
-    def structValue(self, *args): return _chilkat.CkXmp_structValue(self, *args)
-    def version(self): return _chilkat.CkXmp_version(self)
-    def dateToString(self, *args): return _chilkat.CkXmp_dateToString(self, *args)
-    def LoadFromBuffer(self, *args): return _chilkat.CkXmp_LoadFromBuffer(self, *args)
-    def SaveToBuffer(self, *args): return _chilkat.CkXmp_SaveToBuffer(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkXmp_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkXmp_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkXmp_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkXmp_LastErrorText(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkXmp_UnlockComponent(self, *args)
-    def get_Version(self, *args): return _chilkat.CkXmp_get_Version(self, *args)
-    def get_NumEmbedded(self): return _chilkat.CkXmp_get_NumEmbedded(self)
-    def LoadAppFile(self, *args): return _chilkat.CkXmp_LoadAppFile(self, *args)
-    def SaveAppFile(self, *args): return _chilkat.CkXmp_SaveAppFile(self, *args)
-    def GetEmbedded(self, *args): return _chilkat.CkXmp_GetEmbedded(self, *args)
-    def GetSimpleStr(self, *args): return _chilkat.CkXmp_GetSimpleStr(self, *args)
-    def GetSimpleInt(self, *args): return _chilkat.CkXmp_GetSimpleInt(self, *args)
-    def GetSimpleDate(self, *args): return _chilkat.CkXmp_GetSimpleDate(self, *args)
-    def AddSimpleStr(self, *args): return _chilkat.CkXmp_AddSimpleStr(self, *args)
-    def AddSimpleInt(self, *args): return _chilkat.CkXmp_AddSimpleInt(self, *args)
-    def AddSimpleDate(self, *args): return _chilkat.CkXmp_AddSimpleDate(self, *args)
-    def AddNsMapping(self, *args): return _chilkat.CkXmp_AddNsMapping(self, *args)
-    def RemoveNsMapping(self, *args): return _chilkat.CkXmp_RemoveNsMapping(self, *args)
-    def NewXmp(self, *args): return _chilkat.CkXmp_NewXmp(self, *args)
-    def StringToDate(self, *args): return _chilkat.CkXmp_StringToDate(self, *args)
-    def DateToString(self, *args): return _chilkat.CkXmp_DateToString(self, *args)
-    def RemoveSimple(self, *args): return _chilkat.CkXmp_RemoveSimple(self, *args)
-    def Append(self, *args): return _chilkat.CkXmp_Append(self, *args)
-    def RemoveAllEmbedded(self): return _chilkat.CkXmp_RemoveAllEmbedded(self)
-    def RemoveEmbedded(self, *args): return _chilkat.CkXmp_RemoveEmbedded(self, *args)
-    def get_StructInnerDescrip(self): return _chilkat.CkXmp_get_StructInnerDescrip(self)
-    def put_StructInnerDescrip(self, *args): return _chilkat.CkXmp_put_StructInnerDescrip(self, *args)
-    def GetArray(self, *args): return _chilkat.CkXmp_GetArray(self, *args)
-    def RemoveArray(self, *args): return _chilkat.CkXmp_RemoveArray(self, *args)
-    def AddArray(self, *args): return _chilkat.CkXmp_AddArray(self, *args)
-    def GetStructValue(self, *args): return _chilkat.CkXmp_GetStructValue(self, *args)
-    def GetStructPropNames(self, *args): return _chilkat.CkXmp_GetStructPropNames(self, *args)
-    def RemoveStruct(self, *args): return _chilkat.CkXmp_RemoveStruct(self, *args)
-    def RemoveStructProp(self, *args): return _chilkat.CkXmp_RemoveStructProp(self, *args)
-    def AddStructProp(self, *args): return _chilkat.CkXmp_AddStructProp(self, *args)
-CkXmp_swigregister = _chilkat.CkXmp_swigregister
-CkXmp_swigregister(CkXmp)
-
-class CkStringArray(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkStringArray, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkStringArray, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkStringArray()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkStringArray
-    __del__ = lambda self : None;
-    def strAt(self, *args): return _chilkat.CkStringArray_strAt(self, *args)
-    def getString(self, *args): return _chilkat.CkStringArray_getString(self, *args)
-    def serialize(self): return _chilkat.CkStringArray_serialize(self)
-    def pop(self): return _chilkat.CkStringArray_pop(self)
-    def lastStr(self): return _chilkat.CkStringArray_lastStr(self)
-    def LoadFromText(self, *args): return _chilkat.CkStringArray_LoadFromText(self, *args)
-    def SaveNthToFile(self, *args): return _chilkat.CkStringArray_SaveNthToFile(self, *args)
-    def SaveToText(self, *args): return _chilkat.CkStringArray_SaveToText(self, *args)
-    def saveToText(self): return _chilkat.CkStringArray_saveToText(self)
-    def FindFirstMatch(self, *args): return _chilkat.CkStringArray_FindFirstMatch(self, *args)
-    def Union(self, *args): return _chilkat.CkStringArray_Union(self, *args)
-    def GetStringLen(self, *args): return _chilkat.CkStringArray_GetStringLen(self, *args)
-    def get_Utf8(self): return _chilkat.CkStringArray_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkStringArray_put_Utf8(self, *args)
-    def SplitAndAppend(self, *args): return _chilkat.CkStringArray_SplitAndAppend(self, *args)
-    def Append(self, *args): return _chilkat.CkStringArray_Append(self, *args)
-    def get_Count(self): return _chilkat.CkStringArray_get_Count(self)
-    def LoadFromFile(self, *args): return _chilkat.CkStringArray_LoadFromFile(self, *args)
-    def SaveToFile(self, *args): return _chilkat.CkStringArray_SaveToFile(self, *args)
-    def Pop(self, *args): return _chilkat.CkStringArray_Pop(self, *args)
-    def LastString(self, *args): return _chilkat.CkStringArray_LastString(self, *args)
-    def RemoveAt(self, *args): return _chilkat.CkStringArray_RemoveAt(self, *args)
-    def InsertAt(self, *args): return _chilkat.CkStringArray_InsertAt(self, *args)
-    def Find(self, *args): return _chilkat.CkStringArray_Find(self, *args)
-    def Prepend(self, *args): return _chilkat.CkStringArray_Prepend(self, *args)
-    def get_Crlf(self): return _chilkat.CkStringArray_get_Crlf(self)
-    def put_Crlf(self, *args): return _chilkat.CkStringArray_put_Crlf(self, *args)
-    def get_Trim(self): return _chilkat.CkStringArray_get_Trim(self)
-    def put_Trim(self, *args): return _chilkat.CkStringArray_put_Trim(self, *args)
-    def get_Unique(self): return _chilkat.CkStringArray_get_Unique(self)
-    def put_Unique(self, *args): return _chilkat.CkStringArray_put_Unique(self, *args)
-    def Serialize(self, *args): return _chilkat.CkStringArray_Serialize(self, *args)
-    def AppendSerialized(self, *args): return _chilkat.CkStringArray_AppendSerialized(self, *args)
-    def GetString(self, *args): return _chilkat.CkStringArray_GetString(self, *args)
-    def Remove(self, *args): return _chilkat.CkStringArray_Remove(self, *args)
-    def Contains(self, *args): return _chilkat.CkStringArray_Contains(self, *args)
-    def Clear(self): return _chilkat.CkStringArray_Clear(self)
-    def Sort(self, *args): return _chilkat.CkStringArray_Sort(self, *args)
-CkStringArray_swigregister = _chilkat.CkStringArray_swigregister
-CkStringArray_swigregister(CkStringArray)
-
-class CkZipCrc(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkZipCrc, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkZipCrc, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkZipCrc()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkZipCrc
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkZipCrc_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkZipCrc_put_Utf8(self, *args)
-    def ToHex(self, *args): return _chilkat.CkZipCrc_ToHex(self, *args)
-    def FileCrc(self, *args): return _chilkat.CkZipCrc_FileCrc(self, *args)
-    def CalculateCrc(self, *args): return _chilkat.CkZipCrc_CalculateCrc(self, *args)
-    def MoreData(self, *args): return _chilkat.CkZipCrc_MoreData(self, *args)
-    def EndStream(self): return _chilkat.CkZipCrc_EndStream(self)
-    def BeginStream(self): return _chilkat.CkZipCrc_BeginStream(self)
-    def toHex(self, *args): return _chilkat.CkZipCrc_toHex(self, *args)
-CkZipCrc_swigregister = _chilkat.CkZipCrc_swigregister
-CkZipCrc_swigregister(CkZipCrc)
-
-class CkZip(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkZip, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkZip, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkZip()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkZip
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkZip_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkZip_put_Utf8(self, *args)
-    def get_ExeWaitForSetup(self): return _chilkat.CkZip_get_ExeWaitForSetup(self)
-    def put_ExeWaitForSetup(self, *args): return _chilkat.CkZip_put_ExeWaitForSetup(self, *args)
-    def get_FileCount(self): return _chilkat.CkZip_get_FileCount(self)
-    def get_HasZipFormatErrors(self): return _chilkat.CkZip_get_HasZipFormatErrors(self)
-    def get_TextFlag(self): return _chilkat.CkZip_get_TextFlag(self)
-    def put_TextFlag(self, *args): return _chilkat.CkZip_put_TextFlag(self, *args)
-    def ExtractInto(self, *args): return _chilkat.CkZip_ExtractInto(self, *args)
-    def get_CaseSensitive(self): return _chilkat.CkZip_get_CaseSensitive(self)
-    def put_CaseSensitive(self, *args): return _chilkat.CkZip_put_CaseSensitive(self, *args)
-    def VerifyPassword(self): return _chilkat.CkZip_VerifyPassword(self)
-    def WriteExeToMemory(self, *args): return _chilkat.CkZip_WriteExeToMemory(self, *args)
-    def get_OverwriteExisting(self): return _chilkat.CkZip_get_OverwriteExisting(self)
-    def put_OverwriteExisting(self, *args): return _chilkat.CkZip_put_OverwriteExisting(self, *args)
-    def AddNoCompressExtension(self, *args): return _chilkat.CkZip_AddNoCompressExtension(self, *args)
-    def RemoveNoCompressExtension(self, *args): return _chilkat.CkZip_RemoveNoCompressExtension(self, *args)
-    def IsNoCompressExtension(self, *args): return _chilkat.CkZip_IsNoCompressExtension(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkZip_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkZip_put_VerboseLogging(self, *args)
-    def get_IgnoreAccessDenied(self): return _chilkat.CkZip_get_IgnoreAccessDenied(self)
-    def put_IgnoreAccessDenied(self, *args): return _chilkat.CkZip_put_IgnoreAccessDenied(self, *args)
-    def get_ClearReadOnlyAttr(self): return _chilkat.CkZip_get_ClearReadOnlyAttr(self)
-    def put_ClearReadOnlyAttr(self, *args): return _chilkat.CkZip_put_ClearReadOnlyAttr(self, *args)
-    def lastErrorText(self): return _chilkat.CkZip_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkZip_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkZip_lastErrorHtml(self)
-    def QuickAppend(self, *args): return _chilkat.CkZip_QuickAppend(self, *args)
-    def SetExeConfigParam(self, *args): return _chilkat.CkZip_SetExeConfigParam(self, *args)
-    def GetExeConfigParam(self, *args): return _chilkat.CkZip_GetExeConfigParam(self, *args)
-    def getExeConfigParam(self, *args): return _chilkat.CkZip_getExeConfigParam(self, *args)
-    def get_ExeXmlConfig(self, *args): return _chilkat.CkZip_get_ExeXmlConfig(self, *args)
-    def put_ExeXmlConfig(self, *args): return _chilkat.CkZip_put_ExeXmlConfig(self, *args)
-    def exeXmlConfig(self): return _chilkat.CkZip_exeXmlConfig(self)
-    def get_ExeSourceUrl(self, *args): return _chilkat.CkZip_get_ExeSourceUrl(self, *args)
-    def put_ExeSourceUrl(self, *args): return _chilkat.CkZip_put_ExeSourceUrl(self, *args)
-    def exeSourceUrl(self): return _chilkat.CkZip_exeSourceUrl(self)
-    def get_ExeDefaultDir(self, *args): return _chilkat.CkZip_get_ExeDefaultDir(self, *args)
-    def put_ExeDefaultDir(self, *args): return _chilkat.CkZip_put_ExeDefaultDir(self, *args)
-    def put_ExeFinishNotifier(self, *args): return _chilkat.CkZip_put_ExeFinishNotifier(self, *args)
-    def get_ExeFinishNotifier(self): return _chilkat.CkZip_get_ExeFinishNotifier(self)
-    def put_ExeSilentProgress(self, *args): return _chilkat.CkZip_put_ExeSilentProgress(self, *args)
-    def get_ExeSilentProgress(self): return _chilkat.CkZip_get_ExeSilentProgress(self)
-    def version(self): return _chilkat.CkZip_version(self)
-    def tempDir(self): return _chilkat.CkZip_tempDir(self)
-    def appendFromDir(self): return _chilkat.CkZip_appendFromDir(self)
-    def proxy(self): return _chilkat.CkZip_proxy(self)
-    def autoRun(self): return _chilkat.CkZip_autoRun(self)
-    def autoRunParams(self): return _chilkat.CkZip_autoRunParams(self)
-    def exeTitle(self): return _chilkat.CkZip_exeTitle(self)
-    def exeUnzipCaption(self): return _chilkat.CkZip_exeUnzipCaption(self)
-    def exeUnzipDir(self): return _chilkat.CkZip_exeUnzipDir(self)
-    def exeDefaultDir(self): return _chilkat.CkZip_exeDefaultDir(self)
-    def exeIconFile(self): return _chilkat.CkZip_exeIconFile(self)
-    def fileName(self): return _chilkat.CkZip_fileName(self)
-    def pathPrefix(self): return _chilkat.CkZip_pathPrefix(self)
-    def getDirectoryAsXML(self): return _chilkat.CkZip_getDirectoryAsXML(self)
-    def get_PasswordProtect(self): return _chilkat.CkZip_get_PasswordProtect(self)
-    def put_PasswordProtect(self, *args): return _chilkat.CkZip_put_PasswordProtect(self, *args)
-    def get_Encryption(self): return _chilkat.CkZip_get_Encryption(self)
-    def put_Encryption(self, *args): return _chilkat.CkZip_put_Encryption(self, *args)
-    def get_OemCodePage(self): return _chilkat.CkZip_get_OemCodePage(self)
-    def put_OemCodePage(self, *args): return _chilkat.CkZip_put_OemCodePage(self, *args)
-    def get_EncryptKeyLength(self): return _chilkat.CkZip_get_EncryptKeyLength(self)
-    def put_EncryptKeyLength(self, *args): return _chilkat.CkZip_put_EncryptKeyLength(self, *args)
-    def get_Version(self, *args): return _chilkat.CkZip_get_Version(self, *args)
-    def get_TempDir(self, *args): return _chilkat.CkZip_get_TempDir(self, *args)
-    def put_TempDir(self, *args): return _chilkat.CkZip_put_TempDir(self, *args)
-    def get_AppendFromDir(self, *args): return _chilkat.CkZip_get_AppendFromDir(self, *args)
-    def put_AppendFromDir(self, *args): return _chilkat.CkZip_put_AppendFromDir(self, *args)
-    def get_Proxy(self, *args): return _chilkat.CkZip_get_Proxy(self, *args)
-    def put_Proxy(self, *args): return _chilkat.CkZip_put_Proxy(self, *args)
-    def get_DecryptPassword(self, *args): return _chilkat.CkZip_get_DecryptPassword(self, *args)
-    def put_DecryptPassword(self, *args): return _chilkat.CkZip_put_DecryptPassword(self, *args)
-    def get_EncryptPassword(self, *args): return _chilkat.CkZip_get_EncryptPassword(self, *args)
-    def put_EncryptPassword(self, *args): return _chilkat.CkZip_put_EncryptPassword(self, *args)
-    def encryptPassword(self): return _chilkat.CkZip_encryptPassword(self)
-    def decryptPassword(self): return _chilkat.CkZip_decryptPassword(self)
-    def get_AutoRun(self, *args): return _chilkat.CkZip_get_AutoRun(self, *args)
-    def put_AutoRun(self, *args): return _chilkat.CkZip_put_AutoRun(self, *args)
-    def get_AutoTemp(self): return _chilkat.CkZip_get_AutoTemp(self)
-    def put_AutoTemp(self, *args): return _chilkat.CkZip_put_AutoTemp(self, *args)
-    def get_ExeNoInterface(self): return _chilkat.CkZip_get_ExeNoInterface(self)
-    def put_ExeNoInterface(self, *args): return _chilkat.CkZip_put_ExeNoInterface(self, *args)
-    def get_AutoRunParams(self, *args): return _chilkat.CkZip_get_AutoRunParams(self, *args)
-    def put_AutoRunParams(self, *args): return _chilkat.CkZip_put_AutoRunParams(self, *args)
-    def get_ExeTitle(self, *args): return _chilkat.CkZip_get_ExeTitle(self, *args)
-    def put_ExeTitle(self, *args): return _chilkat.CkZip_put_ExeTitle(self, *args)
-    def get_ExeUnzipCaption(self, *args): return _chilkat.CkZip_get_ExeUnzipCaption(self, *args)
-    def put_ExeUnzipCaption(self, *args): return _chilkat.CkZip_put_ExeUnzipCaption(self, *args)
-    def get_ExeUnzipDir(self, *args): return _chilkat.CkZip_get_ExeUnzipDir(self, *args)
-    def put_ExeUnzipDir(self, *args): return _chilkat.CkZip_put_ExeUnzipDir(self, *args)
-    def get_ExeIconFile(self, *args): return _chilkat.CkZip_get_ExeIconFile(self, *args)
-    def put_ExeIconFile(self, *args): return _chilkat.CkZip_put_ExeIconFile(self, *args)
-    def get_ClearArchiveAttribute(self): return _chilkat.CkZip_get_ClearArchiveAttribute(self)
-    def put_ClearArchiveAttribute(self, *args): return _chilkat.CkZip_put_ClearArchiveAttribute(self, *args)
-    def get_NumEntries(self): return _chilkat.CkZip_get_NumEntries(self)
-    def get_FileName(self, *args): return _chilkat.CkZip_get_FileName(self, *args)
-    def put_FileName(self, *args): return _chilkat.CkZip_put_FileName(self, *args)
-    def get_Comment(self, *args): return _chilkat.CkZip_get_Comment(self, *args)
-    def put_Comment(self, *args): return _chilkat.CkZip_put_Comment(self, *args)
-    def get_PathPrefix(self, *args): return _chilkat.CkZip_get_PathPrefix(self, *args)
-    def put_PathPrefix(self, *args): return _chilkat.CkZip_put_PathPrefix(self, *args)
-    def get_DiscardPaths(self): return _chilkat.CkZip_get_DiscardPaths(self)
-    def put_DiscardPaths(self, *args): return _chilkat.CkZip_put_DiscardPaths(self, *args)
-    def FirstEntry(self): return _chilkat.CkZip_FirstEntry(self)
-    def ExcludeDir(self, *args): return _chilkat.CkZip_ExcludeDir(self, *args)
-    def IsPasswordProtected(self, *args): return _chilkat.CkZip_IsPasswordProtected(self, *args)
-    def OpenFromMemory(self, *args): return _chilkat.CkZip_OpenFromMemory(self, *args)
-    def OpenEmbedded(self, *args): return _chilkat.CkZip_OpenEmbedded(self, *args)
-    def AddEmbedded(self, *args): return _chilkat.CkZip_AddEmbedded(self, *args)
-    def AddEmbeddedFromMemory(self, *args): return _chilkat.CkZip_AddEmbeddedFromMemory(self, *args)
-    def ReplaceEmbedded(self, *args): return _chilkat.CkZip_ReplaceEmbedded(self, *args)
-    def RemoveEmbedded(self, *args): return _chilkat.CkZip_RemoveEmbedded(self, *args)
-    def SetPassword(self, *args): return _chilkat.CkZip_SetPassword(self, *args)
-    def SetExclusions(self, *args): return _chilkat.CkZip_SetExclusions(self, *args)
-    def GetExclusions(self): return _chilkat.CkZip_GetExclusions(self)
-    def FirstMatchingEntry(self, *args): return _chilkat.CkZip_FirstMatchingEntry(self, *args)
-    def GetDirectoryAsXML(self, *args): return _chilkat.CkZip_GetDirectoryAsXML(self, *args)
-    def ExtractMatching(self, *args): return _chilkat.CkZip_ExtractMatching(self, *args)
-    def GetEntryByID(self, *args): return _chilkat.CkZip_GetEntryByID(self, *args)
-    def WriteZip(self): return _chilkat.CkZip_WriteZip(self)
-    def WriteZipAndClose(self): return _chilkat.CkZip_WriteZipAndClose(self)
-    def OpenZip(self, *args): return _chilkat.CkZip_OpenZip(self, *args)
-    def OpenFromWeb(self, *args): return _chilkat.CkZip_OpenFromWeb(self, *args)
-    def NewZip(self, *args): return _chilkat.CkZip_NewZip(self, *args)
-    def GetEntryByName(self, *args): return _chilkat.CkZip_GetEntryByName(self, *args)
-    def GetEntryByIndex(self, *args): return _chilkat.CkZip_GetEntryByIndex(self, *args)
-    def Extract(self, *args): return _chilkat.CkZip_Extract(self, *args)
-    def ExtractNewer(self, *args): return _chilkat.CkZip_ExtractNewer(self, *args)
-    def AppendZip(self, *args): return _chilkat.CkZip_AppendZip(self, *args)
-    def AppendOneFileOrDir(self, *args): return _chilkat.CkZip_AppendOneFileOrDir(self, *args)
-    def AppendFiles(self, *args): return _chilkat.CkZip_AppendFiles(self, *args)
-    def AppendFilesEx(self, *args): return _chilkat.CkZip_AppendFilesEx(self, *args)
-    def AppendMultiple(self, *args): return _chilkat.CkZip_AppendMultiple(self, *args)
-    def AppendData(self, *args): return _chilkat.CkZip_AppendData(self, *args)
-    def AppendString(self, *args): return _chilkat.CkZip_AppendString(self, *args)
-    def AppendString2(self, *args): return _chilkat.CkZip_AppendString2(self, *args)
-    def AppendNew(self, *args): return _chilkat.CkZip_AppendNew(self, *args)
-    def AppendNewDir(self, *args): return _chilkat.CkZip_AppendNewDir(self, *args)
-    def InsertNew(self, *args): return _chilkat.CkZip_InsertNew(self, *args)
-    def AppendCompressed(self, *args): return _chilkat.CkZip_AppendCompressed(self, *args)
-    def DeleteEntry(self, *args): return _chilkat.CkZip_DeleteEntry(self, *args)
-    def AppendBase64(self, *args): return _chilkat.CkZip_AppendBase64(self, *args)
-    def AppendHex(self, *args): return _chilkat.CkZip_AppendHex(self, *args)
-    def WriteExe(self, *args): return _chilkat.CkZip_WriteExe(self, *args)
-    def WriteToMemory(self, *args): return _chilkat.CkZip_WriteToMemory(self, *args)
-    def CloseZip(self): return _chilkat.CkZip_CloseZip(self)
-    def UnlockComponent(self, *args): return _chilkat.CkZip_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkZip_IsUnlocked(self)
-    def SaveLastError(self, *args): return _chilkat.CkZip_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkZip_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkZip_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkZip_LastErrorText(self, *args)
-    def Unzip(self, *args): return _chilkat.CkZip_Unzip(self, *args)
-    def UnzipNewer(self, *args): return _chilkat.CkZip_UnzipNewer(self, *args)
-    def UnzipInto(self, *args): return _chilkat.CkZip_UnzipInto(self, *args)
-    def UnzipMatching(self, *args): return _chilkat.CkZip_UnzipMatching(self, *args)
-    def UnzipMatchingInto(self, *args): return _chilkat.CkZip_UnzipMatchingInto(self, *args)
-    def SetCompressionLevel(self, *args): return _chilkat.CkZip_SetCompressionLevel(self, *args)
-    def WriteExe2(self, *args): return _chilkat.CkZip_WriteExe2(self, *args)
-CkZip_swigregister = _chilkat.CkZip_swigregister
-CkZip_swigregister(CkZip)
-
-class CkZipEntry(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkZipEntry, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkZipEntry, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkZipEntry()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkZipEntry
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkZipEntry_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkZipEntry_put_Utf8(self, *args)
-    def lastErrorText(self): return _chilkat.CkZipEntry_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkZipEntry_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkZipEntry_lastErrorHtml(self)
-    def fileName(self): return _chilkat.CkZipEntry_fileName(self)
-    def comment(self): return _chilkat.CkZipEntry_comment(self)
-    def inflateToString(self, *args): return _chilkat.CkZipEntry_inflateToString(self, *args)
-    def inflateToString2(self): return _chilkat.CkZipEntry_inflateToString2(self)
-    def copyToBase64(self): return _chilkat.CkZipEntry_copyToBase64(self)
-    def copyToHex(self): return _chilkat.CkZipEntry_copyToHex(self)
-    def get_FileName(self, *args): return _chilkat.CkZipEntry_get_FileName(self, *args)
-    def put_FileName(self, *args): return _chilkat.CkZipEntry_put_FileName(self, *args)
-    def get_UncompressedLength(self): return _chilkat.CkZipEntry_get_UncompressedLength(self)
-    def get_CompressionLevel(self): return _chilkat.CkZipEntry_get_CompressionLevel(self)
-    def put_CompressionLevel(self, *args): return _chilkat.CkZipEntry_put_CompressionLevel(self, *args)
-    def get_CompressionMethod(self): return _chilkat.CkZipEntry_get_CompressionMethod(self)
-    def put_CompressionMethod(self, *args): return _chilkat.CkZipEntry_put_CompressionMethod(self, *args)
-    def get_CompressedLength(self): return _chilkat.CkZipEntry_get_CompressedLength(self)
-    def get_Comment(self, *args): return _chilkat.CkZipEntry_get_Comment(self, *args)
-    def put_Comment(self, *args): return _chilkat.CkZipEntry_put_Comment(self, *args)
-    def get_EntryType(self): return _chilkat.CkZipEntry_get_EntryType(self)
-    def get_FileDateTime(self, *args): return _chilkat.CkZipEntry_get_FileDateTime(self, *args)
-    def put_FileDateTime(self, *args): return _chilkat.CkZipEntry_put_FileDateTime(self, *args)
-    def get_IsDirectory(self): return _chilkat.CkZipEntry_get_IsDirectory(self)
-    def get_EntryID(self): return _chilkat.CkZipEntry_get_EntryID(self)
-    def Extract(self, *args): return _chilkat.CkZipEntry_Extract(self, *args)
-    def ExtractInto(self, *args): return _chilkat.CkZipEntry_ExtractInto(self, *args)
-    def InflateToString(self, *args): return _chilkat.CkZipEntry_InflateToString(self, *args)
-    def InflateToString2(self, *args): return _chilkat.CkZipEntry_InflateToString2(self, *args)
-    def Inflate(self, *args): return _chilkat.CkZipEntry_Inflate(self, *args)
-    def ReplaceData(self, *args): return _chilkat.CkZipEntry_ReplaceData(self, *args)
-    def AppendData(self, *args): return _chilkat.CkZipEntry_AppendData(self, *args)
-    def CopyToBase64(self, *args): return _chilkat.CkZipEntry_CopyToBase64(self, *args)
-    def CopyToHex(self, *args): return _chilkat.CkZipEntry_CopyToHex(self, *args)
-    def Copy(self, *args): return _chilkat.CkZipEntry_Copy(self, *args)
-    def NextEntry(self): return _chilkat.CkZipEntry_NextEntry(self)
-    def SaveLastError(self, *args): return _chilkat.CkZipEntry_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkZipEntry_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkZipEntry_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkZipEntry_LastErrorText(self, *args)
-CkZipEntry_swigregister = _chilkat.CkZipEntry_swigregister
-CkZipEntry_swigregister(CkZipEntry)
-
-class CkFileAccess(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkFileAccess, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkFileAccess, name)
-    __repr__ = _swig_repr
-    def get_Utf8(self): return _chilkat.CkFileAccess_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkFileAccess_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkFileAccess_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkFileAccess_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkFileAccess_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkFileAccess_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkFileAccess_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkFileAccess_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkFileAccess_lastErrorHtml(self)
-    def ReadEntireTextFile(self, *args): return _chilkat.CkFileAccess_ReadEntireTextFile(self, *args)
-    def readEntireTextFile(self, *args): return _chilkat.CkFileAccess_readEntireTextFile(self, *args)
-    def get_CurrentDir(self, *args): return _chilkat.CkFileAccess_get_CurrentDir(self, *args)
-    def currentDir(self): return _chilkat.CkFileAccess_currentDir(self)
-    def get_EndOfFile(self): return _chilkat.CkFileAccess_get_EndOfFile(self)
-    def SetCurrentDir(self, *args): return _chilkat.CkFileAccess_SetCurrentDir(self, *args)
-    def AppendAnsi(self, *args): return _chilkat.CkFileAccess_AppendAnsi(self, *args)
-    def AppendText(self, *args): return _chilkat.CkFileAccess_AppendText(self, *args)
-    def AppendUnicodeBOM(self): return _chilkat.CkFileAccess_AppendUnicodeBOM(self)
-    def AppendUtf8BOM(self): return _chilkat.CkFileAccess_AppendUtf8BOM(self)
-    def DirAutoCreate(self, *args): return _chilkat.CkFileAccess_DirAutoCreate(self, *args)
-    def DirCreate(self, *args): return _chilkat.CkFileAccess_DirCreate(self, *args)
-    def DirDelete(self, *args): return _chilkat.CkFileAccess_DirDelete(self, *args)
-    def DirEnsureExists(self, *args): return _chilkat.CkFileAccess_DirEnsureExists(self, *args)
-    def FileClose(self): return _chilkat.CkFileAccess_FileClose(self)
-    def FileCopy(self, *args): return _chilkat.CkFileAccess_FileCopy(self, *args)
-    def FileDelete(self, *args): return _chilkat.CkFileAccess_FileDelete(self, *args)
-    def FileExists(self, *args): return _chilkat.CkFileAccess_FileExists(self, *args)
-    def FileOpen(self, *args): return _chilkat.CkFileAccess_FileOpen(self, *args)
-    def FileRead(self, *args): return _chilkat.CkFileAccess_FileRead(self, *args)
-    def FileRename(self, *args): return _chilkat.CkFileAccess_FileRename(self, *args)
-    def FileSeek(self, *args): return _chilkat.CkFileAccess_FileSeek(self, *args)
-    def FileSize(self, *args): return _chilkat.CkFileAccess_FileSize(self, *args)
-    def FileWrite(self, *args): return _chilkat.CkFileAccess_FileWrite(self, *args)
-    def GetTempFilename(self, *args): return _chilkat.CkFileAccess_GetTempFilename(self, *args)
-    def getTempFilename(self, *args): return _chilkat.CkFileAccess_getTempFilename(self, *args)
-    def ReadEntireFile(self, *args): return _chilkat.CkFileAccess_ReadEntireFile(self, *args)
-    def TreeDelete(self, *args): return _chilkat.CkFileAccess_TreeDelete(self, *args)
-    def WriteEntireFile(self, *args): return _chilkat.CkFileAccess_WriteEntireFile(self, *args)
-    def WriteEntireTextFile(self, *args): return _chilkat.CkFileAccess_WriteEntireTextFile(self, *args)
-    def SplitFile(self, *args): return _chilkat.CkFileAccess_SplitFile(self, *args)
-    def ReassembleFile(self, *args): return _chilkat.CkFileAccess_ReassembleFile(self, *args)
-    def ReadBinaryToEncoded(self, *args): return _chilkat.CkFileAccess_ReadBinaryToEncoded(self, *args)
-    def readBinaryToEncoded(self, *args): return _chilkat.CkFileAccess_readBinaryToEncoded(self, *args)
-    def __init__(self): 
-        this = _chilkat.new_CkFileAccess()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkFileAccess
-    __del__ = lambda self : None;
-CkFileAccess_swigregister = _chilkat.CkFileAccess_swigregister
-CkFileAccess_swigregister(CkFileAccess)
-
-class CkRsa(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkRsa, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkRsa, name)
-    __repr__ = _swig_repr
-    def get_Utf8(self): return _chilkat.CkRsa_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkRsa_put_Utf8(self, *args)
-    def get_LittleEndian(self): return _chilkat.CkRsa_get_LittleEndian(self)
-    def put_LittleEndian(self, *args): return _chilkat.CkRsa_put_LittleEndian(self, *args)
-    def get_Version(self, *args): return _chilkat.CkRsa_get_Version(self, *args)
-    def version(self): return _chilkat.CkRsa_version(self)
-    def OpenSslVerifyBytes(self, *args): return _chilkat.CkRsa_OpenSslVerifyBytes(self, *args)
-    def OpenSslSignBytes(self, *args): return _chilkat.CkRsa_OpenSslSignBytes(self, *args)
-    def OpenSslSignBytesENC(self, *args): return _chilkat.CkRsa_OpenSslSignBytesENC(self, *args)
-    def openSslSignBytesENC(self, *args): return _chilkat.CkRsa_openSslSignBytesENC(self, *args)
-    def OpenSslSignString(self, *args): return _chilkat.CkRsa_OpenSslSignString(self, *args)
-    def OpenSslSignStringENC(self, *args): return _chilkat.CkRsa_OpenSslSignStringENC(self, *args)
-    def openSslSignStringENC(self, *args): return _chilkat.CkRsa_openSslSignStringENC(self, *args)
-    def OpenSslVerifyBytesENC(self, *args): return _chilkat.CkRsa_OpenSslVerifyBytesENC(self, *args)
-    def OpenSslVerifyString(self, *args): return _chilkat.CkRsa_OpenSslVerifyString(self, *args)
-    def openSslVerifyString(self, *args): return _chilkat.CkRsa_openSslVerifyString(self, *args)
-    def OpenSslVerifyStringENC(self, *args): return _chilkat.CkRsa_OpenSslVerifyStringENC(self, *args)
-    def openSslVerifyStringENC(self, *args): return _chilkat.CkRsa_openSslVerifyStringENC(self, *args)
-    def VerifyPrivateKey(self, *args): return _chilkat.CkRsa_VerifyPrivateKey(self, *args)
-    def VerifyHash(self, *args): return _chilkat.CkRsa_VerifyHash(self, *args)
-    def VerifyHashENC(self, *args): return _chilkat.CkRsa_VerifyHashENC(self, *args)
-    def SignHash(self, *args): return _chilkat.CkRsa_SignHash(self, *args)
-    def SignHashENC(self, *args): return _chilkat.CkRsa_SignHashENC(self, *args)
-    def signHashENC(self, *args): return _chilkat.CkRsa_signHashENC(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkRsa_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkRsa_put_VerboseLogging(self, *args)
-    def get_NoUnpad(self): return _chilkat.CkRsa_get_NoUnpad(self)
-    def put_NoUnpad(self, *args): return _chilkat.CkRsa_put_NoUnpad(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkRsa_UnlockComponent(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkRsa_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkRsa_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkRsa_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkRsa_LastErrorText(self, *args)
-    def VerifyStringENC(self, *args): return _chilkat.CkRsa_VerifyStringENC(self, *args)
-    def VerifyString(self, *args): return _chilkat.CkRsa_VerifyString(self, *args)
-    def VerifyBytesENC(self, *args): return _chilkat.CkRsa_VerifyBytesENC(self, *args)
-    def VerifyBytes(self, *args): return _chilkat.CkRsa_VerifyBytes(self, *args)
-    def signStringENC(self, *args): return _chilkat.CkRsa_signStringENC(self, *args)
-    def signBytesENC(self, *args): return _chilkat.CkRsa_signBytesENC(self, *args)
-    def SignStringENC(self, *args): return _chilkat.CkRsa_SignStringENC(self, *args)
-    def SignBytesENC(self, *args): return _chilkat.CkRsa_SignBytesENC(self, *args)
-    def SignString(self, *args): return _chilkat.CkRsa_SignString(self, *args)
-    def SignBytes(self, *args): return _chilkat.CkRsa_SignBytes(self, *args)
-    def DecryptStringENC(self, *args): return _chilkat.CkRsa_DecryptStringENC(self, *args)
-    def DecryptString(self, *args): return _chilkat.CkRsa_DecryptString(self, *args)
-    def DecryptBytesENC(self, *args): return _chilkat.CkRsa_DecryptBytesENC(self, *args)
-    def DecryptBytes(self, *args): return _chilkat.CkRsa_DecryptBytes(self, *args)
-    def EncryptStringENC(self, *args): return _chilkat.CkRsa_EncryptStringENC(self, *args)
-    def EncryptBytesENC(self, *args): return _chilkat.CkRsa_EncryptBytesENC(self, *args)
-    def EncryptString(self, *args): return _chilkat.CkRsa_EncryptString(self, *args)
-    def EncryptBytes(self, *args): return _chilkat.CkRsa_EncryptBytes(self, *args)
-    def get_EncodingMode(self, *args): return _chilkat.CkRsa_get_EncodingMode(self, *args)
-    def put_EncodingMode(self, *args): return _chilkat.CkRsa_put_EncodingMode(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkRsa_get_Charset(self, *args)
-    def put_Charset(self, *args): return _chilkat.CkRsa_put_Charset(self, *args)
-    def GenerateKey(self, *args): return _chilkat.CkRsa_GenerateKey(self, *args)
-    def ExportPublicKey(self, *args): return _chilkat.CkRsa_ExportPublicKey(self, *args)
-    def ExportPrivateKey(self, *args): return _chilkat.CkRsa_ExportPrivateKey(self, *args)
-    def ImportPublicKey(self, *args): return _chilkat.CkRsa_ImportPublicKey(self, *args)
-    def ImportPrivateKey(self, *args): return _chilkat.CkRsa_ImportPrivateKey(self, *args)
-    def SnkToXml(self, *args): return _chilkat.CkRsa_SnkToXml(self, *args)
-    def get_NumBits(self): return _chilkat.CkRsa_get_NumBits(self)
-    def get_OaepPadding(self): return _chilkat.CkRsa_get_OaepPadding(self)
-    def put_OaepPadding(self, *args): return _chilkat.CkRsa_put_OaepPadding(self, *args)
-    def lastErrorText(self): return _chilkat.CkRsa_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkRsa_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkRsa_lastErrorHtml(self)
-    def decryptStringENC(self, *args): return _chilkat.CkRsa_decryptStringENC(self, *args)
-    def decryptString(self, *args): return _chilkat.CkRsa_decryptString(self, *args)
-    def encryptStringENC(self, *args): return _chilkat.CkRsa_encryptStringENC(self, *args)
-    def encryptBytesENC(self, *args): return _chilkat.CkRsa_encryptBytesENC(self, *args)
-    def encodingMode(self): return _chilkat.CkRsa_encodingMode(self)
-    def charset(self): return _chilkat.CkRsa_charset(self)
-    def exportPublicKey(self): return _chilkat.CkRsa_exportPublicKey(self)
-    def exportPrivateKey(self): return _chilkat.CkRsa_exportPrivateKey(self)
-    def snkToXml(self, *args): return _chilkat.CkRsa_snkToXml(self, *args)
-    def __init__(self): 
-        this = _chilkat.new_CkRsa()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkRsa
-    __del__ = lambda self : None;
-CkRsa_swigregister = _chilkat.CkRsa_swigregister
-CkRsa_swigregister(CkRsa)
-
-class CkEmail(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkEmail, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkEmail, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkEmail()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkEmail
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkEmail_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkEmail_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkEmail_lastErrorHtml(self)
-    def AddDataAttachment2(self, *args): return _chilkat.CkEmail_AddDataAttachment2(self, *args)
-    def AppendToBody(self, *args): return _chilkat.CkEmail_AppendToBody(self, *args)
-    def GetAltHeaderField(self, *args): return _chilkat.CkEmail_GetAltHeaderField(self, *args)
-    def getAltHeaderField(self, *args): return _chilkat.CkEmail_getAltHeaderField(self, *args)
-    def GetDeliveryStatusInfo(self, *args): return _chilkat.CkEmail_GetDeliveryStatusInfo(self, *args)
-    def getDeliveryStatusInfo(self, *args): return _chilkat.CkEmail_getDeliveryStatusInfo(self, *args)
-    def GetAttachedMessageFilename(self, *args): return _chilkat.CkEmail_GetAttachedMessageFilename(self, *args)
-    def getAttachedMessageFilename(self, *args): return _chilkat.CkEmail_getAttachedMessageFilename(self, *args)
-    def LoadXmlString(self, *args): return _chilkat.CkEmail_LoadXmlString(self, *args)
-    def SetAttachmentCharset(self, *args): return _chilkat.CkEmail_SetAttachmentCharset(self, *args)
-    def SetFromMimeObject(self, *args): return _chilkat.CkEmail_SetFromMimeObject(self, *args)
-    def AspUnpack(self, *args): return _chilkat.CkEmail_AspUnpack(self, *args)
-    def AspUnpack2(self, *args): return _chilkat.CkEmail_AspUnpack2(self, *args)
-    def GetImapUid(self): return _chilkat.CkEmail_GetImapUid(self)
-    def HasHeaderMatching(self, *args): return _chilkat.CkEmail_HasHeaderMatching(self, *args)
-    def get_Language(self, *args): return _chilkat.CkEmail_get_Language(self, *args)
-    def language(self): return _chilkat.CkEmail_language(self)
-    def GetDsnFinalRecipients(self): return _chilkat.CkEmail_GetDsnFinalRecipients(self)
-    def GetRelatedContentLocation(self, *args): return _chilkat.CkEmail_GetRelatedContentLocation(self, *args)
-    def getRelatedContentLocation(self, *args): return _chilkat.CkEmail_getRelatedContentLocation(self, *args)
-    def GetMimeBinary(self, *args): return _chilkat.CkEmail_GetMimeBinary(self, *args)
-    def AttachMessage(self, *args): return _chilkat.CkEmail_AttachMessage(self, *args)
-    def ComputeGlobalKey(self, *args): return _chilkat.CkEmail_ComputeGlobalKey(self, *args)
-    def computeGlobalKey(self, *args): return _chilkat.CkEmail_computeGlobalKey(self, *args)
-    def get_NumDaysOld(self): return _chilkat.CkEmail_get_NumDaysOld(self)
-    def get_PreferredCharset(self, *args): return _chilkat.CkEmail_get_PreferredCharset(self, *args)
-    def preferredCharset(self): return _chilkat.CkEmail_preferredCharset(self)
-    def put_PreferredCharset(self, *args): return _chilkat.CkEmail_put_PreferredCharset(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkEmail_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkEmail_put_VerboseLogging(self, *args)
-    def AddRelatedHeader(self, *args): return _chilkat.CkEmail_AddRelatedHeader(self, *args)
-    def ClearEncryptCerts(self): return _chilkat.CkEmail_ClearEncryptCerts(self)
-    def AddEncryptCert(self, *args): return _chilkat.CkEmail_AddEncryptCert(self, *args)
-    def UnpackHtml(self, *args): return _chilkat.CkEmail_UnpackHtml(self, *args)
-    def SetFromMimeBytes(self, *args): return _chilkat.CkEmail_SetFromMimeBytes(self, *args)
-    def SetAttachmentDisposition(self, *args): return _chilkat.CkEmail_SetAttachmentDisposition(self, *args)
-    def RemoveHtmlAlternative(self): return _chilkat.CkEmail_RemoveHtmlAlternative(self)
-    def RemovePlainTextAlternative(self): return _chilkat.CkEmail_RemovePlainTextAlternative(self)
-    def AddHeaderField2(self, *args): return _chilkat.CkEmail_AddHeaderField2(self, *args)
-    def get_PrependHeaders(self): return _chilkat.CkEmail_get_PrependHeaders(self)
-    def put_PrependHeaders(self, *args): return _chilkat.CkEmail_put_PrependHeaders(self, *args)
-    def CreateDsn(self, *args): return _chilkat.CkEmail_CreateDsn(self, *args)
-    def CreateMdn(self, *args): return _chilkat.CkEmail_CreateMdn(self, *args)
-    def get_SigningHashAlg(self, *args): return _chilkat.CkEmail_get_SigningHashAlg(self, *args)
-    def signingHashAlg(self): return _chilkat.CkEmail_signingHashAlg(self)
-    def put_SigningHashAlg(self, *args): return _chilkat.CkEmail_put_SigningHashAlg(self, *args)
-    def get_Pkcs7CryptAlg(self, *args): return _chilkat.CkEmail_get_Pkcs7CryptAlg(self, *args)
-    def pkcs7CryptAlg(self): return _chilkat.CkEmail_pkcs7CryptAlg(self)
-    def put_Pkcs7CryptAlg(self, *args): return _chilkat.CkEmail_put_Pkcs7CryptAlg(self, *args)
-    def get_Pkcs7KeyLength(self): return _chilkat.CkEmail_get_Pkcs7KeyLength(self)
-    def put_Pkcs7KeyLength(self, *args): return _chilkat.CkEmail_put_Pkcs7KeyLength(self, *args)
-    def SetTextBody(self, *args): return _chilkat.CkEmail_SetTextBody(self, *args)
-    def getRelatedStringCrLf(self, *args): return _chilkat.CkEmail_getRelatedStringCrLf(self, *args)
-    def getRelatedContentID(self, *args): return _chilkat.CkEmail_getRelatedContentID(self, *args)
-    def getRelatedFilename(self, *args): return _chilkat.CkEmail_getRelatedFilename(self, *args)
-    def getRelatedString(self, *args): return _chilkat.CkEmail_getRelatedString(self, *args)
-    def getAlternativeBody(self, *args): return _chilkat.CkEmail_getAlternativeBody(self, *args)
-    def getAlternativeContentType(self, *args): return _chilkat.CkEmail_getAlternativeContentType(self, *args)
-    def getHtmlBody(self): return _chilkat.CkEmail_getHtmlBody(self)
-    def getPlainTextBody(self): return _chilkat.CkEmail_getPlainTextBody(self)
-    def getHeaderFieldName(self, *args): return _chilkat.CkEmail_getHeaderFieldName(self, *args)
-    def getHeaderFieldValue(self, *args): return _chilkat.CkEmail_getHeaderFieldValue(self, *args)
-    def getAttachmentStringCrLf(self, *args): return _chilkat.CkEmail_getAttachmentStringCrLf(self, *args)
-    def getAttachmentContentID(self, *args): return _chilkat.CkEmail_getAttachmentContentID(self, *args)
-    def getAttachmentContentType(self, *args): return _chilkat.CkEmail_getAttachmentContentType(self, *args)
-    def getAttachmentHeader(self, *args): return _chilkat.CkEmail_getAttachmentHeader(self, *args)
-    def getAttachmentString(self, *args): return _chilkat.CkEmail_getAttachmentString(self, *args)
-    def getAttachmentFilename(self, *args): return _chilkat.CkEmail_getAttachmentFilename(self, *args)
-    def getHeaderField(self, *args): return _chilkat.CkEmail_getHeaderField(self, *args)
-    def getBcc(self, *args): return _chilkat.CkEmail_getBcc(self, *args)
-    def getCC(self, *args): return _chilkat.CkEmail_getCC(self, *args)
-    def getTo(self, *args): return _chilkat.CkEmail_getTo(self, *args)
-    def getBccAddr(self, *args): return _chilkat.CkEmail_getBccAddr(self, *args)
-    def getCcAddr(self, *args): return _chilkat.CkEmail_getCcAddr(self, *args)
-    def getToAddr(self, *args): return _chilkat.CkEmail_getToAddr(self, *args)
-    def getBccName(self, *args): return _chilkat.CkEmail_getBccName(self, *args)
-    def getCcName(self, *args): return _chilkat.CkEmail_getCcName(self, *args)
-    def getToName(self, *args): return _chilkat.CkEmail_getToName(self, *args)
-    def getMime(self): return _chilkat.CkEmail_getMime(self)
-    def getXml(self): return _chilkat.CkEmail_getXml(self)
-    def uidl(self): return _chilkat.CkEmail_uidl(self)
-    def charset(self): return _chilkat.CkEmail_charset(self)
-    def encryptedBy(self): return _chilkat.CkEmail_encryptedBy(self)
-    def signedBy(self): return _chilkat.CkEmail_signedBy(self)
-    def fromAddress(self): return _chilkat.CkEmail_fromAddress(self)
-    def fromName(self): return _chilkat.CkEmail_fromName(self)
-    def mailer(self): return _chilkat.CkEmail_mailer(self)
-    def header(self): return _chilkat.CkEmail_header(self)
-    def ck_from(self): return _chilkat.CkEmail_ck_from(self)
-    def subject(self): return _chilkat.CkEmail_subject(self)
-    def replyTo(self): return _chilkat.CkEmail_replyTo(self)
-    def bounceAddress(self): return _chilkat.CkEmail_bounceAddress(self)
-    def body(self): return _chilkat.CkEmail_body(self)
-    def qEncodeString(self, *args): return _chilkat.CkEmail_qEncodeString(self, *args)
-    def bEncodeString(self, *args): return _chilkat.CkEmail_bEncodeString(self, *args)
-    def addFileAttachment(self, *args): return _chilkat.CkEmail_addFileAttachment(self, *args)
-    def addRelatedFile(self, *args): return _chilkat.CkEmail_addRelatedFile(self, *args)
-    def addRelatedString(self, *args): return _chilkat.CkEmail_addRelatedString(self, *args)
-    def getReplaceString2(self, *args): return _chilkat.CkEmail_getReplaceString2(self, *args)
-    def getReplaceString(self, *args): return _chilkat.CkEmail_getReplaceString(self, *args)
-    def getReplacePattern(self, *args): return _chilkat.CkEmail_getReplacePattern(self, *args)
-    def generateFilename(self): return _chilkat.CkEmail_generateFilename(self)
-    def fileDistList(self): return _chilkat.CkEmail_fileDistList(self)
-    def createTempMht(self, *args): return _chilkat.CkEmail_createTempMht(self, *args)
-    def qEncodeBytes(self, *args): return _chilkat.CkEmail_qEncodeBytes(self, *args)
-    def bEncodeBytes(self, *args): return _chilkat.CkEmail_bEncodeBytes(self, *args)
-    def GetRelatedContentType(self, *args): return _chilkat.CkEmail_GetRelatedContentType(self, *args)
-    def getRelatedContentType(self, *args): return _chilkat.CkEmail_getRelatedContentType(self, *args)
-    def AddRelatedString2(self, *args): return _chilkat.CkEmail_AddRelatedString2(self, *args)
-    def AddRelatedFile2(self, *args): return _chilkat.CkEmail_AddRelatedFile2(self, *args)
-    def AddRelatedData2(self, *args): return _chilkat.CkEmail_AddRelatedData2(self, *args)
-    def AddStringAttachment(self, *args): return _chilkat.CkEmail_AddStringAttachment(self, *args)
-    def AddStringAttachment2(self, *args): return _chilkat.CkEmail_AddStringAttachment2(self, *args)
-    def AddRelatedString(self, *args): return _chilkat.CkEmail_AddRelatedString(self, *args)
-    def SetFromMimeText(self, *args): return _chilkat.CkEmail_SetFromMimeText(self, *args)
-    def SetFromMimeText2(self, *args): return _chilkat.CkEmail_SetFromMimeText2(self, *args)
-    def LoadEml(self, *args): return _chilkat.CkEmail_LoadEml(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkEmail_LoadXml(self, *args)
-    def SetFromXmlText(self, *args): return _chilkat.CkEmail_SetFromXmlText(self, *args)
-    def ZipAttachments(self, *args): return _chilkat.CkEmail_ZipAttachments(self, *args)
-    def UnzipAttachments(self): return _chilkat.CkEmail_UnzipAttachments(self)
-    def AesEncrypt(self, *args): return _chilkat.CkEmail_AesEncrypt(self, *args)
-    def AesDecrypt(self, *args): return _chilkat.CkEmail_AesDecrypt(self, *args)
-    def Clone(self): return _chilkat.CkEmail_Clone(self)
-    def CreateForward(self): return _chilkat.CkEmail_CreateForward(self)
-    def CreateReply(self): return _chilkat.CkEmail_CreateReply(self)
-    def SetCSP(self, *args): return _chilkat.CkEmail_SetCSP(self, *args)
-    def GetSignedByCert(self): return _chilkat.CkEmail_GetSignedByCert(self)
-    def GetEncryptedByCert(self): return _chilkat.CkEmail_GetEncryptedByCert(self)
-    def GetEncryptCert(self): return _chilkat.CkEmail_GetEncryptCert(self)
-    def GetSigningCert(self): return _chilkat.CkEmail_GetSigningCert(self)
-    def SetEncryptCert(self, *args): return _chilkat.CkEmail_SetEncryptCert(self, *args)
-    def SetSigningCert(self, *args): return _chilkat.CkEmail_SetSigningCert(self, *args)
-    def SetSigningCert2(self, *args): return _chilkat.CkEmail_SetSigningCert2(self, *args)
-    def GetFileContent(self, *args): return _chilkat.CkEmail_GetFileContent(self, *args)
-    def GetRelatedStringCrLf(self, *args): return _chilkat.CkEmail_GetRelatedStringCrLf(self, *args)
-    def GetRelatedContentID(self, *args): return _chilkat.CkEmail_GetRelatedContentID(self, *args)
-    def GetRelatedFilename(self, *args): return _chilkat.CkEmail_GetRelatedFilename(self, *args)
-    def GetRelatedString(self, *args): return _chilkat.CkEmail_GetRelatedString(self, *args)
-    def GetRelatedData(self, *args): return _chilkat.CkEmail_GetRelatedData(self, *args)
-    def AddHeaderField(self, *args): return _chilkat.CkEmail_AddHeaderField(self, *args)
-    def RemoveHeaderField(self, *args): return _chilkat.CkEmail_RemoveHeaderField(self, *args)
-    def SetHtmlBody(self, *args): return _chilkat.CkEmail_SetHtmlBody(self, *args)
-    def SaveRelatedItem(self, *args): return _chilkat.CkEmail_SaveRelatedItem(self, *args)
-    def DropRelatedItem(self, *args): return _chilkat.CkEmail_DropRelatedItem(self, *args)
-    def DropRelatedItems(self): return _chilkat.CkEmail_DropRelatedItems(self)
-    def AddRelatedFile(self, *args): return _chilkat.CkEmail_AddRelatedFile(self, *args)
-    def AddRelatedData(self, *args): return _chilkat.CkEmail_AddRelatedData(self, *args)
-    def AddHtmlAlternativeBody(self, *args): return _chilkat.CkEmail_AddHtmlAlternativeBody(self, *args)
-    def AddPlainTextAlternativeBody(self, *args): return _chilkat.CkEmail_AddPlainTextAlternativeBody(self, *args)
-    def GetAlternativeBody(self, *args): return _chilkat.CkEmail_GetAlternativeBody(self, *args)
-    def GetAlternativeContentType(self, *args): return _chilkat.CkEmail_GetAlternativeContentType(self, *args)
-    def GetHtmlBody(self, *args): return _chilkat.CkEmail_GetHtmlBody(self, *args)
-    def GetPlainTextBody(self, *args): return _chilkat.CkEmail_GetPlainTextBody(self, *args)
-    def get_NumHeaderFields(self): return _chilkat.CkEmail_get_NumHeaderFields(self)
-    def GetHeaderFieldName(self, *args): return _chilkat.CkEmail_GetHeaderFieldName(self, *args)
-    def GetHeaderFieldValue(self, *args): return _chilkat.CkEmail_GetHeaderFieldValue(self, *args)
-    def GetAttachmentStringCrLf(self, *args): return _chilkat.CkEmail_GetAttachmentStringCrLf(self, *args)
-    def GetAttachmentContentID(self, *args): return _chilkat.CkEmail_GetAttachmentContentID(self, *args)
-    def GetAttachmentContentType(self, *args): return _chilkat.CkEmail_GetAttachmentContentType(self, *args)
-    def GetAttachmentHeader(self, *args): return _chilkat.CkEmail_GetAttachmentHeader(self, *args)
-    def GetAttachmentSize(self, *args): return _chilkat.CkEmail_GetAttachmentSize(self, *args)
-    def GetAttachmentString(self, *args): return _chilkat.CkEmail_GetAttachmentString(self, *args)
-    def SaveAllAttachments(self, *args): return _chilkat.CkEmail_SaveAllAttachments(self, *args)
-    def SaveAttachedFile(self, *args): return _chilkat.CkEmail_SaveAttachedFile(self, *args)
-    def GetAttachmentData(self, *args): return _chilkat.CkEmail_GetAttachmentData(self, *args)
-    def DropSingleAttachment(self, *args): return _chilkat.CkEmail_DropSingleAttachment(self, *args)
-    def SetAttachmentFilename(self, *args): return _chilkat.CkEmail_SetAttachmentFilename(self, *args)
-    def GetAttachmentFilename(self, *args): return _chilkat.CkEmail_GetAttachmentFilename(self, *args)
-    def AddAttachmentHeader(self, *args): return _chilkat.CkEmail_AddAttachmentHeader(self, *args)
-    def DropAttachments(self): return _chilkat.CkEmail_DropAttachments(self)
-    def AddFileAttachment(self, *args): return _chilkat.CkEmail_AddFileAttachment(self, *args)
-    def AddFileAttachment2(self, *args): return _chilkat.CkEmail_AddFileAttachment2(self, *args)
-    def AddDataAttachment(self, *args): return _chilkat.CkEmail_AddDataAttachment(self, *args)
-    def get_NumReplacePatterns(self): return _chilkat.CkEmail_get_NumReplacePatterns(self)
-    def GetReplaceString2(self, *args): return _chilkat.CkEmail_GetReplaceString2(self, *args)
-    def GetReplaceString(self, *args): return _chilkat.CkEmail_GetReplaceString(self, *args)
-    def GetReplacePattern(self, *args): return _chilkat.CkEmail_GetReplacePattern(self, *args)
-    def SetReplacePattern(self, *args): return _chilkat.CkEmail_SetReplacePattern(self, *args)
-    def GenerateFilename(self, *args): return _chilkat.CkEmail_GenerateFilename(self, *args)
-    def AddMultipleBcc(self, *args): return _chilkat.CkEmail_AddMultipleBcc(self, *args)
-    def AddMultipleCC(self, *args): return _chilkat.CkEmail_AddMultipleCC(self, *args)
-    def AddMultipleTo(self, *args): return _chilkat.CkEmail_AddMultipleTo(self, *args)
-    def GetHeaderField(self, *args): return _chilkat.CkEmail_GetHeaderField(self, *args)
-    def GetBcc(self, *args): return _chilkat.CkEmail_GetBcc(self, *args)
-    def GetCC(self, *args): return _chilkat.CkEmail_GetCC(self, *args)
-    def GetTo(self, *args): return _chilkat.CkEmail_GetTo(self, *args)
-    def GetBccAddr(self, *args): return _chilkat.CkEmail_GetBccAddr(self, *args)
-    def GetCcAddr(self, *args): return _chilkat.CkEmail_GetCcAddr(self, *args)
-    def GetToAddr(self, *args): return _chilkat.CkEmail_GetToAddr(self, *args)
-    def GetBccName(self, *args): return _chilkat.CkEmail_GetBccName(self, *args)
-    def GetCcName(self, *args): return _chilkat.CkEmail_GetCcName(self, *args)
-    def GetToName(self, *args): return _chilkat.CkEmail_GetToName(self, *args)
-    def ClearBcc(self): return _chilkat.CkEmail_ClearBcc(self)
-    def ClearCC(self): return _chilkat.CkEmail_ClearCC(self)
-    def ClearTo(self): return _chilkat.CkEmail_ClearTo(self)
-    def AddBcc(self, *args): return _chilkat.CkEmail_AddBcc(self, *args)
-    def AddCC(self, *args): return _chilkat.CkEmail_AddCC(self, *args)
-    def AddTo(self, *args): return _chilkat.CkEmail_AddTo(self, *args)
-    def GetMime(self, *args): return _chilkat.CkEmail_GetMime(self, *args)
-    def GetXml(self, *args): return _chilkat.CkEmail_GetXml(self, *args)
-    def SaveXml(self, *args): return _chilkat.CkEmail_SaveXml(self, *args)
-    def SaveEml(self, *args): return _chilkat.CkEmail_SaveEml(self, *args)
-    def get_Uidl(self, *args): return _chilkat.CkEmail_get_Uidl(self, *args)
-    def get_ReturnReceipt(self): return _chilkat.CkEmail_get_ReturnReceipt(self)
-    def put_ReturnReceipt(self, *args): return _chilkat.CkEmail_put_ReturnReceipt(self, *args)
-    def get_Size(self): return _chilkat.CkEmail_get_Size(self)
-    def get_NumAlternatives(self): return _chilkat.CkEmail_get_NumAlternatives(self)
-    def get_NumRelatedItems(self): return _chilkat.CkEmail_get_NumRelatedItems(self)
-    def get_SendEncrypted(self): return _chilkat.CkEmail_get_SendEncrypted(self)
-    def put_SendEncrypted(self, *args): return _chilkat.CkEmail_put_SendEncrypted(self, *args)
-    def get_FileDistList(self, *args): return _chilkat.CkEmail_get_FileDistList(self, *args)
-    def put_FileDistList(self, *args): return _chilkat.CkEmail_put_FileDistList(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkEmail_get_Charset(self, *args)
-    def put_Charset(self, *args): return _chilkat.CkEmail_put_Charset(self, *args)
-    def get_OverwriteExisting(self): return _chilkat.CkEmail_get_OverwriteExisting(self)
-    def put_OverwriteExisting(self, *args): return _chilkat.CkEmail_put_OverwriteExisting(self, *args)
-    def get_SendSigned(self): return _chilkat.CkEmail_get_SendSigned(self)
-    def put_SendSigned(self, *args): return _chilkat.CkEmail_put_SendSigned(self, *args)
-    def get_EncryptedBy(self, *args): return _chilkat.CkEmail_get_EncryptedBy(self, *args)
-    def get_Decrypted(self): return _chilkat.CkEmail_get_Decrypted(self)
-    def get_SignaturesValid(self): return _chilkat.CkEmail_get_SignaturesValid(self)
-    def get_SignedBy(self, *args): return _chilkat.CkEmail_get_SignedBy(self, *args)
-    def get_ReceivedSigned(self): return _chilkat.CkEmail_get_ReceivedSigned(self)
-    def get_ReceivedEncrypted(self): return _chilkat.CkEmail_get_ReceivedEncrypted(self)
-    def get_NumAttachments(self): return _chilkat.CkEmail_get_NumAttachments(self)
-    def get_FromAddress(self, *args): return _chilkat.CkEmail_get_FromAddress(self, *args)
-    def put_FromAddress(self, *args): return _chilkat.CkEmail_put_FromAddress(self, *args)
-    def get_FromName(self, *args): return _chilkat.CkEmail_get_FromName(self, *args)
-    def put_FromName(self, *args): return _chilkat.CkEmail_put_FromName(self, *args)
-    def get_LocalDate(self, *args): return _chilkat.CkEmail_get_LocalDate(self, *args)
-    def get_EmailDate(self, *args): return _chilkat.CkEmail_get_EmailDate(self, *args)
-    def put_LocalDate(self, *args): return _chilkat.CkEmail_put_LocalDate(self, *args)
-    def put_EmailDate(self, *args): return _chilkat.CkEmail_put_EmailDate(self, *args)
-    def get_Mailer(self, *args): return _chilkat.CkEmail_get_Mailer(self, *args)
-    def put_Mailer(self, *args): return _chilkat.CkEmail_put_Mailer(self, *args)
-    def get_Header(self, *args): return _chilkat.CkEmail_get_Header(self, *args)
-    def get_NumBcc(self): return _chilkat.CkEmail_get_NumBcc(self)
-    def get_NumCC(self): return _chilkat.CkEmail_get_NumCC(self)
-    def get_NumTo(self): return _chilkat.CkEmail_get_NumTo(self)
-    def get_From(self, *args): return _chilkat.CkEmail_get_From(self, *args)
-    def put_From(self, *args): return _chilkat.CkEmail_put_From(self, *args)
-    def get_Subject(self, *args): return _chilkat.CkEmail_get_Subject(self, *args)
-    def put_Subject(self, *args): return _chilkat.CkEmail_put_Subject(self, *args)
-    def get_ReplyTo(self, *args): return _chilkat.CkEmail_get_ReplyTo(self, *args)
-    def put_ReplyTo(self, *args): return _chilkat.CkEmail_put_ReplyTo(self, *args)
-    def get_BounceAddress(self, *args): return _chilkat.CkEmail_get_BounceAddress(self, *args)
-    def put_BounceAddress(self, *args): return _chilkat.CkEmail_put_BounceAddress(self, *args)
-    def get_Body(self, *args): return _chilkat.CkEmail_get_Body(self, *args)
-    def put_Body(self, *args): return _chilkat.CkEmail_put_Body(self, *args)
-    def UidlEquals(self, *args): return _chilkat.CkEmail_UidlEquals(self, *args)
-    def CreateTempMht(self, *args): return _chilkat.CkEmail_CreateTempMht(self, *args)
-    def GetMimeObject(self): return _chilkat.CkEmail_GetMimeObject(self)
-    def SaveLastError(self, *args): return _chilkat.CkEmail_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkEmail_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkEmail_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkEmail_LastErrorText(self, *args)
-    def SetMbPlainTextBody(self, *args): return _chilkat.CkEmail_SetMbPlainTextBody(self, *args)
-    def SetMbHtmlBody(self, *args): return _chilkat.CkEmail_SetMbHtmlBody(self, *args)
-    def GetMbPlainTextBody(self, *args): return _chilkat.CkEmail_GetMbPlainTextBody(self, *args)
-    def GetMbHtmlBody(self, *args): return _chilkat.CkEmail_GetMbHtmlBody(self, *args)
-    def GetMbHeaderField(self, *args): return _chilkat.CkEmail_GetMbHeaderField(self, *args)
-    def GetMbHeaderField2(self, *args): return _chilkat.CkEmail_GetMbHeaderField2(self, *args)
-    def QEncodeBytes(self, *args): return _chilkat.CkEmail_QEncodeBytes(self, *args)
-    def BEncodeBytes(self, *args): return _chilkat.CkEmail_BEncodeBytes(self, *args)
-    def QEncodeString(self, *args): return _chilkat.CkEmail_QEncodeString(self, *args)
-    def BEncodeString(self, *args): return _chilkat.CkEmail_BEncodeString(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkEmail_UnlockComponent(self, *args)
-    def get_NumAttachedMessages(self): return _chilkat.CkEmail_get_NumAttachedMessages(self)
-    def GetAttachedMessage(self, *args): return _chilkat.CkEmail_GetAttachedMessage(self, *args)
-    def RemoveAttachedMessages(self): return _chilkat.CkEmail_RemoveAttachedMessages(self)
-    def RemoveAttachedMessage(self, *args): return _chilkat.CkEmail_RemoveAttachedMessage(self, *args)
-    def GetLinkedDomains(self, *args): return _chilkat.CkEmail_GetLinkedDomains(self, *args)
-    def UnSpamify(self): return _chilkat.CkEmail_UnSpamify(self)
-    def IsMultipartReport(self): return _chilkat.CkEmail_IsMultipartReport(self)
-    def HasHtmlBody(self): return _chilkat.CkEmail_HasHtmlBody(self)
-    def HasPlainTextBody(self): return _chilkat.CkEmail_HasPlainTextBody(self)
-    def RemoveAttachmentPaths(self): return _chilkat.CkEmail_RemoveAttachmentPaths(self)
-    def get_Utf8(self): return _chilkat.CkEmail_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkEmail_put_Utf8(self, *args)
-CkEmail_swigregister = _chilkat.CkEmail_swigregister
-CkEmail_swigregister(CkEmail)
-
-class CkCSP(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCSP, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCSP, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCSP()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCSP
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCSP_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCSP_put_Utf8(self, *args)
-    def lastErrorText(self): return _chilkat.CkCSP_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCSP_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCSP_lastErrorHtml(self)
-    def get_MachineKeyset(self): return _chilkat.CkCSP_get_MachineKeyset(self)
-    def put_MachineKeyset(self, *args): return _chilkat.CkCSP_put_MachineKeyset(self, *args)
-    def hashAlgorithm(self): return _chilkat.CkCSP_hashAlgorithm(self)
-    def encryptAlgorithm(self): return _chilkat.CkCSP_encryptAlgorithm(self)
-    def getKeyContainerName(self, *args): return _chilkat.CkCSP_getKeyContainerName(self, *args)
-    def getSignatureAlgorithm(self, *args): return _chilkat.CkCSP_getSignatureAlgorithm(self, *args)
-    def getKeyExchangeAlgorithm(self, *args): return _chilkat.CkCSP_getKeyExchangeAlgorithm(self, *args)
-    def getHashAlgorithm(self, *args): return _chilkat.CkCSP_getHashAlgorithm(self, *args)
-    def getEncryptionAlgorithm(self, *args): return _chilkat.CkCSP_getEncryptionAlgorithm(self, *args)
-    def keyContainerName(self): return _chilkat.CkCSP_keyContainerName(self)
-    def providerName(self): return _chilkat.CkCSP_providerName(self)
-    def SetProviderMicrosoftBase(self): return _chilkat.CkCSP_SetProviderMicrosoftBase(self)
-    def SetProviderMicrosoftStrong(self): return _chilkat.CkCSP_SetProviderMicrosoftStrong(self)
-    def SetProviderMicrosoftEnhanced(self): return _chilkat.CkCSP_SetProviderMicrosoftEnhanced(self)
-    def SetProviderMicrosoftRsaAes(self): return _chilkat.CkCSP_SetProviderMicrosoftRsaAes(self)
-    def get_ProviderType(self): return _chilkat.CkCSP_get_ProviderType(self)
-    def GetKeyContainerNames(self): return _chilkat.CkCSP_GetKeyContainerNames(self)
-    def SetHashAlgorithm(self, *args): return _chilkat.CkCSP_SetHashAlgorithm(self, *args)
-    def HasHashAlgorithm(self, *args): return _chilkat.CkCSP_HasHashAlgorithm(self, *args)
-    def SetEncryptAlgorithm(self, *args): return _chilkat.CkCSP_SetEncryptAlgorithm(self, *args)
-    def HasEncryptAlgorithm(self, *args): return _chilkat.CkCSP_HasEncryptAlgorithm(self, *args)
-    def get_HashAlgorithmID(self): return _chilkat.CkCSP_get_HashAlgorithmID(self)
-    def get_EncryptAlgorithmID(self): return _chilkat.CkCSP_get_EncryptAlgorithmID(self)
-    def get_HashNumBits(self): return _chilkat.CkCSP_get_HashNumBits(self)
-    def get_EncryptNumBits(self): return _chilkat.CkCSP_get_EncryptNumBits(self)
-    def get_HashAlgorithm(self, *args): return _chilkat.CkCSP_get_HashAlgorithm(self, *args)
-    def get_EncryptAlgorithm(self, *args): return _chilkat.CkCSP_get_EncryptAlgorithm(self, *args)
-    def GetKeyContainerName(self, *args): return _chilkat.CkCSP_GetKeyContainerName(self, *args)
-    def get_NumKeyContainers(self): return _chilkat.CkCSP_get_NumKeyContainers(self)
-    def GetSignatureNumBits(self, *args): return _chilkat.CkCSP_GetSignatureNumBits(self, *args)
-    def GetSignatureAlgorithm(self, *args): return _chilkat.CkCSP_GetSignatureAlgorithm(self, *args)
-    def GetKeyExchangeNumBits(self, *args): return _chilkat.CkCSP_GetKeyExchangeNumBits(self, *args)
-    def GetKeyExchangeAlgorithm(self, *args): return _chilkat.CkCSP_GetKeyExchangeAlgorithm(self, *args)
-    def GetHashNumBits(self, *args): return _chilkat.CkCSP_GetHashNumBits(self, *args)
-    def GetHashAlgorithm(self, *args): return _chilkat.CkCSP_GetHashAlgorithm(self, *args)
-    def GetEncryptionNumBits(self, *args): return _chilkat.CkCSP_GetEncryptionNumBits(self, *args)
-    def GetEncryptionAlgorithm(self, *args): return _chilkat.CkCSP_GetEncryptionAlgorithm(self, *args)
-    def get_KeyContainerName(self, *args): return _chilkat.CkCSP_get_KeyContainerName(self, *args)
-    def put_KeyContainerName(self, *args): return _chilkat.CkCSP_put_KeyContainerName(self, *args)
-    def get_ProviderName(self, *args): return _chilkat.CkCSP_get_ProviderName(self, *args)
-    def put_ProviderName(self, *args): return _chilkat.CkCSP_put_ProviderName(self, *args)
-    def get_NumKeyExchangeAlgorithms(self): return _chilkat.CkCSP_get_NumKeyExchangeAlgorithms(self)
-    def get_NumSignatureAlgorithms(self): return _chilkat.CkCSP_get_NumSignatureAlgorithms(self)
-    def get_NumEncryptAlgorithms(self): return _chilkat.CkCSP_get_NumEncryptAlgorithms(self)
-    def get_NumHashAlgorithms(self): return _chilkat.CkCSP_get_NumHashAlgorithms(self)
-    def SaveLastError(self, *args): return _chilkat.CkCSP_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCSP_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCSP_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCSP_LastErrorText(self, *args)
-CkCSP_swigregister = _chilkat.CkCSP_swigregister
-CkCSP_swigregister(CkCSP)
-
-class CkCert(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCert, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCert, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCert()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCert
-    __del__ = lambda self : None;
-    def CheckRevoked(self): return _chilkat.CkCert_CheckRevoked(self)
-    def get_Sha1Thumbprint(self, *args): return _chilkat.CkCert_get_Sha1Thumbprint(self, *args)
-    def ExportCertXml(self, *args): return _chilkat.CkCert_ExportCertXml(self, *args)
-    def exportCertXml(self): return _chilkat.CkCert_exportCertXml(self)
-    def get_VerboseLogging(self): return _chilkat.CkCert_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkCert_put_VerboseLogging(self, *args)
-    def get_CertVersion(self): return _chilkat.CkCert_get_CertVersion(self)
-    def SetPrivateKey(self, *args): return _chilkat.CkCert_SetPrivateKey(self, *args)
-    def get_OcspUrl(self, *args): return _chilkat.CkCert_get_OcspUrl(self, *args)
-    def ocspUrl(self): return _chilkat.CkCert_ocspUrl(self)
-    def FindIssuer(self): return _chilkat.CkCert_FindIssuer(self)
-    def LoadByIssuerAndSerialNumber(self, *args): return _chilkat.CkCert_LoadByIssuerAndSerialNumber(self, *args)
-    def get_SelfSigned(self): return _chilkat.CkCert_get_SelfSigned(self)
-    def SetPrivateKeyPem(self, *args): return _chilkat.CkCert_SetPrivateKeyPem(self, *args)
-    def GetPrivateKeyPem(self, *args): return _chilkat.CkCert_GetPrivateKeyPem(self, *args)
-    def getPrivateKeyPem(self): return _chilkat.CkCert_getPrivateKeyPem(self)
-    def getEncoded(self): return _chilkat.CkCert_getEncoded(self)
-    def issuerE(self): return _chilkat.CkCert_issuerE(self)
-    def issuerC(self): return _chilkat.CkCert_issuerC(self)
-    def issuerS(self): return _chilkat.CkCert_issuerS(self)
-    def issuerL(self): return _chilkat.CkCert_issuerL(self)
-    def issuerO(self): return _chilkat.CkCert_issuerO(self)
-    def issuerOU(self): return _chilkat.CkCert_issuerOU(self)
-    def issuerCN(self): return _chilkat.CkCert_issuerCN(self)
-    def issuerDN(self): return _chilkat.CkCert_issuerDN(self)
-    def subjectE(self): return _chilkat.CkCert_subjectE(self)
-    def subjectC(self): return _chilkat.CkCert_subjectC(self)
-    def subjectS(self): return _chilkat.CkCert_subjectS(self)
-    def subjectL(self): return _chilkat.CkCert_subjectL(self)
-    def subjectO(self): return _chilkat.CkCert_subjectO(self)
-    def subjectOU(self): return _chilkat.CkCert_subjectOU(self)
-    def subjectCN(self): return _chilkat.CkCert_subjectCN(self)
-    def subjectDN(self): return _chilkat.CkCert_subjectDN(self)
-    def sha1Thumbprint(self): return _chilkat.CkCert_sha1Thumbprint(self)
-    def rfc822Name(self): return _chilkat.CkCert_rfc822Name(self)
-    def serialNumber(self): return _chilkat.CkCert_serialNumber(self)
-    def version(self): return _chilkat.CkCert_version(self)
-    def lastErrorText(self): return _chilkat.CkCert_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCert_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCert_lastErrorHtml(self)
-    def get_IntendedKeyUsage(self): return _chilkat.CkCert_get_IntendedKeyUsage(self)
-    def LoadPfxFile(self, *args): return _chilkat.CkCert_LoadPfxFile(self, *args)
-    def LoadPfxData(self, *args): return _chilkat.CkCert_LoadPfxData(self, *args)
-    def LoadPfxData2(self, *args): return _chilkat.CkCert_LoadPfxData2(self, *args)
-    def ExportToPfxFile(self, *args): return _chilkat.CkCert_ExportToPfxFile(self, *args)
-    def get_Utf8(self): return _chilkat.CkCert_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCert_put_Utf8(self, *args)
-    def LoadFromFile(self, *args): return _chilkat.CkCert_LoadFromFile(self, *args)
-    def LoadFromBase64(self, *args): return _chilkat.CkCert_LoadFromBase64(self, *args)
-    def LoadFromBinary(self, *args): return _chilkat.CkCert_LoadFromBinary(self, *args)
-    def SetFromEncoded(self, *args): return _chilkat.CkCert_SetFromEncoded(self, *args)
-    def GetEncoded(self, *args): return _chilkat.CkCert_GetEncoded(self, *args)
-    def get_IsRoot(self): return _chilkat.CkCert_get_IsRoot(self)
-    def get_IssuerE(self, *args): return _chilkat.CkCert_get_IssuerE(self, *args)
-    def get_IssuerC(self, *args): return _chilkat.CkCert_get_IssuerC(self, *args)
-    def get_IssuerS(self, *args): return _chilkat.CkCert_get_IssuerS(self, *args)
-    def get_IssuerL(self, *args): return _chilkat.CkCert_get_IssuerL(self, *args)
-    def get_IssuerO(self, *args): return _chilkat.CkCert_get_IssuerO(self, *args)
-    def get_IssuerOU(self, *args): return _chilkat.CkCert_get_IssuerOU(self, *args)
-    def get_IssuerCN(self, *args): return _chilkat.CkCert_get_IssuerCN(self, *args)
-    def get_IssuerDN(self, *args): return _chilkat.CkCert_get_IssuerDN(self, *args)
-    def get_SubjectE(self, *args): return _chilkat.CkCert_get_SubjectE(self, *args)
-    def get_SubjectC(self, *args): return _chilkat.CkCert_get_SubjectC(self, *args)
-    def get_SubjectS(self, *args): return _chilkat.CkCert_get_SubjectS(self, *args)
-    def get_SubjectL(self, *args): return _chilkat.CkCert_get_SubjectL(self, *args)
-    def get_SubjectO(self, *args): return _chilkat.CkCert_get_SubjectO(self, *args)
-    def get_SubjectOU(self, *args): return _chilkat.CkCert_get_SubjectOU(self, *args)
-    def get_SubjectCN(self, *args): return _chilkat.CkCert_get_SubjectCN(self, *args)
-    def get_SubjectDN(self, *args): return _chilkat.CkCert_get_SubjectDN(self, *args)
-    def get_SignatureVerified(self): return _chilkat.CkCert_get_SignatureVerified(self)
-    def get_TrustedRoot(self): return _chilkat.CkCert_get_TrustedRoot(self)
-    def get_Revoked(self): return _chilkat.CkCert_get_Revoked(self)
-    def get_Expired(self): return _chilkat.CkCert_get_Expired(self)
-    def HasPrivateKey(self): return _chilkat.CkCert_HasPrivateKey(self)
-    def SaveToFile(self, *args): return _chilkat.CkCert_SaveToFile(self, *args)
-    def get_Rfc822Name(self, *args): return _chilkat.CkCert_get_Rfc822Name(self, *args)
-    def get_ValidTo(self, *args): return _chilkat.CkCert_get_ValidTo(self, *args)
-    def get_ValidFrom(self, *args): return _chilkat.CkCert_get_ValidFrom(self, *args)
-    def get_SerialNumber(self, *args): return _chilkat.CkCert_get_SerialNumber(self, *args)
-    def get_ForTimeStamping(self): return _chilkat.CkCert_get_ForTimeStamping(self)
-    def get_ForCodeSigning(self): return _chilkat.CkCert_get_ForCodeSigning(self)
-    def get_ForClientAuthentication(self): return _chilkat.CkCert_get_ForClientAuthentication(self)
-    def get_ForServerAuthentication(self): return _chilkat.CkCert_get_ForServerAuthentication(self)
-    def get_ForSecureEmail(self): return _chilkat.CkCert_get_ForSecureEmail(self)
-    def get_Version(self, *args): return _chilkat.CkCert_get_Version(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCert_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCert_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCert_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCert_LastErrorText(self, *args)
-    def get_HasKeyContainer(self): return _chilkat.CkCert_get_HasKeyContainer(self)
-    def get_KeyContainerName(self, *args): return _chilkat.CkCert_get_KeyContainerName(self, *args)
-    def keyContainerName(self): return _chilkat.CkCert_keyContainerName(self)
-    def get_CspName(self, *args): return _chilkat.CkCert_get_CspName(self, *args)
-    def cspName(self): return _chilkat.CkCert_cspName(self)
-    def get_MachineKeyset(self): return _chilkat.CkCert_get_MachineKeyset(self)
-    def get_Silent(self): return _chilkat.CkCert_get_Silent(self)
-    def LoadByEmailAddress(self, *args): return _chilkat.CkCert_LoadByEmailAddress(self, *args)
-    def LoadByCommonName(self, *args): return _chilkat.CkCert_LoadByCommonName(self, *args)
-    def ExportCertPem(self, *args): return _chilkat.CkCert_ExportCertPem(self, *args)
-    def ExportCertPemFile(self, *args): return _chilkat.CkCert_ExportCertPemFile(self, *args)
-    def ExportCertDer(self, *args): return _chilkat.CkCert_ExportCertDer(self, *args)
-    def ExportCertDerFile(self, *args): return _chilkat.CkCert_ExportCertDerFile(self, *args)
-    def PemFileToDerFile(self, *args): return _chilkat.CkCert_PemFileToDerFile(self, *args)
-    def ExportPublicKey(self): return _chilkat.CkCert_ExportPublicKey(self)
-    def ExportPrivateKey(self): return _chilkat.CkCert_ExportPrivateKey(self)
-    def LinkPrivateKey(self, *args): return _chilkat.CkCert_LinkPrivateKey(self, *args)
-    def exportCertPem(self): return _chilkat.CkCert_exportCertPem(self)
-CkCert_swigregister = _chilkat.CkCert_swigregister
-CkCert_swigregister(CkCert)
-
-class CkCertStore(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCertStore, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCertStore, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCertStore()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCertStore
-    __del__ = lambda self : None;
-    def CreateFileStore(self, *args): return _chilkat.CkCertStore_CreateFileStore(self, *args)
-    def CreateMemoryStore(self): return _chilkat.CkCertStore_CreateMemoryStore(self)
-    def CreateRegistryStore(self, *args): return _chilkat.CkCertStore_CreateRegistryStore(self, *args)
-    def FindCertByRfc822Name(self, *args): return _chilkat.CkCertStore_FindCertByRfc822Name(self, *args)
-    def OpenChilkatStore(self, *args): return _chilkat.CkCertStore_OpenChilkatStore(self, *args)
-    def OpenCurrentUserStore(self, *args): return _chilkat.CkCertStore_OpenCurrentUserStore(self, *args)
-    def OpenFileStore(self, *args): return _chilkat.CkCertStore_OpenFileStore(self, *args)
-    def OpenOutlookStore(self, *args): return _chilkat.CkCertStore_OpenOutlookStore(self, *args)
-    def OpenRegistryStore(self, *args): return _chilkat.CkCertStore_OpenRegistryStore(self, *args)
-    def FindCertBySha1Thumbprint(self, *args): return _chilkat.CkCertStore_FindCertBySha1Thumbprint(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkCertStore_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkCertStore_put_VerboseLogging(self, *args)
-    def lastErrorText(self): return _chilkat.CkCertStore_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCertStore_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCertStore_lastErrorHtml(self)
-    def version(self): return _chilkat.CkCertStore_version(self)
-    def get_Utf8(self): return _chilkat.CkCertStore_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCertStore_put_Utf8(self, *args)
-    def LoadPfxFile(self, *args): return _chilkat.CkCertStore_LoadPfxFile(self, *args)
-    def LoadPfxData(self, *args): return _chilkat.CkCertStore_LoadPfxData(self, *args)
-    def LoadPfxData2(self, *args): return _chilkat.CkCertStore_LoadPfxData2(self, *args)
-    def FindCertBySerial(self, *args): return _chilkat.CkCertStore_FindCertBySerial(self, *args)
-    def FindCertBySubjectE(self, *args): return _chilkat.CkCertStore_FindCertBySubjectE(self, *args)
-    def FindCertBySubjectO(self, *args): return _chilkat.CkCertStore_FindCertBySubjectO(self, *args)
-    def FindCertBySubjectCN(self, *args): return _chilkat.CkCertStore_FindCertBySubjectCN(self, *args)
-    def FindCertBySubject(self, *args): return _chilkat.CkCertStore_FindCertBySubject(self, *args)
-    def GetEmailCert(self, *args): return _chilkat.CkCertStore_GetEmailCert(self, *args)
-    def FindCertForEmail(self, *args): return _chilkat.CkCertStore_FindCertForEmail(self, *args)
-    def GetCertificate(self, *args): return _chilkat.CkCertStore_GetCertificate(self, *args)
-    def get_NumEmailCerts(self): return _chilkat.CkCertStore_get_NumEmailCerts(self)
-    def RemoveCertificate(self, *args): return _chilkat.CkCertStore_RemoveCertificate(self, *args)
-    def AddCertificate(self, *args): return _chilkat.CkCertStore_AddCertificate(self, *args)
-    def get_NumCertificates(self): return _chilkat.CkCertStore_get_NumCertificates(self)
-    def get_Version(self, *args): return _chilkat.CkCertStore_get_Version(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCertStore_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCertStore_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCertStore_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCertStore_LastErrorText(self, *args)
-CkCertStore_swigregister = _chilkat.CkCertStore_swigregister
-CkCertStore_swigregister(CkCertStore)
-
-class CkCreateCS(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCreateCS, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCreateCS, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCreateCS()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCreateCS
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkCreateCS_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCreateCS_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCreateCS_lastErrorHtml(self)
-    def get_Utf8(self): return _chilkat.CkCreateCS_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCreateCS_put_Utf8(self, *args)
-    def get_ReadOnly(self): return _chilkat.CkCreateCS_get_ReadOnly(self)
-    def put_ReadOnly(self, *args): return _chilkat.CkCreateCS_put_ReadOnly(self, *args)
-    def get_Version(self, *args): return _chilkat.CkCreateCS_get_Version(self, *args)
-    def CreateRegistryStore(self, *args): return _chilkat.CkCreateCS_CreateRegistryStore(self, *args)
-    def OpenRegistryStore(self, *args): return _chilkat.CkCreateCS_OpenRegistryStore(self, *args)
-    def CreateFileStore(self, *args): return _chilkat.CkCreateCS_CreateFileStore(self, *args)
-    def OpenFileStore(self, *args): return _chilkat.CkCreateCS_OpenFileStore(self, *args)
-    def CreateMemoryStore(self): return _chilkat.CkCreateCS_CreateMemoryStore(self)
-    def OpenChilkatStore(self): return _chilkat.CkCreateCS_OpenChilkatStore(self)
-    def OpenOutlookStore(self): return _chilkat.CkCreateCS_OpenOutlookStore(self)
-    def OpenLocalSystemStore(self): return _chilkat.CkCreateCS_OpenLocalSystemStore(self)
-    def OpenCurrentUserStore(self): return _chilkat.CkCreateCS_OpenCurrentUserStore(self)
-    def SaveLastError(self, *args): return _chilkat.CkCreateCS_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCreateCS_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCreateCS_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCreateCS_LastErrorText(self, *args)
-CkCreateCS_swigregister = _chilkat.CkCreateCS_swigregister
-CkCreateCS_swigregister(CkCreateCS)
-
-class CkMime(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkMime, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkMime, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkMime()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkMime
-    __del__ = lambda self : None;
-    def Convert8Bit(self): return _chilkat.CkMime_Convert8Bit(self)
-    def get_UseMmDescription(self): return _chilkat.CkMime_get_UseMmDescription(self)
-    def put_UseMmDescription(self, *args): return _chilkat.CkMime_put_UseMmDescription(self, *args)
-    def GetMimeBytes(self, *args): return _chilkat.CkMime_GetMimeBytes(self, *args)
-    def ExtractPartsToFiles(self, *args): return _chilkat.CkMime_ExtractPartsToFiles(self, *args)
-    def AsnBodyToXml(self, *args): return _chilkat.CkMime_AsnBodyToXml(self, *args)
-    def asnBodyToXml(self): return _chilkat.CkMime_asnBodyToXml(self)
-    def get_CurrentDateTime(self, *args): return _chilkat.CkMime_get_CurrentDateTime(self, *args)
-    def currentDateTime(self): return _chilkat.CkMime_currentDateTime(self)
-    def EncryptN(self): return _chilkat.CkMime_EncryptN(self)
-    def AddEncryptCert(self, *args): return _chilkat.CkMime_AddEncryptCert(self, *args)
-    def ClearEncryptCerts(self): return _chilkat.CkMime_ClearEncryptCerts(self)
-    def SetBody(self, *args): return _chilkat.CkMime_SetBody(self, *args)
-    def UrlEncodeBody(self, *args): return _chilkat.CkMime_UrlEncodeBody(self, *args)
-    def AddContentLength(self): return _chilkat.CkMime_AddContentLength(self)
-    def get_VerboseLogging(self): return _chilkat.CkMime_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkMime_put_VerboseLogging(self, *args)
-    def DecryptUsingPfxData(self, *args): return _chilkat.CkMime_DecryptUsingPfxData(self, *args)
-    def DecryptUsingPfxFile(self, *args): return _chilkat.CkMime_DecryptUsingPfxFile(self, *args)
-    def AddPfxSourceData(self, *args): return _chilkat.CkMime_AddPfxSourceData(self, *args)
-    def AddPfxSourceFile(self, *args): return _chilkat.CkMime_AddPfxSourceFile(self, *args)
-    def get_Pkcs7CryptAlg(self, *args): return _chilkat.CkMime_get_Pkcs7CryptAlg(self, *args)
-    def pkcs7CryptAlg(self): return _chilkat.CkMime_pkcs7CryptAlg(self)
-    def put_Pkcs7CryptAlg(self, *args): return _chilkat.CkMime_put_Pkcs7CryptAlg(self, *args)
-    def get_Pkcs7KeyLength(self): return _chilkat.CkMime_get_Pkcs7KeyLength(self)
-    def put_Pkcs7KeyLength(self, *args): return _chilkat.CkMime_put_Pkcs7KeyLength(self, *args)
-    def get_SigningHashAlg(self, *args): return _chilkat.CkMime_get_SigningHashAlg(self, *args)
-    def signingHashAlg(self): return _chilkat.CkMime_signingHashAlg(self)
-    def put_SigningHashAlg(self, *args): return _chilkat.CkMime_put_SigningHashAlg(self, *args)
-    def GetHeaderFieldAttribute(self, *args): return _chilkat.CkMime_GetHeaderFieldAttribute(self, *args)
-    def getHeaderFieldAttribute(self, *args): return _chilkat.CkMime_getHeaderFieldAttribute(self, *args)
-    def HasSignatureSigningTime(self, *args): return _chilkat.CkMime_HasSignatureSigningTime(self, *args)
-    def GetSignatureSigningTime(self, *args): return _chilkat.CkMime_GetSignatureSigningTime(self, *args)
-    def RemoveHeaderField(self, *args): return _chilkat.CkMime_RemoveHeaderField(self, *args)
-    def entireHead(self): return _chilkat.CkMime_entireHead(self)
-    def entireBody(self): return _chilkat.CkMime_entireBody(self)
-    def xml(self): return _chilkat.CkMime_xml(self)
-    def mime(self): return _chilkat.CkMime_mime(self)
-    def bodyEncoded(self): return _chilkat.CkMime_bodyEncoded(self)
-    def bodyDecoded(self): return _chilkat.CkMime_bodyDecoded(self)
-    def charset(self): return _chilkat.CkMime_charset(self)
-    def disposition(self): return _chilkat.CkMime_disposition(self)
-    def encoding(self): return _chilkat.CkMime_encoding(self)
-    def contentType(self): return _chilkat.CkMime_contentType(self)
-    def filename(self): return _chilkat.CkMime_filename(self)
-    def name(self): return _chilkat.CkMime_name(self)
-    def boundary(self): return _chilkat.CkMime_boundary(self)
-    def micalg(self): return _chilkat.CkMime_micalg(self)
-    def protocol(self): return _chilkat.CkMime_protocol(self)
-    def header(self, *args): return _chilkat.CkMime_header(self, *args)
-    def headerName(self, *args): return _chilkat.CkMime_headerName(self, *args)
-    def headerValue(self, *args): return _chilkat.CkMime_headerValue(self, *args)
-    def getHeaderField(self, *args): return _chilkat.CkMime_getHeaderField(self, *args)
-    def getHeaderFieldName(self, *args): return _chilkat.CkMime_getHeaderFieldName(self, *args)
-    def getHeaderFieldValue(self, *args): return _chilkat.CkMime_getHeaderFieldValue(self, *args)
-    def getEntireHead(self): return _chilkat.CkMime_getEntireHead(self)
-    def getEntireBody(self): return _chilkat.CkMime_getEntireBody(self)
-    def getXml(self): return _chilkat.CkMime_getXml(self)
-    def getMime(self): return _chilkat.CkMime_getMime(self)
-    def getBodyEncoded(self): return _chilkat.CkMime_getBodyEncoded(self)
-    def getBodyDecoded(self): return _chilkat.CkMime_getBodyDecoded(self)
-    def lastErrorText(self): return _chilkat.CkMime_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkMime_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkMime_lastErrorHtml(self)
-    def get_Utf8(self): return _chilkat.CkMime_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkMime_put_Utf8(self, *args)
-    def get_Version(self, *args): return _chilkat.CkMime_get_Version(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkMime_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkMime_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkMime_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkMime_LastErrorText(self, *args)
-    def AddDetachedSignaturePk(self, *args): return _chilkat.CkMime_AddDetachedSignaturePk(self, *args)
-    def AddDetachedSignaturePk2(self, *args): return _chilkat.CkMime_AddDetachedSignaturePk2(self, *args)
-    def ConvertToSignedPk(self, *args): return _chilkat.CkMime_ConvertToSignedPk(self, *args)
-    def Decrypt(self): return _chilkat.CkMime_Decrypt(self)
-    def Decrypt2(self, *args): return _chilkat.CkMime_Decrypt2(self, *args)
-    def Verify(self): return _chilkat.CkMime_Verify(self)
-    def ConvertToMultipartMixed(self): return _chilkat.CkMime_ConvertToMultipartMixed(self)
-    def ConvertToMultipartAlt(self): return _chilkat.CkMime_ConvertToMultipartAlt(self)
-    def SetBodyFromPlainText(self, *args): return _chilkat.CkMime_SetBodyFromPlainText(self, *args)
-    def SetHeaderField(self, *args): return _chilkat.CkMime_SetHeaderField(self, *args)
-    def GetHeaderField(self, *args): return _chilkat.CkMime_GetHeaderField(self, *args)
-    def GetHeaderFieldName(self, *args): return _chilkat.CkMime_GetHeaderFieldName(self, *args)
-    def GetHeaderFieldValue(self, *args): return _chilkat.CkMime_GetHeaderFieldValue(self, *args)
-    def AddDetachedSignature2(self, *args): return _chilkat.CkMime_AddDetachedSignature2(self, *args)
-    def AddHeaderField(self, *args): return _chilkat.CkMime_AddHeaderField(self, *args)
-    def SetVerifyCert(self, *args): return _chilkat.CkMime_SetVerifyCert(self, *args)
-    def LoadMimeFile(self, *args): return _chilkat.CkMime_LoadMimeFile(self, *args)
-    def LoadMime(self, *args): return _chilkat.CkMime_LoadMime(self, *args)
-    def SaveMime(self, *args): return _chilkat.CkMime_SaveMime(self, *args)
-    def ToEmailObject(self): return _chilkat.CkMime_ToEmailObject(self)
-    def get_NumParts(self): return _chilkat.CkMime_get_NumParts(self)
-    def GetPart(self, *args): return _chilkat.CkMime_GetPart(self, *args)
-    def get_Protocol(self, *args): return _chilkat.CkMime_get_Protocol(self, *args)
-    def put_Protocol(self, *args): return _chilkat.CkMime_put_Protocol(self, *args)
-    def get_Micalg(self, *args): return _chilkat.CkMime_get_Micalg(self, *args)
-    def put_Micalg(self, *args): return _chilkat.CkMime_put_Micalg(self, *args)
-    def get_Boundary(self, *args): return _chilkat.CkMime_get_Boundary(self, *args)
-    def put_Boundary(self, *args): return _chilkat.CkMime_put_Boundary(self, *args)
-    def get_Name(self, *args): return _chilkat.CkMime_get_Name(self, *args)
-    def put_Name(self, *args): return _chilkat.CkMime_put_Name(self, *args)
-    def get_Filename(self, *args): return _chilkat.CkMime_get_Filename(self, *args)
-    def put_Filename(self, *args): return _chilkat.CkMime_put_Filename(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkMime_get_Charset(self, *args)
-    def put_Charset(self, *args): return _chilkat.CkMime_put_Charset(self, *args)
-    def get_Disposition(self, *args): return _chilkat.CkMime_get_Disposition(self, *args)
-    def put_Disposition(self, *args): return _chilkat.CkMime_put_Disposition(self, *args)
-    def get_Encoding(self, *args): return _chilkat.CkMime_get_Encoding(self, *args)
-    def put_Encoding(self, *args): return _chilkat.CkMime_put_Encoding(self, *args)
-    def get_ContentType(self, *args): return _chilkat.CkMime_get_ContentType(self, *args)
-    def put_ContentType(self, *args): return _chilkat.CkMime_put_ContentType(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkMime_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkMime_IsUnlocked(self)
-    def get_NumHeaderFields(self): return _chilkat.CkMime_get_NumHeaderFields(self)
-    def get_NumSignerCerts(self): return _chilkat.CkMime_get_NumSignerCerts(self)
-    def get_NumEncryptCerts(self): return _chilkat.CkMime_get_NumEncryptCerts(self)
-    def get_UnwrapExtras(self): return _chilkat.CkMime_get_UnwrapExtras(self)
-    def put_UnwrapExtras(self, *args): return _chilkat.CkMime_put_UnwrapExtras(self, *args)
-    def SetCSP(self, *args): return _chilkat.CkMime_SetCSP(self, *args)
-    def AppendPart(self, *args): return _chilkat.CkMime_AppendPart(self, *args)
-    def AppendPartFromFile(self, *args): return _chilkat.CkMime_AppendPartFromFile(self, *args)
-    def NewMultipartMixed(self): return _chilkat.CkMime_NewMultipartMixed(self)
-    def NewMultipartRelated(self): return _chilkat.CkMime_NewMultipartRelated(self)
-    def NewMultipartAlternative(self): return _chilkat.CkMime_NewMultipartAlternative(self)
-    def NewMessageRfc822(self, *args): return _chilkat.CkMime_NewMessageRfc822(self, *args)
-    def SaveBody(self, *args): return _chilkat.CkMime_SaveBody(self, *args)
-    def IsMultipart(self): return _chilkat.CkMime_IsMultipart(self)
-    def IsPlainText(self): return _chilkat.CkMime_IsPlainText(self)
-    def IsHtml(self): return _chilkat.CkMime_IsHtml(self)
-    def IsXml(self): return _chilkat.CkMime_IsXml(self)
-    def IsSigned(self): return _chilkat.CkMime_IsSigned(self)
-    def IsEncrypted(self): return _chilkat.CkMime_IsEncrypted(self)
-    def IsMultipartMixed(self): return _chilkat.CkMime_IsMultipartMixed(self)
-    def IsMultipartAlternative(self): return _chilkat.CkMime_IsMultipartAlternative(self)
-    def IsMultipartRelated(self): return _chilkat.CkMime_IsMultipartRelated(self)
-    def IsAttachment(self): return _chilkat.CkMime_IsAttachment(self)
-    def IsText(self): return _chilkat.CkMime_IsText(self)
-    def IsApplicationData(self): return _chilkat.CkMime_IsApplicationData(self)
-    def IsImage(self): return _chilkat.CkMime_IsImage(self)
-    def IsAudio(self): return _chilkat.CkMime_IsAudio(self)
-    def IsVideo(self): return _chilkat.CkMime_IsVideo(self)
-    def GetBodyBinary(self, *args): return _chilkat.CkMime_GetBodyBinary(self, *args)
-    def GetBodyEncoded(self, *args): return _chilkat.CkMime_GetBodyEncoded(self, *args)
-    def GetBodyDecoded(self, *args): return _chilkat.CkMime_GetBodyDecoded(self, *args)
-    def SetBodyFromEncoded(self, *args): return _chilkat.CkMime_SetBodyFromEncoded(self, *args)
-    def SetBodyFromHtml(self, *args): return _chilkat.CkMime_SetBodyFromHtml(self, *args)
-    def SetBodyFromXml(self, *args): return _chilkat.CkMime_SetBodyFromXml(self, *args)
-    def SetBodyFromBinary(self, *args): return _chilkat.CkMime_SetBodyFromBinary(self, *args)
-    def SetBodyFromFile(self, *args): return _chilkat.CkMime_SetBodyFromFile(self, *args)
-    def Encrypt(self, *args): return _chilkat.CkMime_Encrypt(self, *args)
-    def ConvertToSigned(self, *args): return _chilkat.CkMime_ConvertToSigned(self, *args)
-    def AddDetachedSignature(self, *args): return _chilkat.CkMime_AddDetachedSignature(self, *args)
-    def SaveXml(self, *args): return _chilkat.CkMime_SaveXml(self, *args)
-    def GetMime(self, *args): return _chilkat.CkMime_GetMime(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkMime_LoadXml(self, *args)
-    def GetXml(self, *args): return _chilkat.CkMime_GetXml(self, *args)
-    def GetEncryptCert(self, *args): return _chilkat.CkMime_GetEncryptCert(self, *args)
-    def GetSignerCert(self, *args): return _chilkat.CkMime_GetSignerCert(self, *args)
-    def UnwrapSecurity(self): return _chilkat.CkMime_UnwrapSecurity(self)
-    def LoadXmlFile(self, *args): return _chilkat.CkMime_LoadXmlFile(self, *args)
-    def GetEntireHead(self, *args): return _chilkat.CkMime_GetEntireHead(self, *args)
-    def GetEntireBody(self, *args): return _chilkat.CkMime_GetEntireBody(self, *args)
-    def RemovePart(self, *args): return _chilkat.CkMime_RemovePart(self, *args)
-    def ContainsEncryptedParts(self): return _chilkat.CkMime_ContainsEncryptedParts(self)
-    def ContainsSignedParts(self): return _chilkat.CkMime_ContainsSignedParts(self)
-CkMime_swigregister = _chilkat.CkMime_swigregister
-CkMime_swigregister(CkMime)
-
-class CkEmailBundle(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkEmailBundle, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkEmailBundle, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkEmailBundle()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkEmailBundle
-    __del__ = lambda self : None;
-    def FindByHeader(self, *args): return _chilkat.CkEmailBundle_FindByHeader(self, *args)
-    def RemoveEmailByIndex(self, *args): return _chilkat.CkEmailBundle_RemoveEmailByIndex(self, *args)
-    def lastErrorText(self): return _chilkat.CkEmailBundle_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkEmailBundle_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkEmailBundle_lastErrorHtml(self)
-    def getXml(self): return _chilkat.CkEmailBundle_getXml(self)
-    def get_Utf8(self): return _chilkat.CkEmailBundle_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkEmailBundle_put_Utf8(self, *args)
-    def GetUidls(self): return _chilkat.CkEmailBundle_GetUidls(self)
-    def RemoveEmail(self, *args): return _chilkat.CkEmailBundle_RemoveEmail(self, *args)
-    def GetEmail(self, *args): return _chilkat.CkEmailBundle_GetEmail(self, *args)
-    def AddEmail(self, *args): return _chilkat.CkEmailBundle_AddEmail(self, *args)
-    def get_MessageCount(self): return _chilkat.CkEmailBundle_get_MessageCount(self)
-    def GetXml(self, *args): return _chilkat.CkEmailBundle_GetXml(self, *args)
-    def SaveXml(self, *args): return _chilkat.CkEmailBundle_SaveXml(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkEmailBundle_LoadXml(self, *args)
-    def LoadXmlString(self, *args): return _chilkat.CkEmailBundle_LoadXmlString(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkEmailBundle_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkEmailBundle_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkEmailBundle_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkEmailBundle_LastErrorText(self, *args)
-    def SortBySubject(self, *args): return _chilkat.CkEmailBundle_SortBySubject(self, *args)
-    def SortBySender(self, *args): return _chilkat.CkEmailBundle_SortBySender(self, *args)
-    def SortByRecipient(self, *args): return _chilkat.CkEmailBundle_SortByRecipient(self, *args)
-    def SortByDate(self, *args): return _chilkat.CkEmailBundle_SortByDate(self, *args)
-CkEmailBundle_swigregister = _chilkat.CkEmailBundle_swigregister
-CkEmailBundle_swigregister(CkEmailBundle)
-
-class CkMailMan(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkMailMan, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkMailMan, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkMailMan()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkMailMan
-    __del__ = lambda self : None;
-    def GetSizeByUidl(self, *args): return _chilkat.CkMailMan_GetSizeByUidl(self, *args)
-    def SendMimeToList(self, *args): return _chilkat.CkMailMan_SendMimeToList(self, *args)
-    def SendToDistributionList(self, *args): return _chilkat.CkMailMan_SendToDistributionList(self, *args)
-    def get_ClientIpAddress(self, *args): return _chilkat.CkMailMan_get_ClientIpAddress(self, *args)
-    def clientIpAddress(self): return _chilkat.CkMailMan_clientIpAddress(self)
-    def put_ClientIpAddress(self, *args): return _chilkat.CkMailMan_put_ClientIpAddress(self, *args)
-    def get_Pop3SessionId(self): return _chilkat.CkMailMan_get_Pop3SessionId(self)
-    def MxLookupAll(self, *args): return _chilkat.CkMailMan_MxLookupAll(self, *args)
-    def DeleteByMsgnum(self, *args): return _chilkat.CkMailMan_DeleteByMsgnum(self, *args)
-    def FetchByMsgnum(self, *args): return _chilkat.CkMailMan_FetchByMsgnum(self, *args)
-    def FetchMimeByMsgnum(self, *args): return _chilkat.CkMailMan_FetchMimeByMsgnum(self, *args)
-    def get_SendBufferSize(self): return _chilkat.CkMailMan_get_SendBufferSize(self)
-    def put_SendBufferSize(self, *args): return _chilkat.CkMailMan_put_SendBufferSize(self, *args)
-    def SshTunnel(self, *args): return _chilkat.CkMailMan_SshTunnel(self, *args)
-    def SshAuthenticatePw(self, *args): return _chilkat.CkMailMan_SshAuthenticatePw(self, *args)
-    def SshAuthenticatePk(self, *args): return _chilkat.CkMailMan_SshAuthenticatePk(self, *args)
-    def SshCloseTunnel(self, *args): return _chilkat.CkMailMan_SshCloseTunnel(self, *args)
-    def get_IncludeRootCert(self): return _chilkat.CkMailMan_get_IncludeRootCert(self)
-    def put_IncludeRootCert(self, *args): return _chilkat.CkMailMan_put_IncludeRootCert(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkMailMan_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkMailMan_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkMailMan_put_SocksHostname(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkMailMan_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkMailMan_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkMailMan_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkMailMan_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkMailMan_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkMailMan_put_SocksPassword(self, *args)
-    def get_SocksPort(self): return _chilkat.CkMailMan_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkMailMan_put_SocksPort(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkMailMan_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkMailMan_put_SocksVersion(self, *args)
-    def SetSslClientCertPfx(self, *args): return _chilkat.CkMailMan_SetSslClientCertPfx(self, *args)
-    def SendMimeBytes(self, *args): return _chilkat.CkMailMan_SendMimeBytes(self, *args)
-    def RenderToMimeBytes(self, *args): return _chilkat.CkMailMan_RenderToMimeBytes(self, *args)
-    def SendMimeBytesQ(self, *args): return _chilkat.CkMailMan_SendMimeBytesQ(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkMailMan_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkMailMan_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkMailMan_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkMailMan_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkMailMan_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkMailMan_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkMailMan_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkMailMan_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkMailMan_put_HttpProxyUsername(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkMailMan_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkMailMan_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkMailMan_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkMailMan_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkMailMan_put_HttpProxyPort(self, *args)
-    def get_AutoFix(self): return _chilkat.CkMailMan_get_AutoFix(self)
-    def put_AutoFix(self, *args): return _chilkat.CkMailMan_put_AutoFix(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkMailMan_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkMailMan_put_VerboseLogging(self, *args)
-    def get_Pop3Stls(self): return _chilkat.CkMailMan_get_Pop3Stls(self)
-    def put_Pop3Stls(self, *args): return _chilkat.CkMailMan_put_Pop3Stls(self, *args)
-    def AddPfxSourceData(self, *args): return _chilkat.CkMailMan_AddPfxSourceData(self, *args)
-    def AddPfxSourceFile(self, *args): return _chilkat.CkMailMan_AddPfxSourceFile(self, *args)
-    def SmtpSendRawCommand(self, *args): return _chilkat.CkMailMan_SmtpSendRawCommand(self, *args)
-    def smtpSendRawCommand(self, *args): return _chilkat.CkMailMan_smtpSendRawCommand(self, *args)
-    def Pop3SendRawCommand(self, *args): return _chilkat.CkMailMan_Pop3SendRawCommand(self, *args)
-    def pop3SendRawCommand(self, *args): return _chilkat.CkMailMan_pop3SendRawCommand(self, *args)
-    def Pop3EndSessionNoQuit(self): return _chilkat.CkMailMan_Pop3EndSessionNoQuit(self)
-    def lastErrorText(self): return _chilkat.CkMailMan_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkMailMan_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkMailMan_lastErrorHtml(self)
-    def smtpPassword(self): return _chilkat.CkMailMan_smtpPassword(self)
-    def smtpUsername(self): return _chilkat.CkMailMan_smtpUsername(self)
-    def dsnNotify(self): return _chilkat.CkMailMan_dsnNotify(self)
-    def dsnEnvid(self): return _chilkat.CkMailMan_dsnEnvid(self)
-    def dsnRet(self): return _chilkat.CkMailMan_dsnRet(self)
-    def smtpAuthMethod(self): return _chilkat.CkMailMan_smtpAuthMethod(self)
-    def smtpLoginDomain(self): return _chilkat.CkMailMan_smtpLoginDomain(self)
-    def filter(self): return _chilkat.CkMailMan_filter(self)
-    def popPassword(self): return _chilkat.CkMailMan_popPassword(self)
-    def popUsername(self): return _chilkat.CkMailMan_popUsername(self)
-    def mailHost(self): return _chilkat.CkMailMan_mailHost(self)
-    def heloHostname(self): return _chilkat.CkMailMan_heloHostname(self)
-    def lastSendQFilename(self): return _chilkat.CkMailMan_lastSendQFilename(self)
-    def version(self): return _chilkat.CkMailMan_version(self)
-    def smtpHost(self): return _chilkat.CkMailMan_smtpHost(self)
-    def logMailReceivedFilename(self): return _chilkat.CkMailMan_logMailReceivedFilename(self)
-    def logMailSentFilename(self): return _chilkat.CkMailMan_logMailSentFilename(self)
-    def mxLookup(self, *args): return _chilkat.CkMailMan_mxLookup(self, *args)
-    def renderToMime(self, *args): return _chilkat.CkMailMan_renderToMime(self, *args)
-    def getMailboxInfoXml(self): return _chilkat.CkMailMan_getMailboxInfoXml(self)
-    def VerifyRecipients(self, *args): return _chilkat.CkMailMan_VerifyRecipients(self, *args)
-    def SetSslClientCert(self, *args): return _chilkat.CkMailMan_SetSslClientCert(self, *args)
-    def GetPop3SslServerCert(self): return _chilkat.CkMailMan_GetPop3SslServerCert(self)
-    def GetSmtpSslServerCert(self): return _chilkat.CkMailMan_GetSmtpSslServerCert(self)
-    def get_Pop3SslServerCertVerified(self): return _chilkat.CkMailMan_get_Pop3SslServerCertVerified(self)
-    def get_SmtpSslServerCertVerified(self): return _chilkat.CkMailMan_get_SmtpSslServerCertVerified(self)
-    def GetMailboxSize(self): return _chilkat.CkMailMan_GetMailboxSize(self)
-    def GetMailboxCount(self): return _chilkat.CkMailMan_GetMailboxCount(self)
-    def Pop3BeginSession(self): return _chilkat.CkMailMan_Pop3BeginSession(self)
-    def Pop3EndSession(self): return _chilkat.CkMailMan_Pop3EndSession(self)
-    def Pop3Noop(self): return _chilkat.CkMailMan_Pop3Noop(self)
-    def Pop3Reset(self): return _chilkat.CkMailMan_Pop3Reset(self)
-    def get_Pop3SessionLog(self, *args): return _chilkat.CkMailMan_get_Pop3SessionLog(self, *args)
-    def ClearPop3SessionLog(self): return _chilkat.CkMailMan_ClearPop3SessionLog(self)
-    def pop3SessionLog(self): return _chilkat.CkMailMan_pop3SessionLog(self)
-    def GetMailboxInfoXml(self, *args): return _chilkat.CkMailMan_GetMailboxInfoXml(self, *args)
-    def SetDecryptCert2(self, *args): return _chilkat.CkMailMan_SetDecryptCert2(self, *args)
-    def get_SmtpSessionLog(self, *args): return _chilkat.CkMailMan_get_SmtpSessionLog(self, *args)
-    def ClearSmtpSessionLog(self): return _chilkat.CkMailMan_ClearSmtpSessionLog(self)
-    def smtpSessionLog(self): return _chilkat.CkMailMan_smtpSessionLog(self)
-    def get_Utf8(self): return _chilkat.CkMailMan_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkMailMan_put_Utf8(self, *args)
-    def OpenSmtpConnection(self): return _chilkat.CkMailMan_OpenSmtpConnection(self)
-    def CloseSmtpConnection(self): return _chilkat.CkMailMan_CloseSmtpConnection(self)
-    def SmtpReset(self): return _chilkat.CkMailMan_SmtpReset(self)
-    def SmtpNoop(self): return _chilkat.CkMailMan_SmtpNoop(self)
-    def get_HeartbeatMs(self): return _chilkat.CkMailMan_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkMailMan_put_HeartbeatMs(self, *args)
-    def get_HeloHostname(self, *args): return _chilkat.CkMailMan_get_HeloHostname(self, *args)
-    def put_HeloHostname(self, *args): return _chilkat.CkMailMan_put_HeloHostname(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkMailMan_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkMailMan_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkMailMan_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkMailMan_LastErrorText(self, *args)
-    def get_SmtpPassword(self, *args): return _chilkat.CkMailMan_get_SmtpPassword(self, *args)
-    def put_SmtpPassword(self, *args): return _chilkat.CkMailMan_put_SmtpPassword(self, *args)
-    def get_SmtpUsername(self, *args): return _chilkat.CkMailMan_get_SmtpUsername(self, *args)
-    def put_SmtpUsername(self, *args): return _chilkat.CkMailMan_put_SmtpUsername(self, *args)
-    def get_DsnNotify(self, *args): return _chilkat.CkMailMan_get_DsnNotify(self, *args)
-    def put_DsnNotify(self, *args): return _chilkat.CkMailMan_put_DsnNotify(self, *args)
-    def get_DsnEnvid(self, *args): return _chilkat.CkMailMan_get_DsnEnvid(self, *args)
-    def put_DsnEnvid(self, *args): return _chilkat.CkMailMan_put_DsnEnvid(self, *args)
-    def get_DsnRet(self, *args): return _chilkat.CkMailMan_get_DsnRet(self, *args)
-    def put_DsnRet(self, *args): return _chilkat.CkMailMan_put_DsnRet(self, *args)
-    def get_LastSmtpStatus(self): return _chilkat.CkMailMan_get_LastSmtpStatus(self)
-    def get_ReadTimeout(self): return _chilkat.CkMailMan_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkMailMan_put_ReadTimeout(self, *args)
-    def get_ConnectTimeout(self): return _chilkat.CkMailMan_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkMailMan_put_ConnectTimeout(self, *args)
-    def get_ResetDateOnLoad(self): return _chilkat.CkMailMan_get_ResetDateOnLoad(self)
-    def put_ResetDateOnLoad(self, *args): return _chilkat.CkMailMan_put_ResetDateOnLoad(self, *args)
-    def get_OpaqueSigning(self): return _chilkat.CkMailMan_get_OpaqueSigning(self)
-    def put_OpaqueSigning(self, *args): return _chilkat.CkMailMan_put_OpaqueSigning(self, *args)
-    def get_AllOrNone(self): return _chilkat.CkMailMan_get_AllOrNone(self)
-    def put_AllOrNone(self, *args): return _chilkat.CkMailMan_put_AllOrNone(self, *args)
-    def get_Pop3SPA(self): return _chilkat.CkMailMan_get_Pop3SPA(self)
-    def put_Pop3SPA(self, *args): return _chilkat.CkMailMan_put_Pop3SPA(self, *args)
-    def get_StartTLS(self): return _chilkat.CkMailMan_get_StartTLS(self)
-    def put_StartTLS(self, *args): return _chilkat.CkMailMan_put_StartTLS(self, *args)
-    def get_EmbedCertChain(self): return _chilkat.CkMailMan_get_EmbedCertChain(self)
-    def put_EmbedCertChain(self, *args): return _chilkat.CkMailMan_put_EmbedCertChain(self, *args)
-    def get_PopSsl(self): return _chilkat.CkMailMan_get_PopSsl(self)
-    def put_PopSsl(self, *args): return _chilkat.CkMailMan_put_PopSsl(self, *args)
-    def get_SmtpSsl(self): return _chilkat.CkMailMan_get_SmtpSsl(self)
-    def put_SmtpSsl(self, *args): return _chilkat.CkMailMan_put_SmtpSsl(self, *args)
-    def get_ImmediateDelete(self): return _chilkat.CkMailMan_get_ImmediateDelete(self)
-    def put_ImmediateDelete(self, *args): return _chilkat.CkMailMan_put_ImmediateDelete(self, *args)
-    def get_SendIndividual(self): return _chilkat.CkMailMan_get_SendIndividual(self)
-    def put_SendIndividual(self, *args): return _chilkat.CkMailMan_put_SendIndividual(self, *args)
-    def get_SmtpAuthMethod(self, *args): return _chilkat.CkMailMan_get_SmtpAuthMethod(self, *args)
-    def put_SmtpAuthMethod(self, *args): return _chilkat.CkMailMan_put_SmtpAuthMethod(self, *args)
-    def get_SmtpLoginDomain(self, *args): return _chilkat.CkMailMan_get_SmtpLoginDomain(self, *args)
-    def put_SmtpLoginDomain(self, *args): return _chilkat.CkMailMan_put_SmtpLoginDomain(self, *args)
-    def get_Filter(self, *args): return _chilkat.CkMailMan_get_Filter(self, *args)
-    def put_Filter(self, *args): return _chilkat.CkMailMan_put_Filter(self, *args)
-    def get_SizeLimit(self): return _chilkat.CkMailMan_get_SizeLimit(self)
-    def put_SizeLimit(self, *args): return _chilkat.CkMailMan_put_SizeLimit(self, *args)
-    def get_MaxCount(self): return _chilkat.CkMailMan_get_MaxCount(self)
-    def put_MaxCount(self, *args): return _chilkat.CkMailMan_put_MaxCount(self, *args)
-    def get_MailPort(self): return _chilkat.CkMailMan_get_MailPort(self)
-    def put_MailPort(self, *args): return _chilkat.CkMailMan_put_MailPort(self, *args)
-    def get_SmtpPort(self): return _chilkat.CkMailMan_get_SmtpPort(self)
-    def put_SmtpPort(self, *args): return _chilkat.CkMailMan_put_SmtpPort(self, *args)
-    def get_PopPassword(self, *args): return _chilkat.CkMailMan_get_PopPassword(self, *args)
-    def put_PopPassword(self, *args): return _chilkat.CkMailMan_put_PopPassword(self, *args)
-    def put_PopPasswordBase64(self, *args): return _chilkat.CkMailMan_put_PopPasswordBase64(self, *args)
-    def get_PopUsername(self, *args): return _chilkat.CkMailMan_get_PopUsername(self, *args)
-    def put_PopUsername(self, *args): return _chilkat.CkMailMan_put_PopUsername(self, *args)
-    def get_MailHost(self, *args): return _chilkat.CkMailMan_get_MailHost(self, *args)
-    def put_MailHost(self, *args): return _chilkat.CkMailMan_put_MailHost(self, *args)
-    def get_LastSendQFilename(self, *args): return _chilkat.CkMailMan_get_LastSendQFilename(self, *args)
-    def get_Version(self, *args): return _chilkat.CkMailMan_get_Version(self, *args)
-    def get_SmtpHost(self, *args): return _chilkat.CkMailMan_get_SmtpHost(self, *args)
-    def put_SmtpHost(self, *args): return _chilkat.CkMailMan_put_SmtpHost(self, *args)
-    def get_AutoGenMessageId(self): return _chilkat.CkMailMan_get_AutoGenMessageId(self)
-    def put_AutoGenMessageId(self, *args): return _chilkat.CkMailMan_put_AutoGenMessageId(self, *args)
-    def get_LogMailReceivedFilename(self, *args): return _chilkat.CkMailMan_get_LogMailReceivedFilename(self, *args)
-    def put_LogMailReceivedFilename(self, *args): return _chilkat.CkMailMan_put_LogMailReceivedFilename(self, *args)
-    def get_LogMailSentFilename(self, *args): return _chilkat.CkMailMan_get_LogMailSentFilename(self, *args)
-    def put_LogMailSentFilename(self, *args): return _chilkat.CkMailMan_put_LogMailSentFilename(self, *args)
-    def ClearBadEmailAddresses(self): return _chilkat.CkMailMan_ClearBadEmailAddresses(self)
-    def GetBadEmailAddresses(self): return _chilkat.CkMailMan_GetBadEmailAddresses(self)
-    def GetUidls(self): return _chilkat.CkMailMan_GetUidls(self)
-    def IsSmtpDsnCapable(self): return _chilkat.CkMailMan_IsSmtpDsnCapable(self)
-    def VerifySmtpLogin(self): return _chilkat.CkMailMan_VerifySmtpLogin(self)
-    def VerifySmtpConnection(self): return _chilkat.CkMailMan_VerifySmtpConnection(self)
-    def VerifyPopLogin(self): return _chilkat.CkMailMan_VerifyPopLogin(self)
-    def VerifyPopConnection(self): return _chilkat.CkMailMan_VerifyPopConnection(self)
-    def FetchMultiple(self, *args): return _chilkat.CkMailMan_FetchMultiple(self, *args)
-    def FetchMultipleMime(self, *args): return _chilkat.CkMailMan_FetchMultipleMime(self, *args)
-    def TransferMultipleMime(self, *args): return _chilkat.CkMailMan_TransferMultipleMime(self, *args)
-    def FetchMultipleHeaders(self, *args): return _chilkat.CkMailMan_FetchMultipleHeaders(self, *args)
-    def DeleteByUidl(self, *args): return _chilkat.CkMailMan_DeleteByUidl(self, *args)
-    def FetchEmail(self, *args): return _chilkat.CkMailMan_FetchEmail(self, *args)
-    def FetchMime(self, *args): return _chilkat.CkMailMan_FetchMime(self, *args)
-    def DeleteMultiple(self, *args): return _chilkat.CkMailMan_DeleteMultiple(self, *args)
-    def DeleteBundle(self, *args): return _chilkat.CkMailMan_DeleteBundle(self, *args)
-    def FetchSingleHeader(self, *args): return _chilkat.CkMailMan_FetchSingleHeader(self, *args)
-    def FetchSingleHeaderByUidl(self, *args): return _chilkat.CkMailMan_FetchSingleHeaderByUidl(self, *args)
-    def GetFullEmail(self, *args): return _chilkat.CkMailMan_GetFullEmail(self, *args)
-    def GetHeaders(self, *args): return _chilkat.CkMailMan_GetHeaders(self, *args)
-    def DeleteEmail(self, *args): return _chilkat.CkMailMan_DeleteEmail(self, *args)
-    def GetAllHeaders(self, *args): return _chilkat.CkMailMan_GetAllHeaders(self, *args)
-    def LoadXmlString(self, *args): return _chilkat.CkMailMan_LoadXmlString(self, *args)
-    def LoadXmlFile(self, *args): return _chilkat.CkMailMan_LoadXmlFile(self, *args)
-    def LoadXmlEmail(self, *args): return _chilkat.CkMailMan_LoadXmlEmail(self, *args)
-    def MxLookup(self, *args): return _chilkat.CkMailMan_MxLookup(self, *args)
-    def LoadXmlEmailString(self, *args): return _chilkat.CkMailMan_LoadXmlEmailString(self, *args)
-    def QuickSend(self, *args): return _chilkat.CkMailMan_QuickSend(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkMailMan_UnlockComponent(self, *args)
-    def CheckMail(self): return _chilkat.CkMailMan_CheckMail(self)
-    def TransferMail(self): return _chilkat.CkMailMan_TransferMail(self)
-    def CopyMail(self): return _chilkat.CkMailMan_CopyMail(self)
-    def SendBundle(self, *args): return _chilkat.CkMailMan_SendBundle(self, *args)
-    def SendEmail(self, *args): return _chilkat.CkMailMan_SendEmail(self, *args)
-    def SendQ(self, *args): return _chilkat.CkMailMan_SendQ(self, *args)
-    def SendQ2(self, *args): return _chilkat.CkMailMan_SendQ2(self, *args)
-    def LoadMbx(self, *args): return _chilkat.CkMailMan_LoadMbx(self, *args)
-    def LoadEml(self, *args): return _chilkat.CkMailMan_LoadEml(self, *args)
-    def LoadMime(self, *args): return _chilkat.CkMailMan_LoadMime(self, *args)
-    def IsUnlocked(self): return _chilkat.CkMailMan_IsUnlocked(self)
-    def RenderToMime(self, *args): return _chilkat.CkMailMan_RenderToMime(self, *args)
-    def SendMime(self, *args): return _chilkat.CkMailMan_SendMime(self, *args)
-    def SendMimeQ(self, *args): return _chilkat.CkMailMan_SendMimeQ(self, *args)
-CkMailMan_swigregister = _chilkat.CkMailMan_swigregister
-CkMailMan_swigregister(CkMailMan)
-
-class CkGzip(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkGzip, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkGzip, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkGzip()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkGzip
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkGzip_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkGzip_put_Utf8(self, *args)
-    def get_Version(self, *args): return _chilkat.CkGzip_get_Version(self, *args)
-    def version(self): return _chilkat.CkGzip_version(self)
-    def CompressFile2(self, *args): return _chilkat.CkGzip_CompressFile2(self, *args)
-    def CompressString(self, *args): return _chilkat.CkGzip_CompressString(self, *args)
-    def CompressStringToFile(self, *args): return _chilkat.CkGzip_CompressStringToFile(self, *args)
-    def ReadFile(self, *args): return _chilkat.CkGzip_ReadFile(self, *args)
-    def UnTarGz(self, *args): return _chilkat.CkGzip_UnTarGz(self, *args)
-    def UncompressFileToString(self, *args): return _chilkat.CkGzip_UncompressFileToString(self, *args)
-    def uncompressFileToString(self, *args): return _chilkat.CkGzip_uncompressFileToString(self, *args)
-    def UncompressString(self, *args): return _chilkat.CkGzip_UncompressString(self, *args)
-    def uncompressString(self, *args): return _chilkat.CkGzip_uncompressString(self, *args)
-    def WriteFile(self, *args): return _chilkat.CkGzip_WriteFile(self, *args)
-    def ExamineFile(self, *args): return _chilkat.CkGzip_ExamineFile(self, *args)
-    def ExamineMemory(self, *args): return _chilkat.CkGzip_ExamineMemory(self, *args)
-    def Decode(self, *args): return _chilkat.CkGzip_Decode(self, *args)
-    def get_UseCurrentDate(self): return _chilkat.CkGzip_get_UseCurrentDate(self)
-    def put_UseCurrentDate(self, *args): return _chilkat.CkGzip_put_UseCurrentDate(self, *args)
-    def XfdlToXml(self, *args): return _chilkat.CkGzip_XfdlToXml(self, *args)
-    def xfdlToXml(self, *args): return _chilkat.CkGzip_xfdlToXml(self, *args)
-    def Encode(self, *args): return _chilkat.CkGzip_Encode(self, *args)
-    def encode(self, *args): return _chilkat.CkGzip_encode(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkGzip_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkGzip_put_VerboseLogging(self, *args)
-    def lastErrorText(self): return _chilkat.CkGzip_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkGzip_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkGzip_lastErrorHtml(self)
-    def comment(self): return _chilkat.CkGzip_comment(self)
-    def filename(self): return _chilkat.CkGzip_filename(self)
-    def DeflateStringENC(self, *args): return _chilkat.CkGzip_DeflateStringENC(self, *args)
-    def InflateStringENC(self, *args): return _chilkat.CkGzip_InflateStringENC(self, *args)
-    def deflateStringENC(self, *args): return _chilkat.CkGzip_deflateStringENC(self, *args)
-    def inflateStringENC(self, *args): return _chilkat.CkGzip_inflateStringENC(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkGzip_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkGzip_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkGzip_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkGzip_LastErrorText(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkGzip_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkGzip_IsUnlocked(self)
-    def CompressFile(self, *args): return _chilkat.CkGzip_CompressFile(self, *args)
-    def UncompressFile(self, *args): return _chilkat.CkGzip_UncompressFile(self, *args)
-    def CompressFileToMem(self, *args): return _chilkat.CkGzip_CompressFileToMem(self, *args)
-    def UncompressFileToMem(self, *args): return _chilkat.CkGzip_UncompressFileToMem(self, *args)
-    def CompressMemToFile(self, *args): return _chilkat.CkGzip_CompressMemToFile(self, *args)
-    def UncompressMemToFile(self, *args): return _chilkat.CkGzip_UncompressMemToFile(self, *args)
-    def CompressMemory(self, *args): return _chilkat.CkGzip_CompressMemory(self, *args)
-    def UncompressMemory(self, *args): return _chilkat.CkGzip_UncompressMemory(self, *args)
-    def get_Filename(self, *args): return _chilkat.CkGzip_get_Filename(self, *args)
-    def put_Filename(self, *args): return _chilkat.CkGzip_put_Filename(self, *args)
-    def get_Comment(self, *args): return _chilkat.CkGzip_get_Comment(self, *args)
-    def put_Comment(self, *args): return _chilkat.CkGzip_put_Comment(self, *args)
-    def get_ExtraData(self, *args): return _chilkat.CkGzip_get_ExtraData(self, *args)
-    def put_ExtraData(self, *args): return _chilkat.CkGzip_put_ExtraData(self, *args)
-    def get_LastMod(self, *args): return _chilkat.CkGzip_get_LastMod(self, *args)
-    def put_LastMod(self, *args): return _chilkat.CkGzip_put_LastMod(self, *args)
-CkGzip_swigregister = _chilkat.CkGzip_swigregister
-CkGzip_swigregister(CkGzip)
-
-class CkUnixCompress(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkUnixCompress, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkUnixCompress, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkUnixCompress()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkUnixCompress
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkUnixCompress_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkUnixCompress_put_Utf8(self, *args)
-    def UncompressString(self, *args): return _chilkat.CkUnixCompress_UncompressString(self, *args)
-    def uncompressString(self, *args): return _chilkat.CkUnixCompress_uncompressString(self, *args)
-    def UncompressFileToString(self, *args): return _chilkat.CkUnixCompress_UncompressFileToString(self, *args)
-    def uncompressFileToString(self, *args): return _chilkat.CkUnixCompress_uncompressFileToString(self, *args)
-    def UnTarZ(self, *args): return _chilkat.CkUnixCompress_UnTarZ(self, *args)
-    def CompressStringToFile(self, *args): return _chilkat.CkUnixCompress_CompressStringToFile(self, *args)
-    def CompressString(self, *args): return _chilkat.CkUnixCompress_CompressString(self, *args)
-    def lastErrorText(self): return _chilkat.CkUnixCompress_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkUnixCompress_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkUnixCompress_lastErrorHtml(self)
-    def SaveLastError(self, *args): return _chilkat.CkUnixCompress_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkUnixCompress_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkUnixCompress_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkUnixCompress_LastErrorText(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkUnixCompress_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkUnixCompress_IsUnlocked(self)
-    def CompressFile(self, *args): return _chilkat.CkUnixCompress_CompressFile(self, *args)
-    def UncompressFile(self, *args): return _chilkat.CkUnixCompress_UncompressFile(self, *args)
-    def CompressFileToMem(self, *args): return _chilkat.CkUnixCompress_CompressFileToMem(self, *args)
-    def UncompressFileToMem(self, *args): return _chilkat.CkUnixCompress_UncompressFileToMem(self, *args)
-    def CompressMemToFile(self, *args): return _chilkat.CkUnixCompress_CompressMemToFile(self, *args)
-    def UncompressMemToFile(self, *args): return _chilkat.CkUnixCompress_UncompressMemToFile(self, *args)
-    def CompressMemory(self, *args): return _chilkat.CkUnixCompress_CompressMemory(self, *args)
-    def UncompressMemory(self, *args): return _chilkat.CkUnixCompress_UncompressMemory(self, *args)
-CkUnixCompress_swigregister = _chilkat.CkUnixCompress_swigregister
-CkUnixCompress_swigregister(CkUnixCompress)
-
-class CkCrypt2(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCrypt2, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCrypt2, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCrypt2()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCrypt2
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCrypt2_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCrypt2_put_Utf8(self, *args)
-    def get_IncludeCertChain(self): return _chilkat.CkCrypt2_get_IncludeCertChain(self)
-    def put_IncludeCertChain(self, *args): return _chilkat.CkCrypt2_put_IncludeCertChain(self, *args)
-    def GenEncodedSecretKey(self, *args): return _chilkat.CkCrypt2_GenEncodedSecretKey(self, *args)
-    def ReadFile(self, *args): return _chilkat.CkCrypt2_ReadFile(self, *args)
-    def StringToBytes(self, *args): return _chilkat.CkCrypt2_StringToBytes(self, *args)
-    def BytesToString(self, *args): return _chilkat.CkCrypt2_BytesToString(self, *args)
-    def bytesToString(self, *args): return _chilkat.CkCrypt2_bytesToString(self, *args)
-    def TrimEndingWith(self, *args): return _chilkat.CkCrypt2_TrimEndingWith(self, *args)
-    def trimEndingWith(self, *args): return _chilkat.CkCrypt2_trimEndingWith(self, *args)
-    def WriteFile(self, *args): return _chilkat.CkCrypt2_WriteFile(self, *args)
-    def SetDecryptCert(self, *args): return _chilkat.CkCrypt2_SetDecryptCert(self, *args)
-    def EncryptEncoded(self, *args): return _chilkat.CkCrypt2_EncryptEncoded(self, *args)
-    def encryptEncoded(self, *args): return _chilkat.CkCrypt2_encryptEncoded(self, *args)
-    def DecryptEncoded(self, *args): return _chilkat.CkCrypt2_DecryptEncoded(self, *args)
-    def decryptEncoded(self, *args): return _chilkat.CkCrypt2_decryptEncoded(self, *args)
-    def ReEncode(self, *args): return _chilkat.CkCrypt2_ReEncode(self, *args)
-    def reEncode(self, *args): return _chilkat.CkCrypt2_reEncode(self, *args)
-    def RandomizeKey(self): return _chilkat.CkCrypt2_RandomizeKey(self)
-    def AddEncryptCert(self, *args): return _chilkat.CkCrypt2_AddEncryptCert(self, *args)
-    def ClearEncryptCerts(self): return _chilkat.CkCrypt2_ClearEncryptCerts(self)
-    def GenRandomBytesENC(self, *args): return _chilkat.CkCrypt2_GenRandomBytesENC(self, *args)
-    def genRandomBytesENC(self, *args): return _chilkat.CkCrypt2_genRandomBytesENC(self, *args)
-    def Pbkdf1(self, *args): return _chilkat.CkCrypt2_Pbkdf1(self, *args)
-    def pbkdf1(self, *args): return _chilkat.CkCrypt2_pbkdf1(self, *args)
-    def Pbkdf2(self, *args): return _chilkat.CkCrypt2_Pbkdf2(self, *args)
-    def pbkdf2(self, *args): return _chilkat.CkCrypt2_pbkdf2(self, *args)
-    def get_PbesPassword(self, *args): return _chilkat.CkCrypt2_get_PbesPassword(self, *args)
-    def pbesPassword(self): return _chilkat.CkCrypt2_pbesPassword(self)
-    def put_PbesPassword(self, *args): return _chilkat.CkCrypt2_put_PbesPassword(self, *args)
-    def get_Salt(self, *args): return _chilkat.CkCrypt2_get_Salt(self, *args)
-    def put_Salt(self, *args): return _chilkat.CkCrypt2_put_Salt(self, *args)
-    def get_IterationCount(self): return _chilkat.CkCrypt2_get_IterationCount(self)
-    def put_IterationCount(self, *args): return _chilkat.CkCrypt2_put_IterationCount(self, *args)
-    def SetEncodedSalt(self, *args): return _chilkat.CkCrypt2_SetEncodedSalt(self, *args)
-    def GetEncodedSalt(self, *args): return _chilkat.CkCrypt2_GetEncodedSalt(self, *args)
-    def getEncodedSalt(self, *args): return _chilkat.CkCrypt2_getEncodedSalt(self, *args)
-    def get_PbesAlgorithm(self, *args): return _chilkat.CkCrypt2_get_PbesAlgorithm(self, *args)
-    def pbesAlgorithm(self): return _chilkat.CkCrypt2_pbesAlgorithm(self)
-    def put_PbesAlgorithm(self, *args): return _chilkat.CkCrypt2_put_PbesAlgorithm(self, *args)
-    def HashBeginBytes(self, *args): return _chilkat.CkCrypt2_HashBeginBytes(self, *args)
-    def HashBeginString(self, *args): return _chilkat.CkCrypt2_HashBeginString(self, *args)
-    def HashMoreString(self, *args): return _chilkat.CkCrypt2_HashMoreString(self, *args)
-    def HashMoreBytes(self, *args): return _chilkat.CkCrypt2_HashMoreBytes(self, *args)
-    def HashFinal(self, *args): return _chilkat.CkCrypt2_HashFinal(self, *args)
-    def HashFinalENC(self, *args): return _chilkat.CkCrypt2_HashFinalENC(self, *args)
-    def hashFinalENC(self): return _chilkat.CkCrypt2_hashFinalENC(self)
-    def MySqlAesEncrypt(self, *args): return _chilkat.CkCrypt2_MySqlAesEncrypt(self, *args)
-    def mySqlAesEncrypt(self, *args): return _chilkat.CkCrypt2_mySqlAesEncrypt(self, *args)
-    def MySqlAesDecrypt(self, *args): return _chilkat.CkCrypt2_MySqlAesDecrypt(self, *args)
-    def mySqlAesDecrypt(self, *args): return _chilkat.CkCrypt2_mySqlAesDecrypt(self, *args)
-    def EncodeString(self, *args): return _chilkat.CkCrypt2_EncodeString(self, *args)
-    def encodeString(self, *args): return _chilkat.CkCrypt2_encodeString(self, *args)
-    def DecodeString(self, *args): return _chilkat.CkCrypt2_DecodeString(self, *args)
-    def decodeString(self, *args): return _chilkat.CkCrypt2_decodeString(self, *args)
-    def get_UuMode(self, *args): return _chilkat.CkCrypt2_get_UuMode(self, *args)
-    def uuMode(self): return _chilkat.CkCrypt2_uuMode(self)
-    def put_UuMode(self, *args): return _chilkat.CkCrypt2_put_UuMode(self, *args)
-    def get_UuFilename(self, *args): return _chilkat.CkCrypt2_get_UuFilename(self, *args)
-    def uuFilename(self): return _chilkat.CkCrypt2_uuFilename(self)
-    def put_UuFilename(self, *args): return _chilkat.CkCrypt2_put_UuFilename(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkCrypt2_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkCrypt2_put_VerboseLogging(self, *args)
-    def AddPfxSourceData(self, *args): return _chilkat.CkCrypt2_AddPfxSourceData(self, *args)
-    def AddPfxSourceFile(self, *args): return _chilkat.CkCrypt2_AddPfxSourceFile(self, *args)
-    def get_Pkcs7CryptAlg(self, *args): return _chilkat.CkCrypt2_get_Pkcs7CryptAlg(self, *args)
-    def pkcs7CryptAlg(self): return _chilkat.CkCrypt2_pkcs7CryptAlg(self)
-    def put_Pkcs7CryptAlg(self, *args): return _chilkat.CkCrypt2_put_Pkcs7CryptAlg(self, *args)
-    def get_FirstChunk(self): return _chilkat.CkCrypt2_get_FirstChunk(self)
-    def put_FirstChunk(self, *args): return _chilkat.CkCrypt2_put_FirstChunk(self, *args)
-    def get_LastChunk(self): return _chilkat.CkCrypt2_get_LastChunk(self)
-    def put_LastChunk(self, *args): return _chilkat.CkCrypt2_put_LastChunk(self, *args)
-    def get_BlockSize(self): return _chilkat.CkCrypt2_get_BlockSize(self)
-    def genEncodedSecretKey(self, *args): return _chilkat.CkCrypt2_genEncodedSecretKey(self, *args)
-    def SetSecretKeyViaPassword(self, *args): return _chilkat.CkCrypt2_SetSecretKeyViaPassword(self, *args)
-    def get_HavalRounds(self): return _chilkat.CkCrypt2_get_HavalRounds(self)
-    def put_HavalRounds(self, *args): return _chilkat.CkCrypt2_put_HavalRounds(self, *args)
-    def get_Rc2EffectiveKeyLength(self): return _chilkat.CkCrypt2_get_Rc2EffectiveKeyLength(self)
-    def put_Rc2EffectiveKeyLength(self, *args): return _chilkat.CkCrypt2_put_Rc2EffectiveKeyLength(self, *args)
-    def CreateDetachedSignature(self, *args): return _chilkat.CkCrypt2_CreateDetachedSignature(self, *args)
-    def VerifyDetachedSignature(self, *args): return _chilkat.CkCrypt2_VerifyDetachedSignature(self, *args)
-    def SetSigningCert2(self, *args): return _chilkat.CkCrypt2_SetSigningCert2(self, *args)
-    def SetDecryptCert2(self, *args): return _chilkat.CkCrypt2_SetDecryptCert2(self, *args)
-    def HashFileENC(self, *args): return _chilkat.CkCrypt2_HashFileENC(self, *args)
-    def HashFile(self, *args): return _chilkat.CkCrypt2_HashFile(self, *args)
-    def hashFileENC(self, *args): return _chilkat.CkCrypt2_hashFileENC(self, *args)
-    def SetHmacKeyBytes(self, *args): return _chilkat.CkCrypt2_SetHmacKeyBytes(self, *args)
-    def SetHmacKeyString(self, *args): return _chilkat.CkCrypt2_SetHmacKeyString(self, *args)
-    def SetHmacKeyEncoded(self, *args): return _chilkat.CkCrypt2_SetHmacKeyEncoded(self, *args)
-    def HmacBytes(self, *args): return _chilkat.CkCrypt2_HmacBytes(self, *args)
-    def HmacString(self, *args): return _chilkat.CkCrypt2_HmacString(self, *args)
-    def HmacBytesENC(self, *args): return _chilkat.CkCrypt2_HmacBytesENC(self, *args)
-    def HmacStringENC(self, *args): return _chilkat.CkCrypt2_HmacStringENC(self, *args)
-    def hmacStringENC(self, *args): return _chilkat.CkCrypt2_hmacStringENC(self, *args)
-    def hmacBytesENC(self, *args): return _chilkat.CkCrypt2_hmacBytesENC(self, *args)
-    def CreateP7S(self, *args): return _chilkat.CkCrypt2_CreateP7S(self, *args)
-    def VerifyP7S(self, *args): return _chilkat.CkCrypt2_VerifyP7S(self, *args)
-    def CreateP7M(self, *args): return _chilkat.CkCrypt2_CreateP7M(self, *args)
-    def VerifyP7M(self, *args): return _chilkat.CkCrypt2_VerifyP7M(self, *args)
-    def OpaqueVerifyStringENC(self, *args): return _chilkat.CkCrypt2_OpaqueVerifyStringENC(self, *args)
-    def OpaqueVerifyString(self, *args): return _chilkat.CkCrypt2_OpaqueVerifyString(self, *args)
-    def OpaqueVerifyBytesENC(self, *args): return _chilkat.CkCrypt2_OpaqueVerifyBytesENC(self, *args)
-    def OpaqueVerifyBytes(self, *args): return _chilkat.CkCrypt2_OpaqueVerifyBytes(self, *args)
-    def OpaqueSignStringENC(self, *args): return _chilkat.CkCrypt2_OpaqueSignStringENC(self, *args)
-    def OpaqueSignBytesENC(self, *args): return _chilkat.CkCrypt2_OpaqueSignBytesENC(self, *args)
-    def OpaqueSignString(self, *args): return _chilkat.CkCrypt2_OpaqueSignString(self, *args)
-    def OpaqueSignBytes(self, *args): return _chilkat.CkCrypt2_OpaqueSignBytes(self, *args)
-    def opaqueSignStringENC(self, *args): return _chilkat.CkCrypt2_opaqueSignStringENC(self, *args)
-    def opaqueSignBytesENC(self, *args): return _chilkat.CkCrypt2_opaqueSignBytesENC(self, *args)
-    def opaqueVerifyStringENC(self, *args): return _chilkat.CkCrypt2_opaqueVerifyStringENC(self, *args)
-    def opaqueVerifyString(self, *args): return _chilkat.CkCrypt2_opaqueVerifyString(self, *args)
-    def signStringENC(self, *args): return _chilkat.CkCrypt2_signStringENC(self, *args)
-    def signBytesENC(self, *args): return _chilkat.CkCrypt2_signBytesENC(self, *args)
-    def inflateStringENC(self, *args): return _chilkat.CkCrypt2_inflateStringENC(self, *args)
-    def inflateString(self, *args): return _chilkat.CkCrypt2_inflateString(self, *args)
-    def compressStringENC(self, *args): return _chilkat.CkCrypt2_compressStringENC(self, *args)
-    def compressBytesENC(self, *args): return _chilkat.CkCrypt2_compressBytesENC(self, *args)
-    def encryptStringENC(self, *args): return _chilkat.CkCrypt2_encryptStringENC(self, *args)
-    def encryptBytesENC(self, *args): return _chilkat.CkCrypt2_encryptBytesENC(self, *args)
-    def decryptString(self, *args): return _chilkat.CkCrypt2_decryptString(self, *args)
-    def decryptStringENC(self, *args): return _chilkat.CkCrypt2_decryptStringENC(self, *args)
-    def hashStringENC(self, *args): return _chilkat.CkCrypt2_hashStringENC(self, *args)
-    def hashBytesENC(self, *args): return _chilkat.CkCrypt2_hashBytesENC(self, *args)
-    def getEncodedKey(self, *args): return _chilkat.CkCrypt2_getEncodedKey(self, *args)
-    def getEncodedIV(self, *args): return _chilkat.CkCrypt2_getEncodedIV(self, *args)
-    def encode(self, *args): return _chilkat.CkCrypt2_encode(self, *args)
-    def encodingMode(self): return _chilkat.CkCrypt2_encodingMode(self)
-    def compressionAlgorithm(self): return _chilkat.CkCrypt2_compressionAlgorithm(self)
-    def cryptAlgorithm(self): return _chilkat.CkCrypt2_cryptAlgorithm(self)
-    def hashAlgorithm(self): return _chilkat.CkCrypt2_hashAlgorithm(self)
-    def charset(self): return _chilkat.CkCrypt2_charset(self)
-    def cipherMode(self): return _chilkat.CkCrypt2_cipherMode(self)
-    def version(self): return _chilkat.CkCrypt2_version(self)
-    def lastErrorText(self): return _chilkat.CkCrypt2_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCrypt2_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCrypt2_lastErrorHtml(self)
-    def SetEncodedKey(self, *args): return _chilkat.CkCrypt2_SetEncodedKey(self, *args)
-    def SetEncodedIV(self, *args): return _chilkat.CkCrypt2_SetEncodedIV(self, *args)
-    def GetEncodedKey(self, *args): return _chilkat.CkCrypt2_GetEncodedKey(self, *args)
-    def GetEncodedIV(self, *args): return _chilkat.CkCrypt2_GetEncodedIV(self, *args)
-    def Encode(self, *args): return _chilkat.CkCrypt2_Encode(self, *args)
-    def Decode(self, *args): return _chilkat.CkCrypt2_Decode(self, *args)
-    def RandomizeIV(self): return _chilkat.CkCrypt2_RandomizeIV(self)
-    def SetCSP(self, *args): return _chilkat.CkCrypt2_SetCSP(self, *args)
-    def GetLastCert(self): return _chilkat.CkCrypt2_GetLastCert(self)
-    def SetEncryptCert(self, *args): return _chilkat.CkCrypt2_SetEncryptCert(self, *args)
-    def SetSigningCert(self, *args): return _chilkat.CkCrypt2_SetSigningCert(self, *args)
-    def SetVerifyCert(self, *args): return _chilkat.CkCrypt2_SetVerifyCert(self, *args)
-    def CkEncryptFile(self, *args): return _chilkat.CkCrypt2_CkEncryptFile(self, *args)
-    def CkDecryptFile(self, *args): return _chilkat.CkCrypt2_CkDecryptFile(self, *args)
-    def VerifyStringENC(self, *args): return _chilkat.CkCrypt2_VerifyStringENC(self, *args)
-    def VerifyString(self, *args): return _chilkat.CkCrypt2_VerifyString(self, *args)
-    def VerifyBytesENC(self, *args): return _chilkat.CkCrypt2_VerifyBytesENC(self, *args)
-    def VerifyBytes(self, *args): return _chilkat.CkCrypt2_VerifyBytes(self, *args)
-    def SignStringENC(self, *args): return _chilkat.CkCrypt2_SignStringENC(self, *args)
-    def SignBytesENC(self, *args): return _chilkat.CkCrypt2_SignBytesENC(self, *args)
-    def SignString(self, *args): return _chilkat.CkCrypt2_SignString(self, *args)
-    def SignBytes(self, *args): return _chilkat.CkCrypt2_SignBytes(self, *args)
-    def InflateStringENC(self, *args): return _chilkat.CkCrypt2_InflateStringENC(self, *args)
-    def InflateString(self, *args): return _chilkat.CkCrypt2_InflateString(self, *args)
-    def InflateBytesENC(self, *args): return _chilkat.CkCrypt2_InflateBytesENC(self, *args)
-    def InflateBytes(self, *args): return _chilkat.CkCrypt2_InflateBytes(self, *args)
-    def CompressStringENC(self, *args): return _chilkat.CkCrypt2_CompressStringENC(self, *args)
-    def CompressBytesENC(self, *args): return _chilkat.CkCrypt2_CompressBytesENC(self, *args)
-    def CompressString(self, *args): return _chilkat.CkCrypt2_CompressString(self, *args)
-    def CompressBytes(self, *args): return _chilkat.CkCrypt2_CompressBytes(self, *args)
-    def get_CompressionAlgorithm(self, *args): return _chilkat.CkCrypt2_get_CompressionAlgorithm(self, *args)
-    def put_CompressionAlgorithm(self, *args): return _chilkat.CkCrypt2_put_CompressionAlgorithm(self, *args)
-    def DecryptStringENC(self, *args): return _chilkat.CkCrypt2_DecryptStringENC(self, *args)
-    def DecryptString(self, *args): return _chilkat.CkCrypt2_DecryptString(self, *args)
-    def DecryptBytesENC(self, *args): return _chilkat.CkCrypt2_DecryptBytesENC(self, *args)
-    def DecryptBytes(self, *args): return _chilkat.CkCrypt2_DecryptBytes(self, *args)
-    def EncryptStringENC(self, *args): return _chilkat.CkCrypt2_EncryptStringENC(self, *args)
-    def EncryptBytesENC(self, *args): return _chilkat.CkCrypt2_EncryptBytesENC(self, *args)
-    def EncryptString(self, *args): return _chilkat.CkCrypt2_EncryptString(self, *args)
-    def EncryptBytes(self, *args): return _chilkat.CkCrypt2_EncryptBytes(self, *args)
-    def HashBytesENC(self, *args): return _chilkat.CkCrypt2_HashBytesENC(self, *args)
-    def HashStringENC(self, *args): return _chilkat.CkCrypt2_HashStringENC(self, *args)
-    def HashBytes(self, *args): return _chilkat.CkCrypt2_HashBytes(self, *args)
-    def HashString(self, *args): return _chilkat.CkCrypt2_HashString(self, *args)
-    def get_EncodingMode(self, *args): return _chilkat.CkCrypt2_get_EncodingMode(self, *args)
-    def put_EncodingMode(self, *args): return _chilkat.CkCrypt2_put_EncodingMode(self, *args)
-    def get_CryptAlgorithm(self, *args): return _chilkat.CkCrypt2_get_CryptAlgorithm(self, *args)
-    def put_CryptAlgorithm(self, *args): return _chilkat.CkCrypt2_put_CryptAlgorithm(self, *args)
-    def get_HashAlgorithm(self, *args): return _chilkat.CkCrypt2_get_HashAlgorithm(self, *args)
-    def put_HashAlgorithm(self, *args): return _chilkat.CkCrypt2_put_HashAlgorithm(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkCrypt2_get_Charset(self, *args)
-    def put_Charset(self, *args): return _chilkat.CkCrypt2_put_Charset(self, *args)
-    def GenerateSecretKey(self, *args): return _chilkat.CkCrypt2_GenerateSecretKey(self, *args)
-    def get_CipherMode(self, *args): return _chilkat.CkCrypt2_get_CipherMode(self, *args)
-    def put_CipherMode(self, *args): return _chilkat.CkCrypt2_put_CipherMode(self, *args)
-    def get_PaddingScheme(self): return _chilkat.CkCrypt2_get_PaddingScheme(self)
-    def put_PaddingScheme(self, *args): return _chilkat.CkCrypt2_put_PaddingScheme(self, *args)
-    def get_KeyLength(self): return _chilkat.CkCrypt2_get_KeyLength(self)
-    def put_KeyLength(self, *args): return _chilkat.CkCrypt2_put_KeyLength(self, *args)
-    def get_IV(self, *args): return _chilkat.CkCrypt2_get_IV(self, *args)
-    def put_IV(self, *args): return _chilkat.CkCrypt2_put_IV(self, *args)
-    def get_SecretKey(self, *args): return _chilkat.CkCrypt2_get_SecretKey(self, *args)
-    def put_SecretKey(self, *args): return _chilkat.CkCrypt2_put_SecretKey(self, *args)
-    def get_Version(self, *args): return _chilkat.CkCrypt2_get_Version(self, *args)
-    def IsUnlocked(self): return _chilkat.CkCrypt2_IsUnlocked(self)
-    def UnlockComponent(self, *args): return _chilkat.CkCrypt2_UnlockComponent(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCrypt2_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCrypt2_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCrypt2_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCrypt2_LastErrorText(self, *args)
-    def SetSecretKey(self, *args): return _chilkat.CkCrypt2_SetSecretKey(self, *args)
-    def SetIV(self, *args): return _chilkat.CkCrypt2_SetIV(self, *args)
-    def encodeBytes(self, *args): return _chilkat.CkCrypt2_encodeBytes(self, *args)
-CkCrypt2_swigregister = _chilkat.CkCrypt2_swigregister
-CkCrypt2_swigregister(CkCrypt2)
-
-class CkFtp2(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkFtp2, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkFtp2, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkFtp2()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkFtp2
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkFtp2_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkFtp2_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkFtp2_lastErrorHtml(self)
-    def get_AllocateSize(self): return _chilkat.CkFtp2_get_AllocateSize(self)
-    def get_ConnectVerified(self): return _chilkat.CkFtp2_get_ConnectVerified(self)
-    def get_LoginVerified(self): return _chilkat.CkFtp2_get_LoginVerified(self)
-    def get_PartialTransfer(self): return _chilkat.CkFtp2_get_PartialTransfer(self)
-    def SendCommand(self, *args): return _chilkat.CkFtp2_SendCommand(self, *args)
-    def sendCommand(self, *args): return _chilkat.CkFtp2_sendCommand(self, *args)
-    def DirTreeXml(self, *args): return _chilkat.CkFtp2_DirTreeXml(self, *args)
-    def dirTreeXml(self): return _chilkat.CkFtp2_dirTreeXml(self)
-    def get_BandwidthThrottleUp(self): return _chilkat.CkFtp2_get_BandwidthThrottleUp(self)
-    def put_BandwidthThrottleUp(self, *args): return _chilkat.CkFtp2_put_BandwidthThrottleUp(self, *args)
-    def get_BandwidthThrottleDown(self): return _chilkat.CkFtp2_get_BandwidthThrottleDown(self)
-    def put_BandwidthThrottleDown(self, *args): return _chilkat.CkFtp2_put_BandwidthThrottleDown(self, *args)
-    def get_ActivePortRangeStart(self): return _chilkat.CkFtp2_get_ActivePortRangeStart(self)
-    def put_ActivePortRangeStart(self, *args): return _chilkat.CkFtp2_put_ActivePortRangeStart(self, *args)
-    def get_ActivePortRangeEnd(self): return _chilkat.CkFtp2_get_ActivePortRangeEnd(self)
-    def put_ActivePortRangeEnd(self, *args): return _chilkat.CkFtp2_put_ActivePortRangeEnd(self, *args)
-    def ClearDirCache(self): return _chilkat.CkFtp2_ClearDirCache(self)
-    def get_Account(self, *args): return _chilkat.CkFtp2_get_Account(self, *args)
-    def put_Account(self, *args): return _chilkat.CkFtp2_put_Account(self, *args)
-    def account(self): return _chilkat.CkFtp2_account(self)
-    def get_ProxyPort(self): return _chilkat.CkFtp2_get_ProxyPort(self)
-    def put_ProxyPort(self, *args): return _chilkat.CkFtp2_put_ProxyPort(self, *args)
-    def get_RestartNext(self): return _chilkat.CkFtp2_get_RestartNext(self)
-    def put_RestartNext(self, *args): return _chilkat.CkFtp2_put_RestartNext(self, *args)
-    def SetModeZ(self): return _chilkat.CkFtp2_SetModeZ(self)
-    def get_HasModeZ(self): return _chilkat.CkFtp2_get_HasModeZ(self)
-    def get_AutoXcrc(self): return _chilkat.CkFtp2_get_AutoXcrc(self)
-    def put_AutoXcrc(self, *args): return _chilkat.CkFtp2_put_AutoXcrc(self, *args)
-    def get_AutoFeat(self): return _chilkat.CkFtp2_get_AutoFeat(self)
-    def put_AutoFeat(self, *args): return _chilkat.CkFtp2_put_AutoFeat(self, *args)
-    def get_AutoSyst(self): return _chilkat.CkFtp2_get_AutoSyst(self)
-    def put_AutoSyst(self, *args): return _chilkat.CkFtp2_put_AutoSyst(self, *args)
-    def Feat(self, *args): return _chilkat.CkFtp2_Feat(self, *args)
-    def feat(self): return _chilkat.CkFtp2_feat(self)
-    def SetSslClientCert(self, *args): return _chilkat.CkFtp2_SetSslClientCert(self, *args)
-    def dirListingCharset(self): return _chilkat.CkFtp2_dirListingCharset(self)
-    def getFilename(self, *args): return _chilkat.CkFtp2_getFilename(self, *args)
-    def listPattern(self): return _chilkat.CkFtp2_listPattern(self)
-    def password(self): return _chilkat.CkFtp2_password(self)
-    def username(self): return _chilkat.CkFtp2_username(self)
-    def hostname(self): return _chilkat.CkFtp2_hostname(self)
-    def sessionLog(self): return _chilkat.CkFtp2_sessionLog(self)
-    def getXmlDirListing(self, *args): return _chilkat.CkFtp2_getXmlDirListing(self, *args)
-    def getTextDirListing(self, *args): return _chilkat.CkFtp2_getTextDirListing(self, *args)
-    def getRemoteFileTextData(self, *args): return _chilkat.CkFtp2_getRemoteFileTextData(self, *args)
-    def getRemoteFileTextC(self, *args): return _chilkat.CkFtp2_getRemoteFileTextC(self, *args)
-    def version(self): return _chilkat.CkFtp2_version(self)
-    def getCurrentRemoteDir(self): return _chilkat.CkFtp2_getCurrentRemoteDir(self)
-    def proxyHostname(self): return _chilkat.CkFtp2_proxyHostname(self)
-    def syst(self): return _chilkat.CkFtp2_syst(self)
-    def ck_stat(self): return _chilkat.CkFtp2_ck_stat(self)
-    def asyncLog(self): return _chilkat.CkFtp2_asyncLog(self)
-    def get_Utf8(self): return _chilkat.CkFtp2_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkFtp2_put_Utf8(self, *args)
-    def get_SslServerCertVerified(self): return _chilkat.CkFtp2_get_SslServerCertVerified(self)
-    def GetSslServerCert(self): return _chilkat.CkFtp2_GetSslServerCert(self)
-    def get_RequireSslCertVerify(self): return _chilkat.CkFtp2_get_RequireSslCertVerify(self)
-    def put_RequireSslCertVerify(self, *args): return _chilkat.CkFtp2_put_RequireSslCertVerify(self, *args)
-    def SetSslCertRequirement(self, *args): return _chilkat.CkFtp2_SetSslCertRequirement(self, *args)
-    def get_AuthSsl(self): return _chilkat.CkFtp2_get_AuthSsl(self)
-    def put_AuthSsl(self, *args): return _chilkat.CkFtp2_put_AuthSsl(self, *args)
-    def DetermineSettings(self, *args): return _chilkat.CkFtp2_DetermineSettings(self, *args)
-    def determineSettings(self): return _chilkat.CkFtp2_determineSettings(self)
-    def DetermineProxyMethod(self): return _chilkat.CkFtp2_DetermineProxyMethod(self)
-    def get_PassiveUseHostAddr(self): return _chilkat.CkFtp2_get_PassiveUseHostAddr(self)
-    def put_PassiveUseHostAddr(self, *args): return _chilkat.CkFtp2_put_PassiveUseHostAddr(self, *args)
-    def get_CrlfMode(self): return _chilkat.CkFtp2_get_CrlfMode(self)
-    def put_CrlfMode(self, *args): return _chilkat.CkFtp2_put_CrlfMode(self, *args)
-    def get_ConnectFailReason(self): return _chilkat.CkFtp2_get_ConnectFailReason(self)
-    def ClearControlChannel(self): return _chilkat.CkFtp2_ClearControlChannel(self)
-    def SleepMs(self, *args): return _chilkat.CkFtp2_SleepMs(self, *args)
-    def AppendFile(self, *args): return _chilkat.CkFtp2_AppendFile(self, *args)
-    def AppendFileFromBinaryData(self, *args): return _chilkat.CkFtp2_AppendFileFromBinaryData(self, *args)
-    def AppendFileFromTextData(self, *args): return _chilkat.CkFtp2_AppendFileFromTextData(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkFtp2_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkFtp2_IsUnlocked(self)
-    def SaveLastError(self, *args): return _chilkat.CkFtp2_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkFtp2_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkFtp2_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkFtp2_LastErrorText(self, *args)
-    def get_IsConnected(self): return _chilkat.CkFtp2_get_IsConnected(self)
-    def DeleteMatching(self, *args): return _chilkat.CkFtp2_DeleteMatching(self, *args)
-    def MGetFiles(self, *args): return _chilkat.CkFtp2_MGetFiles(self, *args)
-    def MPutFiles(self, *args): return _chilkat.CkFtp2_MPutFiles(self, *args)
-    def PutTree(self, *args): return _chilkat.CkFtp2_PutTree(self, *args)
-    def GetFile(self, *args): return _chilkat.CkFtp2_GetFile(self, *args)
-    def PutFile(self, *args): return _chilkat.CkFtp2_PutFile(self, *args)
-    def PutFileFromBinaryData(self, *args): return _chilkat.CkFtp2_PutFileFromBinaryData(self, *args)
-    def PutFileFromTextData(self, *args): return _chilkat.CkFtp2_PutFileFromTextData(self, *args)
-    def GetRemoteFileBinaryData(self, *args): return _chilkat.CkFtp2_GetRemoteFileBinaryData(self, *args)
-    def GetRemoteFileTextData(self, *args): return _chilkat.CkFtp2_GetRemoteFileTextData(self, *args)
-    def GetRemoteFileTextC(self, *args): return _chilkat.CkFtp2_GetRemoteFileTextC(self, *args)
-    def get_Version(self, *args): return _chilkat.CkFtp2_get_Version(self, *args)
-    def RenameRemoteFile(self, *args): return _chilkat.CkFtp2_RenameRemoteFile(self, *args)
-    def DeleteRemoteFile(self, *args): return _chilkat.CkFtp2_DeleteRemoteFile(self, *args)
-    def RemoveRemoteDir(self, *args): return _chilkat.CkFtp2_RemoveRemoteDir(self, *args)
-    def CreateRemoteDir(self, *args): return _chilkat.CkFtp2_CreateRemoteDir(self, *args)
-    def Disconnect(self): return _chilkat.CkFtp2_Disconnect(self)
-    def Connect(self): return _chilkat.CkFtp2_Connect(self)
-    def GetCurrentRemoteDir(self, *args): return _chilkat.CkFtp2_GetCurrentRemoteDir(self, *args)
-    def ChangeRemoteDir(self, *args): return _chilkat.CkFtp2_ChangeRemoteDir(self, *args)
-    def get_DirListingCharset(self, *args): return _chilkat.CkFtp2_get_DirListingCharset(self, *args)
-    def put_DirListingCharset(self, *args): return _chilkat.CkFtp2_put_DirListingCharset(self, *args)
-    def get_ListPattern(self, *args): return _chilkat.CkFtp2_get_ListPattern(self, *args)
-    def put_ListPattern(self, *args): return _chilkat.CkFtp2_put_ListPattern(self, *args)
-    def get_Password(self, *args): return _chilkat.CkFtp2_get_Password(self, *args)
-    def put_Password(self, *args): return _chilkat.CkFtp2_put_Password(self, *args)
-    def get_Username(self, *args): return _chilkat.CkFtp2_get_Username(self, *args)
-    def put_Username(self, *args): return _chilkat.CkFtp2_put_Username(self, *args)
-    def get_Port(self): return _chilkat.CkFtp2_get_Port(self)
-    def put_Port(self, *args): return _chilkat.CkFtp2_put_Port(self, *args)
-    def get_Hostname(self, *args): return _chilkat.CkFtp2_get_Hostname(self, *args)
-    def put_Hostname(self, *args): return _chilkat.CkFtp2_put_Hostname(self, *args)
-    def get_SessionLog(self, *args): return _chilkat.CkFtp2_get_SessionLog(self, *args)
-    def get_Passive(self): return _chilkat.CkFtp2_get_Passive(self)
-    def put_Passive(self, *args): return _chilkat.CkFtp2_put_Passive(self, *args)
-    def get_KeepSessionLog(self): return _chilkat.CkFtp2_get_KeepSessionLog(self)
-    def put_KeepSessionLog(self, *args): return _chilkat.CkFtp2_put_KeepSessionLog(self, *args)
-    def GetSize(self, *args): return _chilkat.CkFtp2_GetSize(self, *args)
-    def GetFilename(self, *args): return _chilkat.CkFtp2_GetFilename(self, *args)
-    def GetIsDirectory(self, *args): return _chilkat.CkFtp2_GetIsDirectory(self, *args)
-    def GetCreateTime(self, *args): return _chilkat.CkFtp2_GetCreateTime(self, *args)
-    def GetLastAccessTime(self, *args): return _chilkat.CkFtp2_GetLastAccessTime(self, *args)
-    def GetLastModifiedTime(self, *args): return _chilkat.CkFtp2_GetLastModifiedTime(self, *args)
-    def get_NumFilesAndDirs(self): return _chilkat.CkFtp2_get_NumFilesAndDirs(self)
-    def get_ProxyHostname(self, *args): return _chilkat.CkFtp2_get_ProxyHostname(self, *args)
-    def put_ProxyHostname(self, *args): return _chilkat.CkFtp2_put_ProxyHostname(self, *args)
-    def get_ProxyMethod(self): return _chilkat.CkFtp2_get_ProxyMethod(self)
-    def put_ProxyMethod(self, *args): return _chilkat.CkFtp2_put_ProxyMethod(self, *args)
-    def get_Ssl(self): return _chilkat.CkFtp2_get_Ssl(self)
-    def put_Ssl(self, *args): return _chilkat.CkFtp2_put_Ssl(self, *args)
-    def get_AuthTls(self): return _chilkat.CkFtp2_get_AuthTls(self)
-    def put_AuthTls(self, *args): return _chilkat.CkFtp2_put_AuthTls(self, *args)
-    def get_HeartbeatMs(self): return _chilkat.CkFtp2_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkFtp2_put_HeartbeatMs(self, *args)
-    def get_IdleTimeoutMs(self): return _chilkat.CkFtp2_get_IdleTimeoutMs(self)
-    def put_IdleTimeoutMs(self, *args): return _chilkat.CkFtp2_put_IdleTimeoutMs(self, *args)
-    def get_UploadRate(self): return _chilkat.CkFtp2_get_UploadRate(self)
-    def get_DownloadRate(self): return _chilkat.CkFtp2_get_DownloadRate(self)
-    def AsyncGetFileStart(self, *args): return _chilkat.CkFtp2_AsyncGetFileStart(self, *args)
-    def AsyncPutFileStart(self, *args): return _chilkat.CkFtp2_AsyncPutFileStart(self, *args)
-    def AsyncAppendFileStart(self, *args): return _chilkat.CkFtp2_AsyncAppendFileStart(self, *args)
-    def AsyncAbort(self): return _chilkat.CkFtp2_AsyncAbort(self)
-    def get_AsyncFinished(self): return _chilkat.CkFtp2_get_AsyncFinished(self)
-    def get_AsyncLog(self, *args): return _chilkat.CkFtp2_get_AsyncLog(self, *args)
-    def get_AsyncSuccess(self): return _chilkat.CkFtp2_get_AsyncSuccess(self)
-    def get_AsyncBytesReceived(self): return _chilkat.CkFtp2_get_AsyncBytesReceived(self)
-    def get_AsyncBytesSent(self): return _chilkat.CkFtp2_get_AsyncBytesSent(self)
-    def DownloadTree(self, *args): return _chilkat.CkFtp2_DownloadTree(self, *args)
-    def DeleteTree(self): return _chilkat.CkFtp2_DeleteTree(self)
-    def GetIsSymbolicLink(self, *args): return _chilkat.CkFtp2_GetIsSymbolicLink(self, *args)
-    def createPlan(self, *args): return _chilkat.CkFtp2_createPlan(self, *args)
-    def CreatePlan(self, *args): return _chilkat.CkFtp2_CreatePlan(self, *args)
-    def PutPlan(self, *args): return _chilkat.CkFtp2_PutPlan(self, *args)
-    def GetSizeByName(self, *args): return _chilkat.CkFtp2_GetSizeByName(self, *args)
-    def ClearSessionLog(self): return _chilkat.CkFtp2_ClearSessionLog(self)
-    def SetTypeBinary(self): return _chilkat.CkFtp2_SetTypeBinary(self)
-    def SetTypeAscii(self): return _chilkat.CkFtp2_SetTypeAscii(self)
-    def Site(self, *args): return _chilkat.CkFtp2_Site(self, *args)
-    def Quote(self, *args): return _chilkat.CkFtp2_Quote(self, *args)
-    def Syst(self, *args): return _chilkat.CkFtp2_Syst(self, *args)
-    def Stat(self, *args): return _chilkat.CkFtp2_Stat(self, *args)
-    def get_ReadTimeout(self): return _chilkat.CkFtp2_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkFtp2_put_ReadTimeout(self, *args)
-    def get_ConnectTimeout(self): return _chilkat.CkFtp2_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkFtp2_put_ConnectTimeout(self, *args)
-    def GetXmlDirListing(self, *args): return _chilkat.CkFtp2_GetXmlDirListing(self, *args)
-    def GetTextDirListing(self, *args): return _chilkat.CkFtp2_GetTextDirListing(self, *args)
-    def get_ProxyPassword(self, *args): return _chilkat.CkFtp2_get_ProxyPassword(self, *args)
-    def proxyPassword(self): return _chilkat.CkFtp2_proxyPassword(self)
-    def put_ProxyPassword(self, *args): return _chilkat.CkFtp2_put_ProxyPassword(self, *args)
-    def get_ProxyUsername(self, *args): return _chilkat.CkFtp2_get_ProxyUsername(self, *args)
-    def proxyUsername(self): return _chilkat.CkFtp2_proxyUsername(self)
-    def put_ProxyUsername(self, *args): return _chilkat.CkFtp2_put_ProxyUsername(self, *args)
-    def GetCreateTimeByName(self, *args): return _chilkat.CkFtp2_GetCreateTimeByName(self, *args)
-    def GetLastAccessTimeByName(self, *args): return _chilkat.CkFtp2_GetLastAccessTimeByName(self, *args)
-    def GetLastModifiedTimeByName(self, *args): return _chilkat.CkFtp2_GetLastModifiedTimeByName(self, *args)
-    def GetSizeStr(self, *args): return _chilkat.CkFtp2_GetSizeStr(self, *args)
-    def getSizeStr(self, *args): return _chilkat.CkFtp2_getSizeStr(self, *args)
-    def Noop(self): return _chilkat.CkFtp2_Noop(self)
-    def SetOldestDate(self, *args): return _chilkat.CkFtp2_SetOldestDate(self, *args)
-    def SyncLocalTree(self, *args): return _chilkat.CkFtp2_SyncLocalTree(self, *args)
-    def SyncRemoteTree(self, *args): return _chilkat.CkFtp2_SyncRemoteTree(self, *args)
-    def ConvertToTls(self): return _chilkat.CkFtp2_ConvertToTls(self)
-    def GetSizeStrByName(self, *args): return _chilkat.CkFtp2_GetSizeStrByName(self, *args)
-    def getSizeStrByName(self, *args): return _chilkat.CkFtp2_getSizeStrByName(self, *args)
-    def SetRemoteFileDateTime(self, *args): return _chilkat.CkFtp2_SetRemoteFileDateTime(self, *args)
-    def get_SendBufferSize(self): return _chilkat.CkFtp2_get_SendBufferSize(self)
-    def put_SendBufferSize(self, *args): return _chilkat.CkFtp2_put_SendBufferSize(self, *args)
-    def get_UseEpsv(self): return _chilkat.CkFtp2_get_UseEpsv(self)
-    def put_UseEpsv(self, *args): return _chilkat.CkFtp2_put_UseEpsv(self, *args)
-    def get_ForcePortIpAddress(self, *args): return _chilkat.CkFtp2_get_ForcePortIpAddress(self, *args)
-    def forcePortIpAddress(self): return _chilkat.CkFtp2_forcePortIpAddress(self)
-    def put_ForcePortIpAddress(self, *args): return _chilkat.CkFtp2_put_ForcePortIpAddress(self, *args)
-    def NlstXml(self, *args): return _chilkat.CkFtp2_NlstXml(self, *args)
-    def nlstXml(self, *args): return _chilkat.CkFtp2_nlstXml(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkFtp2_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkFtp2_put_SocksVersion(self, *args)
-    def get_SocksPort(self): return _chilkat.CkFtp2_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkFtp2_put_SocksPort(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkFtp2_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkFtp2_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkFtp2_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkFtp2_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkFtp2_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkFtp2_put_SocksPassword(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkFtp2_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkFtp2_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkFtp2_put_SocksHostname(self, *args)
-    def get_Greeting(self, *args): return _chilkat.CkFtp2_get_Greeting(self, *args)
-    def greeting(self): return _chilkat.CkFtp2_greeting(self)
-    def SetSslClientCertPfx(self, *args): return _chilkat.CkFtp2_SetSslClientCertPfx(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkFtp2_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkFtp2_put_VerboseLogging(self, *args)
-    def get_SslProtocol(self, *args): return _chilkat.CkFtp2_get_SslProtocol(self, *args)
-    def sslProtocol(self): return _chilkat.CkFtp2_sslProtocol(self)
-    def put_SslProtocol(self, *args): return _chilkat.CkFtp2_put_SslProtocol(self, *args)
-    def get_AutoGetSizeForProgress(self): return _chilkat.CkFtp2_get_AutoGetSizeForProgress(self)
-    def put_AutoGetSizeForProgress(self, *args): return _chilkat.CkFtp2_put_AutoGetSizeForProgress(self, *args)
-    def get_SyncPreview(self, *args): return _chilkat.CkFtp2_get_SyncPreview(self, *args)
-    def syncPreview(self): return _chilkat.CkFtp2_syncPreview(self)
-    def SyncRemoteTree2(self, *args): return _chilkat.CkFtp2_SyncRemoteTree2(self, *args)
-    def get_AutoFix(self): return _chilkat.CkFtp2_get_AutoFix(self)
-    def put_AutoFix(self, *args): return _chilkat.CkFtp2_put_AutoFix(self, *args)
-    def get_ClientIpAddress(self, *args): return _chilkat.CkFtp2_get_ClientIpAddress(self, *args)
-    def clientIpAddress(self): return _chilkat.CkFtp2_clientIpAddress(self)
-    def put_ClientIpAddress(self, *args): return _chilkat.CkFtp2_put_ClientIpAddress(self, *args)
-CkFtp2_swigregister = _chilkat.CkFtp2_swigregister
-CkFtp2_swigregister(CkFtp2)
-
-class CkMht(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkMht, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkMht, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkMht()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkMht
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkMht_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkMht_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkMht_lastErrorHtml(self)
-    def get_UseIEProxy(self): return _chilkat.CkMht_get_UseIEProxy(self)
-    def put_UseIEProxy(self, *args): return _chilkat.CkMht_put_UseIEProxy(self, *args)
-    def get_UseFilename(self): return _chilkat.CkMht_get_UseFilename(self)
-    def put_UseFilename(self, *args): return _chilkat.CkMht_put_UseFilename(self, *args)
-    def get_UseInline(self): return _chilkat.CkMht_get_UseInline(self)
-    def put_UseInline(self, *args): return _chilkat.CkMht_put_UseInline(self, *args)
-    def GetMime(self, *args): return _chilkat.CkMht_GetMime(self, *args)
-    def HtmlToEMLFile(self, *args): return _chilkat.CkMht_HtmlToEMLFile(self, *args)
-    def HtmlToMHTFile(self, *args): return _chilkat.CkMht_HtmlToMHTFile(self, *args)
-    def get_EmbedLocalOnly(self): return _chilkat.CkMht_get_EmbedLocalOnly(self)
-    def put_EmbedLocalOnly(self, *args): return _chilkat.CkMht_put_EmbedLocalOnly(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkMht_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkMht_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkMht_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkMht_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkMht_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkMht_put_SocksPassword(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkMht_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkMht_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkMht_put_SocksHostname(self, *args)
-    def get_SocksPort(self): return _chilkat.CkMht_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkMht_put_SocksPort(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkMht_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkMht_put_SocksVersion(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkMht_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkMht_put_VerboseLogging(self, *args)
-    def get_ProxyLogin(self, *args): return _chilkat.CkMht_get_ProxyLogin(self, *args)
-    def put_ProxyLogin(self, *args): return _chilkat.CkMht_put_ProxyLogin(self, *args)
-    def get_ProxyPassword(self, *args): return _chilkat.CkMht_get_ProxyPassword(self, *args)
-    def put_ProxyPassword(self, *args): return _chilkat.CkMht_put_ProxyPassword(self, *args)
-    def proxyLogin(self): return _chilkat.CkMht_proxyLogin(self)
-    def proxyPassword(self): return _chilkat.CkMht_proxyPassword(self)
-    def put_NumCacheLevels(self, *args): return _chilkat.CkMht_put_NumCacheLevels(self, *args)
-    def get_NumCacheLevels(self): return _chilkat.CkMht_get_NumCacheLevels(self)
-    def get_NumCacheRoots(self): return _chilkat.CkMht_get_NumCacheRoots(self)
-    def GetCacheRoot(self, *args): return _chilkat.CkMht_GetCacheRoot(self, *args)
-    def getCacheRoot(self, *args): return _chilkat.CkMht_getCacheRoot(self, *args)
-    def AddCacheRoot(self, *args): return _chilkat.CkMht_AddCacheRoot(self, *args)
-    def get_UpdateCache(self): return _chilkat.CkMht_get_UpdateCache(self)
-    def put_UpdateCache(self, *args): return _chilkat.CkMht_put_UpdateCache(self, *args)
-    def get_FetchFromCache(self): return _chilkat.CkMht_get_FetchFromCache(self)
-    def put_FetchFromCache(self, *args): return _chilkat.CkMht_put_FetchFromCache(self, *args)
-    def get_IgnoreNoCache(self): return _chilkat.CkMht_get_IgnoreNoCache(self)
-    def put_IgnoreNoCache(self, *args): return _chilkat.CkMht_put_IgnoreNoCache(self, *args)
-    def get_IgnoreMustRevalidate(self): return _chilkat.CkMht_get_IgnoreMustRevalidate(self)
-    def put_IgnoreMustRevalidate(self, *args): return _chilkat.CkMht_put_IgnoreMustRevalidate(self, *args)
-    def getMHT(self, *args): return _chilkat.CkMht_getMHT(self, *args)
-    def getEML(self, *args): return _chilkat.CkMht_getEML(self, *args)
-    def htmlToMHT(self, *args): return _chilkat.CkMht_htmlToMHT(self, *args)
-    def htmlToEML(self, *args): return _chilkat.CkMht_htmlToEML(self, *args)
-    def webSiteLogin(self): return _chilkat.CkMht_webSiteLogin(self)
-    def webSitePassword(self): return _chilkat.CkMht_webSitePassword(self)
-    def debugHtmlBefore(self): return _chilkat.CkMht_debugHtmlBefore(self)
-    def debugHtmlAfter(self): return _chilkat.CkMht_debugHtmlAfter(self)
-    def baseUrl(self): return _chilkat.CkMht_baseUrl(self)
-    def proxy(self): return _chilkat.CkMht_proxy(self)
-    def version(self): return _chilkat.CkMht_version(self)
-    def get_Utf8(self): return _chilkat.CkMht_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkMht_put_Utf8(self, *args)
-    def get_NtlmAuth(self): return _chilkat.CkMht_get_NtlmAuth(self)
-    def put_NtlmAuth(self, *args): return _chilkat.CkMht_put_NtlmAuth(self, *args)
-    def UnpackMHT(self, *args): return _chilkat.CkMht_UnpackMHT(self, *args)
-    def UnpackMHTString(self, *args): return _chilkat.CkMht_UnpackMHTString(self, *args)
-    def GetAndZipMHT(self, *args): return _chilkat.CkMht_GetAndZipMHT(self, *args)
-    def GetAndZipEML(self, *args): return _chilkat.CkMht_GetAndZipEML(self, *args)
-    def GetEmail(self, *args): return _chilkat.CkMht_GetEmail(self, *args)
-    def GetAndSaveMHT(self, *args): return _chilkat.CkMht_GetAndSaveMHT(self, *args)
-    def GetAndSaveEML(self, *args): return _chilkat.CkMht_GetAndSaveEML(self, *args)
-    def GetMHT(self, *args): return _chilkat.CkMht_GetMHT(self, *args)
-    def GetEML(self, *args): return _chilkat.CkMht_GetEML(self, *args)
-    def HtmlToEmail(self, *args): return _chilkat.CkMht_HtmlToEmail(self, *args)
-    def HtmlToMHT(self, *args): return _chilkat.CkMht_HtmlToMHT(self, *args)
-    def HtmlToEML(self, *args): return _chilkat.CkMht_HtmlToEML(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkMht_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkMht_IsUnlocked(self)
-    def AddExternalStyleSheet(self, *args): return _chilkat.CkMht_AddExternalStyleSheet(self, *args)
-    def ExcludeImagesMatching(self, *args): return _chilkat.CkMht_ExcludeImagesMatching(self, *args)
-    def RestoreDefaults(self): return _chilkat.CkMht_RestoreDefaults(self)
-    def get_PreferMHTScripts(self): return _chilkat.CkMht_get_PreferMHTScripts(self)
-    def put_PreferMHTScripts(self, *args): return _chilkat.CkMht_put_PreferMHTScripts(self, *args)
-    def get_NoScripts(self): return _chilkat.CkMht_get_NoScripts(self)
-    def put_NoScripts(self, *args): return _chilkat.CkMht_put_NoScripts(self, *args)
-    def get_UseCids(self): return _chilkat.CkMht_get_UseCids(self)
-    def put_UseCids(self, *args): return _chilkat.CkMht_put_UseCids(self, *args)
-    def get_EmbedImages(self): return _chilkat.CkMht_get_EmbedImages(self)
-    def put_EmbedImages(self, *args): return _chilkat.CkMht_put_EmbedImages(self, *args)
-    def get_DebugTagCleaning(self): return _chilkat.CkMht_get_DebugTagCleaning(self)
-    def put_DebugTagCleaning(self, *args): return _chilkat.CkMht_put_DebugTagCleaning(self, *args)
-    def get_WebSiteLogin(self, *args): return _chilkat.CkMht_get_WebSiteLogin(self, *args)
-    def put_WebSiteLogin(self, *args): return _chilkat.CkMht_put_WebSiteLogin(self, *args)
-    def get_WebSitePassword(self, *args): return _chilkat.CkMht_get_WebSitePassword(self, *args)
-    def put_WebSitePassword(self, *args): return _chilkat.CkMht_put_WebSitePassword(self, *args)
-    def get_DebugHtmlBefore(self, *args): return _chilkat.CkMht_get_DebugHtmlBefore(self, *args)
-    def put_DebugHtmlBefore(self, *args): return _chilkat.CkMht_put_DebugHtmlBefore(self, *args)
-    def get_DebugHtmlAfter(self, *args): return _chilkat.CkMht_get_DebugHtmlAfter(self, *args)
-    def put_DebugHtmlAfter(self, *args): return _chilkat.CkMht_put_DebugHtmlAfter(self, *args)
-    def get_BaseUrl(self, *args): return _chilkat.CkMht_get_BaseUrl(self, *args)
-    def put_BaseUrl(self, *args): return _chilkat.CkMht_put_BaseUrl(self, *args)
-    def get_Proxy(self, *args): return _chilkat.CkMht_get_Proxy(self, *args)
-    def put_Proxy(self, *args): return _chilkat.CkMht_put_Proxy(self, *args)
-    def get_Version(self, *args): return _chilkat.CkMht_get_Version(self, *args)
-    def get_ReadTimeout(self): return _chilkat.CkMht_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkMht_put_ReadTimeout(self, *args)
-    def get_ConnectTimeout(self): return _chilkat.CkMht_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkMht_put_ConnectTimeout(self, *args)
-    def AddCustomHeader(self, *args): return _chilkat.CkMht_AddCustomHeader(self, *args)
-    def RemoveCustomHeader(self, *args): return _chilkat.CkMht_RemoveCustomHeader(self, *args)
-    def ClearCustomHeaders(self): return _chilkat.CkMht_ClearCustomHeaders(self)
-    def SaveLastError(self, *args): return _chilkat.CkMht_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkMht_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkMht_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkMht_LastErrorText(self, *args)
-CkMht_swigregister = _chilkat.CkMht_swigregister
-CkMht_swigregister(CkMht)
-
-class CkHttp(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkHttp, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkHttp, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkHttp()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkHttp
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkHttp_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkHttp_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkHttp_lastErrorHtml(self)
-    def RenderGet(self, *args): return _chilkat.CkHttp_RenderGet(self, *args)
-    def renderGet(self, *args): return _chilkat.CkHttp_renderGet(self, *args)
-    def GetCookieXml(self, *args): return _chilkat.CkHttp_GetCookieXml(self, *args)
-    def getCookieXml(self, *args): return _chilkat.CkHttp_getCookieXml(self, *args)
-    def get_RequiredContentType(self, *args): return _chilkat.CkHttp_get_RequiredContentType(self, *args)
-    def requiredContentType(self): return _chilkat.CkHttp_requiredContentType(self)
-    def put_RequiredContentType(self, *args): return _chilkat.CkHttp_put_RequiredContentType(self, *args)
-    def DownloadAppend(self, *args): return _chilkat.CkHttp_DownloadAppend(self, *args)
-    def PostMime(self, *args): return _chilkat.CkHttp_PostMime(self, *args)
-    def UrlDecode(self, *args): return _chilkat.CkHttp_UrlDecode(self, *args)
-    def urlDecode(self, *args): return _chilkat.CkHttp_urlDecode(self, *args)
-    def UrlEncode(self, *args): return _chilkat.CkHttp_UrlEncode(self, *args)
-    def urlEncode(self, *args): return _chilkat.CkHttp_urlEncode(self, *args)
-    def get_SslProtocol(self, *args): return _chilkat.CkHttp_get_SslProtocol(self, *args)
-    def sslProtocol(self): return _chilkat.CkHttp_sslProtocol(self)
-    def put_SslProtocol(self, *args): return _chilkat.CkHttp_put_SslProtocol(self, *args)
-    def GetHead(self, *args): return _chilkat.CkHttp_GetHead(self, *args)
-    def XmlRpc(self, *args): return _chilkat.CkHttp_XmlRpc(self, *args)
-    def xmlRpc(self, *args): return _chilkat.CkHttp_xmlRpc(self, *args)
-    def GenTimeStamp(self, *args): return _chilkat.CkHttp_GenTimeStamp(self, *args)
-    def genTimeStamp(self): return _chilkat.CkHttp_genTimeStamp(self)
-    def XmlRpcPut(self, *args): return _chilkat.CkHttp_XmlRpcPut(self, *args)
-    def xmlRpcPut(self, *args): return _chilkat.CkHttp_xmlRpcPut(self, *args)
-    def QuickPutStr(self, *args): return _chilkat.CkHttp_QuickPutStr(self, *args)
-    def quickPutStr(self, *args): return _chilkat.CkHttp_quickPutStr(self, *args)
-    def QuickDeleteStr(self, *args): return _chilkat.CkHttp_QuickDeleteStr(self, *args)
-    def quickDeleteStr(self, *args): return _chilkat.CkHttp_quickDeleteStr(self, *args)
-    def PutText(self, *args): return _chilkat.CkHttp_PutText(self, *args)
-    def putText(self, *args): return _chilkat.CkHttp_putText(self, *args)
-    def PutBinary(self, *args): return _chilkat.CkHttp_PutBinary(self, *args)
-    def putBinary(self, *args): return _chilkat.CkHttp_putBinary(self, *args)
-    def get_SendBufferSize(self): return _chilkat.CkHttp_get_SendBufferSize(self)
-    def put_SendBufferSize(self, *args): return _chilkat.CkHttp_put_SendBufferSize(self, *args)
-    def get_NegotiateAuth(self): return _chilkat.CkHttp_get_NegotiateAuth(self)
-    def put_NegotiateAuth(self, *args): return _chilkat.CkHttp_put_NegotiateAuth(self, *args)
-    def get_LoginDomain(self, *args): return _chilkat.CkHttp_get_LoginDomain(self, *args)
-    def loginDomain(self): return _chilkat.CkHttp_loginDomain(self)
-    def put_LoginDomain(self, *args): return _chilkat.CkHttp_put_LoginDomain(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkHttp_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkHttp_put_SocksVersion(self, *args)
-    def get_SocksPort(self): return _chilkat.CkHttp_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkHttp_put_SocksPort(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkHttp_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkHttp_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkHttp_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkHttp_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkHttp_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkHttp_put_SocksPassword(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkHttp_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkHttp_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkHttp_put_SocksHostname(self, *args)
-    def PostXml(self, *args): return _chilkat.CkHttp_PostXml(self, *args)
-    def get_ProxyPartialUrl(self): return _chilkat.CkHttp_get_ProxyPartialUrl(self)
-    def put_ProxyPartialUrl(self, *args): return _chilkat.CkHttp_put_ProxyPartialUrl(self, *args)
-    def GetServerSslCert(self, *args): return _chilkat.CkHttp_GetServerSslCert(self, *args)
-    def get_DigestAuth(self): return _chilkat.CkHttp_get_DigestAuth(self)
-    def put_DigestAuth(self, *args): return _chilkat.CkHttp_put_DigestAuth(self, *args)
-    def SetSslClientCertPfx(self, *args): return _chilkat.CkHttp_SetSslClientCertPfx(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkHttp_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkHttp_put_VerboseLogging(self, *args)
-    def ClearInMemoryCookies(self): return _chilkat.CkHttp_ClearInMemoryCookies(self)
-    def SetCookieXml(self, *args): return _chilkat.CkHttp_SetCookieXml(self, *args)
-    def PostUrlEncoded(self, *args): return _chilkat.CkHttp_PostUrlEncoded(self, *args)
-    def PostBinary(self, *args): return _chilkat.CkHttp_PostBinary(self, *args)
-    def postBinary(self, *args): return _chilkat.CkHttp_postBinary(self, *args)
-    def QuickGetObj(self, *args): return _chilkat.CkHttp_QuickGetObj(self, *args)
-    def get_SessionLogFilename(self, *args): return _chilkat.CkHttp_get_SessionLogFilename(self, *args)
-    def sessionLogFilename(self): return _chilkat.CkHttp_sessionLogFilename(self)
-    def put_SessionLogFilename(self, *args): return _chilkat.CkHttp_put_SessionLogFilename(self, *args)
-    def get_BgLastErrorText(self, *args): return _chilkat.CkHttp_get_BgLastErrorText(self, *args)
-    def bgLastErrorText(self): return _chilkat.CkHttp_bgLastErrorText(self)
-    def get_BgResultData(self, *args): return _chilkat.CkHttp_get_BgResultData(self, *args)
-    def get_BgResultInt(self): return _chilkat.CkHttp_get_BgResultInt(self)
-    def get_BgResultString(self, *args): return _chilkat.CkHttp_get_BgResultString(self, *args)
-    def bgResultString(self): return _chilkat.CkHttp_bgResultString(self)
-    def get_BgTaskFinished(self): return _chilkat.CkHttp_get_BgTaskFinished(self)
-    def get_BgTaskRunning(self): return _chilkat.CkHttp_get_BgTaskRunning(self)
-    def get_BgTaskSuccess(self): return _chilkat.CkHttp_get_BgTaskSuccess(self)
-    def get_EventLogCount(self): return _chilkat.CkHttp_get_EventLogCount(self)
-    def get_KeepEventLog(self): return _chilkat.CkHttp_get_KeepEventLog(self)
-    def put_KeepEventLog(self, *args): return _chilkat.CkHttp_put_KeepEventLog(self, *args)
-    def get_UseBgThread(self): return _chilkat.CkHttp_get_UseBgThread(self)
-    def put_UseBgThread(self, *args): return _chilkat.CkHttp_put_UseBgThread(self, *args)
-    def BgResponseObject(self): return _chilkat.CkHttp_BgResponseObject(self)
-    def BgTaskAbort(self): return _chilkat.CkHttp_BgTaskAbort(self)
-    def ClearBgEventLog(self): return _chilkat.CkHttp_ClearBgEventLog(self)
-    def EventLogName(self, *args): return _chilkat.CkHttp_EventLogName(self, *args)
-    def eventLogName(self, *args): return _chilkat.CkHttp_eventLogName(self, *args)
-    def EventLogValue(self, *args): return _chilkat.CkHttp_EventLogValue(self, *args)
-    def eventLogValue(self, *args): return _chilkat.CkHttp_eventLogValue(self, *args)
-    def SleepMs(self, *args): return _chilkat.CkHttp_SleepMs(self, *args)
-    def get_ClientIpAddress(self, *args): return _chilkat.CkHttp_get_ClientIpAddress(self, *args)
-    def clientIpAddress(self): return _chilkat.CkHttp_clientIpAddress(self)
-    def put_ClientIpAddress(self, *args): return _chilkat.CkHttp_put_ClientIpAddress(self, *args)
-    def get_ProxyAuthMethod(self, *args): return _chilkat.CkHttp_get_ProxyAuthMethod(self, *args)
-    def proxyAuthMethod(self): return _chilkat.CkHttp_proxyAuthMethod(self)
-    def put_ProxyAuthMethod(self, *args): return _chilkat.CkHttp_put_ProxyAuthMethod(self, *args)
-    def AddQuickHeader(self, *args): return _chilkat.CkHttp_AddQuickHeader(self, *args)
-    def RemoveQuickHeader(self, *args): return _chilkat.CkHttp_RemoveQuickHeader(self, *args)
-    def SetSslClientCert(self, *args): return _chilkat.CkHttp_SetSslClientCert(self, *args)
-    def get_LastHeader(self, *args): return _chilkat.CkHttp_get_LastHeader(self, *args)
-    def lastHeader(self): return _chilkat.CkHttp_lastHeader(self)
-    def put_UseIEProxy(self, *args): return _chilkat.CkHttp_put_UseIEProxy(self, *args)
-    def get_UseIEProxy(self): return _chilkat.CkHttp_get_UseIEProxy(self)
-    def get_ProxyLogin(self, *args): return _chilkat.CkHttp_get_ProxyLogin(self, *args)
-    def put_ProxyLogin(self, *args): return _chilkat.CkHttp_put_ProxyLogin(self, *args)
-    def get_ProxyPassword(self, *args): return _chilkat.CkHttp_get_ProxyPassword(self, *args)
-    def put_ProxyPassword(self, *args): return _chilkat.CkHttp_put_ProxyPassword(self, *args)
-    def proxyLogin(self): return _chilkat.CkHttp_proxyLogin(self)
-    def proxyPassword(self): return _chilkat.CkHttp_proxyPassword(self)
-    def version(self): return _chilkat.CkHttp_version(self)
-    def cookieDir(self): return _chilkat.CkHttp_cookieDir(self)
-    def quickGetStr(self, *args): return _chilkat.CkHttp_quickGetStr(self, *args)
-    def proxyDomain(self): return _chilkat.CkHttp_proxyDomain(self)
-    def password(self): return _chilkat.CkHttp_password(self)
-    def login(self): return _chilkat.CkHttp_login(self)
-    def getRequestHeader(self, *args): return _chilkat.CkHttp_getRequestHeader(self, *args)
-    def userAgent(self): return _chilkat.CkHttp_userAgent(self)
-    def referer(self): return _chilkat.CkHttp_referer(self)
-    def ck_accept(self): return _chilkat.CkHttp_ck_accept(self)
-    def acceptCharset(self): return _chilkat.CkHttp_acceptCharset(self)
-    def acceptLanguage(self): return _chilkat.CkHttp_acceptLanguage(self)
-    def connection(self): return _chilkat.CkHttp_connection(self)
-    def getDomain(self, *args): return _chilkat.CkHttp_getDomain(self, *args)
-    def finalRedirectUrl(self): return _chilkat.CkHttp_finalRedirectUrl(self)
-    def getCacheRoot(self, *args): return _chilkat.CkHttp_getCacheRoot(self, *args)
-    def getUrlPath(self, *args): return _chilkat.CkHttp_getUrlPath(self, *args)
-    def lastContentType(self): return _chilkat.CkHttp_lastContentType(self)
-    def lastResponseHeader(self): return _chilkat.CkHttp_lastResponseHeader(self)
-    def lastModDate(self): return _chilkat.CkHttp_lastModDate(self)
-    def get_Utf8(self): return _chilkat.CkHttp_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkHttp_put_Utf8(self, *args)
-    def put_NtlmAuth(self, *args): return _chilkat.CkHttp_put_NtlmAuth(self, *args)
-    def get_NtlmAuth(self): return _chilkat.CkHttp_get_NtlmAuth(self)
-    def UnlockComponent(self, *args): return _chilkat.CkHttp_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkHttp_IsUnlocked(self)
-    def Download(self, *args): return _chilkat.CkHttp_Download(self, *args)
-    def ResumeDownload(self, *args): return _chilkat.CkHttp_ResumeDownload(self, *args)
-    def get_Version(self, *args): return _chilkat.CkHttp_get_Version(self, *args)
-    def get_MaxConnections(self): return _chilkat.CkHttp_get_MaxConnections(self)
-    def put_MaxConnections(self, *args): return _chilkat.CkHttp_put_MaxConnections(self, *args)
-    def put_CookieDir(self, *args): return _chilkat.CkHttp_put_CookieDir(self, *args)
-    def get_CookieDir(self, *args): return _chilkat.CkHttp_get_CookieDir(self, *args)
-    def put_SaveCookies(self, *args): return _chilkat.CkHttp_put_SaveCookies(self, *args)
-    def get_SaveCookies(self): return _chilkat.CkHttp_get_SaveCookies(self)
-    def put_SendCookies(self, *args): return _chilkat.CkHttp_put_SendCookies(self, *args)
-    def get_SendCookies(self): return _chilkat.CkHttp_get_SendCookies(self)
-    def QuickGet(self, *args): return _chilkat.CkHttp_QuickGet(self, *args)
-    def QuickGetStr(self, *args): return _chilkat.CkHttp_QuickGetStr(self, *args)
-    def SynchronousRequest(self, *args): return _chilkat.CkHttp_SynchronousRequest(self, *args)
-    def get_ProxyPort(self): return _chilkat.CkHttp_get_ProxyPort(self)
-    def put_ProxyPort(self, *args): return _chilkat.CkHttp_put_ProxyPort(self, *args)
-    def put_ProxyDomain(self, *args): return _chilkat.CkHttp_put_ProxyDomain(self, *args)
-    def get_ProxyDomain(self, *args): return _chilkat.CkHttp_get_ProxyDomain(self, *args)
-    def put_Login(self, *args): return _chilkat.CkHttp_put_Login(self, *args)
-    def get_Login(self, *args): return _chilkat.CkHttp_get_Login(self, *args)
-    def put_Password(self, *args): return _chilkat.CkHttp_put_Password(self, *args)
-    def get_Password(self, *args): return _chilkat.CkHttp_get_Password(self, *args)
-    def SetRequestHeader(self, *args): return _chilkat.CkHttp_SetRequestHeader(self, *args)
-    def GetRequestHeader(self, *args): return _chilkat.CkHttp_GetRequestHeader(self, *args)
-    def HasRequestHeader(self, *args): return _chilkat.CkHttp_HasRequestHeader(self, *args)
-    def RemoveRequestHeader(self, *args): return _chilkat.CkHttp_RemoveRequestHeader(self, *args)
-    def put_UserAgent(self, *args): return _chilkat.CkHttp_put_UserAgent(self, *args)
-    def get_UserAgent(self, *args): return _chilkat.CkHttp_get_UserAgent(self, *args)
-    def put_Referer(self, *args): return _chilkat.CkHttp_put_Referer(self, *args)
-    def get_Referer(self, *args): return _chilkat.CkHttp_get_Referer(self, *args)
-    def put_Accept(self, *args): return _chilkat.CkHttp_put_Accept(self, *args)
-    def get_Accept(self, *args): return _chilkat.CkHttp_get_Accept(self, *args)
-    def put_AcceptCharset(self, *args): return _chilkat.CkHttp_put_AcceptCharset(self, *args)
-    def get_AcceptCharset(self, *args): return _chilkat.CkHttp_get_AcceptCharset(self, *args)
-    def put_AcceptLanguage(self, *args): return _chilkat.CkHttp_put_AcceptLanguage(self, *args)
-    def get_AcceptLanguage(self, *args): return _chilkat.CkHttp_get_AcceptLanguage(self, *args)
-    def put_Connection(self, *args): return _chilkat.CkHttp_put_Connection(self, *args)
-    def get_Connection(self, *args): return _chilkat.CkHttp_get_Connection(self, *args)
-    def get_MaxUrlLen(self): return _chilkat.CkHttp_get_MaxUrlLen(self)
-    def put_MaxUrlLen(self, *args): return _chilkat.CkHttp_put_MaxUrlLen(self, *args)
-    def get_MaxResponseSize(self): return _chilkat.CkHttp_get_MaxResponseSize(self)
-    def put_MaxResponseSize(self, *args): return _chilkat.CkHttp_put_MaxResponseSize(self, *args)
-    def put_MimicIE(self, *args): return _chilkat.CkHttp_put_MimicIE(self, *args)
-    def get_MimicIE(self): return _chilkat.CkHttp_get_MimicIE(self)
-    def put_MimicFireFox(self, *args): return _chilkat.CkHttp_put_MimicFireFox(self, *args)
-    def get_MimicFireFox(self): return _chilkat.CkHttp_get_MimicFireFox(self)
-    def put_AutoAddHostHeader(self, *args): return _chilkat.CkHttp_put_AutoAddHostHeader(self, *args)
-    def get_AutoAddHostHeader(self): return _chilkat.CkHttp_get_AutoAddHostHeader(self)
-    def get_ConnectTimeout(self): return _chilkat.CkHttp_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkHttp_put_ConnectTimeout(self, *args)
-    def get_ReadTimeout(self): return _chilkat.CkHttp_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkHttp_put_ReadTimeout(self, *args)
-    def GetDomain(self, *args): return _chilkat.CkHttp_GetDomain(self, *args)
-    def get_WasRedirected(self): return _chilkat.CkHttp_get_WasRedirected(self)
-    def get_FinalRedirectUrl(self, *args): return _chilkat.CkHttp_get_FinalRedirectUrl(self, *args)
-    def put_FollowRedirects(self, *args): return _chilkat.CkHttp_put_FollowRedirects(self, *args)
-    def get_FollowRedirects(self): return _chilkat.CkHttp_get_FollowRedirects(self)
-    def put_NumCacheLevels(self, *args): return _chilkat.CkHttp_put_NumCacheLevels(self, *args)
-    def get_NumCacheLevels(self): return _chilkat.CkHttp_get_NumCacheLevels(self)
-    def get_NumCacheRoots(self): return _chilkat.CkHttp_get_NumCacheRoots(self)
-    def GetCacheRoot(self, *args): return _chilkat.CkHttp_GetCacheRoot(self, *args)
-    def AddCacheRoot(self, *args): return _chilkat.CkHttp_AddCacheRoot(self, *args)
-    def get_LastStatus(self): return _chilkat.CkHttp_get_LastStatus(self)
-    def get_LastContentType(self, *args): return _chilkat.CkHttp_get_LastContentType(self, *args)
-    def get_LastResponseHeader(self, *args): return _chilkat.CkHttp_get_LastResponseHeader(self, *args)
-    def get_LastModDate(self, *args): return _chilkat.CkHttp_get_LastModDate(self, *args)
-    def get_UpdateCache(self): return _chilkat.CkHttp_get_UpdateCache(self)
-    def put_UpdateCache(self, *args): return _chilkat.CkHttp_put_UpdateCache(self, *args)
-    def get_FetchFromCache(self): return _chilkat.CkHttp_get_FetchFromCache(self)
-    def put_FetchFromCache(self, *args): return _chilkat.CkHttp_put_FetchFromCache(self, *args)
-    def get_IgnoreNoCache(self): return _chilkat.CkHttp_get_IgnoreNoCache(self)
-    def put_IgnoreNoCache(self, *args): return _chilkat.CkHttp_put_IgnoreNoCache(self, *args)
-    def get_IgnoreMustRevalidate(self): return _chilkat.CkHttp_get_IgnoreMustRevalidate(self)
-    def put_IgnoreMustRevalidate(self, *args): return _chilkat.CkHttp_put_IgnoreMustRevalidate(self, *args)
-    def get_DefaultFreshPeriod(self): return _chilkat.CkHttp_get_DefaultFreshPeriod(self)
-    def put_DefaultFreshPeriod(self, *args): return _chilkat.CkHttp_put_DefaultFreshPeriod(self, *args)
-    def get_FreshnessAlgorithm(self): return _chilkat.CkHttp_get_FreshnessAlgorithm(self)
-    def put_FreshnessAlgorithm(self, *args): return _chilkat.CkHttp_put_FreshnessAlgorithm(self, *args)
-    def get_LMFactor(self): return _chilkat.CkHttp_get_LMFactor(self)
-    def put_LMFactor(self, *args): return _chilkat.CkHttp_put_LMFactor(self, *args)
-    def get_MaxFreshPeriod(self): return _chilkat.CkHttp_get_MaxFreshPeriod(self)
-    def put_MaxFreshPeriod(self, *args): return _chilkat.CkHttp_put_MaxFreshPeriod(self, *args)
-    def get_MinFreshPeriod(self): return _chilkat.CkHttp_get_MinFreshPeriod(self)
-    def put_MinFreshPeriod(self, *args): return _chilkat.CkHttp_put_MinFreshPeriod(self, *args)
-    def GetUrlPath(self, *args): return _chilkat.CkHttp_GetUrlPath(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkHttp_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkHttp_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkHttp_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkHttp_LastErrorText(self, *args)
-CkHttp_swigregister = _chilkat.CkHttp_swigregister
-CkHttp_swigregister(CkHttp)
-
-class CkHttpRequest(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkHttpRequest, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkHttpRequest, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkHttpRequest()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkHttpRequest
-    __del__ = lambda self : None;
-    def RemoveAllParams(self): return _chilkat.CkHttpRequest_RemoveAllParams(self)
-    def LoadBodyFromFile(self, *args): return _chilkat.CkHttpRequest_LoadBodyFromFile(self, *args)
-    def LoadBodyFromBytes(self, *args): return _chilkat.CkHttpRequest_LoadBodyFromBytes(self, *args)
-    def LoadBodyFromString(self, *args): return _chilkat.CkHttpRequest_LoadBodyFromString(self, *args)
-    def UsePut(self): return _chilkat.CkHttpRequest_UsePut(self)
-    def AddBytesForUpload(self, *args): return _chilkat.CkHttpRequest_AddBytesForUpload(self, *args)
-    def UsePostMultipartForm(self): return _chilkat.CkHttpRequest_UsePostMultipartForm(self)
-    def GetUrlEncodedParams(self, *args): return _chilkat.CkHttpRequest_GetUrlEncodedParams(self, *args)
-    def getUrlEncodedParams(self): return _chilkat.CkHttpRequest_getUrlEncodedParams(self)
-    def AddStringForUpload(self, *args): return _chilkat.CkHttpRequest_AddStringForUpload(self, *args)
-    def AddFileForUpload2(self, *args): return _chilkat.CkHttpRequest_AddFileForUpload2(self, *args)
-    def AddStringForUpload2(self, *args): return _chilkat.CkHttpRequest_AddStringForUpload2(self, *args)
-    def AddBytesForUpload2(self, *args): return _chilkat.CkHttpRequest_AddBytesForUpload2(self, *args)
-    def path(self): return _chilkat.CkHttpRequest_path(self)
-    def charset(self): return _chilkat.CkHttpRequest_charset(self)
-    def httpVersion(self): return _chilkat.CkHttpRequest_httpVersion(self)
-    def getHeaderField(self, *args): return _chilkat.CkHttpRequest_getHeaderField(self, *args)
-    def getHeaderName(self, *args): return _chilkat.CkHttpRequest_getHeaderName(self, *args)
-    def getHeaderValue(self, *args): return _chilkat.CkHttpRequest_getHeaderValue(self, *args)
-    def getParam(self, *args): return _chilkat.CkHttpRequest_getParam(self, *args)
-    def getParamName(self, *args): return _chilkat.CkHttpRequest_getParamName(self, *args)
-    def getParamValue(self, *args): return _chilkat.CkHttpRequest_getParamValue(self, *args)
-    def lastErrorText(self): return _chilkat.CkHttpRequest_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkHttpRequest_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkHttpRequest_lastErrorHtml(self)
-    def RemoveParam(self, *args): return _chilkat.CkHttpRequest_RemoveParam(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkHttpRequest_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkHttpRequest_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkHttpRequest_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkHttpRequest_LastErrorText(self, *args)
-    def get_Utf8(self): return _chilkat.CkHttpRequest_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkHttpRequest_put_Utf8(self, *args)
-    def UsePost(self): return _chilkat.CkHttpRequest_UsePost(self)
-    def UseGet(self): return _chilkat.CkHttpRequest_UseGet(self)
-    def UseHead(self): return _chilkat.CkHttpRequest_UseHead(self)
-    def UseXmlHttp(self, *args): return _chilkat.CkHttpRequest_UseXmlHttp(self, *args)
-    def UseUpload(self): return _chilkat.CkHttpRequest_UseUpload(self)
-    def SetFromUrl(self, *args): return _chilkat.CkHttpRequest_SetFromUrl(self, *args)
-    def put_Path(self, *args): return _chilkat.CkHttpRequest_put_Path(self, *args)
-    def get_Path(self, *args): return _chilkat.CkHttpRequest_get_Path(self, *args)
-    def put_Charset(self, *args): return _chilkat.CkHttpRequest_put_Charset(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkHttpRequest_get_Charset(self, *args)
-    def put_SendCharset(self, *args): return _chilkat.CkHttpRequest_put_SendCharset(self, *args)
-    def get_SendCharset(self): return _chilkat.CkHttpRequest_get_SendCharset(self)
-    def put_HttpVersion(self, *args): return _chilkat.CkHttpRequest_put_HttpVersion(self, *args)
-    def get_HttpVersion(self, *args): return _chilkat.CkHttpRequest_get_HttpVersion(self, *args)
-    def AddHeader(self, *args): return _chilkat.CkHttpRequest_AddHeader(self, *args)
-    def AddParam(self, *args): return _chilkat.CkHttpRequest_AddParam(self, *args)
-    def AddFileForUpload(self, *args): return _chilkat.CkHttpRequest_AddFileForUpload(self, *args)
-    def GenerateRequestText(self, *args): return _chilkat.CkHttpRequest_GenerateRequestText(self, *args)
-    def generateRequestText(self): return _chilkat.CkHttpRequest_generateRequestText(self)
-    def GetHeaderField(self, *args): return _chilkat.CkHttpRequest_GetHeaderField(self, *args)
-    def get_NumHeaderFields(self): return _chilkat.CkHttpRequest_get_NumHeaderFields(self)
-    def GetHeaderName(self, *args): return _chilkat.CkHttpRequest_GetHeaderName(self, *args)
-    def GetHeaderValue(self, *args): return _chilkat.CkHttpRequest_GetHeaderValue(self, *args)
-    def GetParam(self, *args): return _chilkat.CkHttpRequest_GetParam(self, *args)
-    def get_NumParams(self): return _chilkat.CkHttpRequest_get_NumParams(self)
-    def GetParamName(self, *args): return _chilkat.CkHttpRequest_GetParamName(self, *args)
-    def GetParamValue(self, *args): return _chilkat.CkHttpRequest_GetParamValue(self, *args)
-CkHttpRequest_swigregister = _chilkat.CkHttpRequest_swigregister
-CkHttpRequest_swigregister(CkHttpRequest)
-
-class CkHttpResponse(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkHttpResponse, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkHttpResponse, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkHttpResponse()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkHttpResponse
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkHttpResponse_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkHttpResponse_put_Utf8(self, *args)
-    def header(self): return _chilkat.CkHttpResponse_header(self)
-    def bodyStr(self): return _chilkat.CkHttpResponse_bodyStr(self)
-    def statusLine(self): return _chilkat.CkHttpResponse_statusLine(self)
-    def charset(self): return _chilkat.CkHttpResponse_charset(self)
-    def domain(self): return _chilkat.CkHttpResponse_domain(self)
-    def getHeaderField(self, *args): return _chilkat.CkHttpResponse_getHeaderField(self, *args)
-    def getHeaderFieldAttr(self, *args): return _chilkat.CkHttpResponse_getHeaderFieldAttr(self, *args)
-    def getHeaderName(self, *args): return _chilkat.CkHttpResponse_getHeaderName(self, *args)
-    def getHeaderValue(self, *args): return _chilkat.CkHttpResponse_getHeaderValue(self, *args)
-    def getCookieDomain(self, *args): return _chilkat.CkHttpResponse_getCookieDomain(self, *args)
-    def getCookiePath(self, *args): return _chilkat.CkHttpResponse_getCookiePath(self, *args)
-    def getCookieExpiresStr(self, *args): return _chilkat.CkHttpResponse_getCookieExpiresStr(self, *args)
-    def getCookieName(self, *args): return _chilkat.CkHttpResponse_getCookieName(self, *args)
-    def getCookieValue(self, *args): return _chilkat.CkHttpResponse_getCookieValue(self, *args)
-    def get_Header(self, *args): return _chilkat.CkHttpResponse_get_Header(self, *args)
-    def get_Body(self, *args): return _chilkat.CkHttpResponse_get_Body(self, *args)
-    def get_BodyStr(self, *args): return _chilkat.CkHttpResponse_get_BodyStr(self, *args)
-    def get_BodyQP(self, *args): return _chilkat.CkHttpResponse_get_BodyQP(self, *args)
-    def get_StatusLine(self, *args): return _chilkat.CkHttpResponse_get_StatusLine(self, *args)
-    def get_StatusCode(self): return _chilkat.CkHttpResponse_get_StatusCode(self)
-    def get_Charset(self, *args): return _chilkat.CkHttpResponse_get_Charset(self, *args)
-    def get_Domain(self, *args): return _chilkat.CkHttpResponse_get_Domain(self, *args)
-    def get_ContentLength(self): return _chilkat.CkHttpResponse_get_ContentLength(self)
-    def get_Date(self, *args): return _chilkat.CkHttpResponse_get_Date(self, *args)
-    def GetHeaderField(self, *args): return _chilkat.CkHttpResponse_GetHeaderField(self, *args)
-    def GetHeaderFieldAttr(self, *args): return _chilkat.CkHttpResponse_GetHeaderFieldAttr(self, *args)
-    def get_NumHeaderFields(self): return _chilkat.CkHttpResponse_get_NumHeaderFields(self)
-    def GetHeaderName(self, *args): return _chilkat.CkHttpResponse_GetHeaderName(self, *args)
-    def GetHeaderValue(self, *args): return _chilkat.CkHttpResponse_GetHeaderValue(self, *args)
-    def get_NumCookies(self): return _chilkat.CkHttpResponse_get_NumCookies(self)
-    def GetCookieDomain(self, *args): return _chilkat.CkHttpResponse_GetCookieDomain(self, *args)
-    def GetCookiePath(self, *args): return _chilkat.CkHttpResponse_GetCookiePath(self, *args)
-    def GetCookieExpiresStr(self, *args): return _chilkat.CkHttpResponse_GetCookieExpiresStr(self, *args)
-    def GetCookieExpires(self, *args): return _chilkat.CkHttpResponse_GetCookieExpires(self, *args)
-    def GetCookieName(self, *args): return _chilkat.CkHttpResponse_GetCookieName(self, *args)
-    def GetCookieValue(self, *args): return _chilkat.CkHttpResponse_GetCookieValue(self, *args)
-CkHttpResponse_swigregister = _chilkat.CkHttpResponse_swigregister
-CkHttpResponse_swigregister(CkHttpResponse)
-
-class CkImap(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkImap, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkImap, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkImap()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkImap
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkImap_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkImap_put_Utf8(self, *args)
-    def get_LastAppendedMime(self, *args): return _chilkat.CkImap_get_LastAppendedMime(self, *args)
-    def lastAppendedMime(self): return _chilkat.CkImap_lastAppendedMime(self)
-    def get_LastIntermediateResponse(self, *args): return _chilkat.CkImap_get_LastIntermediateResponse(self, *args)
-    def lastIntermediateResponse(self): return _chilkat.CkImap_lastIntermediateResponse(self)
-    def get_LastResponse(self, *args): return _chilkat.CkImap_get_LastResponse(self, *args)
-    def lastResponse(self): return _chilkat.CkImap_lastResponse(self)
-    def get_LastCommand(self, *args): return _chilkat.CkImap_get_LastCommand(self, *args)
-    def lastCommand(self): return _chilkat.CkImap_lastCommand(self)
-    def get_Version(self, *args): return _chilkat.CkImap_get_Version(self, *args)
-    def version(self): return _chilkat.CkImap_version(self)
-    def AppendMimeWithFlags(self, *args): return _chilkat.CkImap_AppendMimeWithFlags(self, *args)
-    def Subscribe(self, *args): return _chilkat.CkImap_Subscribe(self, *args)
-    def Unsubscribe(self, *args): return _chilkat.CkImap_Unsubscribe(self, *args)
-    def FetchSingleHeaderAsMime(self, *args): return _chilkat.CkImap_FetchSingleHeaderAsMime(self, *args)
-    def fetchSingleHeaderAsMime(self, *args): return _chilkat.CkImap_fetchSingleHeaderAsMime(self, *args)
-    def AppendMimeWithDate(self, *args): return _chilkat.CkImap_AppendMimeWithDate(self, *args)
-    def get_SelectedMailbox(self, *args): return _chilkat.CkImap_get_SelectedMailbox(self, *args)
-    def selectedMailbox(self): return _chilkat.CkImap_selectedMailbox(self)
-    def get_AppendUid(self): return _chilkat.CkImap_get_AppendUid(self)
-    def get_AuthzId(self, *args): return _chilkat.CkImap_get_AuthzId(self, *args)
-    def authzId(self): return _chilkat.CkImap_authzId(self)
-    def put_AuthzId(self, *args): return _chilkat.CkImap_put_AuthzId(self, *args)
-    def get_SendBufferSize(self): return _chilkat.CkImap_get_SendBufferSize(self)
-    def put_SendBufferSize(self, *args): return _chilkat.CkImap_put_SendBufferSize(self, *args)
-    def SshTunnel(self, *args): return _chilkat.CkImap_SshTunnel(self, *args)
-    def SshAuthenticatePw(self, *args): return _chilkat.CkImap_SshAuthenticatePw(self, *args)
-    def SshAuthenticatePk(self, *args): return _chilkat.CkImap_SshAuthenticatePk(self, *args)
-    def Noop(self): return _chilkat.CkImap_Noop(self)
-    def get_SocksHostname(self, *args): return _chilkat.CkImap_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkImap_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkImap_put_SocksHostname(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkImap_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkImap_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkImap_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkImap_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkImap_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkImap_put_SocksPassword(self, *args)
-    def get_SocksPort(self): return _chilkat.CkImap_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkImap_put_SocksPort(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkImap_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkImap_put_SocksVersion(self, *args)
-    def SetSslClientCertPfx(self, *args): return _chilkat.CkImap_SetSslClientCertPfx(self, *args)
-    def get_StartTls(self): return _chilkat.CkImap_get_StartTls(self)
-    def put_StartTls(self, *args): return _chilkat.CkImap_put_StartTls(self, *args)
-    def get_SslProtocol(self, *args): return _chilkat.CkImap_get_SslProtocol(self, *args)
-    def sslProtocol(self): return _chilkat.CkImap_sslProtocol(self)
-    def put_SslProtocol(self, *args): return _chilkat.CkImap_put_SslProtocol(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkImap_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkImap_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkImap_put_HttpProxyUsername(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkImap_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkImap_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkImap_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkImap_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkImap_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkImap_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkImap_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkImap_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkImap_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkImap_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkImap_put_HttpProxyPort(self, *args)
-    def get_UidNext(self): return _chilkat.CkImap_get_UidNext(self)
-    def get_AutoFix(self): return _chilkat.CkImap_get_AutoFix(self)
-    def put_AutoFix(self, *args): return _chilkat.CkImap_put_AutoFix(self, *args)
-    def AddPfxSourceData(self, *args): return _chilkat.CkImap_AddPfxSourceData(self, *args)
-    def AddPfxSourceFile(self, *args): return _chilkat.CkImap_AddPfxSourceFile(self, *args)
-    def Connect(self, *args): return _chilkat.CkImap_Connect(self, *args)
-    def Disconnect(self): return _chilkat.CkImap_Disconnect(self)
-    def IsConnected(self): return _chilkat.CkImap_IsConnected(self)
-    def get_SeparatorChar(self): return _chilkat.CkImap_get_SeparatorChar(self)
-    def put_SeparatorChar(self, *args): return _chilkat.CkImap_put_SeparatorChar(self, *args)
-    def get_NumMessages(self): return _chilkat.CkImap_get_NumMessages(self)
-    def FetchSequenceAsMime(self, *args): return _chilkat.CkImap_FetchSequenceAsMime(self, *args)
-    def Login(self, *args): return _chilkat.CkImap_Login(self, *args)
-    def Logout(self): return _chilkat.CkImap_Logout(self)
-    def IsLoggedIn(self): return _chilkat.CkImap_IsLoggedIn(self)
-    def SetSslClientCert(self, *args): return _chilkat.CkImap_SetSslClientCert(self, *args)
-    def GetSslServerCert(self): return _chilkat.CkImap_GetSslServerCert(self)
-    def get_SslServerCertVerified(self): return _chilkat.CkImap_get_SslServerCertVerified(self)
-    def get_LoggedInUser(self, *args): return _chilkat.CkImap_get_LoggedInUser(self, *args)
-    def get_ConnectedToHost(self, *args): return _chilkat.CkImap_get_ConnectedToHost(self, *args)
-    def CreateMailbox(self, *args): return _chilkat.CkImap_CreateMailbox(self, *args)
-    def DeleteMailbox(self, *args): return _chilkat.CkImap_DeleteMailbox(self, *args)
-    def RenameMailbox(self, *args): return _chilkat.CkImap_RenameMailbox(self, *args)
-    def CopyMultiple(self, *args): return _chilkat.CkImap_CopyMultiple(self, *args)
-    def CopySequence(self, *args): return _chilkat.CkImap_CopySequence(self, *args)
-    def SetDecryptCert2(self, *args): return _chilkat.CkImap_SetDecryptCert2(self, *args)
-    def LastResponse(self, *args): return _chilkat.CkImap_LastResponse(self, *args)
-    def ListMailboxes(self, *args): return _chilkat.CkImap_ListMailboxes(self, *args)
-    def SelectMailbox(self, *args): return _chilkat.CkImap_SelectMailbox(self, *args)
-    def ExamineMailbox(self, *args): return _chilkat.CkImap_ExamineMailbox(self, *args)
-    def Search(self, *args): return _chilkat.CkImap_Search(self, *args)
-    def ClearSessionLog(self): return _chilkat.CkImap_ClearSessionLog(self)
-    def GetAllUids(self): return _chilkat.CkImap_GetAllUids(self)
-    def FetchSingle(self, *args): return _chilkat.CkImap_FetchSingle(self, *args)
-    def FetchSingleHeader(self, *args): return _chilkat.CkImap_FetchSingleHeader(self, *args)
-    def FetchBundle(self, *args): return _chilkat.CkImap_FetchBundle(self, *args)
-    def FetchHeaders(self, *args): return _chilkat.CkImap_FetchHeaders(self, *args)
-    def FetchChunk(self, *args): return _chilkat.CkImap_FetchChunk(self, *args)
-    def FetchSequence(self, *args): return _chilkat.CkImap_FetchSequence(self, *args)
-    def FetchSequenceHeaders(self, *args): return _chilkat.CkImap_FetchSequenceHeaders(self, *args)
-    def FetchSingleAsMime(self, *args): return _chilkat.CkImap_FetchSingleAsMime(self, *args)
-    def FetchBundleAsMime(self, *args): return _chilkat.CkImap_FetchBundleAsMime(self, *args)
-    def Expunge(self): return _chilkat.CkImap_Expunge(self)
-    def ExpungeAndClose(self): return _chilkat.CkImap_ExpungeAndClose(self)
-    def StoreFlags(self, *args): return _chilkat.CkImap_StoreFlags(self, *args)
-    def FetchFlags(self, *args): return _chilkat.CkImap_FetchFlags(self, *args)
-    def SetFlag(self, *args): return _chilkat.CkImap_SetFlag(self, *args)
-    def SetFlags(self, *args): return _chilkat.CkImap_SetFlags(self, *args)
-    def get_AuthMethod(self, *args): return _chilkat.CkImap_get_AuthMethod(self, *args)
-    def put_AuthMethod(self, *args): return _chilkat.CkImap_put_AuthMethod(self, *args)
-    def get_Domain(self, *args): return _chilkat.CkImap_get_Domain(self, *args)
-    def put_Domain(self, *args): return _chilkat.CkImap_put_Domain(self, *args)
-    def get_Port(self): return _chilkat.CkImap_get_Port(self)
-    def put_Port(self, *args): return _chilkat.CkImap_put_Port(self, *args)
-    def get_Ssl(self): return _chilkat.CkImap_get_Ssl(self)
-    def put_Ssl(self, *args): return _chilkat.CkImap_put_Ssl(self, *args)
-    def AppendMime(self, *args): return _chilkat.CkImap_AppendMime(self, *args)
-    def AppendMail(self, *args): return _chilkat.CkImap_AppendMail(self, *args)
-    def Copy(self, *args): return _chilkat.CkImap_Copy(self, *args)
-    def SetMailFlag(self, *args): return _chilkat.CkImap_SetMailFlag(self, *args)
-    def GetMailFlag(self, *args): return _chilkat.CkImap_GetMailFlag(self, *args)
-    def RefetchMailFlags(self, *args): return _chilkat.CkImap_RefetchMailFlags(self, *args)
-    def GetMailSize(self, *args): return _chilkat.CkImap_GetMailSize(self, *args)
-    def GetMailNumAttach(self, *args): return _chilkat.CkImap_GetMailNumAttach(self, *args)
-    def GetMailAttachSize(self, *args): return _chilkat.CkImap_GetMailAttachSize(self, *args)
-    def GetMailAttachFilename(self, *args): return _chilkat.CkImap_GetMailAttachFilename(self, *args)
-    def get_PeekMode(self): return _chilkat.CkImap_get_PeekMode(self)
-    def put_PeekMode(self, *args): return _chilkat.CkImap_put_PeekMode(self, *args)
-    def get_SessionLog(self, *args): return _chilkat.CkImap_get_SessionLog(self, *args)
-    def get_KeepSessionLog(self): return _chilkat.CkImap_get_KeepSessionLog(self)
-    def put_KeepSessionLog(self, *args): return _chilkat.CkImap_put_KeepSessionLog(self, *args)
-    def get_AppendSeen(self): return _chilkat.CkImap_get_AppendSeen(self)
-    def put_AppendSeen(self, *args): return _chilkat.CkImap_put_AppendSeen(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkImap_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkImap_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkImap_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkImap_LastErrorText(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkImap_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkImap_IsUnlocked(self)
-    def get_ReadTimeout(self): return _chilkat.CkImap_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkImap_put_ReadTimeout(self, *args)
-    def get_ConnectTimeout(self): return _chilkat.CkImap_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkImap_put_ConnectTimeout(self, *args)
-    def SendRawCommand(self, *args): return _chilkat.CkImap_SendRawCommand(self, *args)
-    def lastErrorText(self): return _chilkat.CkImap_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkImap_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkImap_lastErrorHtml(self)
-    def getMailAttachFilename(self, *args): return _chilkat.CkImap_getMailAttachFilename(self, *args)
-    def fetchFlags(self, *args): return _chilkat.CkImap_fetchFlags(self, *args)
-    def authMethod(self): return _chilkat.CkImap_authMethod(self)
-    def domain(self): return _chilkat.CkImap_domain(self)
-    def fetchSingleAsMime(self, *args): return _chilkat.CkImap_fetchSingleAsMime(self, *args)
-    def loggedInUser(self): return _chilkat.CkImap_loggedInUser(self)
-    def connectedToHost(self): return _chilkat.CkImap_connectedToHost(self)
-    def sendRawCommand(self, *args): return _chilkat.CkImap_sendRawCommand(self, *args)
-    def sessionLog(self): return _chilkat.CkImap_sessionLog(self)
-CkImap_swigregister = _chilkat.CkImap_swigregister
-CkImap_swigregister(CkImap)
-
-class CkMailboxes(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkMailboxes, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkMailboxes, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkMailboxes()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkMailboxes
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkMailboxes_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkMailboxes_put_Utf8(self, *args)
-    def IsMarked(self, *args): return _chilkat.CkMailboxes_IsMarked(self, *args)
-    def HasInferiors(self, *args): return _chilkat.CkMailboxes_HasInferiors(self, *args)
-    def IsSelectable(self, *args): return _chilkat.CkMailboxes_IsSelectable(self, *args)
-    def GetName(self, *args): return _chilkat.CkMailboxes_GetName(self, *args)
-    def get_Count(self): return _chilkat.CkMailboxes_get_Count(self)
-    def getName(self, *args): return _chilkat.CkMailboxes_getName(self, *args)
-CkMailboxes_swigregister = _chilkat.CkMailboxes_swigregister
-CkMailboxes_swigregister(CkMailboxes)
-
-class CkMessageSet(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkMessageSet, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkMessageSet, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkMessageSet()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkMessageSet
-    __del__ = lambda self : None;
-    def toString(self): return _chilkat.CkMessageSet_toString(self)
-    def ToString(self, *args): return _chilkat.CkMessageSet_ToString(self, *args)
-    def ToCompactString(self, *args): return _chilkat.CkMessageSet_ToCompactString(self, *args)
-    def toCompactString(self): return _chilkat.CkMessageSet_toCompactString(self)
-    def FromCompactString(self, *args): return _chilkat.CkMessageSet_FromCompactString(self, *args)
-    def ContainsId(self, *args): return _chilkat.CkMessageSet_ContainsId(self, *args)
-    def RemoveId(self, *args): return _chilkat.CkMessageSet_RemoveId(self, *args)
-    def InsertId(self, *args): return _chilkat.CkMessageSet_InsertId(self, *args)
-    def GetId(self, *args): return _chilkat.CkMessageSet_GetId(self, *args)
-    def get_Count(self): return _chilkat.CkMessageSet_get_Count(self)
-    def put_HasUids(self, *args): return _chilkat.CkMessageSet_put_HasUids(self, *args)
-    def get_HasUids(self): return _chilkat.CkMessageSet_get_HasUids(self)
-CkMessageSet_swigregister = _chilkat.CkMessageSet_swigregister
-CkMessageSet_swigregister(CkMessageSet)
-
-class CkCharset(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCharset, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCharset, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCharset()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCharset
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkCharset_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCharset_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCharset_lastErrorHtml(self)
-    def UrlDecodeStr(self, *args): return _chilkat.CkCharset_UrlDecodeStr(self, *args)
-    def urlDecodeStr(self, *args): return _chilkat.CkCharset_urlDecodeStr(self, *args)
-    def getHtmlFileCharset(self, *args): return _chilkat.CkCharset_getHtmlFileCharset(self, *args)
-    def getHtmlCharset(self, *args): return _chilkat.CkCharset_getHtmlCharset(self, *args)
-    def lastOutputAsQP(self): return _chilkat.CkCharset_lastOutputAsQP(self)
-    def lastInputAsQP(self): return _chilkat.CkCharset_lastInputAsQP(self)
-    def lastOutputAsHex(self): return _chilkat.CkCharset_lastOutputAsHex(self)
-    def lastInputAsHex(self): return _chilkat.CkCharset_lastInputAsHex(self)
-    def htmlDecodeToStr(self, *args): return _chilkat.CkCharset_htmlDecodeToStr(self, *args)
-    def toCharset(self): return _chilkat.CkCharset_toCharset(self)
-    def fromCharset(self): return _chilkat.CkCharset_fromCharset(self)
-    def version(self): return _chilkat.CkCharset_version(self)
-    def codePageToCharset(self, *args): return _chilkat.CkCharset_codePageToCharset(self, *args)
-    def altToCharset(self): return _chilkat.CkCharset_altToCharset(self)
-    def upperCase(self, *args): return _chilkat.CkCharset_upperCase(self, *args)
-    def lowerCase(self, *args): return _chilkat.CkCharset_lowerCase(self, *args)
-    def UpperCase(self, *args): return _chilkat.CkCharset_UpperCase(self, *args)
-    def LowerCase(self, *args): return _chilkat.CkCharset_LowerCase(self, *args)
-    def get_Utf8(self): return _chilkat.CkCharset_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCharset_put_Utf8(self, *args)
-    def GetHtmlFileCharset(self, *args): return _chilkat.CkCharset_GetHtmlFileCharset(self, *args)
-    def GetHtmlCharset(self, *args): return _chilkat.CkCharset_GetHtmlCharset(self, *args)
-    def ConvertHtmlFile(self, *args): return _chilkat.CkCharset_ConvertHtmlFile(self, *args)
-    def ConvertHtml(self, *args): return _chilkat.CkCharset_ConvertHtml(self, *args)
-    def get_LastOutputAsQP(self, *args): return _chilkat.CkCharset_get_LastOutputAsQP(self, *args)
-    def get_LastInputAsQP(self, *args): return _chilkat.CkCharset_get_LastInputAsQP(self, *args)
-    def get_LastOutputAsHex(self, *args): return _chilkat.CkCharset_get_LastOutputAsHex(self, *args)
-    def get_LastInputAsHex(self, *args): return _chilkat.CkCharset_get_LastInputAsHex(self, *args)
-    def put_SaveLast(self, *args): return _chilkat.CkCharset_put_SaveLast(self, *args)
-    def get_SaveLast(self): return _chilkat.CkCharset_get_SaveLast(self)
-    def EntityEncodeHex(self, *args): return _chilkat.CkCharset_EntityEncodeHex(self, *args)
-    def EntityEncodeDec(self, *args): return _chilkat.CkCharset_EntityEncodeDec(self, *args)
-    def entityEncodeHex(self, *args): return _chilkat.CkCharset_entityEncodeHex(self, *args)
-    def entityEncodeDec(self, *args): return _chilkat.CkCharset_entityEncodeDec(self, *args)
-    def WriteFile(self, *args): return _chilkat.CkCharset_WriteFile(self, *args)
-    def ReadFile(self, *args): return _chilkat.CkCharset_ReadFile(self, *args)
-    def ConvertFromUnicode(self, *args): return _chilkat.CkCharset_ConvertFromUnicode(self, *args)
-    def ConvertToUnicode(self, *args): return _chilkat.CkCharset_ConvertToUnicode(self, *args)
-    def VerifyFile(self, *args): return _chilkat.CkCharset_VerifyFile(self, *args)
-    def VerifyData(self, *args): return _chilkat.CkCharset_VerifyData(self, *args)
-    def HtmlEntityDecode(self, *args): return _chilkat.CkCharset_HtmlEntityDecode(self, *args)
-    def HtmlDecodeToStr(self, *args): return _chilkat.CkCharset_HtmlDecodeToStr(self, *args)
-    def HtmlEntityDecodeFile(self, *args): return _chilkat.CkCharset_HtmlEntityDecodeFile(self, *args)
-    def ConvertFile(self, *args): return _chilkat.CkCharset_ConvertFile(self, *args)
-    def ConvertData(self, *args): return _chilkat.CkCharset_ConvertData(self, *args)
-    def get_ToCharset(self, *args): return _chilkat.CkCharset_get_ToCharset(self, *args)
-    def put_ToCharset(self, *args): return _chilkat.CkCharset_put_ToCharset(self, *args)
-    def get_FromCharset(self, *args): return _chilkat.CkCharset_get_FromCharset(self, *args)
-    def put_FromCharset(self, *args): return _chilkat.CkCharset_put_FromCharset(self, *args)
-    def get_Version(self, *args): return _chilkat.CkCharset_get_Version(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkCharset_UnlockComponent(self, *args)
-    def IsUnlocked(self): return _chilkat.CkCharset_IsUnlocked(self)
-    def SaveLastError(self, *args): return _chilkat.CkCharset_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCharset_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCharset_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCharset_LastErrorText(self, *args)
-    def CharsetToCodePage(self, *args): return _chilkat.CkCharset_CharsetToCodePage(self, *args)
-    def CodePageToCharset(self, *args): return _chilkat.CkCharset_CodePageToCharset(self, *args)
-    def get_ErrorAction(self): return _chilkat.CkCharset_get_ErrorAction(self)
-    def put_ErrorAction(self, *args): return _chilkat.CkCharset_put_ErrorAction(self, *args)
-    def get_AltToCharset(self, *args): return _chilkat.CkCharset_get_AltToCharset(self, *args)
-    def put_AltToCharset(self, *args): return _chilkat.CkCharset_put_AltToCharset(self, *args)
-    def SetErrorBytes(self, *args): return _chilkat.CkCharset_SetErrorBytes(self, *args)
-    def SetErrorString(self, *args): return _chilkat.CkCharset_SetErrorString(self, *args)
-CkCharset_swigregister = _chilkat.CkCharset_swigregister
-CkCharset_swigregister(CkCharset)
-
-class CkSpider(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSpider, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSpider, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSpider()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSpider
-    __del__ = lambda self : None;
-    def getAvoidPattern(self, *args): return _chilkat.CkSpider_getAvoidPattern(self, *args)
-    def getOutboundLink(self, *args): return _chilkat.CkSpider_getOutboundLink(self, *args)
-    def getFailedUrl(self, *args): return _chilkat.CkSpider_getFailedUrl(self, *args)
-    def getSpideredUrl(self, *args): return _chilkat.CkSpider_getSpideredUrl(self, *args)
-    def getUnspideredUrl(self, *args): return _chilkat.CkSpider_getUnspideredUrl(self, *args)
-    def get_ProxyDomain(self, *args): return _chilkat.CkSpider_get_ProxyDomain(self, *args)
-    def proxyDomain(self): return _chilkat.CkSpider_proxyDomain(self)
-    def put_ProxyDomain(self, *args): return _chilkat.CkSpider_put_ProxyDomain(self, *args)
-    def get_ProxyLogin(self, *args): return _chilkat.CkSpider_get_ProxyLogin(self, *args)
-    def proxyLogin(self): return _chilkat.CkSpider_proxyLogin(self)
-    def put_ProxyLogin(self, *args): return _chilkat.CkSpider_put_ProxyLogin(self, *args)
-    def get_ProxyPassword(self, *args): return _chilkat.CkSpider_get_ProxyPassword(self, *args)
-    def proxyPassword(self): return _chilkat.CkSpider_proxyPassword(self)
-    def put_ProxyPassword(self, *args): return _chilkat.CkSpider_put_ProxyPassword(self, *args)
-    def get_ProxyPort(self): return _chilkat.CkSpider_get_ProxyPort(self)
-    def put_ProxyPort(self, *args): return _chilkat.CkSpider_put_ProxyPort(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkSpider_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkSpider_put_VerboseLogging(self, *args)
-    def put_UserAgent(self, *args): return _chilkat.CkSpider_put_UserAgent(self, *args)
-    def userAgent(self): return _chilkat.CkSpider_userAgent(self)
-    def get_UserAgent(self, *args): return _chilkat.CkSpider_get_UserAgent(self, *args)
-    def cacheDir(self): return _chilkat.CkSpider_cacheDir(self)
-    def avoidPattern(self, *args): return _chilkat.CkSpider_avoidPattern(self, *args)
-    def outboundLink(self, *args): return _chilkat.CkSpider_outboundLink(self, *args)
-    def failedUrl(self, *args): return _chilkat.CkSpider_failedUrl(self, *args)
-    def spideredUrl(self, *args): return _chilkat.CkSpider_spideredUrl(self, *args)
-    def unspideredUrl(self, *args): return _chilkat.CkSpider_unspideredUrl(self, *args)
-    def domain(self): return _chilkat.CkSpider_domain(self)
-    def lastHtmlDescription(self): return _chilkat.CkSpider_lastHtmlDescription(self)
-    def lastHtmlKeywords(self): return _chilkat.CkSpider_lastHtmlKeywords(self)
-    def lastHtmlTitle(self): return _chilkat.CkSpider_lastHtmlTitle(self)
-    def lastHtml(self): return _chilkat.CkSpider_lastHtml(self)
-    def lastUrl(self): return _chilkat.CkSpider_lastUrl(self)
-    def lastModDateStr(self): return _chilkat.CkSpider_lastModDateStr(self)
-    def fetchRobotsText(self): return _chilkat.CkSpider_fetchRobotsText(self)
-    def GetDomain(self, *args): return _chilkat.CkSpider_GetDomain(self, *args)
-    def GetBaseDomain(self, *args): return _chilkat.CkSpider_GetBaseDomain(self, *args)
-    def CanonicalizeUrl(self, *args): return _chilkat.CkSpider_CanonicalizeUrl(self, *args)
-    def getDomain(self, *args): return _chilkat.CkSpider_getDomain(self, *args)
-    def getBaseDomain(self, *args): return _chilkat.CkSpider_getBaseDomain(self, *args)
-    def canonicalizeUrl(self, *args): return _chilkat.CkSpider_canonicalizeUrl(self, *args)
-    def lastErrorText(self): return _chilkat.CkSpider_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSpider_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSpider_lastErrorHtml(self)
-    def get_LastHtmlDescription(self, *args): return _chilkat.CkSpider_get_LastHtmlDescription(self, *args)
-    def get_LastHtmlKeywords(self, *args): return _chilkat.CkSpider_get_LastHtmlKeywords(self, *args)
-    def get_LastHtmlTitle(self, *args): return _chilkat.CkSpider_get_LastHtmlTitle(self, *args)
-    def get_LastHtml(self, *args): return _chilkat.CkSpider_get_LastHtml(self, *args)
-    def get_LastFromCache(self): return _chilkat.CkSpider_get_LastFromCache(self)
-    def get_LastModDate(self, *args): return _chilkat.CkSpider_get_LastModDate(self, *args)
-    def get_LastUrl(self, *args): return _chilkat.CkSpider_get_LastUrl(self, *args)
-    def get_LastModDateStr(self, *args): return _chilkat.CkSpider_get_LastModDateStr(self, *args)
-    def SleepMs(self, *args): return _chilkat.CkSpider_SleepMs(self, *args)
-    def SkipUnspidered(self, *args): return _chilkat.CkSpider_SkipUnspidered(self, *args)
-    def FetchRobotsText(self, *args): return _chilkat.CkSpider_FetchRobotsText(self, *args)
-    def get_Domain(self, *args): return _chilkat.CkSpider_get_Domain(self, *args)
-    def AddMustMatchPattern(self, *args): return _chilkat.CkSpider_AddMustMatchPattern(self, *args)
-    def AddAvoidOutboundLinkPattern(self, *args): return _chilkat.CkSpider_AddAvoidOutboundLinkPattern(self, *args)
-    def GetAvoidPattern(self, *args): return _chilkat.CkSpider_GetAvoidPattern(self, *args)
-    def AddAvoidPattern(self, *args): return _chilkat.CkSpider_AddAvoidPattern(self, *args)
-    def GetOutboundLink(self, *args): return _chilkat.CkSpider_GetOutboundLink(self, *args)
-    def GetFailedUrl(self, *args): return _chilkat.CkSpider_GetFailedUrl(self, *args)
-    def GetSpideredUrl(self, *args): return _chilkat.CkSpider_GetSpideredUrl(self, *args)
-    def GetUnspideredUrl(self, *args): return _chilkat.CkSpider_GetUnspideredUrl(self, *args)
-    def RecrawlLast(self): return _chilkat.CkSpider_RecrawlLast(self)
-    def ClearOutboundLinks(self): return _chilkat.CkSpider_ClearOutboundLinks(self)
-    def ClearFailedUrls(self): return _chilkat.CkSpider_ClearFailedUrls(self)
-    def ClearSpideredUrls(self): return _chilkat.CkSpider_ClearSpideredUrls(self)
-    def get_WindDownCount(self): return _chilkat.CkSpider_get_WindDownCount(self)
-    def put_WindDownCount(self, *args): return _chilkat.CkSpider_put_WindDownCount(self, *args)
-    def get_NumAvoidPatterns(self): return _chilkat.CkSpider_get_NumAvoidPatterns(self)
-    def get_NumOutboundLinks(self): return _chilkat.CkSpider_get_NumOutboundLinks(self)
-    def get_NumFailed(self): return _chilkat.CkSpider_get_NumFailed(self)
-    def get_NumSpidered(self): return _chilkat.CkSpider_get_NumSpidered(self)
-    def get_NumUnspidered(self): return _chilkat.CkSpider_get_NumUnspidered(self)
-    def CrawlNext(self): return _chilkat.CkSpider_CrawlNext(self)
-    def get_ChopAtQuery(self): return _chilkat.CkSpider_get_ChopAtQuery(self)
-    def put_ChopAtQuery(self, *args): return _chilkat.CkSpider_put_ChopAtQuery(self, *args)
-    def get_AvoidHttps(self): return _chilkat.CkSpider_get_AvoidHttps(self)
-    def put_AvoidHttps(self, *args): return _chilkat.CkSpider_put_AvoidHttps(self, *args)
-    def get_MaxResponseSize(self): return _chilkat.CkSpider_get_MaxResponseSize(self)
-    def put_MaxResponseSize(self, *args): return _chilkat.CkSpider_put_MaxResponseSize(self, *args)
-    def get_MaxUrlLen(self): return _chilkat.CkSpider_get_MaxUrlLen(self)
-    def put_MaxUrlLen(self, *args): return _chilkat.CkSpider_put_MaxUrlLen(self, *args)
-    def get_CacheDir(self, *args): return _chilkat.CkSpider_get_CacheDir(self, *args)
-    def put_CacheDir(self, *args): return _chilkat.CkSpider_put_CacheDir(self, *args)
-    def get_UpdateCache(self): return _chilkat.CkSpider_get_UpdateCache(self)
-    def put_UpdateCache(self, *args): return _chilkat.CkSpider_put_UpdateCache(self, *args)
-    def get_FetchFromCache(self): return _chilkat.CkSpider_get_FetchFromCache(self)
-    def put_FetchFromCache(self, *args): return _chilkat.CkSpider_put_FetchFromCache(self, *args)
-    def get_ConnectTimeout(self): return _chilkat.CkSpider_get_ConnectTimeout(self)
-    def put_ConnectTimeout(self, *args): return _chilkat.CkSpider_put_ConnectTimeout(self, *args)
-    def get_ReadTimeout(self): return _chilkat.CkSpider_get_ReadTimeout(self)
-    def put_ReadTimeout(self, *args): return _chilkat.CkSpider_put_ReadTimeout(self, *args)
-    def AddUnspidered(self, *args): return _chilkat.CkSpider_AddUnspidered(self, *args)
-    def Initialize(self, *args): return _chilkat.CkSpider_Initialize(self, *args)
-CkSpider_swigregister = _chilkat.CkSpider_swigregister
-CkSpider_swigregister(CkSpider)
-
-class CkXml(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkXml, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkXml, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkXml()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkXml
-    __del__ = lambda self : None;
-    def GetChildWithContent(self, *args): return _chilkat.CkXml_GetChildWithContent(self, *args)
-    def GetChildExact(self, *args): return _chilkat.CkXml_GetChildExact(self, *args)
-    def get_ContentInt(self): return _chilkat.CkXml_get_ContentInt(self)
-    def put_ContentInt(self, *args): return _chilkat.CkXml_put_ContentInt(self, *args)
-    def GetChildBoolValue(self, *args): return _chilkat.CkXml_GetChildBoolValue(self, *args)
-    def AddAttributeInt(self, *args): return _chilkat.CkXml_AddAttributeInt(self, *args)
-    def DecodeEntities(self, *args): return _chilkat.CkXml_DecodeEntities(self, *args)
-    def decodeEntities(self, *args): return _chilkat.CkXml_decodeEntities(self, *args)
-    def FindChild2(self, *args): return _chilkat.CkXml_FindChild2(self, *args)
-    def GetAttrValueInt(self, *args): return _chilkat.CkXml_GetAttrValueInt(self, *args)
-    def GetAttributeValueInt(self, *args): return _chilkat.CkXml_GetAttributeValueInt(self, *args)
-    def GetChildTagByIndex(self, *args): return _chilkat.CkXml_GetChildTagByIndex(self, *args)
-    def getChildTagByIndex(self, *args): return _chilkat.CkXml_getChildTagByIndex(self, *args)
-    def SaveBinaryContent(self, *args): return _chilkat.CkXml_SaveBinaryContent(self, *args)
-    def SetBinaryContentFromFile(self, *args): return _chilkat.CkXml_SetBinaryContentFromFile(self, *args)
-    def SortByAttributeInt(self, *args): return _chilkat.CkXml_SortByAttributeInt(self, *args)
-    def TagEquals(self, *args): return _chilkat.CkXml_TagEquals(self, *args)
-    def UpdateAttributeInt(self, *args): return _chilkat.CkXml_UpdateAttributeInt(self, *args)
-    def UpdateChildContentInt(self, *args): return _chilkat.CkXml_UpdateChildContentInt(self, *args)
-    def AddStyleSheet(self, *args): return _chilkat.CkXml_AddStyleSheet(self, *args)
-    def SortRecordsByContentInt(self, *args): return _chilkat.CkXml_SortRecordsByContentInt(self, *args)
-    def TagContent(self, *args): return _chilkat.CkXml_TagContent(self, *args)
-    def tagContent(self, *args): return _chilkat.CkXml_tagContent(self, *args)
-    def GetSelf(self): return _chilkat.CkXml_GetSelf(self)
-    def get_DocType(self, *args): return _chilkat.CkXml_get_DocType(self, *args)
-    def docType(self): return _chilkat.CkXml_docType(self)
-    def put_DocType(self, *args): return _chilkat.CkXml_put_DocType(self, *args)
-    def ChilkatPath(self, *args): return _chilkat.CkXml_ChilkatPath(self, *args)
-    def chilkatPath(self, *args): return _chilkat.CkXml_chilkatPath(self, *args)
-    def tag(self): return _chilkat.CkXml_tag(self)
-    def content(self): return _chilkat.CkXml_content(self)
-    def encoding(self): return _chilkat.CkXml_encoding(self)
-    def getXml(self): return _chilkat.CkXml_getXml(self)
-    def lastErrorText(self): return _chilkat.CkXml_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkXml_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkXml_lastErrorHtml(self)
-    def getChildContent(self, *args): return _chilkat.CkXml_getChildContent(self, *args)
-    def getAttrValue(self, *args): return _chilkat.CkXml_getAttrValue(self, *args)
-    def getAttributeValue(self, *args): return _chilkat.CkXml_getAttributeValue(self, *args)
-    def getAttributeName(self, *args): return _chilkat.CkXml_getAttributeName(self, *args)
-    def version(self): return _chilkat.CkXml_version(self)
-    def accumulateTagContent(self, *args): return _chilkat.CkXml_accumulateTagContent(self, *args)
-    def getChildContentByIndex(self, *args): return _chilkat.CkXml_getChildContentByIndex(self, *args)
-    def getChildTag(self, *args): return _chilkat.CkXml_getChildTag(self, *args)
-    def childContent(self, *args): return _chilkat.CkXml_childContent(self, *args)
-    def attr(self, *args): return _chilkat.CkXml_attr(self, *args)
-    def attrValue(self, *args): return _chilkat.CkXml_attrValue(self, *args)
-    def attrName(self, *args): return _chilkat.CkXml_attrName(self, *args)
-    def xml(self): return _chilkat.CkXml_xml(self)
-    def get_Utf8(self): return _chilkat.CkXml_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkXml_put_Utf8(self, *args)
-    def get_SortCaseInsensitive(self): return _chilkat.CkXml_get_SortCaseInsensitive(self)
-    def put_SortCaseInsensitive(self, *args): return _chilkat.CkXml_put_SortCaseInsensitive(self, *args)
-    def GetRoot2(self): return _chilkat.CkXml_GetRoot2(self)
-    def GetParent2(self): return _chilkat.CkXml_GetParent2(self)
-    def FirstChild2(self): return _chilkat.CkXml_FirstChild2(self)
-    def LastChild2(self): return _chilkat.CkXml_LastChild2(self)
-    def HttpGet(self, *args): return _chilkat.CkXml_HttpGet(self, *args)
-    def HttpPost(self, *args): return _chilkat.CkXml_HttpPost(self, *args)
-    def SetBinaryContent(self, *args): return _chilkat.CkXml_SetBinaryContent(self, *args)
-    def GetBinaryContent(self, *args): return _chilkat.CkXml_GetBinaryContent(self, *args)
-    def ZipTree(self): return _chilkat.CkXml_ZipTree(self)
-    def ZipContent(self): return _chilkat.CkXml_ZipContent(self)
-    def UnzipTree(self): return _chilkat.CkXml_UnzipTree(self)
-    def UnzipContent(self): return _chilkat.CkXml_UnzipContent(self)
-    def EncryptContent(self, *args): return _chilkat.CkXml_EncryptContent(self, *args)
-    def DecryptContent(self, *args): return _chilkat.CkXml_DecryptContent(self, *args)
-    def GetRoot(self): return _chilkat.CkXml_GetRoot(self)
-    def GetChildWithTag(self, *args): return _chilkat.CkXml_GetChildWithTag(self, *args)
-    def get_TreeId(self): return _chilkat.CkXml_get_TreeId(self)
-    def PreviousSibling(self): return _chilkat.CkXml_PreviousSibling(self)
-    def NextSibling(self): return _chilkat.CkXml_NextSibling(self)
-    def PreviousSibling2(self): return _chilkat.CkXml_PreviousSibling2(self)
-    def NextSibling2(self): return _chilkat.CkXml_NextSibling2(self)
-    def LastChild(self): return _chilkat.CkXml_LastChild(self)
-    def FirstChild(self): return _chilkat.CkXml_FirstChild(self)
-    def Clear(self): return _chilkat.CkXml_Clear(self)
-    def Copy(self, *args): return _chilkat.CkXml_Copy(self, *args)
-    def GetParent(self): return _chilkat.CkXml_GetParent(self)
-    def SearchForAttribute(self, *args): return _chilkat.CkXml_SearchForAttribute(self, *args)
-    def SearchAllForContent(self, *args): return _chilkat.CkXml_SearchAllForContent(self, *args)
-    def SearchForContent(self, *args): return _chilkat.CkXml_SearchForContent(self, *args)
-    def SearchForTag(self, *args): return _chilkat.CkXml_SearchForTag(self, *args)
-    def SearchForAttribute2(self, *args): return _chilkat.CkXml_SearchForAttribute2(self, *args)
-    def SearchAllForContent2(self, *args): return _chilkat.CkXml_SearchAllForContent2(self, *args)
-    def SearchForContent2(self, *args): return _chilkat.CkXml_SearchForContent2(self, *args)
-    def SearchForTag2(self, *args): return _chilkat.CkXml_SearchForTag2(self, *args)
-    def GetNthChildWithTag2(self, *args): return _chilkat.CkXml_GetNthChildWithTag2(self, *args)
-    def FindChild(self, *args): return _chilkat.CkXml_FindChild(self, *args)
-    def FindOrAddNewChild(self, *args): return _chilkat.CkXml_FindOrAddNewChild(self, *args)
-    def NewChild(self, *args): return _chilkat.CkXml_NewChild(self, *args)
-    def NewChild2(self, *args): return _chilkat.CkXml_NewChild2(self, *args)
-    def NewChildInt2(self, *args): return _chilkat.CkXml_NewChildInt2(self, *args)
-    def GetNthChildWithTag(self, *args): return _chilkat.CkXml_GetNthChildWithTag(self, *args)
-    def NumChildrenHavingTag(self, *args): return _chilkat.CkXml_NumChildrenHavingTag(self, *args)
-    def ExtractChildByName(self, *args): return _chilkat.CkXml_ExtractChildByName(self, *args)
-    def ExtractChildByIndex(self, *args): return _chilkat.CkXml_ExtractChildByIndex(self, *args)
-    def RemoveFromTree(self): return _chilkat.CkXml_RemoveFromTree(self)
-    def GetChild(self, *args): return _chilkat.CkXml_GetChild(self, *args)
-    def GetChild2(self, *args): return _chilkat.CkXml_GetChild2(self, *args)
-    def AddChildTree(self, *args): return _chilkat.CkXml_AddChildTree(self, *args)
-    def SwapTree(self, *args): return _chilkat.CkXml_SwapTree(self, *args)
-    def SwapNode(self, *args): return _chilkat.CkXml_SwapNode(self, *args)
-    def HasAttrWithValue(self, *args): return _chilkat.CkXml_HasAttrWithValue(self, *args)
-    def GetAttrValue(self, *args): return _chilkat.CkXml_GetAttrValue(self, *args)
-    def GetAttributeValue(self, *args): return _chilkat.CkXml_GetAttributeValue(self, *args)
-    def GetAttributeName(self, *args): return _chilkat.CkXml_GetAttributeName(self, *args)
-    def RemoveAllAttributes(self): return _chilkat.CkXml_RemoveAllAttributes(self)
-    def RemoveChild(self, *args): return _chilkat.CkXml_RemoveChild(self, *args)
-    def RemoveAttribute(self, *args): return _chilkat.CkXml_RemoveAttribute(self, *args)
-    def AddAttribute(self, *args): return _chilkat.CkXml_AddAttribute(self, *args)
-    def AppendToContent(self, *args): return _chilkat.CkXml_AppendToContent(self, *args)
-    def GetXml(self, *args): return _chilkat.CkXml_GetXml(self, *args)
-    def SaveXml(self, *args): return _chilkat.CkXml_SaveXml(self, *args)
-    def LoadXmlFile(self, *args): return _chilkat.CkXml_LoadXmlFile(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkXml_LoadXml(self, *args)
-    def LoadXmlFile2(self, *args): return _chilkat.CkXml_LoadXmlFile2(self, *args)
-    def LoadXml2(self, *args): return _chilkat.CkXml_LoadXml2(self, *args)
-    def get_Version(self, *args): return _chilkat.CkXml_get_Version(self, *args)
-    def get_Cdata(self): return _chilkat.CkXml_get_Cdata(self)
-    def put_Cdata(self, *args): return _chilkat.CkXml_put_Cdata(self, *args)
-    def get_NumChildren(self): return _chilkat.CkXml_get_NumChildren(self)
-    def get_Content(self, *args): return _chilkat.CkXml_get_Content(self, *args)
-    def put_Content(self, *args): return _chilkat.CkXml_put_Content(self, *args)
-    def GetChildContent(self, *args): return _chilkat.CkXml_GetChildContent(self, *args)
-    def UpdateChildContent(self, *args): return _chilkat.CkXml_UpdateChildContent(self, *args)
-    def ContentMatches(self, *args): return _chilkat.CkXml_ContentMatches(self, *args)
-    def ChildContentMatches(self, *args): return _chilkat.CkXml_ChildContentMatches(self, *args)
-    def get_Tag(self, *args): return _chilkat.CkXml_get_Tag(self, *args)
-    def put_Tag(self, *args): return _chilkat.CkXml_put_Tag(self, *args)
-    def get_NumAttributes(self): return _chilkat.CkXml_get_NumAttributes(self)
-    def get_Standalone(self): return _chilkat.CkXml_get_Standalone(self)
-    def put_Standalone(self, *args): return _chilkat.CkXml_put_Standalone(self, *args)
-    def get_Encoding(self, *args): return _chilkat.CkXml_get_Encoding(self, *args)
-    def put_Encoding(self, *args): return _chilkat.CkXml_put_Encoding(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkXml_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkXml_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkXml_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkXml_LastErrorText(self, *args)
-    def QEncodeContent(self, *args): return _chilkat.CkXml_QEncodeContent(self, *args)
-    def BEncodeContent(self, *args): return _chilkat.CkXml_BEncodeContent(self, *args)
-    def DecodeContent(self, *args): return _chilkat.CkXml_DecodeContent(self, *args)
-    def UpdateAttribute(self, *args): return _chilkat.CkXml_UpdateAttribute(self, *args)
-    def GetChildIntValue(self, *args): return _chilkat.CkXml_GetChildIntValue(self, *args)
-    def SortByTag(self, *args): return _chilkat.CkXml_SortByTag(self, *args)
-    def SortByContent(self, *args): return _chilkat.CkXml_SortByContent(self, *args)
-    def SortByAttribute(self, *args): return _chilkat.CkXml_SortByAttribute(self, *args)
-    def SortRecordsByContent(self, *args): return _chilkat.CkXml_SortRecordsByContent(self, *args)
-    def SortRecordsByAttribute(self, *args): return _chilkat.CkXml_SortRecordsByAttribute(self, *args)
-    def FindNextRecord(self, *args): return _chilkat.CkXml_FindNextRecord(self, *args)
-    def HasChildWithTag(self, *args): return _chilkat.CkXml_HasChildWithTag(self, *args)
-    def RemoveChildWithContent(self, *args): return _chilkat.CkXml_RemoveChildWithContent(self, *args)
-    def HasChildWithTagAndContent(self, *args): return _chilkat.CkXml_HasChildWithTagAndContent(self, *args)
-    def HasChildWithContent(self, *args): return _chilkat.CkXml_HasChildWithContent(self, *args)
-    def RemoveAllChildren(self): return _chilkat.CkXml_RemoveAllChildren(self)
-    def RemoveChildByIndex(self, *args): return _chilkat.CkXml_RemoveChildByIndex(self, *args)
-    def AccumulateTagContent(self, *args): return _chilkat.CkXml_AccumulateTagContent(self, *args)
-    def GetChildContentByIndex(self, *args): return _chilkat.CkXml_GetChildContentByIndex(self, *args)
-    def GetChildTag(self, *args): return _chilkat.CkXml_GetChildTag(self, *args)
-    def AddToAttribute(self, *args): return _chilkat.CkXml_AddToAttribute(self, *args)
-    def AddToContent(self, *args): return _chilkat.CkXml_AddToContent(self, *args)
-    def AddToChildContent(self, *args): return _chilkat.CkXml_AddToChildContent(self, *args)
-    def AddOrUpdateAttributeI(self, *args): return _chilkat.CkXml_AddOrUpdateAttributeI(self, *args)
-    def AddOrUpdateAttribute(self, *args): return _chilkat.CkXml_AddOrUpdateAttribute(self, *args)
-    def HasAttribute(self, *args): return _chilkat.CkXml_HasAttribute(self, *args)
-CkXml_swigregister = _chilkat.CkXml_swigregister
-CkXml_swigregister(CkXml)
-
-class CkPfx(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkPfx, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkPfx, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkPfx()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkPfx
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkPfx_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkPfx_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkPfx_lastErrorHtml(self)
-    def get_Utf8(self): return _chilkat.CkPfx_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkPfx_put_Utf8(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkPfx_UnlockComponent(self, *args)
-    def ImportPfxFile(self, *args): return _chilkat.CkPfx_ImportPfxFile(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkPfx_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkPfx_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkPfx_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkPfx_LastErrorText(self, *args)
-CkPfx_swigregister = _chilkat.CkPfx_swigregister
-CkPfx_swigregister(CkPfx)
-
-class CkBounce(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkBounce, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkBounce, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkBounce()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkBounce
-    __del__ = lambda self : None;
-    def lastErrorText(self): return _chilkat.CkBounce_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkBounce_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkBounce_lastErrorHtml(self)
-    def bounceAddress(self): return _chilkat.CkBounce_bounceAddress(self)
-    def bounceData(self): return _chilkat.CkBounce_bounceData(self)
-    def get_Version(self, *args): return _chilkat.CkBounce_get_Version(self, *args)
-    def get_Utf8(self): return _chilkat.CkBounce_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkBounce_put_Utf8(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkBounce_UnlockComponent(self, *args)
-    def ExamineEmail(self, *args): return _chilkat.CkBounce_ExamineEmail(self, *args)
-    def ExamineMime(self, *args): return _chilkat.CkBounce_ExamineMime(self, *args)
-    def ExamineEml(self, *args): return _chilkat.CkBounce_ExamineEml(self, *args)
-    def get_BounceType(self): return _chilkat.CkBounce_get_BounceType(self)
-    def get_BounceAddress(self, *args): return _chilkat.CkBounce_get_BounceAddress(self, *args)
-    def get_BounceData(self, *args): return _chilkat.CkBounce_get_BounceData(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkBounce_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkBounce_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkBounce_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkBounce_LastErrorText(self, *args)
-CkBounce_swigregister = _chilkat.CkBounce_swigregister
-CkBounce_swigregister(CkBounce)
-
-class CkRarEntry(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkRarEntry, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkRarEntry, name)
-    __repr__ = _swig_repr
-    def get_Utf8(self): return _chilkat.CkRarEntry_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkRarEntry_put_Utf8(self, *args)
-    def get_Filename(self, *args): return _chilkat.CkRarEntry_get_Filename(self, *args)
-    def get_UncompressedSize(self): return _chilkat.CkRarEntry_get_UncompressedSize(self)
-    def get_CompressedSize(self): return _chilkat.CkRarEntry_get_CompressedSize(self)
-    def get_LastModified(self, *args): return _chilkat.CkRarEntry_get_LastModified(self, *args)
-    def get_IsDirectory(self): return _chilkat.CkRarEntry_get_IsDirectory(self)
-    def get_IsReadOnly(self): return _chilkat.CkRarEntry_get_IsReadOnly(self)
-    def Unrar(self, *args): return _chilkat.CkRarEntry_Unrar(self, *args)
-    def get_Crc(self): return _chilkat.CkRarEntry_get_Crc(self)
-    def SaveLastError(self, *args): return _chilkat.CkRarEntry_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkRarEntry_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkRarEntry_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkRarEntry_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkRarEntry_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkRarEntry_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkRarEntry_lastErrorHtml(self)
-    def filename(self): return _chilkat.CkRarEntry_filename(self)
-    def __init__(self): 
-        this = _chilkat.new_CkRarEntry()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkRarEntry
-    __del__ = lambda self : None;
-CkRarEntry_swigregister = _chilkat.CkRarEntry_swigregister
-CkRarEntry_swigregister(CkRarEntry)
-
-class CkRar(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkRar, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkRar, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkRar()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkRar
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkRar_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkRar_put_Utf8(self, *args)
-    def Unrar(self, *args): return _chilkat.CkRar_Unrar(self, *args)
-    def FastOpen(self, *args): return _chilkat.CkRar_FastOpen(self, *args)
-    def Open(self, *args): return _chilkat.CkRar_Open(self, *args)
-    def Close(self): return _chilkat.CkRar_Close(self)
-    def get_NumEntries(self): return _chilkat.CkRar_get_NumEntries(self)
-    def GetEntryByName(self, *args): return _chilkat.CkRar_GetEntryByName(self, *args)
-    def GetEntryByIndex(self, *args): return _chilkat.CkRar_GetEntryByIndex(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkRar_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkRar_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkRar_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkRar_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkRar_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkRar_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkRar_lastErrorHtml(self)
-CkRar_swigregister = _chilkat.CkRar_swigregister
-CkRar_swigregister(CkRar)
-
-class CkRss(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkRss, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkRss, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkRss()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkRss
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkRss_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkRss_put_Utf8(self, *args)
-    def get_NumChannels(self): return _chilkat.CkRss_get_NumChannels(self)
-    def get_NumItems(self): return _chilkat.CkRss_get_NumItems(self)
-    def AddNewChannel(self): return _chilkat.CkRss_AddNewChannel(self)
-    def AddNewImage(self): return _chilkat.CkRss_AddNewImage(self)
-    def AddNewItem(self): return _chilkat.CkRss_AddNewItem(self)
-    def DownloadRss(self, *args): return _chilkat.CkRss_DownloadRss(self, *args)
-    def GetAttr(self, *args): return _chilkat.CkRss_GetAttr(self, *args)
-    def getAttr(self, *args): return _chilkat.CkRss_getAttr(self, *args)
-    def GetChannel(self, *args): return _chilkat.CkRss_GetChannel(self, *args)
-    def GetCount(self, *args): return _chilkat.CkRss_GetCount(self, *args)
-    def GetDate(self, *args): return _chilkat.CkRss_GetDate(self, *args)
-    def GetImage(self): return _chilkat.CkRss_GetImage(self)
-    def GetInt(self, *args): return _chilkat.CkRss_GetInt(self, *args)
-    def GetItem(self, *args): return _chilkat.CkRss_GetItem(self, *args)
-    def GetString(self, *args): return _chilkat.CkRss_GetString(self, *args)
-    def getString(self, *args): return _chilkat.CkRss_getString(self, *args)
-    def LoadRssFile(self, *args): return _chilkat.CkRss_LoadRssFile(self, *args)
-    def LoadRssString(self, *args): return _chilkat.CkRss_LoadRssString(self, *args)
-    def MGetAttr(self, *args): return _chilkat.CkRss_MGetAttr(self, *args)
-    def mGetAttr(self, *args): return _chilkat.CkRss_mGetAttr(self, *args)
-    def MGetString(self, *args): return _chilkat.CkRss_MGetString(self, *args)
-    def mGetString(self, *args): return _chilkat.CkRss_mGetString(self, *args)
-    def MSetAttr(self, *args): return _chilkat.CkRss_MSetAttr(self, *args)
-    def MSetString(self, *args): return _chilkat.CkRss_MSetString(self, *args)
-    def NewRss(self): return _chilkat.CkRss_NewRss(self)
-    def Remove(self, *args): return _chilkat.CkRss_Remove(self, *args)
-    def SetAttr(self, *args): return _chilkat.CkRss_SetAttr(self, *args)
-    def SetDate(self, *args): return _chilkat.CkRss_SetDate(self, *args)
-    def SetDateNow(self, *args): return _chilkat.CkRss_SetDateNow(self, *args)
-    def SetInt(self, *args): return _chilkat.CkRss_SetInt(self, *args)
-    def SetString(self, *args): return _chilkat.CkRss_SetString(self, *args)
-    def ToXmlString(self, *args): return _chilkat.CkRss_ToXmlString(self, *args)
-    def toXmlString(self): return _chilkat.CkRss_toXmlString(self)
-    def SaveLastError(self, *args): return _chilkat.CkRss_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkRss_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkRss_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkRss_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkRss_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkRss_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkRss_lastErrorHtml(self)
-CkRss_swigregister = _chilkat.CkRss_swigregister
-CkRss_swigregister(CkRss)
-
-class CkAtom(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkAtom, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkAtom, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkAtom()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkAtom
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkAtom_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkAtom_put_Utf8(self, *args)
-    def get_NumEntries(self): return _chilkat.CkAtom_get_NumEntries(self)
-    def AddElement(self, *args): return _chilkat.CkAtom_AddElement(self, *args)
-    def AddElementDate(self, *args): return _chilkat.CkAtom_AddElementDate(self, *args)
-    def AddElementHtml(self, *args): return _chilkat.CkAtom_AddElementHtml(self, *args)
-    def AddElementXHtml(self, *args): return _chilkat.CkAtom_AddElementXHtml(self, *args)
-    def AddElementXml(self, *args): return _chilkat.CkAtom_AddElementXml(self, *args)
-    def AddEntry(self, *args): return _chilkat.CkAtom_AddEntry(self, *args)
-    def AddLink(self, *args): return _chilkat.CkAtom_AddLink(self, *args)
-    def AddPerson(self, *args): return _chilkat.CkAtom_AddPerson(self, *args)
-    def DeleteElement(self, *args): return _chilkat.CkAtom_DeleteElement(self, *args)
-    def DeleteElementAttr(self, *args): return _chilkat.CkAtom_DeleteElementAttr(self, *args)
-    def DeletePerson(self, *args): return _chilkat.CkAtom_DeletePerson(self, *args)
-    def DownloadAtom(self, *args): return _chilkat.CkAtom_DownloadAtom(self, *args)
-    def GetElement(self, *args): return _chilkat.CkAtom_GetElement(self, *args)
-    def getElement(self, *args): return _chilkat.CkAtom_getElement(self, *args)
-    def GetElementAttr(self, *args): return _chilkat.CkAtom_GetElementAttr(self, *args)
-    def getElementAttr(self, *args): return _chilkat.CkAtom_getElementAttr(self, *args)
-    def GetElementCount(self, *args): return _chilkat.CkAtom_GetElementCount(self, *args)
-    def GetElementDate(self, *args): return _chilkat.CkAtom_GetElementDate(self, *args)
-    def GetEntry(self, *args): return _chilkat.CkAtom_GetEntry(self, *args)
-    def GetLinkHref(self, *args): return _chilkat.CkAtom_GetLinkHref(self, *args)
-    def getLinkHref(self, *args): return _chilkat.CkAtom_getLinkHref(self, *args)
-    def GetPersonInfo(self, *args): return _chilkat.CkAtom_GetPersonInfo(self, *args)
-    def getPersonInfo(self, *args): return _chilkat.CkAtom_getPersonInfo(self, *args)
-    def GetTopAttr(self, *args): return _chilkat.CkAtom_GetTopAttr(self, *args)
-    def getTopAttr(self, *args): return _chilkat.CkAtom_getTopAttr(self, *args)
-    def HasElement(self, *args): return _chilkat.CkAtom_HasElement(self, *args)
-    def LoadXml(self, *args): return _chilkat.CkAtom_LoadXml(self, *args)
-    def NewEntry(self): return _chilkat.CkAtom_NewEntry(self)
-    def NewFeed(self): return _chilkat.CkAtom_NewFeed(self)
-    def SetElementAttr(self, *args): return _chilkat.CkAtom_SetElementAttr(self, *args)
-    def SetTopAttr(self, *args): return _chilkat.CkAtom_SetTopAttr(self, *args)
-    def ToXmlString(self, *args): return _chilkat.CkAtom_ToXmlString(self, *args)
-    def toXmlString(self): return _chilkat.CkAtom_toXmlString(self)
-    def UpdateElement(self, *args): return _chilkat.CkAtom_UpdateElement(self, *args)
-    def UpdateElementDate(self, *args): return _chilkat.CkAtom_UpdateElementDate(self, *args)
-    def UpdateElementHtml(self, *args): return _chilkat.CkAtom_UpdateElementHtml(self, *args)
-    def UpdateElementXHtml(self, *args): return _chilkat.CkAtom_UpdateElementXHtml(self, *args)
-    def UpdateElementXml(self, *args): return _chilkat.CkAtom_UpdateElementXml(self, *args)
-    def UpdatePerson(self, *args): return _chilkat.CkAtom_UpdatePerson(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkAtom_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkAtom_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkAtom_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkAtom_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkAtom_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkAtom_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkAtom_lastErrorHtml(self)
-CkAtom_swigregister = _chilkat.CkAtom_swigregister
-CkAtom_swigregister(CkAtom)
-
-class CkCache(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCache, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCache, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCache()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCache
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCache_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCache_put_Utf8(self, *args)
-    def get_LastEtagFetched(self, *args): return _chilkat.CkCache_get_LastEtagFetched(self, *args)
-    def lastEtagFetched(self): return _chilkat.CkCache_lastEtagFetched(self)
-    def get_LastExpirationFetched(self, *args): return _chilkat.CkCache_get_LastExpirationFetched(self, *args)
-    def get_LastHitExpired(self): return _chilkat.CkCache_get_LastHitExpired(self)
-    def get_LastKeyFetched(self, *args): return _chilkat.CkCache_get_LastKeyFetched(self, *args)
-    def lastKeyFetched(self): return _chilkat.CkCache_lastKeyFetched(self)
-    def get_Level(self): return _chilkat.CkCache_get_Level(self)
-    def put_Level(self, *args): return _chilkat.CkCache_put_Level(self, *args)
-    def get_NumRoots(self): return _chilkat.CkCache_get_NumRoots(self)
-    def AddRoot(self, *args): return _chilkat.CkCache_AddRoot(self, *args)
-    def DeleteAll(self): return _chilkat.CkCache_DeleteAll(self)
-    def DeleteAllExpired(self): return _chilkat.CkCache_DeleteAllExpired(self)
-    def DeleteFromCache(self, *args): return _chilkat.CkCache_DeleteFromCache(self, *args)
-    def DeleteOlder(self, *args): return _chilkat.CkCache_DeleteOlder(self, *args)
-    def FetchFromCache(self, *args): return _chilkat.CkCache_FetchFromCache(self, *args)
-    def GetEtag(self, *args): return _chilkat.CkCache_GetEtag(self, *args)
-    def getEtag(self, *args): return _chilkat.CkCache_getEtag(self, *args)
-    def GetExpiration(self, *args): return _chilkat.CkCache_GetExpiration(self, *args)
-    def GetFilename(self, *args): return _chilkat.CkCache_GetFilename(self, *args)
-    def getFilename(self, *args): return _chilkat.CkCache_getFilename(self, *args)
-    def GetRoot(self, *args): return _chilkat.CkCache_GetRoot(self, *args)
-    def getRoot(self, *args): return _chilkat.CkCache_getRoot(self, *args)
-    def IsCached(self, *args): return _chilkat.CkCache_IsCached(self, *args)
-    def SaveToCache(self, *args): return _chilkat.CkCache_SaveToCache(self, *args)
-    def SaveToCacheNoExpire(self, *args): return _chilkat.CkCache_SaveToCacheNoExpire(self, *args)
-    def UpdateExpiration(self, *args): return _chilkat.CkCache_UpdateExpiration(self, *args)
-    def FetchText(self, *args): return _chilkat.CkCache_FetchText(self, *args)
-    def fetchText(self, *args): return _chilkat.CkCache_fetchText(self, *args)
-    def SaveText(self, *args): return _chilkat.CkCache_SaveText(self, *args)
-    def SaveTextNoExpire(self, *args): return _chilkat.CkCache_SaveTextNoExpire(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCache_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCache_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCache_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCache_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkCache_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCache_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCache_lastErrorHtml(self)
-CkCache_swigregister = _chilkat.CkCache_swigregister
-CkCache_swigregister(CkCache)
-
-class CkDh(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkDh, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkDh, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkDh()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkDh
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkDh_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkDh_put_Utf8(self, *args)
-    def UseKnownPrime(self, *args): return _chilkat.CkDh_UseKnownPrime(self, *args)
-    def get_G(self): return _chilkat.CkDh_get_G(self)
-    def get_P(self, *args): return _chilkat.CkDh_get_P(self, *args)
-    def p(self): return _chilkat.CkDh_p(self)
-    def SetPG(self, *args): return _chilkat.CkDh_SetPG(self, *args)
-    def CreateE(self, *args): return _chilkat.CkDh_CreateE(self, *args)
-    def createE(self, *args): return _chilkat.CkDh_createE(self, *args)
-    def FindK(self, *args): return _chilkat.CkDh_FindK(self, *args)
-    def findK(self, *args): return _chilkat.CkDh_findK(self, *args)
-    def GenPG(self, *args): return _chilkat.CkDh_GenPG(self, *args)
-    def get_Version(self, *args): return _chilkat.CkDh_get_Version(self, *args)
-    def version(self): return _chilkat.CkDh_version(self)
-    def UnlockComponent(self, *args): return _chilkat.CkDh_UnlockComponent(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkDh_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkDh_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkDh_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkDh_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkDh_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkDh_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkDh_lastErrorHtml(self)
-CkDh_swigregister = _chilkat.CkDh_swigregister
-CkDh_swigregister(CkDh)
-
-class CkDsa(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkDsa, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkDsa, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkDsa()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkDsa
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkDsa_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkDsa_put_Utf8(self, *args)
-    def get_GroupSize(self): return _chilkat.CkDsa_get_GroupSize(self)
-    def put_GroupSize(self, *args): return _chilkat.CkDsa_put_GroupSize(self, *args)
-    def GenKey(self, *args): return _chilkat.CkDsa_GenKey(self, *args)
-    def GenKeyFromParamsDerFile(self, *args): return _chilkat.CkDsa_GenKeyFromParamsDerFile(self, *args)
-    def GenKeyFromParamsPemFile(self, *args): return _chilkat.CkDsa_GenKeyFromParamsPemFile(self, *args)
-    def GenKeyFromParamsDer(self, *args): return _chilkat.CkDsa_GenKeyFromParamsDer(self, *args)
-    def GenKeyFromParamsPem(self, *args): return _chilkat.CkDsa_GenKeyFromParamsPem(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkDsa_UnlockComponent(self, *args)
-    def VerifyKey(self): return _chilkat.CkDsa_VerifyKey(self)
-    def ToXml(self, *args): return _chilkat.CkDsa_ToXml(self, *args)
-    def toXml(self, *args): return _chilkat.CkDsa_toXml(self, *args)
-    def FromXml(self, *args): return _chilkat.CkDsa_FromXml(self, *args)
-    def FromEncryptedPem(self, *args): return _chilkat.CkDsa_FromEncryptedPem(self, *args)
-    def FromPem(self, *args): return _chilkat.CkDsa_FromPem(self, *args)
-    def SaveText(self, *args): return _chilkat.CkDsa_SaveText(self, *args)
-    def ToEncryptedPem(self, *args): return _chilkat.CkDsa_ToEncryptedPem(self, *args)
-    def toEncryptedPem(self, *args): return _chilkat.CkDsa_toEncryptedPem(self, *args)
-    def ToPem(self, *args): return _chilkat.CkDsa_ToPem(self, *args)
-    def toPem(self): return _chilkat.CkDsa_toPem(self)
-    def ToDer(self, *args): return _chilkat.CkDsa_ToDer(self, *args)
-    def ToDerFile(self, *args): return _chilkat.CkDsa_ToDerFile(self, *args)
-    def FromDer(self, *args): return _chilkat.CkDsa_FromDer(self, *args)
-    def FromDerFile(self, *args): return _chilkat.CkDsa_FromDerFile(self, *args)
-    def FromPublicPem(self, *args): return _chilkat.CkDsa_FromPublicPem(self, *args)
-    def ToPublicPem(self, *args): return _chilkat.CkDsa_ToPublicPem(self, *args)
-    def toPublicPem(self): return _chilkat.CkDsa_toPublicPem(self)
-    def get_Hash(self, *args): return _chilkat.CkDsa_get_Hash(self, *args)
-    def put_Hash(self, *args): return _chilkat.CkDsa_put_Hash(self, *args)
-    def get_Signature(self, *args): return _chilkat.CkDsa_get_Signature(self, *args)
-    def put_Signature(self, *args): return _chilkat.CkDsa_put_Signature(self, *args)
-    def SetEncodedHash(self, *args): return _chilkat.CkDsa_SetEncodedHash(self, *args)
-    def SetEncodedSignature(self, *args): return _chilkat.CkDsa_SetEncodedSignature(self, *args)
-    def GetEncodedSignature(self, *args): return _chilkat.CkDsa_GetEncodedSignature(self, *args)
-    def getEncodedSignature(self, *args): return _chilkat.CkDsa_getEncodedSignature(self, *args)
-    def GetEncodedHash(self, *args): return _chilkat.CkDsa_GetEncodedHash(self, *args)
-    def getEncodedHash(self, *args): return _chilkat.CkDsa_getEncodedHash(self, *args)
-    def SignHash(self): return _chilkat.CkDsa_SignHash(self)
-    def Verify(self): return _chilkat.CkDsa_Verify(self)
-    def SetKeyExplicit(self, *args): return _chilkat.CkDsa_SetKeyExplicit(self, *args)
-    def ToPublicDerFile(self, *args): return _chilkat.CkDsa_ToPublicDerFile(self, *args)
-    def ToPublicDer(self, *args): return _chilkat.CkDsa_ToPublicDer(self, *args)
-    def FromPublicDer(self, *args): return _chilkat.CkDsa_FromPublicDer(self, *args)
-    def FromPublicDerFile(self, *args): return _chilkat.CkDsa_FromPublicDerFile(self, *args)
-    def get_HexP(self, *args): return _chilkat.CkDsa_get_HexP(self, *args)
-    def hexP(self): return _chilkat.CkDsa_hexP(self)
-    def get_HexQ(self, *args): return _chilkat.CkDsa_get_HexQ(self, *args)
-    def hexQ(self): return _chilkat.CkDsa_hexQ(self)
-    def get_HexG(self, *args): return _chilkat.CkDsa_get_HexG(self, *args)
-    def hexG(self): return _chilkat.CkDsa_hexG(self)
-    def get_HexX(self, *args): return _chilkat.CkDsa_get_HexX(self, *args)
-    def hexX(self): return _chilkat.CkDsa_hexX(self)
-    def get_HexY(self, *args): return _chilkat.CkDsa_get_HexY(self, *args)
-    def hexY(self): return _chilkat.CkDsa_hexY(self)
-    def SetPubKeyExplicit(self, *args): return _chilkat.CkDsa_SetPubKeyExplicit(self, *args)
-    def get_Version(self, *args): return _chilkat.CkDsa_get_Version(self, *args)
-    def version(self): return _chilkat.CkDsa_version(self)
-    def LoadText(self, *args): return _chilkat.CkDsa_LoadText(self, *args)
-    def loadText(self, *args): return _chilkat.CkDsa_loadText(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkDsa_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkDsa_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkDsa_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkDsa_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkDsa_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkDsa_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkDsa_lastErrorHtml(self)
-CkDsa_swigregister = _chilkat.CkDsa_swigregister
-CkDsa_swigregister(CkDsa)
-
-class CkSFtpFile(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSFtpFile, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSFtpFile, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSFtpFile()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSFtpFile
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSFtpFile_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSFtpFile_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSFtpFile_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSFtpFile_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSFtpFile_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSFtpFile_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSFtpFile_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSFtpFile_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSFtpFile_lastErrorHtml(self)
-    def get_Filename(self, *args): return _chilkat.CkSFtpFile_get_Filename(self, *args)
-    def filename(self): return _chilkat.CkSFtpFile_filename(self)
-    def get_Owner(self, *args): return _chilkat.CkSFtpFile_get_Owner(self, *args)
-    def owner(self): return _chilkat.CkSFtpFile_owner(self)
-    def get_Group(self, *args): return _chilkat.CkSFtpFile_get_Group(self, *args)
-    def group(self): return _chilkat.CkSFtpFile_group(self)
-    def get_FileType(self, *args): return _chilkat.CkSFtpFile_get_FileType(self, *args)
-    def fileType(self): return _chilkat.CkSFtpFile_fileType(self)
-    def get_IsRegular(self): return _chilkat.CkSFtpFile_get_IsRegular(self)
-    def get_IsDirectory(self): return _chilkat.CkSFtpFile_get_IsDirectory(self)
-    def get_IsSymLink(self): return _chilkat.CkSFtpFile_get_IsSymLink(self)
-    def get_IsReadOnly(self): return _chilkat.CkSFtpFile_get_IsReadOnly(self)
-    def get_IsSystem(self): return _chilkat.CkSFtpFile_get_IsSystem(self)
-    def get_IsHidden(self): return _chilkat.CkSFtpFile_get_IsHidden(self)
-    def get_IsCaseInsensitive(self): return _chilkat.CkSFtpFile_get_IsCaseInsensitive(self)
-    def get_IsArchive(self): return _chilkat.CkSFtpFile_get_IsArchive(self)
-    def get_IsEncrypted(self): return _chilkat.CkSFtpFile_get_IsEncrypted(self)
-    def get_IsCompressed(self): return _chilkat.CkSFtpFile_get_IsCompressed(self)
-    def get_IsSparse(self): return _chilkat.CkSFtpFile_get_IsSparse(self)
-    def get_IsAppendOnly(self): return _chilkat.CkSFtpFile_get_IsAppendOnly(self)
-    def get_IsImmutable(self): return _chilkat.CkSFtpFile_get_IsImmutable(self)
-    def get_IsSync(self): return _chilkat.CkSFtpFile_get_IsSync(self)
-    def get_Permissions(self): return _chilkat.CkSFtpFile_get_Permissions(self)
-    def get_Size32(self): return _chilkat.CkSFtpFile_get_Size32(self)
-    def get_LastModifiedTime(self, *args): return _chilkat.CkSFtpFile_get_LastModifiedTime(self, *args)
-    def get_LastAccessTime(self, *args): return _chilkat.CkSFtpFile_get_LastAccessTime(self, *args)
-    def get_CreateTime(self, *args): return _chilkat.CkSFtpFile_get_CreateTime(self, *args)
-    def get_SizeStr(self, *args): return _chilkat.CkSFtpFile_get_SizeStr(self, *args)
-    def sizeStr(self): return _chilkat.CkSFtpFile_sizeStr(self)
-    def get_Uid(self): return _chilkat.CkSFtpFile_get_Uid(self)
-    def get_Gid(self): return _chilkat.CkSFtpFile_get_Gid(self)
-CkSFtpFile_swigregister = _chilkat.CkSFtpFile_swigregister
-CkSFtpFile_swigregister(CkSFtpFile)
-
-class CkSFtpDir(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSFtpDir, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSFtpDir, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSFtpDir()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSFtpDir
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSFtpDir_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSFtpDir_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSFtpDir_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSFtpDir_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSFtpDir_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSFtpDir_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSFtpDir_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSFtpDir_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSFtpDir_lastErrorHtml(self)
-    def get_NumFilesAndDirs(self): return _chilkat.CkSFtpDir_get_NumFilesAndDirs(self)
-    def get_OriginalPath(self, *args): return _chilkat.CkSFtpDir_get_OriginalPath(self, *args)
-    def originalPath(self): return _chilkat.CkSFtpDir_originalPath(self)
-    def GetFileObject(self, *args): return _chilkat.CkSFtpDir_GetFileObject(self, *args)
-    def GetFilename(self, *args): return _chilkat.CkSFtpDir_GetFilename(self, *args)
-    def getFilename(self, *args): return _chilkat.CkSFtpDir_getFilename(self, *args)
-CkSFtpDir_swigregister = _chilkat.CkSFtpDir_swigregister
-CkSFtpDir_swigregister(CkSFtpDir)
-
-class CkSFtp(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSFtp, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSFtp, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSFtp()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSFtp
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSFtp_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSFtp_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSFtp_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSFtp_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSFtp_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSFtp_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSFtp_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSFtp_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSFtp_lastErrorHtml(self)
-    def UnlockComponent(self, *args): return _chilkat.CkSFtp_UnlockComponent(self, *args)
-    def get_ConnectTimeoutMs(self): return _chilkat.CkSFtp_get_ConnectTimeoutMs(self)
-    def put_ConnectTimeoutMs(self, *args): return _chilkat.CkSFtp_put_ConnectTimeoutMs(self, *args)
-    def get_DisconnectCode(self): return _chilkat.CkSFtp_get_DisconnectCode(self)
-    def get_InitializeFailCode(self): return _chilkat.CkSFtp_get_InitializeFailCode(self)
-    def get_MaxPacketSize(self): return _chilkat.CkSFtp_get_MaxPacketSize(self)
-    def put_MaxPacketSize(self, *args): return _chilkat.CkSFtp_put_MaxPacketSize(self, *args)
-    def get_IdleTimeoutMs(self): return _chilkat.CkSFtp_get_IdleTimeoutMs(self)
-    def put_IdleTimeoutMs(self, *args): return _chilkat.CkSFtp_put_IdleTimeoutMs(self, *args)
-    def get_InitializeFailReason(self, *args): return _chilkat.CkSFtp_get_InitializeFailReason(self, *args)
-    def initializeFailReason(self): return _chilkat.CkSFtp_initializeFailReason(self)
-    def get_DisconnectReason(self, *args): return _chilkat.CkSFtp_get_DisconnectReason(self, *args)
-    def disconnectReason(self): return _chilkat.CkSFtp_disconnectReason(self)
-    def get_Version(self, *args): return _chilkat.CkSFtp_get_Version(self, *args)
-    def version(self): return _chilkat.CkSFtp_version(self)
-    def get_IsConnected(self): return _chilkat.CkSFtp_get_IsConnected(self)
-    def get_KeepSessionLog(self): return _chilkat.CkSFtp_get_KeepSessionLog(self)
-    def put_KeepSessionLog(self, *args): return _chilkat.CkSFtp_put_KeepSessionLog(self, *args)
-    def get_SessionLog(self, *args): return _chilkat.CkSFtp_get_SessionLog(self, *args)
-    def sessionLog(self): return _chilkat.CkSFtp_sessionLog(self)
-    def Disconnect(self): return _chilkat.CkSFtp_Disconnect(self)
-    def Connect(self, *args): return _chilkat.CkSFtp_Connect(self, *args)
-    def AuthenticatePk(self, *args): return _chilkat.CkSFtp_AuthenticatePk(self, *args)
-    def AuthenticatePw(self, *args): return _chilkat.CkSFtp_AuthenticatePw(self, *args)
-    def InitializeSftp(self): return _chilkat.CkSFtp_InitializeSftp(self)
-    def OpenFile(self, *args): return _chilkat.CkSFtp_OpenFile(self, *args)
-    def openFile(self, *args): return _chilkat.CkSFtp_openFile(self, *args)
-    def OpenDir(self, *args): return _chilkat.CkSFtp_OpenDir(self, *args)
-    def openDir(self, *args): return _chilkat.CkSFtp_openDir(self, *args)
-    def CloseHandle(self, *args): return _chilkat.CkSFtp_CloseHandle(self, *args)
-    def GetFileSize32(self, *args): return _chilkat.CkSFtp_GetFileSize32(self, *args)
-    def GetFileSizeStr(self, *args): return _chilkat.CkSFtp_GetFileSizeStr(self, *args)
-    def getFileSizeStr(self, *args): return _chilkat.CkSFtp_getFileSizeStr(self, *args)
-    def GetFileLastAccess(self, *args): return _chilkat.CkSFtp_GetFileLastAccess(self, *args)
-    def GetFileLastModified(self, *args): return _chilkat.CkSFtp_GetFileLastModified(self, *args)
-    def GetFileCreateTime(self, *args): return _chilkat.CkSFtp_GetFileCreateTime(self, *args)
-    def GetFileOwner(self, *args): return _chilkat.CkSFtp_GetFileOwner(self, *args)
-    def getFileOwner(self, *args): return _chilkat.CkSFtp_getFileOwner(self, *args)
-    def GetFileGroup(self, *args): return _chilkat.CkSFtp_GetFileGroup(self, *args)
-    def getFileGroup(self, *args): return _chilkat.CkSFtp_getFileGroup(self, *args)
-    def GetFilePermissions(self, *args): return _chilkat.CkSFtp_GetFilePermissions(self, *args)
-    def Add64(self, *args): return _chilkat.CkSFtp_Add64(self, *args)
-    def add64(self, *args): return _chilkat.CkSFtp_add64(self, *args)
-    def ReadFileBytes32(self, *args): return _chilkat.CkSFtp_ReadFileBytes32(self, *args)
-    def ReadFileBytes64s(self, *args): return _chilkat.CkSFtp_ReadFileBytes64s(self, *args)
-    def ReadFileText64s(self, *args): return _chilkat.CkSFtp_ReadFileText64s(self, *args)
-    def readFileText64s(self, *args): return _chilkat.CkSFtp_readFileText64s(self, *args)
-    def ReadFileText32(self, *args): return _chilkat.CkSFtp_ReadFileText32(self, *args)
-    def readFileText32(self, *args): return _chilkat.CkSFtp_readFileText32(self, *args)
-    def DownloadFile(self, *args): return _chilkat.CkSFtp_DownloadFile(self, *args)
-    def Eof(self, *args): return _chilkat.CkSFtp_Eof(self, *args)
-    def ReadFileBytes(self, *args): return _chilkat.CkSFtp_ReadFileBytes(self, *args)
-    def ReadFileText(self, *args): return _chilkat.CkSFtp_ReadFileText(self, *args)
-    def readFileText(self, *args): return _chilkat.CkSFtp_readFileText(self, *args)
-    def LastReadFailed(self, *args): return _chilkat.CkSFtp_LastReadFailed(self, *args)
-    def LastReadNumBytes(self, *args): return _chilkat.CkSFtp_LastReadNumBytes(self, *args)
-    def WriteFileBytes(self, *args): return _chilkat.CkSFtp_WriteFileBytes(self, *args)
-    def WriteFileBytes32(self, *args): return _chilkat.CkSFtp_WriteFileBytes32(self, *args)
-    def WriteFileBytes64s(self, *args): return _chilkat.CkSFtp_WriteFileBytes64s(self, *args)
-    def WriteFileText(self, *args): return _chilkat.CkSFtp_WriteFileText(self, *args)
-    def WriteFileText32(self, *args): return _chilkat.CkSFtp_WriteFileText32(self, *args)
-    def WriteFileText64s(self, *args): return _chilkat.CkSFtp_WriteFileText64s(self, *args)
-    def UploadFile(self, *args): return _chilkat.CkSFtp_UploadFile(self, *args)
-    def RealPath(self, *args): return _chilkat.CkSFtp_RealPath(self, *args)
-    def realPath(self, *args): return _chilkat.CkSFtp_realPath(self, *args)
-    def ReadDir(self, *args): return _chilkat.CkSFtp_ReadDir(self, *args)
-    def RemoveFile(self, *args): return _chilkat.CkSFtp_RemoveFile(self, *args)
-    def RemoveDir(self, *args): return _chilkat.CkSFtp_RemoveDir(self, *args)
-    def RenameFileOrDir(self, *args): return _chilkat.CkSFtp_RenameFileOrDir(self, *args)
-    def CreateDir(self, *args): return _chilkat.CkSFtp_CreateDir(self, *args)
-    def SetCreateTime(self, *args): return _chilkat.CkSFtp_SetCreateTime(self, *args)
-    def SetLastModifiedTime(self, *args): return _chilkat.CkSFtp_SetLastModifiedTime(self, *args)
-    def SetLastAccessTime(self, *args): return _chilkat.CkSFtp_SetLastAccessTime(self, *args)
-    def SetOwnerAndGroup(self, *args): return _chilkat.CkSFtp_SetOwnerAndGroup(self, *args)
-    def SetPermissions(self, *args): return _chilkat.CkSFtp_SetPermissions(self, *args)
-    def CopyFileAttr(self, *args): return _chilkat.CkSFtp_CopyFileAttr(self, *args)
-    def get_ProtocolVersion(self): return _chilkat.CkSFtp_get_ProtocolVersion(self)
-    def get_EnableCache(self): return _chilkat.CkSFtp_get_EnableCache(self)
-    def put_EnableCache(self, *args): return _chilkat.CkSFtp_put_EnableCache(self, *args)
-    def ClearCache(self): return _chilkat.CkSFtp_ClearCache(self)
-    def DownloadFileByName(self, *args): return _chilkat.CkSFtp_DownloadFileByName(self, *args)
-    def get_HeartbeatMs(self): return _chilkat.CkSFtp_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkSFtp_put_HeartbeatMs(self, *args)
-    def UploadFileByName(self, *args): return _chilkat.CkSFtp_UploadFileByName(self, *args)
-    def ResumeUploadFileByName(self, *args): return _chilkat.CkSFtp_ResumeUploadFileByName(self, *args)
-    def ResumeDownloadFileByName(self, *args): return _chilkat.CkSFtp_ResumeDownloadFileByName(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkSFtp_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkSFtp_put_VerboseLogging(self, *args)
-    def get_FilenameCharset(self, *args): return _chilkat.CkSFtp_get_FilenameCharset(self, *args)
-    def filenameCharset(self): return _chilkat.CkSFtp_filenameCharset(self)
-    def put_FilenameCharset(self, *args): return _chilkat.CkSFtp_put_FilenameCharset(self, *args)
-    def ClearSessionLog(self): return _chilkat.CkSFtp_ClearSessionLog(self)
-    def get_ForceV3(self): return _chilkat.CkSFtp_get_ForceV3(self)
-    def put_ForceV3(self, *args): return _chilkat.CkSFtp_put_ForceV3(self, *args)
-    def get_UtcMode(self): return _chilkat.CkSFtp_get_UtcMode(self)
-    def put_UtcMode(self, *args): return _chilkat.CkSFtp_put_UtcMode(self, *args)
-    def get_PreserveDate(self): return _chilkat.CkSFtp_get_PreserveDate(self)
-    def put_PreserveDate(self, *args): return _chilkat.CkSFtp_put_PreserveDate(self, *args)
-    def get_ClientIdentifier(self, *args): return _chilkat.CkSFtp_get_ClientIdentifier(self, *args)
-    def clientIdentifier(self): return _chilkat.CkSFtp_clientIdentifier(self)
-    def put_ClientIdentifier(self, *args): return _chilkat.CkSFtp_put_ClientIdentifier(self, *args)
-    def get_HostKeyFingerprint(self, *args): return _chilkat.CkSFtp_get_HostKeyFingerprint(self, *args)
-    def hostKeyFingerprint(self): return _chilkat.CkSFtp_hostKeyFingerprint(self)
-    def get_SocksHostname(self, *args): return _chilkat.CkSFtp_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkSFtp_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkSFtp_put_SocksHostname(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkSFtp_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkSFtp_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkSFtp_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkSFtp_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkSFtp_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkSFtp_put_SocksPassword(self, *args)
-    def get_SocksPort(self): return _chilkat.CkSFtp_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkSFtp_put_SocksPort(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkSFtp_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkSFtp_put_SocksVersion(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkSFtp_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkSFtp_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkSFtp_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkSFtp_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkSFtp_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkSFtp_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkSFtp_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkSFtp_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkSFtp_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkSFtp_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkSFtp_put_HttpProxyPort(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkSFtp_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkSFtp_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkSFtp_put_HttpProxyUsername(self, *args)
-    def get_TcpNoDelay(self): return _chilkat.CkSFtp_get_TcpNoDelay(self)
-    def put_TcpNoDelay(self, *args): return _chilkat.CkSFtp_put_TcpNoDelay(self, *args)
-    def get_AccumulateBuffer(self, *args): return _chilkat.CkSFtp_get_AccumulateBuffer(self, *args)
-    def ClearAccumulateBuffer(self): return _chilkat.CkSFtp_ClearAccumulateBuffer(self)
-    def AccumulateBytes(self, *args): return _chilkat.CkSFtp_AccumulateBytes(self, *args)
-    def AuthenticatePwPk(self, *args): return _chilkat.CkSFtp_AuthenticatePwPk(self, *args)
-CkSFtp_swigregister = _chilkat.CkSFtp_swigregister
-CkSFtp_swigregister(CkSFtp)
-
-class CkSsh(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSsh, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSsh, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSsh()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSsh
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSsh_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSsh_put_Utf8(self, *args)
-    def Connect(self, *args): return _chilkat.CkSsh_Connect(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkSsh_UnlockComponent(self, *args)
-    def AuthenticatePw(self, *args): return _chilkat.CkSsh_AuthenticatePw(self, *args)
-    def get_Version(self, *args): return _chilkat.CkSsh_get_Version(self, *args)
-    def version(self): return _chilkat.CkSsh_version(self)
-    def get_KeepSessionLog(self): return _chilkat.CkSsh_get_KeepSessionLog(self)
-    def put_KeepSessionLog(self, *args): return _chilkat.CkSsh_put_KeepSessionLog(self, *args)
-    def get_SessionLog(self, *args): return _chilkat.CkSsh_get_SessionLog(self, *args)
-    def sessionLog(self): return _chilkat.CkSsh_sessionLog(self)
-    def get_IdleTimeoutMs(self): return _chilkat.CkSsh_get_IdleTimeoutMs(self)
-    def put_IdleTimeoutMs(self, *args): return _chilkat.CkSsh_put_IdleTimeoutMs(self, *args)
-    def get_ConnectTimeoutMs(self): return _chilkat.CkSsh_get_ConnectTimeoutMs(self)
-    def put_ConnectTimeoutMs(self, *args): return _chilkat.CkSsh_put_ConnectTimeoutMs(self, *args)
-    def get_ChannelOpenFailCode(self): return _chilkat.CkSsh_get_ChannelOpenFailCode(self)
-    def get_DisconnectCode(self): return _chilkat.CkSsh_get_DisconnectCode(self)
-    def get_DisconnectReason(self, *args): return _chilkat.CkSsh_get_DisconnectReason(self, *args)
-    def disconnectReason(self): return _chilkat.CkSsh_disconnectReason(self)
-    def get_ChannelOpenFailReason(self, *args): return _chilkat.CkSsh_get_ChannelOpenFailReason(self, *args)
-    def channelOpenFailReason(self): return _chilkat.CkSsh_channelOpenFailReason(self)
-    def get_MaxPacketSize(self): return _chilkat.CkSsh_get_MaxPacketSize(self)
-    def put_MaxPacketSize(self, *args): return _chilkat.CkSsh_put_MaxPacketSize(self, *args)
-    def Disconnect(self): return _chilkat.CkSsh_Disconnect(self)
-    def OpenSessionChannel(self): return _chilkat.CkSsh_OpenSessionChannel(self)
-    def OpenCustomChannel(self, *args): return _chilkat.CkSsh_OpenCustomChannel(self, *args)
-    def get_NumOpenChannels(self): return _chilkat.CkSsh_get_NumOpenChannels(self)
-    def GetChannelNumber(self, *args): return _chilkat.CkSsh_GetChannelNumber(self, *args)
-    def GetChannelType(self, *args): return _chilkat.CkSsh_GetChannelType(self, *args)
-    def getChannelType(self, *args): return _chilkat.CkSsh_getChannelType(self, *args)
-    def SendReqPty(self, *args): return _chilkat.CkSsh_SendReqPty(self, *args)
-    def SendReqX11Forwarding(self, *args): return _chilkat.CkSsh_SendReqX11Forwarding(self, *args)
-    def SendReqSetEnv(self, *args): return _chilkat.CkSsh_SendReqSetEnv(self, *args)
-    def SendReqShell(self, *args): return _chilkat.CkSsh_SendReqShell(self, *args)
-    def SendReqExec(self, *args): return _chilkat.CkSsh_SendReqExec(self, *args)
-    def SendReqSubsystem(self, *args): return _chilkat.CkSsh_SendReqSubsystem(self, *args)
-    def SendReqWindowChange(self, *args): return _chilkat.CkSsh_SendReqWindowChange(self, *args)
-    def SendReqXonXoff(self, *args): return _chilkat.CkSsh_SendReqXonXoff(self, *args)
-    def SendReqSignal(self, *args): return _chilkat.CkSsh_SendReqSignal(self, *args)
-    def ChannelSendData(self, *args): return _chilkat.CkSsh_ChannelSendData(self, *args)
-    def ChannelSendString(self, *args): return _chilkat.CkSsh_ChannelSendString(self, *args)
-    def ChannelPoll(self, *args): return _chilkat.CkSsh_ChannelPoll(self, *args)
-    def ChannelReadAndPoll(self, *args): return _chilkat.CkSsh_ChannelReadAndPoll(self, *args)
-    def ChannelRead(self, *args): return _chilkat.CkSsh_ChannelRead(self, *args)
-    def GetReceivedData(self, *args): return _chilkat.CkSsh_GetReceivedData(self, *args)
-    def GetReceivedStderr(self, *args): return _chilkat.CkSsh_GetReceivedStderr(self, *args)
-    def ChannelReceivedEof(self, *args): return _chilkat.CkSsh_ChannelReceivedEof(self, *args)
-    def ChannelReceivedClose(self, *args): return _chilkat.CkSsh_ChannelReceivedClose(self, *args)
-    def ChannelSendClose(self, *args): return _chilkat.CkSsh_ChannelSendClose(self, *args)
-    def ChannelSendEof(self, *args): return _chilkat.CkSsh_ChannelSendEof(self, *args)
-    def ChannelIsOpen(self, *args): return _chilkat.CkSsh_ChannelIsOpen(self, *args)
-    def ChannelReceiveToClose(self, *args): return _chilkat.CkSsh_ChannelReceiveToClose(self, *args)
-    def ClearTtyModes(self): return _chilkat.CkSsh_ClearTtyModes(self)
-    def SetTtyMode(self, *args): return _chilkat.CkSsh_SetTtyMode(self, *args)
-    def get_IsConnected(self): return _chilkat.CkSsh_get_IsConnected(self)
-    def ReKey(self): return _chilkat.CkSsh_ReKey(self)
-    def AuthenticatePk(self, *args): return _chilkat.CkSsh_AuthenticatePk(self, *args)
-    def GetReceivedText(self, *args): return _chilkat.CkSsh_GetReceivedText(self, *args)
-    def getReceivedText(self, *args): return _chilkat.CkSsh_getReceivedText(self, *args)
-    def GetReceivedNumBytes(self, *args): return _chilkat.CkSsh_GetReceivedNumBytes(self, *args)
-    def ChannelReceiveUntilMatch(self, *args): return _chilkat.CkSsh_ChannelReceiveUntilMatch(self, *args)
-    def SendIgnore(self): return _chilkat.CkSsh_SendIgnore(self)
-    def OpenDirectTcpIpChannel(self, *args): return _chilkat.CkSsh_OpenDirectTcpIpChannel(self, *args)
-    def GetReceivedTextS(self, *args): return _chilkat.CkSsh_GetReceivedTextS(self, *args)
-    def getReceivedTextS(self, *args): return _chilkat.CkSsh_getReceivedTextS(self, *args)
-    def GetReceivedDataN(self, *args): return _chilkat.CkSsh_GetReceivedDataN(self, *args)
-    def PeekReceivedText(self, *args): return _chilkat.CkSsh_PeekReceivedText(self, *args)
-    def peekReceivedText(self, *args): return _chilkat.CkSsh_peekReceivedText(self, *args)
-    def get_HeartbeatMs(self): return _chilkat.CkSsh_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkSsh_put_HeartbeatMs(self, *args)
-    def ChannelReceivedExitStatus(self, *args): return _chilkat.CkSsh_ChannelReceivedExitStatus(self, *args)
-    def GetChannelExitStatus(self, *args): return _chilkat.CkSsh_GetChannelExitStatus(self, *args)
-    def get_ClientIdentifier(self, *args): return _chilkat.CkSsh_get_ClientIdentifier(self, *args)
-    def clientIdentifier(self): return _chilkat.CkSsh_clientIdentifier(self)
-    def put_ClientIdentifier(self, *args): return _chilkat.CkSsh_put_ClientIdentifier(self, *args)
-    def get_ReadTimeoutMs(self): return _chilkat.CkSsh_get_ReadTimeoutMs(self)
-    def put_ReadTimeoutMs(self, *args): return _chilkat.CkSsh_put_ReadTimeoutMs(self, *args)
-    def get_TcpNoDelay(self): return _chilkat.CkSsh_get_TcpNoDelay(self)
-    def put_TcpNoDelay(self, *args): return _chilkat.CkSsh_put_TcpNoDelay(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkSsh_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkSsh_put_VerboseLogging(self, *args)
-    def get_HostKeyFingerprint(self, *args): return _chilkat.CkSsh_get_HostKeyFingerprint(self, *args)
-    def hostKeyFingerprint(self): return _chilkat.CkSsh_hostKeyFingerprint(self)
-    def get_SocksVersion(self): return _chilkat.CkSsh_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkSsh_put_SocksVersion(self, *args)
-    def get_SocksPort(self): return _chilkat.CkSsh_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkSsh_put_SocksPort(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkSsh_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkSsh_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkSsh_put_SocksHostname(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkSsh_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkSsh_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkSsh_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkSsh_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkSsh_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkSsh_put_SocksPassword(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkSsh_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkSsh_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkSsh_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkSsh_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkSsh_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkSsh_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkSsh_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkSsh_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkSsh_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkSsh_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkSsh_put_HttpProxyPort(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkSsh_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkSsh_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkSsh_put_HttpProxyUsername(self, *args)
-    def ChannelReceiveUntilMatchN(self, *args): return _chilkat.CkSsh_ChannelReceiveUntilMatchN(self, *args)
-    def ChannelReadAndPoll2(self, *args): return _chilkat.CkSsh_ChannelReadAndPoll2(self, *args)
-    def AuthenticatePwPk(self, *args): return _chilkat.CkSsh_AuthenticatePwPk(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSsh_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSsh_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSsh_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSsh_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSsh_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSsh_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSsh_lastErrorHtml(self)
-CkSsh_swigregister = _chilkat.CkSsh_swigregister
-CkSsh_swigregister(CkSsh)
-
-class CkSshKey(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSshKey, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSshKey, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSshKey()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSshKey
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSshKey_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSshKey_put_Utf8(self, *args)
-    def get_IsRsaKey(self): return _chilkat.CkSshKey_get_IsRsaKey(self)
-    def get_IsDsaKey(self): return _chilkat.CkSshKey_get_IsDsaKey(self)
-    def get_IsPrivateKey(self): return _chilkat.CkSshKey_get_IsPrivateKey(self)
-    def get_Password(self, *args): return _chilkat.CkSshKey_get_Password(self, *args)
-    def password(self): return _chilkat.CkSshKey_password(self)
-    def put_Password(self, *args): return _chilkat.CkSshKey_put_Password(self, *args)
-    def get_Comment(self, *args): return _chilkat.CkSshKey_get_Comment(self, *args)
-    def comment(self): return _chilkat.CkSshKey_comment(self)
-    def put_Comment(self, *args): return _chilkat.CkSshKey_put_Comment(self, *args)
-    def GenFingerprint(self, *args): return _chilkat.CkSshKey_GenFingerprint(self, *args)
-    def genFingerprint(self): return _chilkat.CkSshKey_genFingerprint(self)
-    def ToXml(self, *args): return _chilkat.CkSshKey_ToXml(self, *args)
-    def toXml(self): return _chilkat.CkSshKey_toXml(self)
-    def ToRfc4716PublicKey(self, *args): return _chilkat.CkSshKey_ToRfc4716PublicKey(self, *args)
-    def toRfc4716PublicKey(self): return _chilkat.CkSshKey_toRfc4716PublicKey(self)
-    def ToOpenSshPublicKey(self, *args): return _chilkat.CkSshKey_ToOpenSshPublicKey(self, *args)
-    def toOpenSshPublicKey(self): return _chilkat.CkSshKey_toOpenSshPublicKey(self)
-    def FromXml(self, *args): return _chilkat.CkSshKey_FromXml(self, *args)
-    def FromRfc4716PublicKey(self, *args): return _chilkat.CkSshKey_FromRfc4716PublicKey(self, *args)
-    def FromOpenSshPublicKey(self, *args): return _chilkat.CkSshKey_FromOpenSshPublicKey(self, *args)
-    def FromPuttyPrivateKey(self, *args): return _chilkat.CkSshKey_FromPuttyPrivateKey(self, *args)
-    def FromOpenSshPrivateKey(self, *args): return _chilkat.CkSshKey_FromOpenSshPrivateKey(self, *args)
-    def GenerateRsaKey(self, *args): return _chilkat.CkSshKey_GenerateRsaKey(self, *args)
-    def GenerateDsaKey(self, *args): return _chilkat.CkSshKey_GenerateDsaKey(self, *args)
-    def SaveText(self, *args): return _chilkat.CkSshKey_SaveText(self, *args)
-    def LoadText(self, *args): return _chilkat.CkSshKey_LoadText(self, *args)
-    def loadText(self, *args): return _chilkat.CkSshKey_loadText(self, *args)
-    def ToOpenSshPrivateKey(self, *args): return _chilkat.CkSshKey_ToOpenSshPrivateKey(self, *args)
-    def toOpenSshPrivateKey(self, *args): return _chilkat.CkSshKey_toOpenSshPrivateKey(self, *args)
-    def ToPuttyPrivateKey(self, *args): return _chilkat.CkSshKey_ToPuttyPrivateKey(self, *args)
-    def toPuttyPrivateKey(self, *args): return _chilkat.CkSshKey_toPuttyPrivateKey(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSshKey_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSshKey_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSshKey_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSshKey_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSshKey_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSshKey_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSshKey_lastErrorHtml(self)
-CkSshKey_swigregister = _chilkat.CkSshKey_swigregister
-CkSshKey_swigregister(CkSshKey)
-
-class CkIcon(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkIcon, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkIcon, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkIcon()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkIcon
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkIcon_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkIcon_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkIcon_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkIcon_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkIcon_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkIcon_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkIcon_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkIcon_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkIcon_lastErrorHtml(self)
-CkIcon_swigregister = _chilkat.CkIcon_swigregister
-CkIcon_swigregister(CkIcon)
-
-class CkService(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkService, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkService, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkService()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkService
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkService_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkService_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkService_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkService_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkService_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkService_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkService_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkService_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkService_lastErrorHtml(self)
-    def Install(self): return _chilkat.CkService_Install(self)
-    def Uninstall(self): return _chilkat.CkService_Uninstall(self)
-    def Start(self): return _chilkat.CkService_Start(self)
-    def Stop(self): return _chilkat.CkService_Stop(self)
-    def get_ServiceName(self, *args): return _chilkat.CkService_get_ServiceName(self, *args)
-    def serviceName(self): return _chilkat.CkService_serviceName(self)
-    def put_ServiceName(self, *args): return _chilkat.CkService_put_ServiceName(self, *args)
-    def get_DisplayName(self, *args): return _chilkat.CkService_get_DisplayName(self, *args)
-    def displayName(self): return _chilkat.CkService_displayName(self)
-    def put_DisplayName(self, *args): return _chilkat.CkService_put_DisplayName(self, *args)
-    def get_ExeFilename(self, *args): return _chilkat.CkService_get_ExeFilename(self, *args)
-    def exeFilename(self): return _chilkat.CkService_exeFilename(self)
-    def put_ExeFilename(self, *args): return _chilkat.CkService_put_ExeFilename(self, *args)
-    def get_AutoStart(self): return _chilkat.CkService_get_AutoStart(self)
-    def put_AutoStart(self, *args): return _chilkat.CkService_put_AutoStart(self, *args)
-    def SetAutoStart(self): return _chilkat.CkService_SetAutoStart(self)
-    def SetDemandStart(self): return _chilkat.CkService_SetDemandStart(self)
-    def Disable(self): return _chilkat.CkService_Disable(self)
-    def IsAutoStart(self): return _chilkat.CkService_IsAutoStart(self)
-    def IsDemandStart(self): return _chilkat.CkService_IsDemandStart(self)
-    def IsDisabled(self): return _chilkat.CkService_IsDisabled(self)
-    def IsInstalled(self): return _chilkat.CkService_IsInstalled(self)
-    def IsRunning(self): return _chilkat.CkService_IsRunning(self)
-CkService_swigregister = _chilkat.CkService_swigregister
-CkService_swigregister(CkService)
-
-class CkCompression(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCompression, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCompression, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCompression()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCompression
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCompression_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCompression_put_Utf8(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkCompression_get_Charset(self, *args)
-    def charset(self): return _chilkat.CkCompression_charset(self)
-    def put_Charset(self, *args): return _chilkat.CkCompression_put_Charset(self, *args)
-    def get_EncodingMode(self, *args): return _chilkat.CkCompression_get_EncodingMode(self, *args)
-    def encodingMode(self): return _chilkat.CkCompression_encodingMode(self)
-    def put_EncodingMode(self, *args): return _chilkat.CkCompression_put_EncodingMode(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkCompression_UnlockComponent(self, *args)
-    def get_Algorithm(self, *args): return _chilkat.CkCompression_get_Algorithm(self, *args)
-    def algorithm(self): return _chilkat.CkCompression_algorithm(self)
-    def put_Algorithm(self, *args): return _chilkat.CkCompression_put_Algorithm(self, *args)
-    def BeginCompressBytes(self, *args): return _chilkat.CkCompression_BeginCompressBytes(self, *args)
-    def BeginCompressBytesENC(self, *args): return _chilkat.CkCompression_BeginCompressBytesENC(self, *args)
-    def beginCompressBytesENC(self, *args): return _chilkat.CkCompression_beginCompressBytesENC(self, *args)
-    def BeginCompressString(self, *args): return _chilkat.CkCompression_BeginCompressString(self, *args)
-    def BeginCompressStringENC(self, *args): return _chilkat.CkCompression_BeginCompressStringENC(self, *args)
-    def beginCompressStringENC(self, *args): return _chilkat.CkCompression_beginCompressStringENC(self, *args)
-    def BeginDecompressBytes(self, *args): return _chilkat.CkCompression_BeginDecompressBytes(self, *args)
-    def BeginDecompressBytesENC(self, *args): return _chilkat.CkCompression_BeginDecompressBytesENC(self, *args)
-    def BeginDecompressString(self, *args): return _chilkat.CkCompression_BeginDecompressString(self, *args)
-    def beginDecompressString(self, *args): return _chilkat.CkCompression_beginDecompressString(self, *args)
-    def BeginDecompressStringENC(self, *args): return _chilkat.CkCompression_BeginDecompressStringENC(self, *args)
-    def beginDecompressStringENC(self, *args): return _chilkat.CkCompression_beginDecompressStringENC(self, *args)
-    def CompressBytes(self, *args): return _chilkat.CkCompression_CompressBytes(self, *args)
-    def CompressBytesENC(self, *args): return _chilkat.CkCompression_CompressBytesENC(self, *args)
-    def compressBytesENC(self, *args): return _chilkat.CkCompression_compressBytesENC(self, *args)
-    def CompressFile(self, *args): return _chilkat.CkCompression_CompressFile(self, *args)
-    def CompressString(self, *args): return _chilkat.CkCompression_CompressString(self, *args)
-    def CompressStringENC(self, *args): return _chilkat.CkCompression_CompressStringENC(self, *args)
-    def compressStringENC(self, *args): return _chilkat.CkCompression_compressStringENC(self, *args)
-    def DecompressBytes(self, *args): return _chilkat.CkCompression_DecompressBytes(self, *args)
-    def DecompressBytesENC(self, *args): return _chilkat.CkCompression_DecompressBytesENC(self, *args)
-    def DecompressFile(self, *args): return _chilkat.CkCompression_DecompressFile(self, *args)
-    def DecompressString(self, *args): return _chilkat.CkCompression_DecompressString(self, *args)
-    def decompressString(self, *args): return _chilkat.CkCompression_decompressString(self, *args)
-    def DecompressStringENC(self, *args): return _chilkat.CkCompression_DecompressStringENC(self, *args)
-    def decompressStringENC(self, *args): return _chilkat.CkCompression_decompressStringENC(self, *args)
-    def EndCompressBytes(self, *args): return _chilkat.CkCompression_EndCompressBytes(self, *args)
-    def EndCompressBytesENC(self, *args): return _chilkat.CkCompression_EndCompressBytesENC(self, *args)
-    def endCompressBytesENC(self): return _chilkat.CkCompression_endCompressBytesENC(self)
-    def EndCompressString(self, *args): return _chilkat.CkCompression_EndCompressString(self, *args)
-    def EndCompressStringENC(self, *args): return _chilkat.CkCompression_EndCompressStringENC(self, *args)
-    def endCompressStringENC(self): return _chilkat.CkCompression_endCompressStringENC(self)
-    def EndDecompressBytes(self, *args): return _chilkat.CkCompression_EndDecompressBytes(self, *args)
-    def EndDecompressBytesENC(self, *args): return _chilkat.CkCompression_EndDecompressBytesENC(self, *args)
-    def EndDecompressString(self, *args): return _chilkat.CkCompression_EndDecompressString(self, *args)
-    def endDecompressString(self): return _chilkat.CkCompression_endDecompressString(self)
-    def EndDecompressStringENC(self, *args): return _chilkat.CkCompression_EndDecompressStringENC(self, *args)
-    def endDecompressStringENC(self): return _chilkat.CkCompression_endDecompressStringENC(self)
-    def MoreCompressBytes(self, *args): return _chilkat.CkCompression_MoreCompressBytes(self, *args)
-    def MoreCompressBytesENC(self, *args): return _chilkat.CkCompression_MoreCompressBytesENC(self, *args)
-    def moreCompressBytesENC(self, *args): return _chilkat.CkCompression_moreCompressBytesENC(self, *args)
-    def MoreCompressString(self, *args): return _chilkat.CkCompression_MoreCompressString(self, *args)
-    def MoreCompressStringENC(self, *args): return _chilkat.CkCompression_MoreCompressStringENC(self, *args)
-    def moreCompressStringENC(self, *args): return _chilkat.CkCompression_moreCompressStringENC(self, *args)
-    def MoreDecompressBytes(self, *args): return _chilkat.CkCompression_MoreDecompressBytes(self, *args)
-    def MoreDecompressBytesENC(self, *args): return _chilkat.CkCompression_MoreDecompressBytesENC(self, *args)
-    def MoreDecompressString(self, *args): return _chilkat.CkCompression_MoreDecompressString(self, *args)
-    def moreDecompressString(self, *args): return _chilkat.CkCompression_moreDecompressString(self, *args)
-    def MoreDecompressStringENC(self, *args): return _chilkat.CkCompression_MoreDecompressStringENC(self, *args)
-    def moreDecompressStringENC(self, *args): return _chilkat.CkCompression_moreDecompressStringENC(self, *args)
-    def get_Version(self, *args): return _chilkat.CkCompression_get_Version(self, *args)
-    def version(self): return _chilkat.CkCompression_version(self)
-    def SaveLastError(self, *args): return _chilkat.CkCompression_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCompression_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCompression_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCompression_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkCompression_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCompression_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCompression_lastErrorHtml(self)
-CkCompression_swigregister = _chilkat.CkCompression_swigregister
-CkCompression_swigregister(CkCompression)
-
-class CkBz2(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkBz2, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkBz2, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkBz2()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkBz2
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkBz2_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkBz2_put_Utf8(self, *args)
-    def UncompressFile(self, *args): return _chilkat.CkBz2_UncompressFile(self, *args)
-    def CompressFile(self, *args): return _chilkat.CkBz2_CompressFile(self, *args)
-    def UncompressFileToMem(self, *args): return _chilkat.CkBz2_UncompressFileToMem(self, *args)
-    def CompressFileToMem(self, *args): return _chilkat.CkBz2_CompressFileToMem(self, *args)
-    def CompressMemToFile(self, *args): return _chilkat.CkBz2_CompressMemToFile(self, *args)
-    def UncompressMemToFile(self, *args): return _chilkat.CkBz2_UncompressMemToFile(self, *args)
-    def CompressMemory(self, *args): return _chilkat.CkBz2_CompressMemory(self, *args)
-    def UncompressMemory(self, *args): return _chilkat.CkBz2_UncompressMemory(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkBz2_UnlockComponent(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkBz2_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkBz2_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkBz2_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkBz2_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkBz2_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkBz2_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkBz2_lastErrorHtml(self)
-CkBz2_swigregister = _chilkat.CkBz2_swigregister
-CkBz2_swigregister(CkBz2)
-
-class CkCgi(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCgi, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCgi, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCgi()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCgi
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCgi_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCgi_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCgi_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCgi_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCgi_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCgi_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkCgi_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCgi_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCgi_lastErrorHtml(self)
-CkCgi_swigregister = _chilkat.CkCgi_swigregister
-CkCgi_swigregister(CkCgi)
-
-class CkHtmlToText(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkHtmlToText, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkHtmlToText, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkHtmlToText()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkHtmlToText
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkHtmlToText_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkHtmlToText_put_Utf8(self, *args)
-    def IsUnlocked(self): return _chilkat.CkHtmlToText_IsUnlocked(self)
-    def ToText(self, *args): return _chilkat.CkHtmlToText_ToText(self, *args)
-    def toText(self, *args): return _chilkat.CkHtmlToText_toText(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkHtmlToText_UnlockComponent(self, *args)
-    def WriteStringToFile(self, *args): return _chilkat.CkHtmlToText_WriteStringToFile(self, *args)
-    def ReadFileToString(self, *args): return _chilkat.CkHtmlToText_ReadFileToString(self, *args)
-    def readFileToString(self, *args): return _chilkat.CkHtmlToText_readFileToString(self, *args)
-    def get_RightMargin(self): return _chilkat.CkHtmlToText_get_RightMargin(self)
-    def put_RightMargin(self, *args): return _chilkat.CkHtmlToText_put_RightMargin(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkHtmlToText_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkHtmlToText_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkHtmlToText_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkHtmlToText_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkHtmlToText_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkHtmlToText_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkHtmlToText_lastErrorHtml(self)
-CkHtmlToText_swigregister = _chilkat.CkHtmlToText_swigregister
-CkHtmlToText_swigregister(CkHtmlToText)
-
-class CkCsv(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkCsv, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkCsv, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkCsv()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkCsv
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkCsv_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkCsv_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkCsv_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkCsv_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkCsv_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkCsv_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkCsv_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkCsv_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkCsv_lastErrorHtml(self)
-    def LoadFile(self, *args): return _chilkat.CkCsv_LoadFile(self, *args)
-    def SaveFile(self, *args): return _chilkat.CkCsv_SaveFile(self, *args)
-    def SaveFile2(self, *args): return _chilkat.CkCsv_SaveFile2(self, *args)
-    def LoadFile2(self, *args): return _chilkat.CkCsv_LoadFile2(self, *args)
-    def GetCell(self, *args): return _chilkat.CkCsv_GetCell(self, *args)
-    def getCell(self, *args): return _chilkat.CkCsv_getCell(self, *args)
-    def get_NumRows(self): return _chilkat.CkCsv_get_NumRows(self)
-    def SetCell(self, *args): return _chilkat.CkCsv_SetCell(self, *args)
-    def GetNumCols(self, *args): return _chilkat.CkCsv_GetNumCols(self, *args)
-    def get_Delimiter(self, *args): return _chilkat.CkCsv_get_Delimiter(self, *args)
-    def delimiter(self): return _chilkat.CkCsv_delimiter(self)
-    def put_Delimiter(self, *args): return _chilkat.CkCsv_put_Delimiter(self, *args)
-    def get_Crlf(self): return _chilkat.CkCsv_get_Crlf(self)
-    def put_Crlf(self, *args): return _chilkat.CkCsv_put_Crlf(self, *args)
-    def get_HasColumnNames(self): return _chilkat.CkCsv_get_HasColumnNames(self)
-    def put_HasColumnNames(self, *args): return _chilkat.CkCsv_put_HasColumnNames(self, *args)
-    def get_NumColumns(self): return _chilkat.CkCsv_get_NumColumns(self)
-    def GetIndex(self, *args): return _chilkat.CkCsv_GetIndex(self, *args)
-    def GetColumnName(self, *args): return _chilkat.CkCsv_GetColumnName(self, *args)
-    def getColumnName(self, *args): return _chilkat.CkCsv_getColumnName(self, *args)
-    def LoadFromString(self, *args): return _chilkat.CkCsv_LoadFromString(self, *args)
-    def SaveToString(self, *args): return _chilkat.CkCsv_SaveToString(self, *args)
-    def saveToString(self): return _chilkat.CkCsv_saveToString(self)
-    def SetColumnName(self, *args): return _chilkat.CkCsv_SetColumnName(self, *args)
-CkCsv_swigregister = _chilkat.CkCsv_swigregister
-CkCsv_swigregister(CkCsv)
-
-class CkTar(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkTar, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkTar, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkTar()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkTar
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkTar_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkTar_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkTar_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkTar_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkTar_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkTar_LastErrorText(self, *args)
-    def get_Version(self, *args): return _chilkat.CkTar_get_Version(self, *args)
-    def lastErrorText(self): return _chilkat.CkTar_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkTar_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkTar_lastErrorHtml(self)
-    def version(self): return _chilkat.CkTar_version(self)
-    def get_NoAbsolutePaths(self): return _chilkat.CkTar_get_NoAbsolutePaths(self)
-    def put_NoAbsolutePaths(self, *args): return _chilkat.CkTar_put_NoAbsolutePaths(self, *args)
-    def get_UntarCaseSensitive(self): return _chilkat.CkTar_get_UntarCaseSensitive(self)
-    def put_UntarCaseSensitive(self, *args): return _chilkat.CkTar_put_UntarCaseSensitive(self, *args)
-    def get_UntarDebugLog(self): return _chilkat.CkTar_get_UntarDebugLog(self)
-    def put_UntarDebugLog(self, *args): return _chilkat.CkTar_put_UntarDebugLog(self, *args)
-    def get_UntarDiscardPaths(self): return _chilkat.CkTar_get_UntarDiscardPaths(self)
-    def put_UntarDiscardPaths(self, *args): return _chilkat.CkTar_put_UntarDiscardPaths(self, *args)
-    def get_UntarFromDir(self, *args): return _chilkat.CkTar_get_UntarFromDir(self, *args)
-    def untarFromDir(self): return _chilkat.CkTar_untarFromDir(self)
-    def put_UntarFromDir(self, *args): return _chilkat.CkTar_put_UntarFromDir(self, *args)
-    def get_UntarMatchPattern(self, *args): return _chilkat.CkTar_get_UntarMatchPattern(self, *args)
-    def untarMatchPattern(self): return _chilkat.CkTar_untarMatchPattern(self)
-    def put_UntarMatchPattern(self, *args): return _chilkat.CkTar_put_UntarMatchPattern(self, *args)
-    def get_UntarMaxCount(self): return _chilkat.CkTar_get_UntarMaxCount(self)
-    def put_UntarMaxCount(self, *args): return _chilkat.CkTar_put_UntarMaxCount(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkTar_UnlockComponent(self, *args)
-    def Untar(self, *args): return _chilkat.CkTar_Untar(self, *args)
-    def UntarFromMemory(self, *args): return _chilkat.CkTar_UntarFromMemory(self, *args)
-    def UntarFirstMatchingToMemory(self, *args): return _chilkat.CkTar_UntarFirstMatchingToMemory(self, *args)
-    def AddDirRoot(self, *args): return _chilkat.CkTar_AddDirRoot(self, *args)
-    def get_NumDirRoots(self): return _chilkat.CkTar_get_NumDirRoots(self)
-    def GetDirRoot(self, *args): return _chilkat.CkTar_GetDirRoot(self, *args)
-    def getDirRoot(self, *args): return _chilkat.CkTar_getDirRoot(self, *args)
-    def WriteTar(self, *args): return _chilkat.CkTar_WriteTar(self, *args)
-    def WriteTarGz(self, *args): return _chilkat.CkTar_WriteTarGz(self, *args)
-    def WriteTarBz2(self, *args): return _chilkat.CkTar_WriteTarBz2(self, *args)
-    def WriteTarZ(self, *args): return _chilkat.CkTar_WriteTarZ(self, *args)
-    def ListXml(self, *args): return _chilkat.CkTar_ListXml(self, *args)
-    def listXml(self, *args): return _chilkat.CkTar_listXml(self, *args)
-    def get_Charset(self, *args): return _chilkat.CkTar_get_Charset(self, *args)
-    def charset(self): return _chilkat.CkTar_charset(self)
-    def put_Charset(self, *args): return _chilkat.CkTar_put_Charset(self, *args)
-    def UntarZ(self, *args): return _chilkat.CkTar_UntarZ(self, *args)
-    def UntarGz(self, *args): return _chilkat.CkTar_UntarGz(self, *args)
-    def UntarBz2(self, *args): return _chilkat.CkTar_UntarBz2(self, *args)
-    def get_UserName(self, *args): return _chilkat.CkTar_get_UserName(self, *args)
-    def userName(self): return _chilkat.CkTar_userName(self)
-    def put_UserName(self, *args): return _chilkat.CkTar_put_UserName(self, *args)
-    def get_GroupName(self, *args): return _chilkat.CkTar_get_GroupName(self, *args)
-    def groupName(self): return _chilkat.CkTar_groupName(self)
-    def put_GroupName(self, *args): return _chilkat.CkTar_put_GroupName(self, *args)
-    def get_UserId(self): return _chilkat.CkTar_get_UserId(self)
-    def put_UserId(self, *args): return _chilkat.CkTar_put_UserId(self, *args)
-    def get_GroupId(self): return _chilkat.CkTar_get_GroupId(self)
-    def put_GroupId(self, *args): return _chilkat.CkTar_put_GroupId(self, *args)
-    def get_DirMode(self): return _chilkat.CkTar_get_DirMode(self)
-    def put_DirMode(self, *args): return _chilkat.CkTar_put_DirMode(self, *args)
-    def get_FileMode(self): return _chilkat.CkTar_get_FileMode(self)
-    def put_FileMode(self, *args): return _chilkat.CkTar_put_FileMode(self, *args)
-    def get_VerboseLogging(self): return _chilkat.CkTar_get_VerboseLogging(self)
-    def put_VerboseLogging(self, *args): return _chilkat.CkTar_put_VerboseLogging(self, *args)
-    def get_WriteFormat(self, *args): return _chilkat.CkTar_get_WriteFormat(self, *args)
-    def writeFormat(self): return _chilkat.CkTar_writeFormat(self)
-    def put_WriteFormat(self, *args): return _chilkat.CkTar_put_WriteFormat(self, *args)
-    def get_HeartbeatMs(self): return _chilkat.CkTar_get_HeartbeatMs(self)
-    def put_HeartbeatMs(self, *args): return _chilkat.CkTar_put_HeartbeatMs(self, *args)
-CkTar_swigregister = _chilkat.CkTar_swigregister
-CkTar_swigregister(CkTar)
-
-class CkSocksProxy(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSocksProxy, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSocksProxy, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSocksProxy()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSocksProxy
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSocksProxy_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSocksProxy_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSocksProxy_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSocksProxy_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSocksProxy_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSocksProxy_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSocksProxy_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSocksProxy_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSocksProxy_lastErrorHtml(self)
-    def UnlockComponent(self, *args): return _chilkat.CkSocksProxy_UnlockComponent(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkSocksProxy_get_SocksVersion(self)
-    def get_AuthenticatedSocks5(self): return _chilkat.CkSocksProxy_get_AuthenticatedSocks5(self)
-    def get_ConnectionPending(self): return _chilkat.CkSocksProxy_get_ConnectionPending(self)
-    def get_ClientPort(self): return _chilkat.CkSocksProxy_get_ClientPort(self)
-    def get_ServerPort(self): return _chilkat.CkSocksProxy_get_ServerPort(self)
-    def get_ClientIp(self, *args): return _chilkat.CkSocksProxy_get_ClientIp(self, *args)
-    def clientIp(self): return _chilkat.CkSocksProxy_clientIp(self)
-    def get_ServerIp(self, *args): return _chilkat.CkSocksProxy_get_ServerIp(self, *args)
-    def serverIp(self): return _chilkat.CkSocksProxy_serverIp(self)
-    def get_Login(self, *args): return _chilkat.CkSocksProxy_get_Login(self, *args)
-    def login(self): return _chilkat.CkSocksProxy_login(self)
-    def get_Password(self, *args): return _chilkat.CkSocksProxy_get_Password(self, *args)
-    def password(self): return _chilkat.CkSocksProxy_password(self)
-    def Initialize(self, *args): return _chilkat.CkSocksProxy_Initialize(self, *args)
-    def WaitForConnection(self, *args): return _chilkat.CkSocksProxy_WaitForConnection(self, *args)
-    def AllowConnection(self): return _chilkat.CkSocksProxy_AllowConnection(self)
-    def ProceedSocks5(self): return _chilkat.CkSocksProxy_ProceedSocks5(self)
-    def RejectConnection(self): return _chilkat.CkSocksProxy_RejectConnection(self)
-    def get_AllowUnauthenticatedSocks5(self): return _chilkat.CkSocksProxy_get_AllowUnauthenticatedSocks5(self)
-    def put_AllowUnauthenticatedSocks5(self, *args): return _chilkat.CkSocksProxy_put_AllowUnauthenticatedSocks5(self, *args)
-    def get_ListenBindIpAddress(self, *args): return _chilkat.CkSocksProxy_get_ListenBindIpAddress(self, *args)
-    def listenBindIpAddress(self): return _chilkat.CkSocksProxy_listenBindIpAddress(self)
-    def put_ListenBindIpAddress(self, *args): return _chilkat.CkSocksProxy_put_ListenBindIpAddress(self, *args)
-    def get_OutboundBindIpAddress(self, *args): return _chilkat.CkSocksProxy_get_OutboundBindIpAddress(self, *args)
-    def outboundBindIpAddress(self): return _chilkat.CkSocksProxy_outboundBindIpAddress(self)
-    def put_OutboundBindIpAddress(self, *args): return _chilkat.CkSocksProxy_put_OutboundBindIpAddress(self, *args)
-    def get_OutboundBindPort(self): return _chilkat.CkSocksProxy_get_OutboundBindPort(self)
-    def put_OutboundBindPort(self, *args): return _chilkat.CkSocksProxy_put_OutboundBindPort(self, *args)
-    def GetTunnelsXml(self, *args): return _chilkat.CkSocksProxy_GetTunnelsXml(self, *args)
-    def getTunnelsXml(self): return _chilkat.CkSocksProxy_getTunnelsXml(self)
-    def StopAllTunnels(self, *args): return _chilkat.CkSocksProxy_StopAllTunnels(self, *args)
-CkSocksProxy_swigregister = _chilkat.CkSocksProxy_swigregister
-CkSocksProxy_swigregister(CkSocksProxy)
-
-class CkSshTunnel(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkSshTunnel, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkSshTunnel, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkSshTunnel()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkSshTunnel
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkSshTunnel_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkSshTunnel_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkSshTunnel_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkSshTunnel_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkSshTunnel_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkSshTunnel_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkSshTunnel_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkSshTunnel_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkSshTunnel_lastErrorHtml(self)
-    def UnlockComponent(self, *args): return _chilkat.CkSshTunnel_UnlockComponent(self, *args)
-    def get_SshLogin(self, *args): return _chilkat.CkSshTunnel_get_SshLogin(self, *args)
-    def sshLogin(self): return _chilkat.CkSshTunnel_sshLogin(self)
-    def put_SshLogin(self, *args): return _chilkat.CkSshTunnel_put_SshLogin(self, *args)
-    def get_SshPassword(self, *args): return _chilkat.CkSshTunnel_get_SshPassword(self, *args)
-    def sshPassword(self): return _chilkat.CkSshTunnel_sshPassword(self)
-    def put_SshPassword(self, *args): return _chilkat.CkSshTunnel_put_SshPassword(self, *args)
-    def get_ConnectLog(self, *args): return _chilkat.CkSshTunnel_get_ConnectLog(self, *args)
-    def connectLog(self): return _chilkat.CkSshTunnel_connectLog(self)
-    def put_ConnectLog(self, *args): return _chilkat.CkSshTunnel_put_ConnectLog(self, *args)
-    def get_DestHostname(self, *args): return _chilkat.CkSshTunnel_get_DestHostname(self, *args)
-    def destHostname(self): return _chilkat.CkSshTunnel_destHostname(self)
-    def put_DestHostname(self, *args): return _chilkat.CkSshTunnel_put_DestHostname(self, *args)
-    def get_SshHostname(self, *args): return _chilkat.CkSshTunnel_get_SshHostname(self, *args)
-    def sshHostname(self): return _chilkat.CkSshTunnel_sshHostname(self)
-    def put_SshHostname(self, *args): return _chilkat.CkSshTunnel_put_SshHostname(self, *args)
-    def get_SshPort(self): return _chilkat.CkSshTunnel_get_SshPort(self)
-    def put_SshPort(self, *args): return _chilkat.CkSshTunnel_put_SshPort(self, *args)
-    def get_DestPort(self): return _chilkat.CkSshTunnel_get_DestPort(self)
-    def put_DestPort(self, *args): return _chilkat.CkSshTunnel_put_DestPort(self, *args)
-    def get_IsAccepting(self): return _chilkat.CkSshTunnel_get_IsAccepting(self)
-    def StopAllTunnels(self, *args): return _chilkat.CkSshTunnel_StopAllTunnels(self, *args)
-    def GetTunnelsXml(self, *args): return _chilkat.CkSshTunnel_GetTunnelsXml(self, *args)
-    def getTunnelsXml(self): return _chilkat.CkSshTunnel_getTunnelsXml(self)
-    def StopAccepting(self): return _chilkat.CkSshTunnel_StopAccepting(self)
-    def BeginAccepting(self, *args): return _chilkat.CkSshTunnel_BeginAccepting(self, *args)
-    def SetSshAuthenticationKey(self, *args): return _chilkat.CkSshTunnel_SetSshAuthenticationKey(self, *args)
-    def get_ListenBindIpAddress(self, *args): return _chilkat.CkSshTunnel_get_ListenBindIpAddress(self, *args)
-    def listenBindIpAddress(self): return _chilkat.CkSshTunnel_listenBindIpAddress(self)
-    def put_ListenBindIpAddress(self, *args): return _chilkat.CkSshTunnel_put_ListenBindIpAddress(self, *args)
-    def get_OutboundBindIpAddress(self, *args): return _chilkat.CkSshTunnel_get_OutboundBindIpAddress(self, *args)
-    def outboundBindIpAddress(self): return _chilkat.CkSshTunnel_outboundBindIpAddress(self)
-    def put_OutboundBindIpAddress(self, *args): return _chilkat.CkSshTunnel_put_OutboundBindIpAddress(self, *args)
-    def get_OutboundBindPort(self): return _chilkat.CkSshTunnel_get_OutboundBindPort(self)
-    def put_OutboundBindPort(self, *args): return _chilkat.CkSshTunnel_put_OutboundBindPort(self, *args)
-    def get_MaxPacketSize(self): return _chilkat.CkSshTunnel_get_MaxPacketSize(self)
-    def put_MaxPacketSize(self, *args): return _chilkat.CkSshTunnel_put_MaxPacketSize(self, *args)
-    def get_TcpNoDelay(self): return _chilkat.CkSshTunnel_get_TcpNoDelay(self)
-    def put_TcpNoDelay(self, *args): return _chilkat.CkSshTunnel_put_TcpNoDelay(self, *args)
-    def get_HttpProxyHostname(self, *args): return _chilkat.CkSshTunnel_get_HttpProxyHostname(self, *args)
-    def httpProxyHostname(self): return _chilkat.CkSshTunnel_httpProxyHostname(self)
-    def put_HttpProxyHostname(self, *args): return _chilkat.CkSshTunnel_put_HttpProxyHostname(self, *args)
-    def get_HttpProxyUsername(self, *args): return _chilkat.CkSshTunnel_get_HttpProxyUsername(self, *args)
-    def httpProxyUsername(self): return _chilkat.CkSshTunnel_httpProxyUsername(self)
-    def put_HttpProxyUsername(self, *args): return _chilkat.CkSshTunnel_put_HttpProxyUsername(self, *args)
-    def get_HttpProxyPassword(self, *args): return _chilkat.CkSshTunnel_get_HttpProxyPassword(self, *args)
-    def httpProxyPassword(self): return _chilkat.CkSshTunnel_httpProxyPassword(self)
-    def put_HttpProxyPassword(self, *args): return _chilkat.CkSshTunnel_put_HttpProxyPassword(self, *args)
-    def get_HttpProxyAuthMethod(self, *args): return _chilkat.CkSshTunnel_get_HttpProxyAuthMethod(self, *args)
-    def httpProxyAuthMethod(self): return _chilkat.CkSshTunnel_httpProxyAuthMethod(self)
-    def put_HttpProxyAuthMethod(self, *args): return _chilkat.CkSshTunnel_put_HttpProxyAuthMethod(self, *args)
-    def get_HttpProxyPort(self): return _chilkat.CkSshTunnel_get_HttpProxyPort(self)
-    def put_HttpProxyPort(self, *args): return _chilkat.CkSshTunnel_put_HttpProxyPort(self, *args)
-    def get_SocksPort(self): return _chilkat.CkSshTunnel_get_SocksPort(self)
-    def put_SocksPort(self, *args): return _chilkat.CkSshTunnel_put_SocksPort(self, *args)
-    def get_SocksHostname(self, *args): return _chilkat.CkSshTunnel_get_SocksHostname(self, *args)
-    def socksHostname(self): return _chilkat.CkSshTunnel_socksHostname(self)
-    def put_SocksHostname(self, *args): return _chilkat.CkSshTunnel_put_SocksHostname(self, *args)
-    def get_SocksUsername(self, *args): return _chilkat.CkSshTunnel_get_SocksUsername(self, *args)
-    def socksUsername(self): return _chilkat.CkSshTunnel_socksUsername(self)
-    def put_SocksUsername(self, *args): return _chilkat.CkSshTunnel_put_SocksUsername(self, *args)
-    def get_SocksPassword(self, *args): return _chilkat.CkSshTunnel_get_SocksPassword(self, *args)
-    def socksPassword(self): return _chilkat.CkSshTunnel_socksPassword(self)
-    def put_SocksPassword(self, *args): return _chilkat.CkSshTunnel_put_SocksPassword(self, *args)
-    def get_SocksVersion(self): return _chilkat.CkSshTunnel_get_SocksVersion(self)
-    def put_SocksVersion(self, *args): return _chilkat.CkSshTunnel_put_SocksVersion(self, *args)
-    def get_ConnectTimeoutMs(self): return _chilkat.CkSshTunnel_get_ConnectTimeoutMs(self)
-    def put_ConnectTimeoutMs(self, *args): return _chilkat.CkSshTunnel_put_ConnectTimeoutMs(self, *args)
-    def get_ListenPort(self): return _chilkat.CkSshTunnel_get_ListenPort(self)
-CkSshTunnel_swigregister = _chilkat.CkSshTunnel_swigregister
-CkSshTunnel_swigregister(CkSshTunnel)
-
-class CkNtlm(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkNtlm, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkNtlm, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkNtlm()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkNtlm
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkNtlm_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkNtlm_put_Utf8(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkNtlm_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkNtlm_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkNtlm_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkNtlm_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkNtlm_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkNtlm_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkNtlm_lastErrorHtml(self)
-    def UnlockComponent(self, *args): return _chilkat.CkNtlm_UnlockComponent(self, *args)
-    def get_TargetName(self, *args): return _chilkat.CkNtlm_get_TargetName(self, *args)
-    def targetName(self): return _chilkat.CkNtlm_targetName(self)
-    def put_TargetName(self, *args): return _chilkat.CkNtlm_put_TargetName(self, *args)
-    def get_NetBiosComputerName(self, *args): return _chilkat.CkNtlm_get_NetBiosComputerName(self, *args)
-    def netBiosComputerName(self): return _chilkat.CkNtlm_netBiosComputerName(self)
-    def put_NetBiosComputerName(self, *args): return _chilkat.CkNtlm_put_NetBiosComputerName(self, *args)
-    def get_NetBiosDomainName(self, *args): return _chilkat.CkNtlm_get_NetBiosDomainName(self, *args)
-    def netBiosDomainName(self): return _chilkat.CkNtlm_netBiosDomainName(self)
-    def put_NetBiosDomainName(self, *args): return _chilkat.CkNtlm_put_NetBiosDomainName(self, *args)
-    def get_DnsDomainName(self, *args): return _chilkat.CkNtlm_get_DnsDomainName(self, *args)
-    def dnsDomainName(self): return _chilkat.CkNtlm_dnsDomainName(self)
-    def put_DnsDomainName(self, *args): return _chilkat.CkNtlm_put_DnsDomainName(self, *args)
-    def get_DnsComputerName(self, *args): return _chilkat.CkNtlm_get_DnsComputerName(self, *args)
-    def dnsComputerName(self): return _chilkat.CkNtlm_dnsComputerName(self)
-    def put_DnsComputerName(self, *args): return _chilkat.CkNtlm_put_DnsComputerName(self, *args)
-    def get_UserName(self, *args): return _chilkat.CkNtlm_get_UserName(self, *args)
-    def userName(self): return _chilkat.CkNtlm_userName(self)
-    def put_UserName(self, *args): return _chilkat.CkNtlm_put_UserName(self, *args)
-    def get_Password(self, *args): return _chilkat.CkNtlm_get_Password(self, *args)
-    def password(self): return _chilkat.CkNtlm_password(self)
-    def put_Password(self, *args): return _chilkat.CkNtlm_put_Password(self, *args)
-    def get_NtlmVersion(self): return _chilkat.CkNtlm_get_NtlmVersion(self)
-    def put_NtlmVersion(self, *args): return _chilkat.CkNtlm_put_NtlmVersion(self, *args)
-    def get_OemCodePage(self): return _chilkat.CkNtlm_get_OemCodePage(self)
-    def put_OemCodePage(self, *args): return _chilkat.CkNtlm_put_OemCodePage(self, *args)
-    def get_Flags(self, *args): return _chilkat.CkNtlm_get_Flags(self, *args)
-    def flags(self): return _chilkat.CkNtlm_flags(self)
-    def put_Flags(self, *args): return _chilkat.CkNtlm_put_Flags(self, *args)
-    def get_Domain(self, *args): return _chilkat.CkNtlm_get_Domain(self, *args)
-    def domain(self): return _chilkat.CkNtlm_domain(self)
-    def put_Domain(self, *args): return _chilkat.CkNtlm_put_Domain(self, *args)
-    def get_Workstation(self, *args): return _chilkat.CkNtlm_get_Workstation(self, *args)
-    def workstation(self): return _chilkat.CkNtlm_workstation(self)
-    def put_Workstation(self, *args): return _chilkat.CkNtlm_put_Workstation(self, *args)
-    def GenType1(self, *args): return _chilkat.CkNtlm_GenType1(self, *args)
-    def genType1(self): return _chilkat.CkNtlm_genType1(self)
-    def GenType2(self, *args): return _chilkat.CkNtlm_GenType2(self, *args)
-    def genType2(self, *args): return _chilkat.CkNtlm_genType2(self, *args)
-    def GenType3(self, *args): return _chilkat.CkNtlm_GenType3(self, *args)
-    def genType3(self, *args): return _chilkat.CkNtlm_genType3(self, *args)
-    def ParseType1(self, *args): return _chilkat.CkNtlm_ParseType1(self, *args)
-    def parseType1(self, *args): return _chilkat.CkNtlm_parseType1(self, *args)
-    def ParseType2(self, *args): return _chilkat.CkNtlm_ParseType2(self, *args)
-    def parseType2(self, *args): return _chilkat.CkNtlm_parseType2(self, *args)
-    def ParseType3(self, *args): return _chilkat.CkNtlm_ParseType3(self, *args)
-    def parseType3(self, *args): return _chilkat.CkNtlm_parseType3(self, *args)
-    def get_EncodingMode(self, *args): return _chilkat.CkNtlm_get_EncodingMode(self, *args)
-    def encodingMode(self): return _chilkat.CkNtlm_encodingMode(self)
-    def put_EncodingMode(self, *args): return _chilkat.CkNtlm_put_EncodingMode(self, *args)
-    def SetFlag(self, *args): return _chilkat.CkNtlm_SetFlag(self, *args)
-    def get_ClientChallenge(self, *args): return _chilkat.CkNtlm_get_ClientChallenge(self, *args)
-    def clientChallenge(self): return _chilkat.CkNtlm_clientChallenge(self)
-    def put_ClientChallenge(self, *args): return _chilkat.CkNtlm_put_ClientChallenge(self, *args)
-    def get_ServerChallenge(self, *args): return _chilkat.CkNtlm_get_ServerChallenge(self, *args)
-    def serverChallenge(self): return _chilkat.CkNtlm_serverChallenge(self)
-    def put_ServerChallenge(self, *args): return _chilkat.CkNtlm_put_ServerChallenge(self, *args)
-    def LoadType3(self, *args): return _chilkat.CkNtlm_LoadType3(self, *args)
-CkNtlm_swigregister = _chilkat.CkNtlm_swigregister
-CkNtlm_swigregister(CkNtlm)
-
-class CkDkim(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkDkim, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkDkim, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkDkim()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkDkim
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkDkim_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkDkim_put_Utf8(self, *args)
-    def UnlockComponent(self, *args): return _chilkat.CkDkim_UnlockComponent(self, *args)
-    def get_DkimCanon(self, *args): return _chilkat.CkDkim_get_DkimCanon(self, *args)
-    def dkimCanon(self): return _chilkat.CkDkim_dkimCanon(self)
-    def put_DkimCanon(self, *args): return _chilkat.CkDkim_put_DkimCanon(self, *args)
-    def get_DomainKeyCanon(self, *args): return _chilkat.CkDkim_get_DomainKeyCanon(self, *args)
-    def domainKeyCanon(self): return _chilkat.CkDkim_domainKeyCanon(self)
-    def put_DomainKeyCanon(self, *args): return _chilkat.CkDkim_put_DomainKeyCanon(self, *args)
-    def get_DkimAlg(self, *args): return _chilkat.CkDkim_get_DkimAlg(self, *args)
-    def dkimAlg(self): return _chilkat.CkDkim_dkimAlg(self)
-    def put_DkimAlg(self, *args): return _chilkat.CkDkim_put_DkimAlg(self, *args)
-    def get_DomainKeyAlg(self, *args): return _chilkat.CkDkim_get_DomainKeyAlg(self, *args)
-    def domainKeyAlg(self): return _chilkat.CkDkim_domainKeyAlg(self)
-    def put_DomainKeyAlg(self, *args): return _chilkat.CkDkim_put_DomainKeyAlg(self, *args)
-    def get_DkimHeaders(self, *args): return _chilkat.CkDkim_get_DkimHeaders(self, *args)
-    def dkimHeaders(self): return _chilkat.CkDkim_dkimHeaders(self)
-    def put_DkimHeaders(self, *args): return _chilkat.CkDkim_put_DkimHeaders(self, *args)
-    def get_DomainKeyHeaders(self, *args): return _chilkat.CkDkim_get_DomainKeyHeaders(self, *args)
-    def domainKeyHeaders(self): return _chilkat.CkDkim_domainKeyHeaders(self)
-    def put_DomainKeyHeaders(self, *args): return _chilkat.CkDkim_put_DomainKeyHeaders(self, *args)
-    def get_DkimDomain(self, *args): return _chilkat.CkDkim_get_DkimDomain(self, *args)
-    def dkimDomain(self): return _chilkat.CkDkim_dkimDomain(self)
-    def put_DkimDomain(self, *args): return _chilkat.CkDkim_put_DkimDomain(self, *args)
-    def get_DomainKeyDomain(self, *args): return _chilkat.CkDkim_get_DomainKeyDomain(self, *args)
-    def domainKeyDomain(self): return _chilkat.CkDkim_domainKeyDomain(self)
-    def put_DomainKeyDomain(self, *args): return _chilkat.CkDkim_put_DomainKeyDomain(self, *args)
-    def get_DkimSelector(self, *args): return _chilkat.CkDkim_get_DkimSelector(self, *args)
-    def dkimSelector(self): return _chilkat.CkDkim_dkimSelector(self)
-    def put_DkimSelector(self, *args): return _chilkat.CkDkim_put_DkimSelector(self, *args)
-    def get_DomainKeySelector(self, *args): return _chilkat.CkDkim_get_DomainKeySelector(self, *args)
-    def domainKeySelector(self): return _chilkat.CkDkim_domainKeySelector(self)
-    def put_DomainKeySelector(self, *args): return _chilkat.CkDkim_put_DomainKeySelector(self, *args)
-    def get_DkimBodyLengthCount(self): return _chilkat.CkDkim_get_DkimBodyLengthCount(self)
-    def put_DkimBodyLengthCount(self, *args): return _chilkat.CkDkim_put_DkimBodyLengthCount(self, *args)
-    def LoadDkimPk(self, *args): return _chilkat.CkDkim_LoadDkimPk(self, *args)
-    def LoadDomainKeyPk(self, *args): return _chilkat.CkDkim_LoadDomainKeyPk(self, *args)
-    def LoadDkimPkFile(self, *args): return _chilkat.CkDkim_LoadDkimPkFile(self, *args)
-    def LoadDomainKeyPkFile(self, *args): return _chilkat.CkDkim_LoadDomainKeyPkFile(self, *args)
-    def LoadPublicKey(self, *args): return _chilkat.CkDkim_LoadPublicKey(self, *args)
-    def LoadPublicKeyFile(self, *args): return _chilkat.CkDkim_LoadPublicKeyFile(self, *args)
-    def PrefetchPublicKey(self, *args): return _chilkat.CkDkim_PrefetchPublicKey(self, *args)
-    def VerifyDkimSignature(self, *args): return _chilkat.CkDkim_VerifyDkimSignature(self, *args)
-    def VerifyDomainKeySignature(self, *args): return _chilkat.CkDkim_VerifyDomainKeySignature(self, *args)
-    def NumDkimSignatures(self, *args): return _chilkat.CkDkim_NumDkimSignatures(self, *args)
-    def NumDomainKeySignatures(self, *args): return _chilkat.CkDkim_NumDomainKeySignatures(self, *args)
-    def AddDkimSignature(self, *args): return _chilkat.CkDkim_AddDkimSignature(self, *args)
-    def AddDomainKeySignature(self, *args): return _chilkat.CkDkim_AddDomainKeySignature(self, *args)
-    def LoadDkimPkBytes(self, *args): return _chilkat.CkDkim_LoadDkimPkBytes(self, *args)
-    def LoadDomainKeyPkBytes(self, *args): return _chilkat.CkDkim_LoadDomainKeyPkBytes(self, *args)
-    def SaveLastError(self, *args): return _chilkat.CkDkim_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkDkim_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkDkim_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkDkim_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkDkim_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkDkim_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkDkim_lastErrorHtml(self)
-CkDkim_swigregister = _chilkat.CkDkim_swigregister
-CkDkim_swigregister(CkDkim)
-
-class CkDirTree(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CkDirTree, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CkDirTree, name)
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _chilkat.new_CkDirTree()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _chilkat.delete_CkDirTree
-    __del__ = lambda self : None;
-    def get_Utf8(self): return _chilkat.CkDirTree_get_Utf8(self)
-    def put_Utf8(self, *args): return _chilkat.CkDirTree_put_Utf8(self, *args)
-    def get_BaseDir(self, *args): return _chilkat.CkDirTree_get_BaseDir(self, *args)
-    def baseDir(self): return _chilkat.CkDirTree_baseDir(self)
-    def put_BaseDir(self, *args): return _chilkat.CkDirTree_put_BaseDir(self, *args)
-    def get_Recurse(self): return _chilkat.CkDirTree_get_Recurse(self)
-    def put_Recurse(self, *args): return _chilkat.CkDirTree_put_Recurse(self, *args)
-    def get_DoneIterating(self): return _chilkat.CkDirTree_get_DoneIterating(self)
-    def BeginIterate(self): return _chilkat.CkDirTree_BeginIterate(self)
-    def AdvancePosition(self): return _chilkat.CkDirTree_AdvancePosition(self)
-    def get_IsDirectory(self): return _chilkat.CkDirTree_get_IsDirectory(self)
-    def get_RelativePath(self, *args): return _chilkat.CkDirTree_get_RelativePath(self, *args)
-    def relativePath(self): return _chilkat.CkDirTree_relativePath(self)
-    def get_FullPath(self, *args): return _chilkat.CkDirTree_get_FullPath(self, *args)
-    def fullPath(self): return _chilkat.CkDirTree_fullPath(self)
-    def get_FullUncPath(self, *args): return _chilkat.CkDirTree_get_FullUncPath(self, *args)
-    def fullUncPath(self): return _chilkat.CkDirTree_fullUncPath(self)
-    def get_FileSize32(self): return _chilkat.CkDirTree_get_FileSize32(self)
-    def SaveLastError(self, *args): return _chilkat.CkDirTree_SaveLastError(self, *args)
-    def LastErrorXml(self, *args): return _chilkat.CkDirTree_LastErrorXml(self, *args)
-    def LastErrorHtml(self, *args): return _chilkat.CkDirTree_LastErrorHtml(self, *args)
-    def LastErrorText(self, *args): return _chilkat.CkDirTree_LastErrorText(self, *args)
-    def lastErrorText(self): return _chilkat.CkDirTree_lastErrorText(self)
-    def lastErrorXml(self): return _chilkat.CkDirTree_lastErrorXml(self)
-    def lastErrorHtml(self): return _chilkat.CkDirTree_lastErrorHtml(self)
-CkDirTree_swigregister = _chilkat.CkDirTree_swigregister
-CkDirTree_swigregister(CkDirTree)
-
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py
deleted file mode 100644
index a19f2d59cff..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# This package defines dialog boxes used by the main
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-import os, sys, stat
-#import dialog_map
-
-def LoadDialogs(rc_name = "dialogs.rc"):
-    base_name = os.path.splitext(rc_name)[0]
-    mod_name = "dialogs.resources." + base_name
-    mod = None
-    # If we are running from source code, check the .py file is up to date
-    # wrt the .rc file passed in.
-    # If we are running from binaries, the rc name is not used at all - we
-    # assume someone running from source previously generated the .py!
-    if not hasattr(sys, "frozen"):
-        from resources import rc2py
-        rc_path = os.path.dirname( rc2py.__file__ )
-        if not os.path.isabs(rc_name):
-            rc_name = os.path.join( rc_path, rc_name)
-        py_name = os.path.join(rc_path, base_name + ".py")
-        mtime = size = None
-        if os.path.exists(py_name):
-            try:
-                mod = __import__(mod_name)
-                mod = sys.modules[mod_name]
-                mtime = mod._rc_mtime_
-                size = mod._rc_size_
-            except (ImportError, AttributeError):
-                mtime = None
-        try:
-            stat_data = os.stat(rc_name)
-            rc_mtime = stat_data[stat.ST_MTIME]
-            rc_size = stat_data[stat.ST_SIZE]
-        except OSError:
-            rc_mtime = rc_size = None
-        if rc_mtime!=mtime or rc_size!=size:
-            # Need to generate the dialog.
-            print "Generating %s from %s" % (py_name, rc_name)
-            rc2py.convert(rc_name, py_name)
-            if mod is not None:
-                reload(mod)
-    if mod is None:
-        mod = __import__(mod_name)
-        mod = sys.modules[mod_name]
-    return mod.FakeParser()
-
-def ShowDialog(parent, manager, config, idd):
-    """Displays another dialog"""
-    if manager.dialog_parser is None:
-        manager.dialog_parser = LoadDialogs()
-    import dialog_map
-    print dir(dialog_map)
-    commands = dialog_map.dialog_map[idd]
-    if not parent:
-        import win32gui
-        try:
-            parent = win32gui.GetActiveWindow()
-        except win32gui.error:
-            pass
-
-    import dlgcore
-    dlg = dlgcore.ProcessorDialog(parent, manager, config, idd, commands)
-    return dlg.DoModal()
-
-def MakePropertyPage(parent, manager, config, idd, yoffset=24):
-    """Creates a child dialog box to use as property page in a tab control"""
-    if manager.dialog_parser is None:
-        manager.dialog_parser = LoadDialogs()
-    import dialog_map
-    commands = dialog_map.dialog_map[idd]
-    if not parent:
-        raise "Parent must be the tab control"
-
-    import dlgcore
-    dlg = dlgcore.ProcessorPage(parent, manager, config, idd, commands, yoffset)
-    return dlg
-
-import dlgutils
-SetWaitCursor = dlgutils.SetWaitCursor
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
deleted file mode 100644
index 8576a3526ff..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ /dev/null
@@ -1,1810 +0,0 @@
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# -*- 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 processors import *
-from opt_processors import *
-import os
-import addin
-from dialogs import ShowDialog, MakePropertyPage
-
-import win32ui
-import webbrowser
-import commctrl
-import win32con
-import win32gui
-
-import win32gui_struct
-import xmlrpclib
-
-from manager import ustr
-
-try:
-    enumerate
-except NameError:   # enumerate new in 2.3
-    def enumerate(seq):
-        return [(i, seq[i]) for i in xrange(len(seq))]
-
-BIF_NEWDIALOGSTYLE = 0x00000040
-BIF_NONEWFOLDERBUTTON = 0x0000200
-CSIDL_COMMONMYPICTURES = 0x00000036
-
-class _WIN32MASKEDSTRUCT:
-    def __init__(self, **kw):
-        full_fmt = ""
-        for name, fmt, default, mask in self._struct_items_:
-            self.__dict__[name] = None
-            if fmt == "z":
-                full_fmt += "pi"
-            else:
-                full_fmt += fmt
-        for name, val in kw.iteritems():
-            if name not in self.__dict__:
-                raise ValueError("LVITEM structures do not have an item '%s'" % (name,))
-            self.__dict__[name] = val
-
-    def __setattr__(self, attr, val):
-        if not attr.startswith("_") and attr not in self.__dict__:
-            raise AttributeError(attr)
-        self.__dict__[attr] = val
-
-    def toparam(self):
-        self._buffs = []
-        full_fmt = ""
-        vals = []
-        mask = 0
-        # calc the mask
-        for name, fmt, default, this_mask in self._struct_items_:
-            if this_mask is not None and self.__dict__.get(name) is not None:
-                mask |= this_mask
-        self.mask = mask
-        for name, fmt, default, this_mask in self._struct_items_:
-            val = self.__dict__[name]
-            if fmt == "z":
-                fmt = "Pi"
-                if val is None:
-                    vals.append(0)
-                    vals.append(0)
-                else:
-                    # Note this demo still works with byte strings.  An
-                    # alternate strategy would be to use unicode natively
-                    # and use the 'W' version of the messages - eg,
-                    # LVM_SETITEMW etc.
-                    val = val + "\0"
-                    if isinstance(val, unicode):
-                        val = val.encode("mbcs")
-                    str_buf = array.array("b", val)
-                    vals.append(str_buf.buffer_info()[0])
-                    vals.append(len(val))
-                    self._buffs.append(str_buf) # keep alive during the call.
-            else:
-                if val is None:
-                    val = default
-                vals.append(val)
-            full_fmt += fmt
-        return struct.pack(*(full_fmt,) + tuple(vals))
-
-
-# NOTE: See the win32gui_struct module for an alternative way of dealing
-# with these structures
-class LVITEM(_WIN32MASKEDSTRUCT):
-    _struct_items_ = [
-        ("mask", "I", 0, None),
-        ("iItem", "i", 0, None),
-        ("iSubItem", "i", 0, None),
-        ("state", "I", 0, commctrl.LVIF_STATE),
-        ("stateMask", "I", 0, None),
-        ("text", "z", None, commctrl.LVIF_TEXT),
-        ("iImage", "i", 0, commctrl.LVIF_IMAGE),
-        ("lParam", "i", 0, commctrl.LVIF_PARAM),
-        ("iIdent", "i", 0, None),
-        ("cchTextMax", "i", 0, 255),
-        ("pszText", "i", 0, None),
-        ("flags", "i", 0, None),
-    ]
-
-class LVCOLUMN(_WIN32MASKEDSTRUCT):
-    _struct_items_ = [
-        ("mask", "I", 0, None),
-        ("fmt", "i", 0, commctrl.LVCF_FMT),
-        ("cx", "i", 0, commctrl.LVCF_WIDTH),
-        ("text", "z", None, commctrl.LVCF_TEXT),
-        ("iSubItem", "i", 0, commctrl.LVCF_SUBITEM),
-        ("iImage", "i", 0, commctrl.LVCF_IMAGE),
-        ("iOrder", "i", 0, commctrl.LVCF_ORDER),
-    ]
-
-global flag_stop
-flag_stop=win32con.MB_ICONSTOP
-
-global flag_error
-flag_error=win32con.MB_ICONERROR
-
-global flag_info
-flag_info=win32con.MB_ICONINFORMATION
-
-global flag_excl
-flag_excl=win32con.MB_ICONEXCLAMATION
-
-#global NewConn
-NewConn=addin.GetConn()
-## Retrieves current registered XMLRPC connection
-def GetConn():
-    return NewConn
-
-global objects_with_match
-objects_with_match=[]
-
-global hwndChk_list
-hwndChk_list=[]
-
-global search_text
-search_text='search_text'
-global partner_ref
-partner_ref = ''
-global name
-name=''
-global email
-email=''
-global country_ref
-country_ref = ""
-global state_ref
-state_ref = ""
-global new_con_country
-new_con_country= ""
-global new_con_state
-new_con_state= ""
-global search_country
-search_country = None
-
-def check():
-    server = NewConn.getitem('_server')
-    port = NewConn.getitem('_port')
-    NewConn.GetDBList()
-    if str(NewConn.getitem('_running')) == 'False':
-        win32ui.MessageBox("No server running on host "+ server+" at port "+str(port), "OpenERP Connection", flag_excl)
-        return False
-    if str(NewConn.getitem('_login')) == 'False':
-        return False
-    return True
-
-def resetConnAttribs(window):
-    config = window.manager.LoadConfig()
-    NewConn.setitem('_server', config['server'])
-    NewConn.setitem('_port', config['port'])
-    NewConn.setitem('protocol', config['protocol'])
-    NewConn.setitem('_uri', "http://" + config['server'] + ":" + str(config['port']))
-    NewConn.setitem('_obj_list', config['objects'])
-    NewConn.setitem('_dbname', config['database'])
-    NewConn.setitem('_uname', config['uname'])
-    NewConn.setitem('_pwd', config['pwd'])
-    NewConn.setitem('_login', str(config['login']))
-    NewConn.setitem('_webserver',manager.config['webserver'])
-    NewConn.setitem('_webport',manager.config['webport'])
-    NewConn.setitem('_webportocol',manager.config['webportocol'])
-    return
-
-def setConnAttribs(server, port, manager):
-    protocol = NewConn.getitem('protocol')
-    if protocol=='XML-RPCS':
-        protocol='https://'
-    else:
-        protocol='http://'
-    uri = protocol + server + ":" + str(port)
-    NewConn.setitem('_server',server)
-    NewConn.setitem('_port',port)
-    NewConn.setitem('_uri',uri)
-    NewConn.GetDBList()
-    manager.config = manager.LoadConfig()
-    NewConn.setitem('_dbname',manager.config['database'])
-    NewConn.setitem('_uname', manager.config['uname'])
-    NewConn.setitem('_pwd', manager.config['pwd'])
-    NewConn.setitem('_login', str(manager.config['login']))
-    NewConn.setitem('_obj_list', manager.config['objects'])
-    NewConn.setitem('_webserver',manager.config['webserver'])
-    NewConn.setitem('_webport',manager.config['webport'])
-    NewConn.setitem('_webprotocol',manager.config['webprotocol'])
-    return
-
-def getConnAttributes(manager):
-    manager.config['server'] = NewConn.getitem('_server')
-    manager.config['port'] = NewConn.getitem('_port')
-    manager.config['protocol'] = NewConn.getitem('protocol')
-    manager.config['objects'] = eval(NewConn.getitem('_obj_list'))
-    manager.config['database'] = NewConn.getitem('_dbname')
-    manager.config['uname'] = NewConn.getitem('_uname')
-    manager.config['pwd'] = NewConn.getitem('_pwd')
-    manager.config['login'] = NewConn.getitem('_login')
-    manager.config['webserver'] = NewConn.getitem('_webserver')
-    manager.config['webport'] = NewConn.getitem('_webport')
-    manager.config['webprotocol'] = NewConn.getitem('_webprotocol')
-    return
-
-def setWebConnAttribs(server, port, manager):
-    manager.config = manager.LoadConfig()
-    NewConn.setitem('_webserver',server)
-    NewConn.setitem('_webport',port)
-    return
-
-def getMessage(e):
-    import pywintypes
-    print "Exception %s: %s"%(type(e),str(e))
-    msg = str(e)
-    if type(e) == pywintypes.com_error:
-        msg=str(e)
-    elif type(e) == xmlrpclib.Fault:
-        msg = str(e.faultCode) or e.faultString or e.message or str(e)
-    else:
-        if hasattr(e, 'faultCode') and e.faultCode:
-            msg = str(e.faultCode)
-        elif hasattr(e, 'faultString') and e.faultString:
-            msg = e.faultString
-        elif hasattr(e, 'message') and e.message:
-            msg = e.message
-    return msg
-
-class OKButtonProcessor(ButtonProcessor):
-    def __init__(self, window, control_ids):
-        self.mngr = window.manager
-        ControlProcessor.__init__(self, window, control_ids)
-
-    def OnClicked(self, id):
-        server = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[0])
-        protocol = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[3])
-        if not protocol:
-            win32ui.MessageBox("Invalid Protocol !\nPlease select Protocol from Connection Protocol List.", "OpenERP Connection", flag_excl)
-            return
-        NewConn.setitem('protocol', protocol)
-        try:
-            port = int(win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[1]))
-        except ValueError, e:
-            win32ui.MessageBox("Port should be an integer", "OpenERP Connection", flag_excl)
-            return
-        except Exception,e:
-            msg = getMessage(e)
-            win32ui.MessageBox(msg, "OpenERP Connection", flag_excl)
-            return
-        setConnAttribs(server, port, self.mngr)
-        if str(NewConn.getitem('_running')) == 'False':
-            msg = "No server running on host '%s' at port '%d'. Press ignore to still continue with this configuration?"%(server,port)
-            r=win32ui.MessageBox(msg, "OpenERP Connection", win32con.MB_ABORTRETRYIGNORE | win32con.MB_ICONQUESTION)
-            if r==3:
-                resetConnAttribs(self.window)
-                return
-            elif r==4:
-                self.OnClicked(id)
-            elif r==5:
-                setConnAttribs(server, port, self.mngr)
-        win32gui.EndDialog(self.window.hwnd, id)
-
-class DoneButtonProcessor(ButtonProcessor):
-    def OnClicked(self, id):
-        getConnAttributes(self.window.manager)
-        self.window.manager.SaveConfig()
-        win32gui.EndDialog(self.window.hwnd, id)
-
-class WEBOKButtonProcessor(ButtonProcessor):
-    def __init__(self, window, control_ids):
-        self.mngr = window.manager
-        ControlProcessor.__init__(self, window, control_ids)
-
-    def OnClicked(self, id):
-#        global web_server
-#        global web_server_port
-        server = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[0])
-        web_protocol = 'http:\\\\'
-
-        hwnd = win32gui.GetDlgItem(self.window.hwnd, self.other_ids[2])
-        chk = win32gui.SendMessage(hwnd, win32con.BM_GETCHECK)
-        if chk:
-            web_protocol = 'https:\\\\'
-        NewConn.setitem('_webprotocol', web_protocol)
-        try:
-            port = int(win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[1]))
-        except ValueError:
-            win32ui.MessageBox("Port should be an integer", "OpenERP Connection", flag_excl)
-            return
-        if server.strip() == "" or server.strip() == "http:\\\\":
-            win32ui.MessageBox("Invalid web Server address.", "OpenERP Connection", flag_excl)
-            return
-        setWebConnAttribs(server, port, self.mngr)
-        win32gui.EndDialog(self.window.hwnd, id)
-
-class WEBCHKProcessor(ButtonProcessor):
-    def __init__(self, window, control_ids):
-        self.mngr = window.manager
-        ControlProcessor.__init__(self, window, control_ids)
-
-    def OnClicked(self, id):
-        web_protocol = 'http:\\\\'
-        hwnd = self.GetControl()
-        chk = win32gui.SendMessage(hwnd, win32con.BM_GETCHECK)
-        if chk:
-            web_protocol = 'https:\\\\'
-        NewConn.setitem('_webprotocol', web_protocol)
-
-class MessageProcessor(ControlProcessor):
-    def Init(self):
-        text = "  This Outlook Plugin for OpenERP has been developed by OpenERP s.a.\n\n \
-                      For more information, please visit our website \n\n \
-                                    http://www.openerp.com \n\n\n \
-                       Copyright @ 2005-Today. All rights reserved.\n\n\
-OpenERP is a trademark of OpenERP s.a. The software is released under AGPL."
-        win32gui.SendMessage(self.GetControl(), win32con.WM_SETTEXT, 0, text)
-
-    def GetPopupHelpText(self, cid):
-        return "Displays details on this plugin"
-
-class TabProcessor(ControlProcessor):
-    def __init__(self, window, control_ids, page_ids):
-        ControlProcessor.__init__(self, window, control_ids)
-        self.page_ids = page_ids.split()
-
-    def Init(self):
-        self.pages = {}
-        self.currentPage = None
-        self.currentPageIndex = -1
-        self.currentPageHwnd = None
-        for index, page_id in enumerate(self.page_ids):
-            template = self.window.manager.dialog_parser.dialogs[page_id]
-            self.addPage(index, page_id, template[0][0])
-        server = self.window.manager.config['server']
-        port = self.window.manager.config['port']
-        setConnAttribs(server, port, self.window.manager)
-        self.switchToPage(0)
-
-    def Done(self):
-        if self.currentPageHwnd is not None:
-            if not self.currentPage.SaveAllControls():
-                win32gui.SendMessage(self.GetControl(), commctrl.TCM_SETCURSEL, self.currentPageIndex,0)
-                return False
-        return True
-
-    def OnNotify(self, nmhdr, wparam, lparam):
-        selChangedCode =  5177342
-        code = nmhdr[2]
-        if code==selChangedCode:
-            index = win32gui.SendMessage(self.GetControl(), commctrl.TCM_GETCURSEL, 0,0)
-            if index!=self.currentPageIndex:
-                self.switchToPage(index)
-
-    def switchToPage(self, index):
-        if self.currentPageHwnd is not None:
-            if not self.currentPage.SaveAllControls():
-                win32gui.SendMessage(self.GetControl(), commctrl.TCM_SETCURSEL, self.currentPageIndex,0)
-                return 1
-            win32gui.DestroyWindow(self.currentPageHwnd)
-        self.currentPage = MakePropertyPage(self.GetControl(), self.window.manager, self.window.config, self.pages[index])
-        self.currentPageHwnd = self.currentPage.CreateWindow()
-        self.currentPageIndex = index
-        return 0
-#
-    def addPage(self, item, idName, label):
-        format = "iiiiiii"
-        lbuf = win32gui.PyMakeBuffer(len(label)+1)
-        address,l = win32gui.PyGetBufferAddressAndLen(lbuf)
-        win32gui.PySetString(address, label)
-
-        buf = struct.pack(format,
-            commctrl.TCIF_TEXT, # mask
-            0, # state
-            0, # state mask
-            address,
-            0, #unused
-            0, #image
-            item
-            )
-        item = win32gui.SendMessage(self.GetControl(),
-                             commctrl.TCM_INSERTITEM,
-                             item,
-                             buf)
-        self.pages[item] = idName
-
-class DialogCommand(ButtonProcessor):
-    def __init__(self, window, control_ids, idd, func=None, args=()):
-        self.idd = idd
-        self.func = func
-        self.args = args
-        ButtonProcessor.__init__(self, window, control_ids)
-
-    def OnClicked(self, id):
-        self.id = id
-        if self.func:
-            args = (self, ) + self.args
-            self.func(*args)
-        parent = self.window.hwnd
-        self.window.SaveAllControls()
-        ShowDialog(parent, self.window.manager, self.window.config, self.idd)
-        self.window.LoadAllControls()
-
-    def GetPopupHelpText(self, id):
-        dd = self.window.manager.dialog_parser.dialogs[self.idd]
-        return "Displays the %s dialog" % dd.caption
-
-def TestConnection(btnProcessor,*args):
-    dbname = None
-    server = NewConn.getitem('_server')
-    port = NewConn.getitem('_port')
-    NewConn.GetDBList()
-    if str(NewConn.getitem('_running')) == 'False':
-        btnProcessor.window.LoadAllControls()
-        win32ui.MessageBox("No server running on host "+ server+" at port "+str(port), "OpenERP Connection", flag_excl)
-        return
-
-    dbname = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    if not dbname:
-        try:
-            dbname = win32gui.GetDlgItemText(btnProcessor.window.hwnd, 7000)
-            if not dbname:
-                win32ui.MessageBox("Authentication Error !\nBad Database Name !", "OpenERP Connection", flag_excl)
-                return
-        except Exception,e:
-            pass
-    if not dbname:
-        win32ui.MessageBox("No database found on host "+ server+" at port "+str(port), "OpenERP Connection", flag_excl)
-        return
-    uname = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-    pwd = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
-
-    if not uname:
-        win32ui.MessageBox("Authentication Error !\nBad User Name !", "OpenERP Connection", flag_excl)
-        return
-    if not pwd:
-        win32ui.MessageBox("Authentication Error !\nBad Password !", "OpenERP Connection", flag_excl)
-        return
-
-    #Establish Connection
-    try:
-        uid = NewConn.login(dbname, uname, pwd)
-        if uid:
-            msg = "Connection Successful"
-            NewConn.setitem('_login', 'True')
-            NewConn.setitem('_uname', uname)
-            NewConn.setitem('_pwd', pwd)
-            NewConn.setitem('_uid', uid)
-            flag = flag_info
-            if not NewConn.IsCRMInstalled():
-                msg+= '\n\n'+" 'CRM' module is not installed. So CRM cases cannot be created."
-                NewConn.setitem('_iscrm', False)
-            else:
-                NewConn.setitem('_iscrm', True)
-        else:
-            msg = "Authentication Error !\nBad UserName or Password"
-            flag = flag_stop
-            NewConn.setitem('_login', 'False')
-    except Exception,e:
-        msg = "Authentication Error !\n Invalid Configuration Please check server parameters and database name."
-        flag = flag_error
-    win32ui.MessageBox(msg, "OpenERP Connection", flag)
-    return
-
-def BrowseCallbackProc(hwnd, msg, lp, data):
-    from win32com.shell import shell, shellcon
-    if msg== shellcon.BFFM_INITIALIZED:
-        win32gui.SendMessage(hwnd, shellcon.BFFM_SETSELECTION, 1, data)
-        win32gui.SendMessage(hwnd, shellcon.BFFM_ENABLEOK, 0, 0)
-    elif msg == shellcon.BFFM_SELCHANGED:
-        # Set the status text of the
-        # For this message, 'lp' is the address of the PIDL.
-        pidl = shell.AddressAsPIDL(lp)
-        try:
-            path = shell.SHGetPathFromIDList(pidl)
-            if os.path.isdir(path):
-                win32gui.SendMessage(hwnd, shellcon.BFFM_ENABLEOK, 0, 0)
-            else:
-                ext = path.split('.')[-1]
-                if ext not in ['gif', 'bmp', 'jpg', 'tif', 'ico', 'png']:
-                        win32gui.SendMessage(hwnd, shellcon.BFFM_ENABLEOK, 0, 0)
-                else:
-                    win32gui.SendMessage(hwnd, shellcon.BFFM_ENABLEOK, 0, 1)
-        except shell.error:
-            # No path for this PIDL
-            pass
-
-def GetImagePath(btnProcessor,*args):
-    from win32com.shell import shell, shellcon
-    ulFlags = shellcon.BIF_BROWSEINCLUDEFILES | BIF_NEWDIALOGSTYLE | BIF_NONEWFOLDERBUTTON
-    pidl, display_name, image_list=shell.SHBrowseForFolder(btnProcessor.window.hwnd, # parent HWND
-                            None, # root PIDL.
-                            "Get the image path", # title
-                            ulFlags, # flags
-                            BrowseCallbackProc, # callback function
-                            os.getcwd() # 'data' param for the callback
-                            )
-    if (pidl, display_name, image_list) == (None, None, None):
-      return
-    else:
-      path = shell.SHGetPathFromIDList (pidl)
-      win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0], path)
-
-def AddNewObject(btnProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-
-    #Check if title or object not specified
-    obj_title = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    obj_name = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-    if not obj_title:
-        win32ui.MessageBox("No Title specified", "Documents Setting", flag_excl)
-        return
-    if not obj_name:
-        win32ui.MessageBox("No Document specified", "Documents Setting", flag_excl)
-        return
-
-    #Check if object does not exist in the database or it already exist in the list
-    try:
-        all_obj_list = NewConn.GetAllObjects()
-        curr_obj_list = [obj[1] for obj in NewConn.GetObjList()]
-        curr_title_list = [obj[0] for obj in NewConn.GetObjList()]
-        if obj_name not in all_obj_list:
-            win32ui.MessageBox("No such Document exists", "Documents Setting", flag_excl)
-            return
-        elif obj_name in curr_obj_list:
-            win32ui.MessageBox("Document already in the list", "Documents Setting", flag_info)
-            return
-        elif obj_title in curr_title_list:
-            win32ui.MessageBox("Title already in the list. Please give different title", "Documents Setting", flag_excl)
-            return
-
-        #extract image path and load the image
-        image_path=''
-        image_path = os.path.join(btnProcessor.window.manager.application_directory, "dialogs\\resources\\openerp_logo1.bmp")
-        path=win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
-        if path:
-            image_path = path
-        load_bmp_flags=win32con.LR_LOADFROMFILE | win32con.LR_LOADTRANSPARENT
-        try:
-            hicon = win32gui.LoadImage(0, image_path,win32con.IMAGE_BITMAP, 40, 40, load_bmp_flags)
-        except Exception,e:
-            msg=getMessage(e)
-            hicon=None
-            win32ui.MessageBox(msg, "Load Image", flag_error)
-
-        #Add the object in the list
-        win32gui.ImageList_Add(il,hicon,0)
-        cnt = win32gui.ImageList_GetImageCount(il)
-
-        hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[3])
-        num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-
-        item = LVITEM(text=obj_title, iImage=cnt-2, iItem = num_items)
-        new_index = win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-        win32gui.SendMessage(hwndList, commctrl.LVM_SETIMAGELIST, commctrl.LVSIL_SMALL, il)
-        item = LVITEM(text=obj_name, iItem = new_index, iSubItem = 1)
-        win32gui.SendMessage(hwndList, commctrl.LVM_SETITEM, 0, item.toparam())
-
-        NewConn.InsertObj(obj_title,obj_name,image_path)
-    except Exception, e:
-        msg = "Object not added\n\n" + getMessage(e)
-        win32ui.MessageBox(msg,"",flag_excl)
-        return
-
-    #Empty all the text controls
-    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0], '')
-    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1], '')
-    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2], '')
-
-def DeleteSelectedObjects(btnProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-
-    #Delete selected items
-    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
-    for i in range(0,sel_count):
-        sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, -1, commctrl.LVNI_SELECTED)
-        buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
-        r = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
-        sel_text = ''
-        for n in extra:
-            nombre = n.tostring()
-            sel_text = nombre[0:r]
-        try:
-            NewConn.DeleteObject(sel_text)
-        except Exception,e:
-            msg = "Documents '%s' not deleted\n\n"%sel_text + getMessage(e)
-            win32ui.MessageBox(msg,"Documents Setting",flag_excl)
-
-def GetMail(processor):
-    ex = processor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
-    return mail
-#get selected records from list
-def GetSelectedItems(hwndList):
-    r=[]
-    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
-    sel=-1
-    for i in range(0,sel_count):
-        sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, sel, commctrl.LVNI_SELECTED)
-        buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
-        size = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
-        sel_text = ''
-        for n in extra:
-            nombre = n.tostring()
-            sel_text = nombre[0:size]
-        for item in objects_with_match:
-            if item[2] == sel_text:
-                 r.append(item)
-    return r
-
-def MakeAttachment(btnProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-    ex = btnProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
-    mail = GetMail(btnProcessor)
-    #get selected records
-    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    r = GetSelectedItems(hwndList)
-    if not r:
-        win32ui.MessageBox("No records selected", "Push to OpenERP", flag_info)
-        return
-    try:
-        flg = NewConn.ArchiveToOpenERP(r,mail)
-        if flg:
-            win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-            return
-    except Exception,e:
-        msg = "Attachment not created \n\n" + getMessage(e)
-        flag = flag_error
-        win32ui.MessageBox(msg, "Push to OpenERP", flag)
-    return
-
-def CreateCase(btnProcessor,*args):
-    try:
-        #Check if server running or user logged in
-        b = check()
-        if not b:
-            return
-
-        if str(NewConn.getitem('_iscrm')) == 'True':
-        #    Get the selected mail
-            ex = btnProcessor.window.manager.outlook.ActiveExplorer()
-            assert ex.Selection.Count == 1
-            mail = ex.Selection.Item(1)
-            section = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-            section = str(section)
-            section=section.lower().replace(' ','.')
-            if not section:
-                win32ui.MessageBox("Documents can not be created.", "Documents Setting", flag_excl)
-                return
-            hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-            partner_ids=[]
-            r = GetSelectedItems(hwndList)
-            for rec in r:
-                if rec[0] == 'res.partner':
-                    partner_ids.append(rec[1])
-            f = False
-            #Create new case
-            try:
-                f = NewConn.CreateCase(str(section), mail, partner_ids)
-                msg="New Document created."
-                flag=flag_info
-            except Exception,e:
-                msg="New Document not created \n\n"+str(e)
-                flag=flag_error
-            if f:
-                win32ui.MessageBox(msg, "Create Document", flag)
-                win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
-                return
-            else:
-                win32ui.MessageBox("Error While creating document.\n Document can not be created.", "Create Document", flag_error)
-                return
-        else:
-            win32ui.MessageBox("Document can not be created. CRM not installed", "Create Object", flag_info)
-    except Exception, e:
-        win32ui.MessageBox(str(e), 'New Document')
-
-def GetSearchText(txtProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-    try:
-        global objects_with_match
-        list_hwnd = win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
-        objects_with_match = NewConn.SearchPartners()
-        setList(list_hwnd)
-    except Exception,e:
-        win32ui.MessageBox('Document can not be loaded.\n'+str(e), "Push", flag_error)
-    txtProcessor.init_done=True
-
-def SetNameColumn(listProcessor,*args):
-    hwndList = listProcessor.GetControl()
-    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
-    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
-
-    # set header row
-    lvc =  LVCOLUMN(
-                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
-                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
-                    )
-    lvc.fmt = commctrl.LVCFMT_LEFT
-    lvc.iSubItem = 1
-    lvc.text = "Document Type"
-    lvc.cx = 100
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-    lvc.iSubItem = 0
-    lvc.text = "Name"
-    lvc.cx = 240
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-    listProcessor.init_done = True
-
-def setList(list_hwnd):
-    # Set default list of objects
-    win32gui.SendMessage(list_hwnd, commctrl.LVM_DELETEALLITEMS)
-    for obj in objects_with_match:
-        num_items = win32gui.SendMessage(list_hwnd, commctrl.LVM_GETITEMCOUNT)
-        item = LVITEM(text=obj[2],iItem = num_items)
-        new = win32gui.SendMessage(list_hwnd, commctrl.LVM_INSERTITEM, 0, item.toparam())
-        item = LVITEM(text=obj[3],iItem = new,  iSubItem = 1)
-        win32gui.SendMessage(list_hwnd, commctrl.LVM_SETITEM, 0, item.toparam())
-
-def SearchObjectsForText(btnProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-
-    search_txt = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    # Get titles from list
-    obj_titles=[]
-    for ch in hwndChk_list:
-        id = ch[0]
-        hwnd = ch[1]
-        chk = win32gui.SendMessage(hwnd, win32con.BM_GETCHECK)
-        if chk:
-            txt = win32gui.GetDlgItemText(btnProcessor.window.hwnd,id)
-            obj_titles.append(txt)
-
-    # Prepare list of objects to search for the seach_keyword
-    obj_list = btnProcessor.window.manager.config['objects']
-    search_list = []
-    try:
-        all_obj_list = NewConn.GetAllObjects()
-        for title in obj_titles:
-            objname = [obj[1] for obj in obj_list if obj[0] == title]
-            if objname:
-                assert len(objname) == 1
-                if objname[0] in all_obj_list:
-                     search_list.append(objname[0])
-                else:
-                    win32ui.MessageBox("Module %s (%s) not installed. Please install it." \
-                                       %(title,objname[0]), "Push to OpenERP", flag_excl)
-                    return
-
-        #  Get the records by searching the objects in search_list for the search_keyword as objects_with_match
-        global objects_with_match
-        list_hwnd = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        if search_list:
-            objects_with_match = NewConn.GetObjectItems(search_list, search_txt)
-            if not objects_with_match:
-                win32ui.MessageBox("No matching records found in checked objects", "Push to OpenERP", flag_info)
-        else:
-            win32ui.MessageBox("No object selected", "Push to OpenERP", flag_info)
-            objects_with_match=[]
-        # Display the objects_with_match records in list
-        setList(list_hwnd)
-    except Exception,e:
-        msg=getMessage(e)
-        win32ui.MessageBox(msg, "Search Text", flag_error)
-
-def CreateContact(btnProcessor,*args):
-    b = check()
-    if not b:
-        return
-
-    partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[9])
-    name = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    email = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-    office_no = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
-    mobile_no = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[3])
-    fax = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[4])
-    street = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[5])
-    street2 = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[6])
-    city = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[7])
-    zip = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[8])
-    state = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[10])
-    country = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[11])
-    if not name:
-        win32ui.MessageBox("Please enter name.", "Create Contact", flag_stop)
-        return
-
-    res = {
-           'partner_id':ustr(partner),
-           'name':ustr(name),
-           'email':ustr(email),
-           'phone':ustr(office_no),
-           'mobile':ustr(mobile_no),
-           'fax':ustr(fax),
-           'street':ustr(street),
-           'street2':ustr(street2),
-           'city':ustr(city),
-           'zip':ustr(zip),
-           'state_id':ustr(state),
-           'country_id':ustr(country)
-       }
-    if res.get('name').strip == '' or res.get('email').strip == '':
-        win32ui.MessageBox("Contact name or Email id is Missing\nPlease fill those information", "Create Contact", flag_error)
-        return
-    try:
-        NewConn.CreateContact(str(res))
-        if not partner:
-            msg="New contact created."
-        else:
-            msg="New contact created for partner '%s'."%partner
-    except Exception,e:
-        msg="Contact not created \n\n" + getMessage(e)
-        win32ui.MessageBox(msg, "Create Contact", flag_error)
-        return
-    win32ui.MessageBox(msg, "Create Contact", flag_info)
-    for i in range(0,9):
-        win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[i], '')
-    win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.id)
-
-def SetAllText(txtProcessor,*args):
-    url = NewConn.getitem('_uri')
-    tbox = txtProcessor.GetControl()
-    win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(url))
-
-    uname = NewConn.getitem('_uname')
-    tbox = txtProcessor.GetControl(txtProcessor.other_ids[0])
-    win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(uname))
-
-    passbox = txtProcessor.GetControl(txtProcessor.other_ids[1])
-    pwd = NewConn.getitem('_pwd')
-    win32gui.SendMessage(passbox, win32con.WM_SETTEXT, 0, str(pwd))
-    serverBox = txtProcessor.GetControl(txtProcessor.other_ids[2])
-    webstr = NewConn.getitem('_webprotocol')+NewConn.getitem('_webserver')+":"+str(NewConn.getitem('_webport'))
-    win32gui.SendMessage(serverBox, win32con.WM_SETTEXT, 0, str(webstr))
-
-def SetDefaultList(listProcessor,*args):
-    import win32api
-    hwndList = listProcessor.GetControl()
-
-    # set full row select style
-    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
-    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
-
-    # set header row
-    lvc =  LVCOLUMN(
-                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
-                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
-                    )
-    lvc.fmt = commctrl.LVCFMT_LEFT
-    lvc.iSubItem = 1
-    lvc.text = "Object Name"
-    lvc.cx = 315
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-    lvc.iSubItem = 0
-    lvc.text = "Document Title"
-    lvc.cx = 315
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-
-    #create imagelist
-    global il
-    il = win32gui.ImageList_Create(
-                        win32api.GetSystemMetrics(win32con.SM_CXSMICON),
-                        win32api.GetSystemMetrics(win32con.SM_CYSMICON),
-                        commctrl.ILC_COLOR32 | commctrl.ILC_MASK,
-                        1, # initial size
-                        0) # cGrow
-
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETIMAGELIST,\
-                                 commctrl.LVSIL_SMALL, il)
-    # Set objects from config
-    objs = eval(NewConn.getitem('_obj_list'))
-    load_bmp_flags=win32con.LR_LOADFROMFILE | win32con.LR_LOADTRANSPARENT
-    for obj in objs:
-        image_path = os.path.join(listProcessor.window.manager.application_directory, "dialogs\\resources\\openerp_logo1.bmp")
-        path=obj[2]
-        if path:
-            image_path = path
-        try:
-            hicon = win32gui.LoadImage(0, image_path,win32con.IMAGE_BITMAP, 40, 40, load_bmp_flags)
-        except Exception, e:
-            msg = "Problem loading the image \n\n" + getMessage(e)
-            hicon = None
-            win32ui.MessageBox(msg, "Load Image", flag_error)
-
-        #Add the object in the list
-        win32gui.ImageList_Add(il,hicon,0)
-        cnt = win32gui.ImageList_GetImageCount(il)
-        num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-        item = LVITEM(text=obj[0],iImage=cnt-2, iItem = num_items)
-        new_index = win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-        item = LVITEM(text=obj[1], iItem = new_index, iSubItem = 1)
-        win32gui.SendMessage(hwndList, commctrl.LVM_SETITEM, 0, item.toparam())
-
-def SetDefaultContact(txtProcessor,*args):
-    # Acquiring the control of the text box
-    global name
-    global email
-    global partner_ref
-    global new_con_country
-    global new_con_state
-    global state_ref
-    global country_ref
-    state = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2])
-    country = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3])
-    if txtProcessor.init_done:
-        if new_con_country == "":
-            new_con_country = country
-        if new_con_state == "":
-            new_con_state = state
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[1],partner_ref)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id,name)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0],email)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2],new_con_state)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3],new_con_country)
-        new_con_country = ""
-        new_con_state = ""
-        state_ref = ""
-        country_ref =""
-        return
-    #
-    try:
-        mail = GetMail(txtProcessor)
-        name = ustr(mail.SenderName).encode('iso-8859-1')
-        email = ustr(mail.SenderEmailAddress).encode('iso-8859-1')
-    except Exception:
-        pass
-
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id,name)
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0],email)
-
-    txtProcessor.init_done = True
-
-def setCheckList(groupProcessor,*args):
-    b = check()
-    if not b:
-        return
-    try:
-        hinst = win32gui.dllhandle
-        objs = groupProcessor.window.manager.config['objects']
-        ins_objs = NewConn.GetAllObjects()
-        left = 20
-        top = 60
-        cnt=0
-        id=4001
-        id1=6001
-        if groupProcessor.init_done:
-           return
-        else:
-           for obj in objs:
-             if obj[1] in ins_objs:
-                groupProcessor.init_done = True
-                #Add Checkbox
-                left+= 17
-                hwndChk = win32gui.CreateWindowEx(
-                                                    0,"BUTTON",obj[0],win32con.WS_VISIBLE | win32con.WS_CHILD | \
-                                                    win32con.BS_AUTOCHECKBOX | win32con.WS_TABSTOP | win32con.BST_CHECKED, \
-                                                    left, top, 130,20,groupProcessor.window.hwnd,id1,hinst,None
-                                                  )
-                if obj[1] in ['res.partner','res.partner.address']:
-                    win32gui.SendMessage(hwndChk , win32con.BM_SETCHECK, 1, 0);
-                hwndChk_list.append((id1,hwndChk))
-
-                cnt=cnt+1
-                id+=1
-                id1+=1
-                left+=17
-                left+=140
-                if cnt > 1:
-                    left = 20
-                    top+=18
-                    cnt=0
-    except Exception, e:
-        win32ui.MessageBox(str(e), 'Push to OpenERP')
-
-def CreatePartner(btnProcessor,*args):
-    #Check if server running or user logged in
-    b = check()
-    if not b:
-        return
-    global partner_ref
-    partner_name = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    if not partner_name:
-        win32ui.MessageBox("Please enter Partner name.", "Create Partner", flag_excl)
-        return
-    res = {'name':ustr(partner_name)}
-    try:
-        id = NewConn.CreatePartner(str(res))
-    except Exception,e:
-        msg="Partner not created \n\n" + getMessage(e)
-        win32ui.MessageBox(msg, "Create Partner", flag_error)
-        return
-    if id:
-        win32ui.MessageBox("New Partner '%s' created."%partner_name, "Create Partner", flag_info)
-        partner_ref = str(partner_name)
-        win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.id)
-    else:
-        win32ui.MessageBox("Partner '%s' already Exists."%partner_name, "Create Partner", flag_info)
-    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],'')
-
-def set_search_text(dialogProcessor,*args):
-    global search_text
-    search_text = win32gui.GetDlgItemText(dialogProcessor.window.hwnd, dialogProcessor.other_ids[0])
-    return
-
-def set_name_email(dialogProcessor,*args):
-    global name
-    global email
-    global partner_ref
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2], ustr(partner_ref))
-    name = win32gui.GetDlgItemText(dialogProcessor.window.hwnd, dialogProcessor.other_ids[0])
-    email = win32gui.GetDlgItemText(dialogProcessor.window.hwnd, dialogProcessor.other_ids[1])
-
-#Function for Getting default mail when dialog is loaded and finding contact related to this
-#setting values to the appropriate text areas
-def GetDefaultEmail(txtProcessor,*args):
-
-    import win32con
-    b = check()
-    global partner_ref
-    global country_ref
-    global state_ref
-    global new_con_country
-    global new_con_state
-    partner_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0])
-    state_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10])
-    country_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11])
-    if partner_ref == "":
-        partner_ref = partner_n
-    if country_ref == "":
-        country_ref = country_n
-    if state_ref == "":
-        state_ref = state_n
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], ustr(partner_ref))
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10], ustr(state_ref))
-    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11], ustr(country_ref))
-    partner_ref = ""
-    country_ref = ""
-    state_ref = ""
-    new_con_country = ""
-    new_con_state = ""
-    if country_ref == None:
-        country_ref = ""
-
-
-    if not b:
-        return
-    #Acquiring control of the text box
-    search_partner_box = txtProcessor.GetControl()
-    global search_partner_text
-    if txtProcessor.init_done:
-        win32gui.SendMessage(search_partner_box, win32con.WM_SETTEXT, 0,search_partner_text)
-        return
-    #Reading Current Selected Email.
-    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
-    #Fetching Sender MailID from Selected Mail
-    try:
-        search_partner_text = ustr(mail.SenderEmailAddress).encode('iso-8859-1')
-    except Exception:
-        win32ui.MessageBox("Error In reading email ID from Email ","Open Contact", flag_error)
-        pass
-    win32gui.SendMessage(search_partner_box, win32con.WM_SETTEXT, 0, search_partner_text)
-    if search_partner_text.strip() == "":
-        search_partner_text = None
-        return
-    vals = []
-    #Searching the res.partner.address for contact based on Sender Mail ID.
-    vals = NewConn.SearchPartnerDetail(search_partner_text)
-    #If no user Found.
-    if vals == None:
-        for i in range(1,12):
-            win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[i], "")
-        win32ui.MessageBox("No matching records found for  : "+str(search_partner)+".","Open Contact", flag_excl)
-        return
-    else:
-        #If user Found than Setting the Value for the contact in fields.
-        for i in range(1,12):
-            win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[i], "")
-
-        for val in vals:
-            if val[0] == 'partner_id':
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], ustr(val[1][1]))
-
-            if val[0] == 'name' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[1], ustr(val[1]))
-
-            if val[0] == 'street' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2], ustr(val[1]))
-
-            if val[0] == 'street2' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3], ustr(val[1]))
-
-            if val[0] == 'zip' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[9], ustr(val[1]))
-
-            if val[0] == 'city' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[4], ustr(val[1]))
-
-            if val[0] == 'state_id' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10], ustr(val[1][1]))
-
-            if val[0] == 'country_id' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11], ustr(val[1][1]))
-                global search_country
-                search_country =  ustr(val[1][1])
-
-            if val[0] == 'phone' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[5], ustr(val[1]))
-
-            if val[0] == 'mobile' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[6], ustr(val[1]))
-
-            if val[0] == 'fax' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[7], ustr(val[1]))
-
-            if val[0] == 'email' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[8], ustr(val[1]))
-
-    txtProcessor.init_done=True
-
-def SearchPartner(btnProcessor,*args):
-    b = check()
-    global partner_ref
-    if not b:
-        return
-    try :
-        search_partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-        if not search_partner:
-            win32ui.MessageBox("Please enter email id to search for.", "Open Contact", flag_excl)
-            return
-        vals = []
-        #Searching the contact.
-        vals = NewConn.SearchPartnerDetail(search_partner)
-        #if contact not found resetting all field to blank
-        if vals == None:
-            for i in range(1,13):
-                win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[i], "")
-            win32ui.MessageBox("No matching records found for  : "+str(search_partner)+".","Open Contact", flag_excl)
-            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0], "<enter new search>")
-            return
-        #if contact found than setting the values for the contact.
-        else:
-            for i in range(1,13):
-                win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[i], "")
-            for val in vals:
-                if val[0] == 'partner_id':
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1], ustr(val[1][1]))
-
-                if val[0] == 'name' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2], ustr(val[1]))
-
-                if val[0] == 'street' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[3], ustr(val[1]))
-
-                if val[0] == 'street2' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[4], ustr(val[1]))
-
-                if val[0] == 'zip' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[10], ustr(val[1]))
-
-                if val[0] == 'city' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[5], ustr(val[1]))
-
-                if val[0] == 'state_id' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[11], ustr(val[1][1]))
-
-                if val[0] == 'country_id' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[12], ustr(val[1][1]))
-                    global search_country
-                    search_country =  ustr(val[1][1])
-
-                if val[0] == 'phone' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[6], ustr(val[1]))
-
-                if val[0] == 'mobile' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[7], ustr(val[1]))
-
-                if val[0] == 'fax' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[8], ustr(val[1]))
-
-                if val[0] == 'email' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[9], ustr(val[1]))
-
-            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0], "<Enter  new search>")
-    except Exception,e:
-        msg = getMessage(e)
-        win32ui.MessageBox(msg, "Open Contact", flag_error)
-        pass
-
-def WritePartner(btnProcessor,*args):
-    new_vals=[]
-    #Reading new value of the fields.
-    partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    contect_name = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-    street = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
-    street2 = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[3])
-    city = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[4])
-    state = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[5])
-    country = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[6])
-    phone = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[7])
-    mobile = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[8])
-    fax = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[9])
-    email = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[10])
-    zip = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[11])
-    if contect_name.strip() == "":
-        win32ui.MessageBox("Please enter partner Contact Name name.", "Open Contact", flag_excl)
-        return
-    new_vals.append(['partner',partner])
-    new_vals.append(['name',contect_name])
-    new_vals.append(['street',street])
-    new_vals.append(['street2',street2])
-    new_vals.append(['city',city])
-    new_vals.append(['phone',phone])
-    new_vals.append(['mobile',mobile])
-    new_vals.append(['email',email])
-    new_vals.append(['fax',fax])
-    new_vals.append(['zip',zip])
-    new_vals.append(['state',state])
-    new_vals.append(['country',country])
-    new_vals.append(['state',state])
-    flag = 0
-    try:
-        #writing the updated values to the Server.
-        flag = NewConn.WritePartnerValues(new_vals)
-    except Exception,e:
-        msg = getMessage(e)
-        win32ui.MessageBox(msg, "Open Contact", flag_error)
-        pass
-    if flag == 1:
-        win32ui.MessageBox("Changes have been Updated Successfully.", "Open Contact", flag_info)
-    elif flag == 0:
-        win32ui.MessageBox("Error in Updating the Changes.\n Please check the Database Connection.", "Open Contact", flag_error)
-    elif flag == -1:
-        win32ui.MessageBox("Contact can not be Save.\nFirst select partner using Search.","Open Contact", flag_info)
-
-def SetPartnerNameColumn(listProcessor,*args):
-    hwndList = listProcessor.GetControl()
-    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
-    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
-
-    # set header row
-    lvc =  LVCOLUMN(
-                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
-                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
-                    )
-    lvc.fmt = commctrl.LVCFMT_LEFT
-    lvc.iSubItem = 1
-    lvc.text = "Partner Name"
-    lvc.cx = 275
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-
-    partners = list(NewConn.GetPartners(''))
-    win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-    if not partners:
-        win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-        win32ui.MessageBox("No Partner found with name {0}.".format(search_partner),"Search Partner",flag_error)
-    for partner in partners[::-1]:
-        num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-        item = LVITEM(text=partner[1],iItem = num_items)
-        win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-
-    listProcessor.init_done = True
-
-def SelectPartnerFromList(btnProcessor,*args):
-
-    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
-    sel_text = ''
-    if sel_count == 1:
-        sel=-1
-        for i in range(0,sel_count):
-            sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, sel, commctrl.LVNI_SELECTED)
-            buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
-            size = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
-            sel_text = ''
-            for n in extra:
-                nombre = n.tostring()
-                sel_text = nombre[0:size]
-        global partner_ref
-        if str(sel_text).strip() == "":
-            win32ui.MessageBox("Invalid partner selected.","Search Partner")
-            return
-        try:
-            partner_ref = str(sel_text)
-        except Exception:
-            pass
-        win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        return
-    elif sel_count < 1:
-        win32ui.MessageBox("You should select one partner.","Search Partner")
-        return
-    else:
-        win32ui.MessageBox("Multiple Selection is not allowed.","Search Partner")
-        return
-
-def SearchPartnerList(btnProcessor,*args):
-    b = check()
-    if not b:
-        return
-    try :
-        search_partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-        #Searching the contact.
-        hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        partners = list(NewConn.GetPartners(search_partner))
-        win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-        if not partners:
-            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-            win32ui.MessageBox("No Partner found with name {0}.".format(search_partner),"Search Partner",flag_error)
-        for partner in partners[::-1]:
-            num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-            item = LVITEM(text=partner[1],iItem = num_items)
-            win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-    except Exception,e:
-        msg = getMessage(e)
-        win32ui.MessageBox(msg, "Search Partner", flag_error)
-        pass
-
-def ConnectWebServer(btnProcessor, *args):
-	b = check()
-	if not b:
-		return
-	server = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-	webbrowser.open_new(str(server)+"\\openerp\\")
-
-
-def OpenPartnerForm(txtProcessor,*args):
-    import win32con
-    b = check()
-    if not b:
-    	return
-    #Acquiring control of the text box
-    partner_link = txtProcessor.GetControl()
-    #Reading Current Selected Email.
-    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
-    partner_text = ""
-    try:
-    	partner_text = ustr(mail.SenderName).encode('iso-8859-1')
-        sender_mail = ustr(mail.SenderEmailAddress).strip()
-    except Exception:
-    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Error in reading email.>")
-    	pass
-    vals = NewConn.SearchPartner(sender_mail)
-    if not vals:
-        win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Their is contact related to "+str(partner_text)+"  email address, but no partner is linked to contact>")
-        txtProcessor.init_done=True
-        return
-
-    if NewConn.getitem('_webserver') == "" or NewConn.getitem('_webserver') in ["http:\\\\","https:\\\\"]:
-    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, " <Invalid Server Address>")
-    	txtProcessor.init_done=True
-    	return
-    try:
-        import urllib
-        next =  urllib.urlencode({'next' : '/openerp/form/view?model=res.partner&id=' +str(vals) })
-        weburl = NewConn.getitem('_webprotocol')+NewConn.getitem('_webserver')+":"+str(NewConn.getitem('_webport'))
-        linktopartner = weburl + '?' + next
-        win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, str(linktopartner))
-    except Exception,e:
-    	win32ui.MessageBox("Error While Opening Partner.\n"+str(e),"Open Partner", flag_error)
-    webbrowser.open_new(linktopartner)
-    txtProcessor.init_done=True
-
-def SerachOpenDocuemnt(txtProcessor,*args):
-    import win32con
-    import win32ui
-    import win32com
-    from win32com.mapi import  mapitags
-    b = check()
-    if not b:
-        return
-#    global web_server
-#    global web_server_port
-    #Reading Current Selected Email.
-    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
-    #Acquiring control of the text box
-    link_box = txtProcessor.GetControl()
-    #Checking for the web server Parameters
-    if NewConn.getitem('_webserver') == "" or NewConn.getitem('_webserver') in ["http:\\\\","https:\\\\"]:
-        win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, " <Invalid Server Address>")
-        txtProcessor.init_done=True
-        return
-    linktodoc = ""
-    message_id = None
-    try:
-        session = win32com.client.Dispatch("MAPI.session")
-        session.Logon('Outlook')
-        objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
-        objFields = objMessage.Fields
-        strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
-        strheader = ustr(strheader).encode('iso-8859-1')
-        headers = {}
-        strheader = strheader.replace("\n ", " ").splitlines()
-        for line in strheader:
-            split_here = line.find(":")
-            headers[line[:split_here]] = line[split_here:]
-        temp1 = headers.get('Message-ID')
-        temp2 = headers.get('Message-Id')
-        if temp1 == None:    message_id = temp2
-        if temp2 == None:    message_id = temp1
-        startCut = message_id.find("<")
-        endCut = message_id.find(">")
-        message_id = message_id[startCut:endCut+1]
-    except Exception,e:
-        win32ui.MessageBox(str(e),"Open Document")
-    vals = NewConn.SearchEmailResources(message_id)
-    if vals == None:
-        win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, "< Mail is still not archived.>")
-        txtProcessor.init_done=True
-        return
-    try:
-        import urllib
-        next =  urllib.urlencode({'next' : '/openerp/form/view?model='+vals[0][1]+'&id='+str(vals[1][1])})
-        weburl = NewConn.getitem('_webprotocol')+NewConn.getitem('_webserver')+":"+str(NewConn.getitem('_webport'))
-        linktodoc = weburl + '?' + next
-        win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, str(linktodoc))
-    except Exception,e:
-        win32ui.MessageBox("Error While Opening Document.\n"+str(e),"Open Document", flag_error)
-    webbrowser.open_new(linktodoc)
-    txtProcessor.init_done=True
-
-def SearchCountry(btnProcessor, *args):
-    b = check()
-    if not b:
-        return
-    try :
-        search_country = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-        #Searching the contact.
-        hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        countries = list(NewConn.GetCountry(search_country))
-        win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-        if not countries:
-            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-            win32ui.MessageBox("No country found with name {0}.".format(search_country),"Search Country",flag_error)
-        for country in countries:
-            num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-            item = LVITEM(text=country[1],iItem = num_items)
-            win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-    except Exception,e:
-        msg = getMessage(e)
-        win32ui.MessageBox(msg, "Search Country", flag_error)
-        pass
-
-def SetCountryList(listProcessor,*args):
-
-    hwndList = listProcessor.GetControl()
-    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
-    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
-
-    # set header row
-    lvc =  LVCOLUMN(
-                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
-                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
-                    )
-    lvc.fmt = commctrl.LVCFMT_LEFT
-    lvc.iSubItem = 1
-    lvc.text = "Country Name"
-    lvc.cx = 275
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-
-    countries = list(NewConn.GetCountry(''))
-    win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-    if not countries:
-        win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-        win32ui.MessageBox("No country found with name {0}.".format(search_country),"Search Country",flag_error)
-    for country in countries:
-        num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-        item = LVITEM(text=country[1],iItem = num_items)
-        win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-
-    listProcessor.init_done = True
-
-def SelectCountryFromList(btnProcessor,*args):
-
-    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
-    sel_text = ''
-    if sel_count == 1:
-        sel=-1
-        for i in range(0,sel_count):
-            sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, sel, commctrl.LVNI_SELECTED)
-            buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
-            size = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
-            sel_text = ''
-            for n in extra:
-                nombre = n.tostring()
-                sel_text = nombre[0:size]
-        global country_ref
-        global new_con_country
-        global search_country
-        if str(sel_text).strip() == "":
-            win32ui.MessageBox("Invalid country selected.","Search Country")
-            return
-        try:
-            country_ref = str(sel_text)
-            new_con_country = str(sel_text)
-            search_country = str(sel_text)
-        except Exception:
-            pass
-        win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        return
-    elif sel_count < 1:
-        win32ui.MessageBox("You must one country.","Search Country")
-        return
-    else:
-        win32ui.MessageBox("Multiple selection is not allowed.","Search Country")
-        return
-
-def SearchState(btnProcessor, *args):
-    b = check()
-    if not b:
-        return
-    try :
-        global new_con_country
-        global search_country
-        search_state = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-        #Searching the contact.
-        hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        states = list(NewConn.GetStates(search_state, search_country))
-        win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-        if not states:
-            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-            win32ui.MessageBox("No state found with name {0}.".format(search_state),"Search Fed.State",flag_error)
-        for state in states:
-            num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-            item = LVITEM(text=state[1],iItem = num_items)
-            win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-    except Exception,e:
-        msg = getMessage(e)
-        win32ui.MessageBox(msg, "Search Fed.State", flag_error)
-        pass
-
-def SetStateList(listProcessor,*args):
-    hwndList = listProcessor.GetControl()
-    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
-    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
-    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
-
-    # set header row
-    lvc =  LVCOLUMN(
-                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
-                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
-                    )
-    lvc.fmt = commctrl.LVCFMT_LEFT
-    lvc.iSubItem = 1
-    lvc.text = "Fed.State Name"
-    lvc.cx = 275
-    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
-
-    global new_con_country
-    global search_country
-    states = list(NewConn.GetStates('', search_country))
-    win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
-    if not states:
-        win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
-        win32ui.MessageBox("No state found with name {0}.".format(search_state),"Search Fed.State",flag_error)
-    for state in states:
-        num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
-        item = LVITEM(text=state[1],iItem = num_items)
-        win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
-    listProcessor.init_done = True
-
-def SelectStateFromList(btnProcessor,*args):
-    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
-    sel_text = ''
-    if sel_count == 1:
-        sel=-1
-        for i in range(0,sel_count):
-            sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, sel, commctrl.LVNI_SELECTED)
-            buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
-            size = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
-            sel_text = ''
-            for n in extra:
-                nombre = n.tostring()
-                sel_text = nombre[0:size]
-        global state_ref
-        global new_con_state
-        if str(sel_text).strip() == "":
-            win32ui.MessageBox("Invalid fed. state selected.","Search Fed.State")
-            return
-        try:
-            state_ref = str(sel_text)
-            new_con_state = str(sel_text)
-            win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
-        except Exception:
-            pass
-
-        return
-    elif sel_count < 1:
-        win32ui.MessageBox("You must select state.","Search Fed.State")
-        return
-    else:
-        win32ui.MessageBox("Multiple selection is not allowed.","Search Fed.State")
-        return
-
-def SetWebDefaultVals(txtProcessor,*args):
-    import win32con
-    #Acquiring control of the text box
-    chk_hwnd =  win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
-    try:
-        web_server = NewConn.getitem('_webserver')
-        web_port =  NewConn.getitem('_webport')
-        web_protocol =  NewConn.getitem('_webprotocol')
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id, web_server)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], web_port)
-        if web_protocol == "https:\\\\":
-            win32gui.SendMessage(chk_hwnd , win32con.BM_SETCHECK, 1, 0);
-    except Exception, e:
-        txtProcessor.init_done=True
-    #Reading Current Selected Email.
-    txtProcessor.init_done=True
-
-def SetServerDefaultVals(txtProcessor,*args):
-    import win32con
-    select = 1
-    #Acquiring control of the text box
-    cbprotocol_hwnd =  win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
-    try:
-        web_server = NewConn.getitem('_server')
-        web_port =  NewConn.getitem('_port')
-        web_protocol =  NewConn.getitem('protocol')
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id, web_server)
-        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], web_port)
-        if web_protocol == "XML-RPCS":
-            select = 2
-        win32gui.SendMessage(cbprotocol_hwnd, win32con.CB_SETCURSEL, select, 0)
-    except Exception, e:
-        txtProcessor.init_done=True
-    #Reading Current Selected Email.
-    txtProcessor.init_done=True
-
-dialog_map = {
-                "IDD_MANAGER" :            (
-                    (CancelButtonProcessor,    "IDCANCEL", resetConnAttribs, ()),
-                    (TabProcessor,             "IDC_TAB IDC_LIST",
-                                               """IDD_GENERAL IDD_OBJECT_SETTINGS IDD_ABOUT"""),
-                    (DoneButtonProcessor,      "ID_DONE"),
-                ),
-
-                "IDD_GENERAL":             (
-                    (DBComboProcessor,          "ID_DB_DROPDOWNLIST", GetConn, ()),
-                    (TextProcessor,             "ID_SERVER_PORT ID_USERNAME ID_PASSWORD IDET_WED_SERVER", SetAllText, ()),
-                    (CommandButtonProcessor,    "ID_BUT_TESTCONNECTION ID_DB_DROPDOWNLIST ID_USERNAME \
-                                                ID_PASSWORD", TestConnection, ()),
-                    (DialogCommand,             "IDC_BUT_SET_SERVER_PORT", "IDD_SERVER_PORT_DIALOG"),
-                    (DialogCommand,            "ID_SET_WEB_CONNECTION", "IDD_WEB_SERVER_PORT_DIALOG" ),
-                	(CommandButtonProcessor,	"IDPB_WEB_CONNECTION IDET_WED_SERVER",  ConnectWebServer, ()),
-                ),
-
-                "IDD_OBJECT_SETTINGS" :    (
-                    (CommandButtonProcessor,   "IDC_BUT_LOAD_IMAGE IDC_IMAGE_PATH", GetImagePath, ()),
-                    (CommandButtonProcessor,   "IDC_BUT_SAVE_OBJECT IDC_OBJECT_TITLE IDC_OBJECT_NAME \
-                                                IDC_IMAGE_PATH IDC_LIST", AddNewObject, ()),
-                    (CommandButtonProcessor,   "IDC_BUT_DEL_OBJECT IDC_LIST", DeleteSelectedObjects, ()),
-                    (ListBoxProcessor,         "IDC_LIST", SetDefaultList, ())
-                ),
-
-                "IDD_ABOUT" :              (
-                    (ImageProcessor,          "IDB_OPENERPLOGO"),
-                    (MessageProcessor,        "IDC_ABOUT"),
-                ),
-
-                "IDD_SERVER_PORT_DIALOG" : (
-                    (TextProcessor,           "ID_SERVER ID_PORT ID_DROPDOWNLIST_PROTOCOL", SetServerDefaultVals, ()),
-                    (ProtocolComboProcessor,  "ID_DROPDOWNLIST_PROTOCOL", GetConn, ()),
-                    (CloseButtonProcessor,    "IDCANCEL"),
-                    (OKButtonProcessor,       "IDOK ID_SERVER ID_PORT IDR_XML_PROTOCOL ID_DROPDOWNLIST_PROTOCOL"),
-#
-#                    (RadioButtonProcessor,    "IDR_XML_PROTOCOL", GetConn, ()),
-#                    (RadioButtonProcessor,    "IDR_XMLS_PROTOCOL", GetConn, ()),
-#                    (RadioButtonProcessor,    "IDR_NETRPC_PROTOCOL", GetConn, ()),
-                ),
-
-                "IDD_SYNC" :               (
-                    (CommandButtonProcessor,    "ID_SEARCH ID_SEARCH_TEXT IDC_NAME_LIST", SearchObjectsForText,()),
-                    (GroupProcessor,            "IDC_STATIC_GROUP", setCheckList, ()),
-                    (CSComboProcessor,          "ID_ATT_METHOD_DROPDOWNLIST", GetConn,()),
-                    (DialogCommand,             "ID_CREATE_CONTACT ID_SEARCH_TEXT", "IDD_NEW_CONTACT_DIALOG", set_search_text, ()),
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                    (CommandButtonProcessor,    "ID_MAKE_ATTACHMENT IDC_NAME_LIST IDD_SYNC", MakeAttachment, ()),
-                    (CommandButtonProcessor,    "ID_CREATE_CASE ID_ATT_METHOD_DROPDOWNLIST IDC_NAME_LIST IDD_SYNC", CreateCase, ()),
-                    (ListBoxProcessor,          "IDC_NAME_LIST", SetNameColumn, ()),
-                    (TextProcessor,             "ID_SEARCH_TEXT ID_SEARCH_TEXT IDC_NAME_LIST", GetSearchText, ()),
-
-                ),
-
-                "IDD_NEW_CONTACT_DIALOG" : (
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                    (CommandButtonProcessor,    "ID_CONTACT_SAVE_BUTTON ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_CONTACT_OFFICE_TEXT ID_CONTACT_MOBILE_TEXT ID_FAX_TEXT ID_STREET_TEXT ID_STREET2_TEXT ID_PARTNER_CITY_TEXT ID_ZIP_TEXT ID_PARTNER_TEXT IDET_NC_PARTNER_STATE IDET_NC_PARTNER_COUNTRY", CreateContact, ()),
-                    (TextProcessor,             "ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_PARTNER_TEXT IDET_NC_PARTNER_STATE IDET_NC_PARTNER_COUNTRY" , SetDefaultContact, ()),
-                    (DialogCommand,             "ID_NEW_PARTNER_BUTTON", "IDD_SELECT_PARTNER"),
-                    (DialogCommand,             "IDPB_NEW_PARTNER_BUTTON", "IDD_NEW_PARTNER_DIALOG"),
-                    (DialogCommand,             "IDPB_NC_SEARCH_STATE1", "IDD_SELECT_STATE"),
-                    (DialogCommand,             "IDPB_NC_SEARCH_COUNTRY1", "IDD_SELECT_COUNTRY"),
-                ),
-
-                "IDD_NEW_PARTNER_DIALOG" : (
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                    (CommandButtonProcessor,    "ID_SAVE_PARTNER_BUTTON ID_PARTNER_NAME_TEXT", CreatePartner, ()),
-                ),
-
-                "IDD_VIEW_PARTNER_DIALOG" : (
-                    (TextProcessor,             "IDET_SEARCH_PARTNER IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP IDET_PARTNER_STATE IDET_PARTNER_COUNTRY", GetDefaultEmail, ()),
-                    (CommandButtonProcessor,    "IDPB_SEARCH_PARTNER IDET_SEARCH_PARTNER IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP IDET_PARTNER_STATE IDET_PARTNER_COUNTRY", SearchPartner, ()),
-                    (CommandButtonProcessor,    "IDPB_WRITE_CHANGES IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_STATE IDET_PARTNER_COUNTRY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP", WritePartner, ()),
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                    (DialogCommand,             "ID_NEW_PART_BUTTON", "IDD_SELECT_PARTNER" ),
-                    (DialogCommand,             "IDPB_NEWPARTNER_BUTTON" , "IDD_NEW_CONTACT_DIALOG"),
-                    (DialogCommand,             "IDPB_NEW_PART_BUTTON", "IDD_NEW_PARTNER_DIALOG"),
-                    (DialogCommand,             "IDPB_SEARCH_COUNTRY1", "IDD_SELECT_COUNTRY"),
-                    (DialogCommand,             "IDPB_SEARCH_STATE1", "IDD_SELECT_STATE"),
-
-                ),
-                "IDD_SELECT_PARTNER" : (
-                    (ListBoxProcessor,          "IDC_LIST_PARTNER" ,SetPartnerNameColumn, ()),
-                    (CommandButtonProcessor,    "IDPB_PARTNER_SEARCH IDET_PARTNER_SEARCH_NAME IDC_LIST_PARTNER", SearchPartnerList,()),
-                    (CommandButtonProcessor,    "IDPB_SELECT_PARTNER IDC_LIST_PARTNER IDD_SELECT_PARTNER" , SelectPartnerFromList,()),
-                    (DialogCommand,             "IDPB_CREATE_NEW_PARTNER" , "IDD_NEW_PARTNER_DIALOG")
-                ),
-                "IDD_OPEN_PARTNER_DIALOG" : (
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                	(TextProcessor,             "IDET_PARTNER_LINK_TEXT", OpenPartnerForm, ()),
-                ),
-                "IDD_OPEN_DOCUEMNT_DIALOG" : (
-                    (CloseButtonProcessor,      "IDCANCEL"),
-                    (TextProcessor,             "IDEB_OPENDOC_LINK_TEXT", SerachOpenDocuemnt,()),
-                ),
-                "IDD_WEB_SERVER_PORT_DIALOG" :(
-                     (TextProcessor,             "IDET_WEB_SERVER IDET_WEB_PORT IDCB_WEB_SECURE", SetWebDefaultVals, ()),
-                     (CloseButtonProcessor,      "IDCANCEL"),
-                     (WEBOKButtonProcessor,      "ID_WEB_OK IDET_WEB_SERVER IDET_WEB_PORT IDCB_WEB_SECURE"),
-                     (WEBCHKProcessor,           "IDCB_WEB_SECURE"),
-
-                ),
-                "IDD_SELECT_COUNTRY" : (
-                    (CommandButtonProcessor,     "IDPB_SEARCH_COUNTRY IDET_COUNTRY_SEARCH_NAME IDC_LIST_COUNTRY" , SearchCountry, ()),
-                    (ListBoxProcessor,           "IDC_LIST_COUNTRY" ,SetCountryList, ()),
-                    (CommandButtonProcessor,    "IDPB_SELECT_COUNTRY IDC_LIST_COUNTRY IDD_SELECT_COUNTRY" , SelectCountryFromList,()),
-                ),
-                "IDD_SELECT_STATE" : (
-                    (CommandButtonProcessor,     "IDPB_STATE_SEARCH IDET_STATE_SEARCH_NAME IDC_LIST_STATE" , SearchState, ()),
-                    (ListBoxProcessor,           "IDC_LIST_STATE" ,SetStateList, ()),
-                    (CommandButtonProcessor,     "IDPB_SELECT_STATE IDC_LIST_STATE IDD_SELECT_STATE" , SelectStateFromList,()),
-                ),
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py
deleted file mode 100644
index bce802b5ed1..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py
+++ /dev/null
@@ -1,325 +0,0 @@
-# A core, data-driven dialog.
-# Driven completely by "Control Processor" objects.
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-import win32gui, win32api, win32con
-import commctrl
-import struct, array
-
-from dlgutils import *
-# Isolate the nasty stuff for tooltips somewhere.
-class TooltipManager:
-    def __init__(self, dialog):
-        self.dialog = dialog
-        self.hwnd_tooltip = None
-        self.tooltip_tools = {}
-
-    def HideTooltip(self):
-        if self.hwnd_tooltip is not None:
-            win32gui.SendMessage(self.hwnd_tooltip, commctrl.TTM_TRACKACTIVATE, 0, 0)
-
-    def ShowTooltipForControl(self, control_id, text):
-        # Note sure this tooltip stuff is quite right!
-        # Hide an existing one, so the new one gets created.
-        # (new one empty is no big deal, but hiding the old one is, so
-        # we get re-queried for the text.
-        hwnd_dialog = self.dialog.hwnd
-        self.HideTooltip()
-        if self.hwnd_tooltip is None:
-            TTS_BALLOON = 0x40
-            self.hwnd_tooltip = win32gui.CreateWindowEx(0, "tooltips_class32", None,
-                                    win32con.WS_POPUP | TTS_BALLOON,
-                                    win32con.CW_USEDEFAULT, win32con.CW_USEDEFAULT,
-                                    win32con.CW_USEDEFAULT, win32con.CW_USEDEFAULT,
-                                    hwnd_dialog, 0, 0, None)
-            # 80 chars max for our tooltip
-            # hrm - how to measure this in pixels!
-            win32gui.SendMessage(self.hwnd_tooltip,
-                                 commctrl.TTM_SETMAXTIPWIDTH,
-                                 0, 300)
-
-        format = "iiiiiiiiiii"
-        tt_size = struct.calcsize(format)
-        buffer = array.array("c", text + "\0")
-        text_address, size = buffer.buffer_info()
-        uID = control_id
-        flags = commctrl.TTF_TRACK | commctrl.TTF_ABSOLUTE
-        data = struct.pack(format, tt_size, flags, hwnd_dialog, uID, 0,0,0,0, 0, text_address, 0)
-
-        # Add a tool for this control only if we haven't already
-        if control_id not in self.tooltip_tools:
-            win32gui.SendMessage(self.hwnd_tooltip,
-                                 commctrl.TTM_ADDTOOL,
-                                 0, data)
-            self.tooltip_tools[control_id] = 1
-
-        control = win32gui.GetDlgItem(hwnd_dialog, control_id)
-        child_rect = win32gui.GetWindowRect(control)
-        xOff = yOff = 15 # just below and right of the control
-
-        win32gui.SendMessage(self.hwnd_tooltip,
-                             commctrl.TTM_TRACKPOSITION,
-                             0,
-                             MAKELONG(child_rect[0]+xOff, child_rect[1]+yOff))
-        win32gui.SendMessage(self.hwnd_tooltip,
-                             commctrl.TTM_TRACKACTIVATE,
-                             1,data)
-
-# A base dialog class, that loads from resources.  Has no real smarts.
-class Dialog:
-    def __init__(self, parent, parser, idd):
-        win32gui.InitCommonControls()
-        self.hinst = win32api.GetModuleHandle(None)
-        self.parent = parent
-        self.dialog_parser = parser
-        self.template = parser.dialogs[idd]
-
-    def _GetIDName(self, cid):
-        return self.dialog_parser.names.get(cid, str(cid))
-
-    def CreateWindow(self):
-        return self._DoCreate(win32gui.CreateDialogIndirect)
-
-    def DoModal(self):
-        return self._DoCreate(win32gui.DialogBoxIndirect)
-
-    def GetMessageMap(self):
-        ret = {
-            win32con.WM_COMMAND: self.OnCommand,
-            win32con.WM_NOTIFY: self.OnNotify,
-            win32con.WM_INITDIALOG: self.OnInitDialog,
-            win32con.WM_CLOSE: self.OnClose,
-            win32con.WM_DESTROY: self.OnDestroy,
-            win32con.WM_RBUTTONUP: self.OnRButtonUp,
-        }
-        return ret
-
-    def DoInitialPosition(self):
-        # centre the dialog
-        desktop = win32gui.GetDesktopWindow()
-        l,t,r,b = win32gui.GetWindowRect(self.hwnd)
-        w = r-l
-        h = b-t
-        dt_l, dt_t, dt_r, dt_b = win32gui.GetWindowRect(desktop)
-        centre_x, centre_y = win32gui.ClientToScreen( desktop, ( (dt_r-dt_l)/2, (dt_b-dt_t)/2) )
-        win32gui.MoveWindow(self.hwnd, centre_x-(w/2), centre_y-(h/2), w, h, 0)
-
-    def OnInitDialog(self, hwnd, msg, wparam, lparam):
-        self.hwnd = hwnd
-        self.DoInitialPosition()
-
-    def OnCommand(self, hwnd, msg, wparam, lparam):
-        pass
-    def OnNotify(self, hwnd, msg, wparam, lparam):
-        pass
-    def OnClose(self, hwnd, msg, wparam, lparam):
-        pass
-    def OnDestroy(self, hwnd, msg, wparam, lparam):
-        pass
-    def OnRButtonUp(self, hwnd, msg, wparam, lparam):
-        pass
-
-    def _DoCreate(self, fn):
-        message_map = self.GetMessageMap()
-        return win32gui.DialogBoxIndirect(self.hinst, self.template, self.parent, message_map)
-    # A couple of helpers
-    def GetDlgItem(self, id):
-        if type(id)==type(''):
-            id = self.dialog_parser.ids[id]
-        return win32gui.GetDlgItem(self.hwnd, id)
-    def SetDlgItemText(self, id, text):
-        hchild = self.GetDlgItem(id)
-        win32gui.SendMessage(hchild, win32con.WM_SETTEXT, 0, text)
-
-# A dialog with a tooltip manager
-class TooltipDialog(Dialog):
-    def __init__(self, parent, parser, idd):
-        Dialog.__init__(self, parent, parser, idd)
-        self.tt = TooltipManager(self)
-
-    def GetMessageMap(self):
-        ret = Dialog.GetMessageMap(self)
-        ret.update( {
-            win32con.WM_HELP: self.OnHelp,
-            win32con.WM_LBUTTONDOWN: self.OnLButtonDown,
-            win32con.WM_ACTIVATE: self.OnActivate,
-        })
-        return ret
-
-    def OnLButtonDown(self, hwnd, msg, wparam, lparam):
-        self.tt.HideTooltip()
-
-    def OnActivate(self, hwnd, msg, wparam, lparam):
-        self.tt.HideTooltip()
-
-    def OnDestroy(self, hwnd, msg, wparam, lparam):
-        self.tt.HideTooltip()
-
-    def OnHelp(self, hwnd, msg, wparam, lparam):
-        format = "iiiiiii"
-        buf = win32gui.PyMakeBuffer(struct.calcsize(format), lparam)
-        cbSize, iContextType, iCtrlId, hItemHandle, dwContextID, x, y = \
-                struct.unpack(format, buf)
-        tt_text = self.GetPopupHelpText(iCtrlId)
-        if tt_text:
-            self.tt.ShowTooltipForControl(iCtrlId, tt_text)
-        else:
-            self.tt.HideTooltip()
-        return 1
-
-    def GetPopupHelpText(self, control_id):
-        return None
-
-# A "Processor Dialog" works with Command Processors, to link Outlook-Plugin
-# options with control IDS, giving a "data driven" dialog.
-class ProcessorDialog(TooltipDialog):
-    def __init__(self, parent, manager, config, idd, option_handlers):
-        TooltipDialog.__init__(self, parent, manager.dialog_parser, idd)
-        parser = manager.dialog_parser
-        self.manager = manager
-        self.config = config
-        self.command_processors = {}
-        self.processor_message_map = {}
-        self.all_processors = []
-        for data in option_handlers:
-            klass = data[0]
-            id_names = data[1]
-            rest = data[2:]
-            ids = id_names.split()
-            int_ids = [ parser.ids[id] for id in ids]
-            instance = klass(self,int_ids, *rest)
-            self.all_processors.append(instance)
-            for int_id in int_ids:
-                self.command_processors[int_id] = instance
-            for message in instance.GetMessages():
-                existing = self.processor_message_map.setdefault(message, [])
-                existing.append(instance)
-
-    def GetMessageMap(self):
-        ret = TooltipDialog.GetMessageMap(self)
-        for key in self.processor_message_map.keys():
-            if key in ret:
-                print "*** WARNING: Overwriting message!!!"
-            ret[key] = self.OnCommandProcessorMessage
-        return ret
-
-    def OnInitDialog(self, hwnd, msg, wparam, lparam):
-        TooltipDialog.OnInitDialog(self, hwnd, msg, wparam, lparam)
-        if __debug__: # this is just a debugging aid
-            for int_id in self.command_processors:
-                try:
-                    self.GetDlgItem(int_id)
-                except win32gui.error:
-                    print "ERROR: Dialog item %s refers to an invalid control" % \
-                          self._GetIDName(int_id)
-        self.LoadAllControls()
-
-    def GetPopupHelpText(self, iCtrlId):
-        cp = self.command_processors.get(iCtrlId)
-        tt_text = None
-        if cp is not None:
-            return cp.GetPopupHelpText(iCtrlId)
-
-        print "Can not get command processor for", self._GetIDName(iCtrlId)
-        return None
-    def OnRButtonUp(self, hwnd, msg, wparam, lparam):
-        for cp in self.command_processors.values():
-            cp.OnRButtonUp(wparam,lparam)
-
-    def OnCommandProcessorMessage(self, hwnd, msg, wparam, lparam):
-        for p in self.processor_message_map[msg]:
-            p.OnMessage(msg, wparam, lparam)
-
-    # Called back by a processor when it changes an option.  We tell all other
-    # options on our page that the value changed.
-    def OnOptionChanged(self, changed_by, option):
-        for p in self.all_processors:
-            if p is not changed_by:
-                p.OnOptionChanged(option)
-
-
-    def OnDestroy(self, hwnd, msg, wparam, lparam):
-        for p in self.all_processors:
-            p.Term()
-        TooltipDialog.OnDestroy(self, hwnd, msg, wparam, lparam)
-        self.command_processors = None
-        self.all_processors = None
-        self.processor_message_map = None
-
-    def LoadAllControls(self):
-        for p in self.all_processors:
-            p.Init()
-
-    def ApplyHandlingOptionValueError(self, func, *args):
-        try:
-            return func(*args)
-        except ValueError, why:
-            mb_flags = win32con.MB_ICONEXCLAMATION | win32con.MB_OK
-            win32gui.MessageBox(self.hwnd, str(why), "OpenERP Configuration", mb_flags)
-            return False
-
-    def SaveAllControls(self):
-        for p in self.all_processors:
-            if not self.ApplyHandlingOptionValueError(p.Done):
-                win32gui.SetFocus(p.GetControl())
-                return False
-        return True
-
-    def OnClose(self, hwnd, msg, wparam, lparam):
-        if TooltipDialog.OnClose(self, hwnd, msg, wparam, lparam):
-            return 1
-        if not self.SaveAllControls():
-            return 1
-        win32gui.EndDialog(hwnd, 0)
-
-    def OnNotify(self, hwnd, msg, wparam, lparam):
-        # Parse the NMHDR
-        TooltipDialog.OnNotify(self, hwnd, msg, wparam, lparam)
-        format = "iii"
-        buf = win32gui.PyMakeBuffer(struct.calcsize(format), lparam)
-        hwndFrom, idFrom, code = struct.unpack(format, buf)
-        code += 0x4f0000 # hrm - wtf - commctrl uses this, and it works with mfc.  *sigh*
-        # delegate rest to our commands.
-        self._GetIDName(idFrom)
-        if self.command_processors is not None:
-            handler = self.command_processors.get(idFrom)
-            if handler is None:
-                print "Ignoring OnNotify for", self._GetIDName(idFrom)
-                return
-            return handler.OnNotify( (hwndFrom, idFrom, code), wparam, lparam)
-        return
-
-    def OnCommand(self, hwnd, msg, wparam, lparam):
-        TooltipDialog.OnCommand(self, hwnd, msg, wparam, lparam)
-        id = win32api.LOWORD(wparam)
-        # Sometimes called after OnDestroy???
-        if self.command_processors is None:
-            print "Ignoring OnCommand for", self._GetIDName(id)
-            return
-        else:
-            handler = self.command_processors.get(id)
-            if handler is None:
-                print "Ignoring OnCommand for", self._GetIDName(id)
-                return
-
-        self.ApplyHandlingOptionValueError(handler.OnCommand, wparam, lparam)
-
-class ProcessorPage(ProcessorDialog):
-    def __init__(self, parent, manager, config, idd, option_handlers, yoffset):
-        ProcessorDialog.__init__(self, parent, manager, config, idd,option_handlers)
-        self.yoffset = yoffset
-    def DoInitialPosition(self):
-        # The hardcoded values are a bit of a hack.
-        win32gui.SetWindowPos(self.hwnd, win32con.HWND_TOP, 1, self.yoffset, 0, 0, win32con.SWP_NOSIZE)
-    def CreateWindow(self):
-        # modeless. Pages should have the WS_CHILD window style
-        message_map = self.GetMessageMap()
-        # remove frame from dialog and make sure it is a child
-        self.template[0][2] = self.template[0][2] & ~(win32con.DS_MODALFRAME|win32con.WS_POPUP|win32con.WS_OVERLAPPED|win32con.WS_CAPTION)
-        self.template[0][2] = self.template[0][2] | win32con.WS_CHILD
-        return win32gui.CreateDialogIndirect(self.hinst, self.template, self.parent, message_map)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py
deleted file mode 100644
index bede3cd63c2..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generic utilities for dialog functions.
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-def MAKELONG(l,h):
-    return ((h & 0xFFFF) << 16) | (l & 0xFFFF)
-
-MAKELPARAM=MAKELONG
-
-def SetWaitCursor(wait):
-    import win32gui, win32con
-    if wait:
-        hCursor = win32gui.LoadCursor(0, win32con.IDC_WAIT)
-    else:
-        hCursor = win32gui.LoadCursor(0, 0)
-    win32gui.SetCursor(hCursor)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
deleted file mode 100644
index 0a129423e29..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
+++ /dev/null
@@ -1,320 +0,0 @@
-# Option Control Processors for our dialog.
-# These are extensions to basic Control Processors that are linked with
-# Outlook-Plugin options.
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# -*- 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 win32gui, win32api, win32con, win32ui
-import commctrl
-import struct, array
-from dlgutils import *
-import xmlrpclib
-import processors
-verbose = 0 # set to 1 to see option values fetched and set.
-# A ControlProcessor that is linked up with options.  These get a bit smarter.
-class OptionControlProcessor(processors.ControlProcessor):
-    def __init__(self, window, control_ids):
-        processors.ControlProcessor.__init__(self, window, control_ids)
-
-    def GetPopupHelpText(self, idFrom):
-        doc = " ".join(self.option.doc().split())
-        if self.option.default_value:
-            doc += " (the default value is %s)" % self.option.default_value
-        return doc
-
-    # We override Init, and break it into 2 steps.
-    def Init(self):
-        self.UpdateControl_FromValue()
-
-    def Done(self):
-        self.UpdateValue_FromControl()
-        return True
-
-#    # Only sub-classes know how to update their controls from the value.
-    def UpdateControl_FromValue(self):
-        raise NotImplementedError
-    def UpdateValue_FromControl(self):
-        raise NotImplementedError
-
-class ComboProcessor(OptionControlProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        OptionControlProcessor.__init__(self, window, control_ids)
-    def OnCommand(self, wparam, lparam):
-        code = win32api.HIWORD(wparam)
-        if code == win32con.CBN_SELCHANGE:
-            self.UpdateValue_FromControl()
-    def Init(self):
-        self.UpdateControl_FromValue()
-    def UpdateControl_FromValue(self):
-        pass
-    def UpdateValue_FromControl(self):
-        pass
-
-class DBComboProcessor(ComboProcessor):
-    def Init(self):
-        self.UpdateControl_FromValue()
-
-    def UpdateControl_FromValue(self):
-        combo = self.GetControl()
-        conn = self.func()
-        list = conn.GetDBList()
-        db = conn.getitem('_dbname')
-        if list == -1:
-            hinst = win32gui.dllhandle
-            parent = self.window.hwnd
-            dwStyle = win32con.WS_CHILD | win32con.WS_VISIBLE | win32con.WS_TABSTOP | win32con.WS_BORDER | \
-                        win32con.ES_AUTOHSCROLL | win32con.FF_ROMAN | win32con.FW_EXTRALIGHT
-
-            hwndImg = win32gui.CreateWindow (
-                                        "EDIT",
-                                        db,
-                                        dwStyle,
-                                        127,80,235,20,
-                                        parent,
-                                        7000,
-                                        0,
-                                        None);
-            self.active_control_id = 7000
-            win32gui.ShowWindow(combo, False)
-        else:
-            try:
-                txtbx = win32gui.GetDlgItem(self.window.hwnd, 7000)
-                win32gui.DestroyWindow(txtbx)
-            except Exception,e:
-                print "Exception : %s"%str(e)
-                pass
-            win32gui.ShowWindow(combo, True)
-            win32gui.SendMessage(combo, win32con.CB_RESETCONTENT,0, 0);
-            for item in list:
-                win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, str(item))
-            sel = win32gui.SendMessage(combo, win32con.CB_SELECTSTRING, 0, db)
-            dbb=win32gui.GetDlgItemText(self.window.hwnd, 2004)
-            if sel == -1:
-                win32gui.SendMessage(combo, win32con.CB_SETCURSEL, 0, 0)
-            self.active_control_id = self.control_id
-
-    def UpdateValue_FromControl(self):
-        db = win32gui.GetDlgItemText(self.window.hwnd, self.active_control_id)
-        conn = self.func()
-        if conn.getitem('_dbname') != db:
-            conn.setitem('_dbname', db)
-            conn.setitem('_login', 'False')
-
-class PartnersComboProcessor(ComboProcessor):
-
-    def UpdateControl_FromValue(self):
-        from manager import ustr
-        import win32ui
-        combo = self.GetControl()
-        conn = self.func()
-        win32gui.SendMessage(combo, win32con.CB_RESETCONTENT,0, 0);
-        id_list = {}
-        p_list=[]
-        try:
-            p_list = list(conn.GetPartners())
-            cnt=0
-            for item in p_list:
-                win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, ustr(item[1]).encode('iso-8859-1'))
-                id_list[cnt] = item[0]
-                cnt+=1
-            conn.setitem('partner_id_list', str(id_list))
-            cnt = win32gui.SendMessage(combo, win32con.CB_GETCOUNT, 0, 0)
-            win32gui.SendMessage(combo, win32con.CB_SETCURSEL, -1, 0)
-            return
-        except xmlrpclib.Fault,e:
-             msg = str(e.faultCode) or e.faultString or e.message or str(e)
-        except Exception,e:
-            msg = str(e)
-        win32ui.MessageBox(str(e),"Partners",win32con.MB_ICONEXCLAMATION)
-        win32gui.DestroyWindow(self.window.hwnd)
-
-    def UpdateValue_FromControl(self):
-        combo = self.GetControl()
-        conn = self.func()
-        sel = win32gui.SendMessage(combo, win32con.CB_GETCURSEL)
-        conn.setitem('sel_id', sel)
-
-class StateComboProcessor(ComboProcessor):
-
-     def Init(self):
-        self.UpdateControl_FromValue()
-
-     def UpdateControl_FromValue(self):
-        from manager import ustr
-        import win32ui
-        combo = self.GetControl()
-        conn = self.func()
-        win32gui.SendMessage(combo, win32con.CB_RESETCONTENT, 0, 0);
-        id_list = {}
-        state_list=[]
-        try:
-            state_list = list(conn.GetAllState())
-            for item in state_list:
-                win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, ustr(item[1]).encode('iso-8859-1'))
-            win32gui.SendMessage(combo, win32con.CB_SETCURSEL, -1, 0)
-            cnt = win32gui.SendMessage(combo, win32con.CB_GETCOUNT, 0, 0)
-            return
-        except xmlrpclib.Fault,e:
-            msg = str(e.faultCode) or e.faultString or e.message or str(e)
-            win32ui.MessageBox(msg, "Open Partner")
-        except Exception,e:
-            win32ui.MessageBox(str(e), "Open Partner")
-     def UpdateValue_FromControl(self):
-        pass
-
-class CountryComboProcessor(ComboProcessor):
-
-     def Init(self):
-        self.UpdateControl_FromValue()
-
-     def UpdateControl_FromValue(self):
-        from manager import ustr
-        import win32ui
-        combo = self.GetControl()
-        conn = self.func()
-        win32gui.SendMessage(combo, win32con.CB_RESETCONTENT, 0, 0);
-        id_list = {}
-        state_list=[]
-        try:
-            country_list = list(conn.GetAllCountry())
-            for item in country_list:
-                win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, ustr(item[1]).encode('iso-8859-1'))
-            win32gui.SendMessage(combo, win32con.CB_SETCURSEL, -1, 0)
-            cnt = win32gui.SendMessage(combo, win32con.CB_GETCOUNT, 0, 0)
-            return
-        except xmlrpclib.Fault,e:
-            msg = str(e.faultCode) or e.faultString or e.message or str(e)
-            win32ui.MessageBox(msg, "Open Partner")
-        except Exception,e:
-            win32ui.MessageBox(str(e), "Open Partner")
-     def UpdateValue_FromControl(self):
-        pass
-
-class CSComboProcessor(ComboProcessor):
-    def UpdateControl_FromValue(self):
-        combo = self.GetControl()
-        conn = self.func()
-        if str(conn.getitem('_iscrm')) == 'False':
-            win32gui.EnableWindow(combo, False)
-            return
-        try:
-            list=['CRM Lead']#, 'CRM Helpdesk', 'CRM Lead', 'CRM Meeting', 'CRM Opportunity', 'CRM Phonecall']
-            objlist = conn.GetAllObjects()
-            if'hr.applicant' in objlist:
-                list.append('HR Applicant')
-            if'project.issue' in objlist:
-                list.append('Project Issue')
-
-            win32gui.SendMessage(combo, win32con.CB_RESETCONTENT,0, 0);
-            for item in list:
-                win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, str(item))
-            win32gui.SendMessage(combo, win32con.CB_SETCURSEL, 0, 0)
-            return
-        except xmlrpclib.Fault,e:
-            win32ui.MessageBox(str(e.faultCode),"CRM Case",win32con.MB_ICONEXCLAMATION)
-        except Exception,e:
-            win32ui.MessageBox(str(e),"CRM Case",win32con.MB_ICONEXCLAMATION)
-
-    def UpdateValue_FromControl(self):
-        pass
-
-class TextProcessor(OptionControlProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        OptionControlProcessor.__init__(self, window, control_ids)
-
-    def UpdateControl_FromValue(self):
-        args = (self,)+(self.window,) + self.args
-        self.func(*args)
-
-    def UpdateValue_FromControl(self):
-        pass
-
-class ListBoxProcessor(OptionControlProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        OptionControlProcessor.__init__(self, window, control_ids)
-
-    def Init(self):
-        args = (self,)+(self.window,) + self.args
-        if not self.init_done:
-            self.func(*args)
-
-    def UpdateControl_FromValue(self):
-        pass
-    def UpdateValue_FromControl(self):
-        pass
-
-class ListBoxProcessor(OptionControlProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        OptionControlProcessor.__init__(self, window, control_ids)
-
-    def Init(self):
-        args = (self,)+(self.window,) + self.args
-        if not self.init_done:
-            self.func(*args)
-
-    def UpdateControl_FromValue(self):
-        pass
-    def UpdateValue_FromControl(self):
-        pass
-
-class GroupProcessor(OptionControlProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        OptionControlProcessor.__init__(self, window, control_ids)
-    def Init(self):
-        args = (self,)+(self.window,) + self.args
-        self.func(*args)
-    def UpdateControl_FromValue(self):
-        pass
-    def UpdateValue_FromControl(self):
-        pass
-
-
-class ProtocolComboProcessor(ComboProcessor):
-    def Init(self):
-        self.UpdateControl_FromValue()
-
-    def UpdateControl_FromValue(self):
-        combo = self.GetControl()
-        list = ['XML-RPC', 'XML-RPCS']
-        win32gui.ShowWindow(combo, True)
-        win32gui.SendMessage(combo, win32con.CB_RESETCONTENT, 0, 0);
-        for item in list:
-            win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, str(item))
-        if sel == -1:
-            win32gui.SendMessage(combo, win32con.CB_SETCURSEL, 1, 0)
-        self.active_control_id = self.control_id
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py
deleted file mode 100644
index 34af9e073a4..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py
+++ /dev/null
@@ -1,147 +0,0 @@
-# Control Processors for our dialog.
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# -*- 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 win32gui, win32api, win32con
-import commctrl
-import struct, array
-from dlgutils import *
-import win32ui
-
-# Cache our leaky bitmap handles
-bitmap_handles = {}
-
-# A generic set of "ControlProcessors".  A control processor by itself only
-# does a few basic things.
-class ControlProcessor:
-    def __init__(self, window, control_ids):
-        self.control_id = control_ids[0]
-        self.other_ids = control_ids[1:]
-        self.window = window
-        self.init_done=False
-
-    def Init(self):
-        pass
-    def Done(self): # done with 'ok' - ie, save options.  May return false.
-        return True
-    def Term(self): # closing - can't fail.
-        pass
-    def GetControl(self, control_id = None):
-        control_id = control_id or self.control_id
-        try:
-            h = win32gui.GetDlgItem(self.window.hwnd, control_id)
-        except:
-            hparent = win32gui.GetParent(self.window.hwnd)
-            hparent = win32gui.GetParent(hparent)
-            h = win32gui.GetDlgItem(hparent, control_id)
-        return h
-    def GetPopupHelpText(self, idFrom):
-        return None
-    def OnCommand(self, wparam, lparam):
-        pass
-    def OnNotify(self, nmhdr, wparam, lparam):
-        pass
-    def GetMessages(self):
-        return []
-    def OnMessage(self, msg, wparam, lparam):
-        raise RuntimeError, "I don't hook any messages, so I shouldn't be called"
-    def OnOptionChanged(self, option):
-        pass
-    def OnRButtonUp(self, wparam, lparam):
-        pass
-
-class ImageProcessor(ControlProcessor):
-    def Init(self):
-        rcp = self.window.manager.dialog_parser;
-        bmp_id = int(win32gui.GetWindowText(self.GetControl()))
-        if bitmap_handles.has_key(bmp_id):
-            handle = bitmap_handles[bmp_id]
-        else:
-            import resources
-            mod_handle, mod_bmp, extra_flags = resources.GetImageParamsFromBitmapID(rcp, bmp_id)
-            load_flags = extra_flags|win32con.LR_COLOR|win32con.LR_SHARED
-            handle = win32gui.LoadImage(mod_handle, mod_bmp,win32con.IMAGE_BITMAP,0,0,load_flags)
-            bitmap_handles[bmp_id] = handle
-        win32gui.SendMessage(self.GetControl(), win32con.STM_SETIMAGE, win32con.IMAGE_BITMAP, handle)
-
-    def GetPopupHelpText(self, cid):
-        return None
-
-class ButtonProcessor(ControlProcessor):
-    def OnCommand(self, wparam, lparam):
-        code = win32api.HIWORD(wparam)
-        id = win32api.LOWORD(wparam)
-        if code == win32con.BN_CLICKED:
-            self.OnClicked(id)
-
-class RadioButtonProcessor(ControlProcessor):
-    def __init__(self, window, control_ids, func='', args=''):
-        self.func = func
-        self.args = args
-        ControlProcessor.__init__(self, window, control_ids)
-
-    def OnCommand(self, wparam, lparam):
-        code = win32api.HIWORD(wparam)
-        id = win32api.LOWORD(wparam)
-        if code == win32con.BN_CLICKED:
-            text=win32gui.GetDlgItemText(self.window.hwnd, self.control_id)
-            conn = self.func()
-            conn.setitem('protocol', text)
-            p=conn.getitem('protocol')
-
-class CloseButtonProcessor(ButtonProcessor):
-    def OnClicked(self, id):
-        win32gui.EndDialog(self.window.hwnd, id)
-
-class CancelButtonProcessor(ButtonProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        ControlProcessor.__init__(self, window, control_ids)
-    def OnClicked(self, id):
-        a=self.func(self.window)
-        win32gui.EndDialog(self.window.hwnd, id)
-
-class CommandButtonProcessor(ButtonProcessor):
-    def __init__(self, window, control_ids, func, args):
-        self.func = func
-        self.args = args
-        ControlProcessor.__init__(self, window, control_ids)
-
-    def OnClicked(self, id):
-        # Bit of a hack - always pass the manager as the first arg.
-        self.id = id
-        args = (self, ) + self.args
-        self.func(*args)
-
-    def GetPopupHelpText(self, ctrlid):
-        assert ctrlid == self.control_id
-        doc = self.func.__doc__
-        if doc is None:
-            return ""
-        return " ".join(doc.split())
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp
deleted file mode 100644
index c8bb6091839..00000000000
Binary files a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp and /dev/null differ
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py
deleted file mode 100644
index cf3e416c209..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# Package that manages and defines dialog resources
-
-def GetImageParamsFromBitmapID(rc_parser, bmpid):
-    import os, sys
-    import win32gui, win32con, win32api
-    if type(bmpid)==type(0):
-        bmpid = rc_parser.names[bmpid]
-    int_bmpid = rc_parser.ids[bmpid]
-    # For both binary and source versions, we currently load from files.
-    # In future py2exe built binary versions we will be able to load the
-    # bitmaps directly from our DLL.
-    filename = rc_parser.bitmaps[bmpid]
-    if hasattr(sys, "frozen"):
-        # in our .exe/.dll - load from that.
-        if sys.frozen=="dll":
-            hmod = sys.frozendllhandle
-        else:
-            hmod = win32api.GetModuleHandle(None)
-        return hmod, int_bmpid, 0
-    else:
-        # source code - load the .bmp directly.
-        if not os.path.isabs(filename):
-            # In this directory
-            filename = os.path.join( os.path.dirname( __file__ ), filename)
-        return 0, filename, win32con.LR_LOADFROMFILE
-    assert 0, "not reached"
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
deleted file mode 100644
index 2bf0d1aec48..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
+++ /dev/null
@@ -1,224 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by dialogs.rc
-//
-#define IDD_MANAGER                     101
-#define IDD_TRAINING                    102
-#define IDD_FILTER                      103
-#define IDD_FILTER_NOW                  104
-#define IDD_FOLDER_SELECTOR             105
-#define IDD_ABOUT                    	106
-#define IDD_GENERAL                     108
-
-//#define IDD_FILTER_SPAM                 110
-#define IDD_FILTER_UNSURE               111
-#define IDD_DIAGNOSTIC                  113
-#define IDD_WIZARD                      114
-#define IDD_WIZARD_WELCOME              115
-#define IDD_WIZARD_FINISHED_UNTRAINED   116
-#define IDD_WIZARD_FOLDERS_REST         117
-#define IDD_WIZARD_FOLDERS_WATCH        118
-#define IDD_WIZARD_FINISHED_UNCONFIGURED 119
-#define IDD_WIZARD_FOLDERS_TRAIN        120
-#define IDD_WIZARD_TRAIN                121
-#define IDD_WIZARD_FINISHED_TRAINED     122
-#define IDD_WIZARD_TRAINING_IS_IMPORTANT 123
-#define IDD_WIZARD_FINISHED_TRAIN_LATER 124
-#define IDB_SBWIZLOGO                   125
-#define IDB_FOLDERS                     127
-#define IDC_PROGRESS                    1000
-#define IDC_PROGRESS_TEXT               1001
-#define IDC_STATIC_HAM                  1002
-#define IDC_STATIC_SPAM                 1003
-#define IDC_BROWSE_HAM                  1004
-#define IDC_BROWSE_SPAM                 1005
-#define IDC_START                       1006
-#define IDC_BUT_REBUILD                 1007
-#define IDC_BUT_RESCORE                 1008
-#define IDC_VERSION                     1009
-#define IDC_BUT_TRAIN_FROM_SPAM_FOLDER  1010
-#define IDC_BUT_TRAIN_TO_SPAM_FOLDER    1011
-#define IDC_BUT_TRAIN_NOW               1012
-#define IDC_BUT_FILTER_ENABLE           1013
-#define IDC_FILTER_STATUS               1014
-#define IDC_BUT_FILTER_DEFINE           1016
-#define IDC_BUT_ABOUT                   1017
-#define IDC_BUT_ACT_SCORE               1018
-#define IDC_BUT_ACT_ALL                 1019
-#define IDC_BUT_UNREAD                  1020
-#define IDC_BUT_UNSEEN                  1021
-#define IDC_SLIDER_CERTAIN              1023
-#define IDC_EDIT_CERTAIN                1024
-#define IDC_ACTION_CERTAIN              1025
-#define IDC_FOLDER_CERTAIN              1027
-#define IDC_BROWSE_CERTAIN              1028
-#define IDC_SLIDER_UNSURE               1029
-#define IDC_EDIT_UNSURE                 1030
-#define IDC_ACTION_UNSURE               1031
-#define IDC_FOLDER_UNSURE               1033
-#define IDC_BROWSE_UNSURE               1034
-#define IDC_TRAINING_STATUS             1035
-#define IDC_FOLDER_NAMES                1036
-#define IDC_BROWSE                      1037
-#define IDC_FOLDER_WATCH                1038
-#define IDC_BROWSE_WATCH                1039
-#define IDC_LIST_FOLDERS                1040
-#define IDC_BUT_SEARCHSUB               1041
-#define IDC_BUT_CLEARALL                1042
-#define IDC_STATUS1                     1043
-#define IDC_STATUS2                     1044
-#define IDC_BUT_NEW                     1046
-#define IDC_MARK_SPAM_AS_READ           1047
-#define IDC_SAVE_SPAM_SCORE             1048
-#define IDC_MARK_UNSURE_AS_READ         1051
-#define IDC_DELAY1_SLIDER               1056
-#define IDC_DELAY1_TEXT                 1057
-#define IDC_DELAY2_SLIDER               1058
-#define IDC_DELAY2_TEXT                 1059
-#define IDC_INBOX_TIMER_ONLY            1060
-#define IDC_VERBOSE_LOG                 1061
-#define IDB_OPENERPLOGO                 1062
-#define IDC_TAB                         1068
-#define IDC_BACK_BTN                    1069
-#define IDC_BUT_WIZARD                  1070
-#define IDC_SHOW_DATA_FOLDER            1071
-#define IDC_ABOUT_BTN                   1072
-#define IDC_BUT_RESET                   1073
-#define IDC_DEL_SPAM_RS                 1074
-#define IDC_RECOVER_RS                  1075
-#define IDC_FORWARD_BTN                 1077
-#define IDC_PAGE_PLACEHOLDER            1078
-#define IDC_BUT_SHOW_DIAGNOSTICS        1080
-#define IDC_BUT_PREPARATION             1081
-#define IDC_FOLDER_HAM                  1083
-#define IDC_BUT_UNTRAINED               1088
-#define IDC_BUT_TRAIN                   1089
-#define IDC_BUT_TIMER_ENABLED           1091
-#define IDC_WIZ_GRAPHIC                 1092
-#define IDC_BUT_VIEW_LOG                1093
-#define IDC_EDIT1                       1094
-#define IDC_STATISTICS                  1095
-
-#define ID_SERVER						2001
-#define ID_PORT							2002
-#define ID_SERVER_PORT					2003
-#define ID_DB_DROPDOWNLIST				2004
-#define ID_USERNAME						2005
-#define ID_PASSWORD						2006
-#define ID_BUT_TESTCONNECTION			2007
-#define ID_DONE							2008
-#define IDD_OBJECT_SETTINGS				2009
-#define IDC_BUT_LOAD_IMAGE				2010
-#define	IDC_BUT_SAVE_OBJECT				2011
-#define IDC_BUT_DEL_OBJECT				2012
-#define IDC_OBJECT_TITLE				2013
-#define IDC_OBJECT_NAME					2014
-#define IDC_IMAGE_PATH					2015
-#define IDC_LIST						2016
-#define IDC_HEADER						2017
-#define ID_CREATE_CONTACT				2018
-#define ID_MAKE_ATTACHMENT				2019
-#define ID_CREATE_CASE					2020
-#define IDC_BUT_SET_SERVER_PORT			2021
-#define IDD_SERVER_PORT_DIALOG			2022
-#define IDC_CHKBX						2023
-#define IDC_STATIC_GROUP				2024
-#define ID_ATT_METHOD_DROPDOWNLIST		2025
-#define IDC_NAME_LIST					2026
-#define IDD_ABOUT						2027
-#define IDC_ABOUT						2028
-#define IDC_CONTACT_LIST				2029
-#define ID_NAME_TEXT					2030
-#define IDD_NEW_CONTACT_DIALOG			2031
-#define ID_PARTNER_DROPDOWNLIST			2032
-#define ID_NEW_PARTNER_BUTTON			2033
-#define IDD_NEW_PARTNER_DIALOG			2034
-#define ID_SAVE_PARTNER_BUTTON			2035
-#define ID_PARTNER_NAME_TEXT			2036
-#define IDC_NAME_LIST1					2037
-#define IDC_RELOAD						2038
-#define ID_PROTOCOL_GRP					2040
-#define IDR_XML_PROTOCOL				2041
-#define IDR_XMLS_PROTOCOL				2042
-#define IDR_NETRPC_PROTOCOL				2043
-#define IDD_VIEW_PARTNER_DIALOG			2044
-#define IDET_PARTNER_NAME				2045
-#define IDET_PARTNER_CONTACT_NAME   	2046
-#define IDET_PARTNER_EMAIL				2047
-#define IDET_PARTNER_OFFICENO			2048
-#define	IDET_PARTNER_MOBILENO			2050
-#define IDET_SEARCH_PARTNER    			2051
-#define IDPB_SEARCH_PARTNER  			2052
-#define IDET_PARTNER_STREET				2053
-#define	IDET_PARTNER_STREET2			2054
-#define IDET_PARTNER_COUNTRY			2057
-#define IDET_PARTNER_FAX				2058
-#define IDPB_WRITE_CHANGES				2059
-#define ID_ALL_STATE_DROPDOWNLIST		2060
-#define ID_ALL_COUNTRY_DROPDOWNLIST		2061
-#define IDET_PARTNER_STATE				2062
-#define IDET_PARTNER_COUNTRY			2063
-#define IDET_PARTNER					2064
-//
-#define ID_STREET_TEXT					2062
-#define ID_STREET2_TEXT					2063
-#define ID_FED_STATE_DROPLIST			2064
-#define ID_COUNTRY_DROPLIST				2065
-#define ID_FAX_TEXT						2066
-#define ID_PARTNER_CITY_TEXT			2067
-#define ID_ZIP_TEXT						2068
-#define ID_PARTNER_DROPLIST				2069
-#define ID_NEW_PART_BUTTON				2070
-#define IDPB_NEWPARTNER_BUTTON			2071
-#define IDD_SELECT_PARTNER				2073
-#define IDC_LIST_PARTNER				2072
-#define IDPB_SELECT_PARTNER				2075
-#define IDET_PARTNER_SEARCH_NAME		2076
-#define IDPB_PARTNER_SEARCH				2077
-#define IDPB_CREATE_NEW_PARTNER			2078
-#define ID_PARTNER_TEXT					2079
-#define IDET_WED_SERVER					2080
-#define IDET_WEB_PORT					2081
-#define ID_SET_WEB_CONNECTION			2082
-#define IDPB_WEB_CONNECTION				2083
-#define IDD_OPEN_PARTNER_DIALOG			2084
-#define IDET_PARTNER_LINK_TEXT			2085
-#define IDEB_OPENDOC_LINK_TEXT			2086
-#define IDD_OPEN_DOCUEMNT_DIALOG		2087
-#define IDD_WEB_SERVER_PORT_DIALOG		2088
-#define IDET_WEB_SERVER					2089
-#define IDET_WEB_PORT					2090
-#define ID_WEB_OK						2091
-#define IDPB_NEW_PARTNER_BUTTON			2092
-#define IDPB_NEW_PART_BUTTON			2093
-#define	IDD_SELECT_COUNTRY				2094
-#define IDET_COUNTRY_SEARCH_NAME		2095
-#define IDC_LIST_COUNTRY				2096
-#define IDPB_SELECT_COUNTRY				2097
-#define IDPB_SEARCH_COUNTRY				2098
-#define	IDD_SELECT_STATE				2099
-#define IDET_STATE_SEARCH_NAME			2100
-#define IDC_LIST_STATE					2101
-#define IDPB_SELECT_STATE				2102
-#define IDPB_SEARCH_STATE				2103
-#define IDPB_SEARCH_STATE1				2104
-#define IDPB_SEARCH_COUNTRY1			2105
-
-#define IDET_NC_PARTNER_STATE			2106
-#define IDPB_NC_SEARCH_STATE1			2107
-#define IDET_NC_PARTNER_COUNTRY			2108
-#define IDPB_NC_SEARCH_COUNTRY1			2109
-#define ID_DROPDOWNLIST_PROTOCOL		2110
-#define IDCB_WEB_SECURE					2111
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        128
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1096
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
-
-
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
deleted file mode 100644
index e1e8bac21d7..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#C:\Program Files\Openerp Outlook Addin\dialogs\resources\dialogs.py
-#This is a generated file. Please edit C:\Program Files\Openerp Outlook Addin\dialogs\resources\dialogs.rc instead.
-_rc_size_=16350
-_rc_mtime_=1296608638
-class FakeParser:
-	dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Fed. State', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, 'Connection Parameters', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 154, 40), 1344339971], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 343, 32), 1342177287], [130, 'Title:', -1, (5, 16, 30, 17), 1342177280], [129, '', 2013, (22, 14, 57, 12), 1350631552], [130, 'Document Name:', -1, (83, 16, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image:', -1, (200, 16, 22, 17), 1342177280], [129, '', 2015, (223, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (289, 13, 50, 15), 1342242816], [128, 'Add', 2011, (350, 13, 38, 15), 1342242816], [128, 'Delete', 2012, (392, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuration', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 80), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 50, 45, 14), 1342242816], [128, 'OK', 2091, (50, 50, 50, 14), 1342242817], [128, 'SSL (https)', 2111, (20, 35, 100, 14), 1342242819]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 134, 50, 15), 1342177280], [129, '', 2106, (76, 135, 54, 12), 1350568064], [128, 'Search', 2107, (135, 136, 40, 12), 1342242816], [130, 'Country :', -1, (18, 121, 35, 15), 1342177280], [129, '', 2108, (76, 122, 54, 12), 1350568064], [128, 'Search', 2109, (135, 121, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 90), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (45, 3, 100, 12), 1350631552], [130, '  Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (45, 18, 100, 12), 1350631552], [128, '', 2024, (5, 35, 150, 5), 1342177287], [130, 'Protocol Connection :', -1, (5, 45, 80, 17), 1342177280], [133, '', 2110, (75, 43, 75, 50), 1344339971], [128, 'Close', 2, (60, 70, 45, 14), 1342242816], [128, 'OK', 1, (110, 70, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a New Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a New Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
-	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDD_OPEN_PARTNER_DIALOG': 2084, 'IDD_SELECT_STATE': 2099, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'ID_CONTACT_NAME_TEXT': 40005, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'IDET_WED_SERVER': 2080, 'ID_WEB_OK': 2091, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'IDPB_NEW_PARTNER_BUTTON': 2092, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDET_PARTNER_LINK_TEXT': 2085, 'IDC_FOLDER_HAM': 1083, 'IDC_LIST_COUNTRY': 2096, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, 'IDET_STATE_SEARCH_NAME': 2100, 'IDET_WEB_SERVER': 2089, '_APS_NEXT_RESOURCE_VALUE': 128, 'ID_SET_WEB_CONNECTION': 2082, 'ID_DROPDOWNLIST_PROTOCOL': 2110, 'IDC_LIST_STATE': 2101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDPB_WEB_CONNECTION': 2083, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDET_NC_PARTNER_STATE': 2106, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDEB_OPENDOC_LINK_TEXT': 2086, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDCB_WEB_SECURE': 2111, 'IDD_OPEN_DOCUEMNT_DIALOG': 2087, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'IDPB_SEARCH_COUNTRY1': 2105, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDPB_SEARCH_STATE': 2103, 'IDET_COUNTRY_SEARCH_NAME': 2095, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDPB_SEARCH_STATE1': 2104, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'IDD_SELECT_COUNTRY': 2094, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDET_WEB_PORT': 2090, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'IDPB_STATE_SEARCH': 40012, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'ID_SEARCH': 40004, 'IDET_PARTNER_CONTACT_NAME': 2046, 'IDPB_SELECT_STATE': 2102, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'IDPB_NEW_PART_BUTTON': 2093, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'IDPB_SEARCH_COUNTRY': 2098, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'IDD_WEB_SERVER_PORT_DIALOG': 2088, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'IDPB_SELECT_COUNTRY': 2097, 'ID_SEARCH_TEXT': 40003, 'IDET_NC_PARTNER_COUNTRY': 2108, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'IDPB_NC_SEARCH_STATE1': 2107, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012, 'IDPB_NC_SEARCH_COUNTRY1': 2109}
-	names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2076: 'IDET_PARTNER_SEARCH_NAME', 2077: 'IDPB_PARTNER_SEARCH', 2078: 'IDPB_CREATE_NEW_PARTNER', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 2088: 'IDD_WEB_SERVER_PORT_DIALOG', 2089: 'IDET_WEB_SERVER', 2090: 'IDET_WEB_PORT', 2091: 'ID_WEB_OK', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 2100: 'IDET_STATE_SEARCH_NAME', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 2106: 'IDET_NC_PARTNER_STATE', 1083: 'IDC_FOLDER_HAM', 2108: 'IDET_NC_PARTNER_COUNTRY', 2058: 'IDET_PARTNER_FAX', 2110: 'ID_DROPDOWNLIST_PROTOCOL', 2111: 'IDCB_WEB_SECURE', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 40012: 'IDPB_STATE_SEARCH', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'IDET_PARTNER_STATE', 2063: 'IDET_PARTNER_COUNTRY', 2064: 'IDET_PARTNER', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2072: 'IDC_LIST_PARTNER', 2073: 'IDD_SELECT_PARTNER', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 2075: 'IDPB_SELECT_PARTNER', 2079: 'ID_PARTNER_TEXT', 2080: 'IDET_WED_SERVER', 2081: 'IDET_WEB_PORT', 2082: 'ID_SET_WEB_CONNECTION', 2083: 'IDPB_WEB_CONNECTION', 2084: 'IDD_OPEN_PARTNER_DIALOG', 2085: 'IDET_PARTNER_LINK_TEXT', 40004: 'ID_SEARCH', 2086: 'IDEB_OPENDOC_LINK_TEXT', 2087: 'IDD_OPEN_DOCUEMNT_DIALOG', 2046: 'IDET_PARTNER_CONTACT_NAME', 2105: 'IDPB_SEARCH_COUNTRY1', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2092: 'IDPB_NEW_PARTNER_BUTTON', 2093: 'IDPB_NEW_PART_BUTTON', 2094: 'IDD_SELECT_COUNTRY', 2095: 'IDET_COUNTRY_SEARCH_NAME', 2096: 'IDC_LIST_COUNTRY', 2097: 'IDPB_SELECT_COUNTRY', 2098: 'IDPB_SEARCH_COUNTRY', 2099: 'IDD_SELECT_STATE', 2101: 'IDC_LIST_STATE', 2102: 'IDPB_SELECT_STATE', 2103: 'IDPB_SEARCH_STATE', 2104: 'IDPB_SEARCH_STATE1', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2107: 'IDPB_NC_SEARCH_STATE1', 2109: 'IDPB_NC_SEARCH_COUNTRY1', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
-	bitmaps = {'IDB_OPENERPLOGO': 'OpenERP_Logo.bmp'}
-def ParseDialogs(s):
-	return FakeParser()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
deleted file mode 100644
index b402e4b7958..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
+++ /dev/null
@@ -1,339 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "dialogs.h"
-
-IDB_OPENERPLOGO              BITMAP                  "OpenERP_Logo.bmp"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_MANAGER DIALOGEX 0, 0, 460, 260
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME
-CAPTION "OpenERP Configuration"
-FONT 8, "Tahoma", 1000, 0, 0x0
-BEGIN
-    DEFPUSHBUTTON   "Close",ID_DONE,400,239,50,14//,WS_VISIBLE //| WS_TABSTOP
-    CONTROL         "",IDC_TAB,"SysTabControl32",0x0,8,7,440,228
-    CONTROL         "",IDC_LIST,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
-            		 LVS_SHOWSELALWAYS | LVS_REPORT | LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES,0,0,0,0
-END
-
-IDD_GENERAL DIALOGEX 0, 0, 430, 210
-STYLE DS_SETFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
-CAPTION "Connection Parameters"
-FONT 8, "Tahoma", 0, 0, 0x1
-BEGIN
-	GROUPBOX		"Connection Parameters",IDC_STATIC_GROUP, 10, 10,250,130
-    LTEXT           "Server   : ",IDC_STATIC,30,30,100,17
-    EDITTEXT        ID_SERVER_PORT,85,30,120,12,ES_READONLY | WS_VISIBLE | WS_TABSTOP// left top width height
-    PUSHBUTTON      "Change",IDC_BUT_SET_SERVER_PORT,210,30,30,13, WS_VISIBLE | WS_TABSTOP
-    LTEXT           "Database : ",IDC_STATIC,30,50,100,17
-    COMBOBOX        ID_DB_DROPDOWNLIST,85,50,154,40,CBS_DROPDOWNLIST |
-                    WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-
-    LTEXT           "Username : ",IDC_STATIC,30,70,100,17
-    EDITTEXT        ID_USERNAME,85,70,154,12,ES_AUTOHSCROLL | WS_VISIBLE | WS_TABSTOP
-    LTEXT           "Password : ",IDC_STATIC,30,90,100,17
-    EDITTEXT        ID_PASSWORD,85,90,154,12,ES_AUTOHSCROLL | WS_VISIBLE | WS_TABSTOP | ES_PASSWORD
-    PUSHBUTTON      "Connect",ID_BUT_TESTCONNECTION,179,110,60,13, WS_VISIBLE | WS_TABSTOP
-
-	GROUPBOX		"WebServer Parameters",IDC_STATIC_GROUP, 270, 10,150,130
-    LTEXT           "Server : ",IDC_STATIC, 280, 30, 50, 15
-    EDITTEXT        IDET_WED_SERVER,310, 29, 90, 12,ES_AUTOHSCROLL | ES_READONLY
-    PUSHBUTTON      "Change",ID_SET_WEB_CONNECTION, 295, 50, 50, 12 , WS_VISIBLE | WS_TABSTOP
-	PUSHBUTTON      "Connect",IDPB_WEB_CONNECTION, 350, 50, 50, 12 , WS_VISIBLE | WS_TABSTOP
-END
-
-IDD_OBJECT_SETTINGS DIALOGEX 0, 0, 430, 210
-STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Documents Setting"
-FONT 8, "Tahoma", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Document Attributes",IDC_STATIC_GROUP, 2, 2, 343, 32
-
-    LTEXT           "Title:",IDC_STATIC,5,16,30,17
-    EDITTEXT        IDC_OBJECT_TITLE,22,14,57,12,ES_AUTOHSCROLL | WS_TABSTOP// left top width height
-    LTEXT           "Document Name:",IDC_STATIC,83,16,60,17
-    EDITTEXT        IDC_OBJECT_NAME,138,14,57,12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Image:",IDC_STATIC,200,16,22,17
-    EDITTEXT        IDC_IMAGE_PATH,223,14,57,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Load Image",IDC_BUT_LOAD_IMAGE,289,13,50,15,WS_TABSTOP
-    PUSHBUTTON      "Add",IDC_BUT_SAVE_OBJECT,350,13,38,15,WS_TABSTOP
-    PUSHBUTTON      "Delete",IDC_BUT_DEL_OBJECT,392,13,38,15,WS_TABSTOP
-    CONTROL         "List1",IDC_LIST,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
-            		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,535,160
-END
-
-IDD_ABOUT DIALOGEX 0, 0, 430, 210
-STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "About"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    GROUPBOX        "About Plugin",IDC_STATIC,7,3,422,200
-    CONTROL         1062,IDB_OPENERPLOGO,"Static",SS_BITMAP | SS_REALSIZEIMAGE,60,30,20,20
-    LTEXT           "",IDC_ABOUT,80,90,300,100
-END
-
-IDD_SERVER_PORT_DIALOG DIALOGEX 0, 0, 160, 90
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "OpenERP Connection"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    LTEXT           "Server : ",IDC_STATIC,5,3,150,17
-    EDITTEXT        ID_SERVER, 45, 3, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "  Port   : ",IDC_STATIC,5,18,100,17
-    EDITTEXT        ID_PORT, 45, 18, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-
-    GROUPBOX        "", IDC_STATIC_GROUP, 5, 35, 150, 5
-    LTEXT           "Protocol Connection :", IDC_STATIC, 5, 45, 80, 17
-    COMBOBOX        ID_DROPDOWNLIST_PROTOCOL, 75, 43, 75, 50, CBS_DROPDOWNLIST |WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-
-    PUSHBUTTON      "Close",IDCANCEL,60,70,45,14,WS_TABSTOP
-    DEFPUSHBUTTON   "OK",IDOK,110,70,45,14,WS_TABSTOP
-END
-
-IDD_SYNC DIALOGEX 0, 0, 470, 320
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Push to OpenERP"
-FONT 8, "Tahoma", 1000, 0, 0x0
-BEGIN
-	GROUPBOX        "Link to an Existing Documents ", IDC_STATIC_GROUP, 8,5,250,290,WS_TABSTOP
-	LTEXT           "Search : ",IDC_STATIC,15,17,40,12
-	EDITTEXT        ID_SEARCH_TEXT,60,15,120,12,ES_AUTOHSCROLL | WS_TABSTOP// left top width height
-    PUSHBUTTON   	"Search",ID_SEARCH,187,15,40,14,WS_TABSTOP
-	LTEXT           "Documents : ",IDC_STATIC,15,140,100,14
-    CONTROL         "List1",IDC_NAME_LIST,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | LVS_SHOWSELALWAYS | LVS_REPORT | WS_TABSTOP, 15,150,234,110
-    PUSHBUTTON      "Push",ID_MAKE_ATTACHMENT,160,270,85,14,WS_TABSTOP
-
-	GROUPBOX        " Create a New Document ", IDC_STATIC_GROUP, 263,5,202,100,WS_TABSTOP
-	LTEXT           "Type of Document : ",IDC_STATIC,266,25,100,12
-    COMBOBOX        ID_ATT_METHOD_DROPDOWNLIST,332,24,75,45,CBS_DROPDOWNLIST |
-                    WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Create",ID_CREATE_CASE,412,23,50,14,WS_TABSTOP
-
-	GROUPBOX        " Create a New Contact ", IDC_STATIC_GROUP, 263, 110,202,185,WS_TABSTOP
-	LTEXT           "Create a New Contact : ",IDC_STATIC,280,140,100,12
-    PUSHBUTTON   	"Create Contact",ID_CREATE_CONTACT,360,138,60,14,WS_TABSTOP
-    PUSHBUTTON      "Close",IDCANCEL,385,300,60,14,WS_TABSTOP
-END
-
-IDD_NEW_CONTACT_DIALOG DIALOGEX 0, 0, 350, 180
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Create a New Contact"
-FONT 8, "Tahoma", 1000, 0, 0x0
-BEGIN
-
-	LTEXT           "Select Partner : ",IDC_STATIC,13,20,50,17
-	EDITTEXT        ID_PARTNER_TEXT, 70, 18, 150, 12 , ES_AUTOHSCROLL |ES_READONLY
-	PUSHBUTTON   	"Search Partner",ID_NEW_PARTNER_BUTTON,225,17,60,14, WS_TABSTOP
-	PUSHBUTTON   	"New Partner",IDPB_NEW_PARTNER_BUTTON,290, 17, 50, 14, WS_TABSTOP
-
-    GROUPBOX		"Postal Address ", IDC_STATIC_GROUP,10,35,175,123
-	LTEXT           "Contact Name : ",IDC_STATIC, 18, 53, 100, 17
-	EDITTEXT        ID_CONTACT_NAME_TEXT, 76, 52, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT           "Street : ",IDC_STATIC, 18, 67, 40, 17
-	EDITTEXT        ID_STREET_TEXT, 76, 66, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT           "Street2 : ",IDC_STATIC, 18, 81, 40, 17
-	EDITTEXT        ID_STREET2_TEXT, 76, 80, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Zip : ",IDC_STATIC, 18, 94, 50, 17
-    EDITTEXT		ID_ZIP_TEXT,76, 93, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "City : ",IDC_STATIC, 18,106, 50, 17
-    EDITTEXT		ID_PARTNER_CITY_TEXT,76,107,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-
-
-    LTEXT           "Fed. State : ",IDC_STATIC,18, 134, 50, 15
-    EDITTEXT		IDET_NC_PARTNER_STATE, 76, 135, 54, 12,ES_AUTOHSCROLL |ES_READONLY
-    PUSHBUTTON 		"Search", IDPB_NC_SEARCH_STATE1 ,135, 136, 40, 12, WS_TABSTOP
-
-	LTEXT           "Country :",IDC_STATIC, 18,121,35,15
-    EDITTEXT		IDET_NC_PARTNER_COUNTRY, 76, 122, 54, 12,ES_AUTOHSCROLL |ES_READONLY
-	PUSHBUTTON 		"Search", IDPB_NC_SEARCH_COUNTRY1, 135, 121, 40, 12, WS_TABSTOP
-
-
-    GROUPBOX		"Communication ", IDC_STATIC_GROUP, 188, 35, 150, 123
-	LTEXT           "Office : ",IDC_STATIC,194, 53, 30, 17
-	EDITTEXT        ID_CONTACT_OFFICE_TEXT, 224, 52, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT           "Mobile : ",IDC_STATIC,194, 67, 30, 17
-	EDITTEXT        ID_CONTACT_MOBILE_TEXT, 224, 66, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT           "Fax : ",IDC_STATIC,194, 81, 30, 17
-	EDITTEXT        ID_FAX_TEXT, 224, 80, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT           "Email  : ",IDC_STATIC, 194, 95, 30, 17
-	EDITTEXT        ID_CONTACT_EMAIL_TEXT, 224, 94, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
-
-	PUSHBUTTON   	"Cancel",IDCANCEL,290,162,45,13, WS_TABSTOP
-	PUSHBUTTON   	"Save",ID_CONTACT_SAVE_BUTTON,240,162,45,13, WS_TABSTOP
-END
-
-IDD_NEW_PARTNER_DIALOG DIALOGEX 0, 0, 140,40
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Create a New Partner"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    LTEXT           "Name : ",IDC_STATIC,5,3,100,17
-    EDITTEXT        ID_PARTNER_NAME_TEXT,40,3,94,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Cancel",IDCANCEL,90,22,45,14,WS_TABSTOP
-    DEFPUSHBUTTON   "Save",ID_SAVE_PARTNER_BUTTON,40,22,45,14,WS_TABSTOP
-END
-
-IDD_VIEW_PARTNER_DIALOG DIALOGEX 0, 0, 350, 215
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Open Contact"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-	LTEXT           "Email ID : ",IDC_STATIC,32,17,40,12
-	EDITTEXT        IDET_SEARCH_PARTNER, 70, 15, 200, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON   	"Search Contact ",IDPB_SEARCH_PARTNER,280,15,60,14,WS_TABSTOP
-
-    LTEXT           "Partner Name : ",IDC_STATIC,13,42,50,17
-	EDITTEXT		IDET_PARTNER,70, 42, 150, 12,ES_AUTOHSCROLL |ES_READONLY
-	PUSHBUTTON   	"Search Partner",ID_NEW_PART_BUTTON,225,41,60,14, WS_TABSTOP
-	PUSHBUTTON   	"New Partner",IDPB_NEW_PART_BUTTON,290,41,50,14, WS_TABSTOP
-
-    GROUPBOX		"Postal Address ", IDC_STATIC_GROUP,10,65,175,125
-    LTEXT           "Contact Name : ",IDC_STATIC,18,83,50,17
-    EDITTEXT		IDET_PARTNER_CONTACT_NAME,76,82,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Street : ",IDC_STATIC,18,97,50,17
-    EDITTEXT		IDET_PARTNER_STREET,76,96,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Street2 : ",IDC_STATIC,18,112,50,17
-    EDITTEXT		IDET_PARTNER_STREET2, 76, 111, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT			"Zip : ",IDC_STATIC, 18, 126, 50,14
-	EDITTEXT		IDET_ZIP, 76, 125, 100, 12 , ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "City : ",IDC_STATIC,18,140,50,17
-    EDITTEXT		IDET_PARTNER_CITY,76,139,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-
-    LTEXT           "Fed. State : ",IDC_STATIC,18,154,50,17
-    EDITTEXT		IDET_PARTNER_STATE, 76, 153, 54, 12,ES_AUTOHSCROLL |ES_READONLY
-    PUSHBUTTON 		"Search", IDPB_SEARCH_STATE1 ,135, 153, 40, 12, WS_TABSTOP
-
-	LTEXT           "Country :",IDC_STATIC, 18, 169, 35, 17
-    EDITTEXT		IDET_PARTNER_COUNTRY, 76, 168, 54, 12,ES_AUTOHSCROLL |ES_READONLY
-	PUSHBUTTON 		"Search", IDPB_SEARCH_COUNTRY1, 135, 168, 40, 12, WS_TABSTOP
-
-    GROUPBOX		"Communication ", IDC_STATIC_GROUP, 188, 65, 152, 125
-    LTEXT           "Phone : ",IDC_STATIC, 194, 83, 30, 17
-    EDITTEXT		IDET_PARTNER_OFFICENO, 224, 82, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Mobile : ",IDC_STATIC, 194, 97, 30, 17
-    EDITTEXT		IDET_PARTNER_MOBILENO, 224, 96, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Email : ",IDC_STATIC, 194, 111, 30, 17
-	EDITTEXT		IDET_PARTNER_FAX, 224, 110, 100, 12, ES_AUTOHSCROLL |ES_READONLY
-    LTEXT           "Fax : ",IDC_STATIC,194,125,30,17
-	EDITTEXT		IDET_PARTNER_EMAIL, 224, 124, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-
-	PUSHBUTTON		"Create a New Contact", IDPB_NEWPARTNER_BUTTON, 124, 195, 82, 14, WS_TABSTOP
-	PUSHBUTTON 		"Save", IDPB_WRITE_CHANGES, 213, 195, 60, 14, WS_TABSTOP
-    PUSHBUTTON      "Cancel", IDCANCEL, 281, 195, 60, 14, WS_TABSTOP
-END
-
-IDD_SELECT_PARTNER DIALOGEX 0, 0, 220, 250
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Search Partner"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-
-    LTEXT           "Enter Name : ",IDC_STATIC,8,12,80,17
-    EDITTEXT		IDET_PARTNER_SEARCH_NAME, 55, 10, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON 		"Search", IDPB_PARTNER_SEARCH, 160, 10, 50, 14, WS_TABSTOP
-
-    CONTROL         "List1",IDC_LIST_PARTNER,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
-            		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
-	PUSHBUTTON 		"Create New Partner", IDPB_CREATE_NEW_PARTNER, 10, 230, 100, 14, WS_TABSTOP
-	PUSHBUTTON 		"Select", IDPB_SELECT_PARTNER, 170, 230, 40, 14, WS_TABSTOP
-END
-
-IDD_OPEN_PARTNER_DIALOG DIALOGEX 0, 0, 200,65
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Open Partner"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    LTEXT           "Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ",IDC_STATIC,5,3,190,25
-    EDITTEXT        IDET_PARTNER_LINK_TEXT,5,31,190,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Ok",IDCANCEL,150,45,45,13,WS_TABSTOP
-
-END
-
-IDD_OPEN_DOCUEMNT_DIALOG DIALOGEX 0, 0, 200,65
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Open Document"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    LTEXT           "Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ",IDC_STATIC,5,3,190,25
-    EDITTEXT        IDEB_OPENDOC_LINK_TEXT,5,31,190,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Ok",IDCANCEL,150,45,45,14,WS_TABSTOP
-END
-
-IDD_WEB_SERVER_PORT_DIALOG DIALOGEX 0, 0, 160, 80
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "OpenERP Connection"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-    LTEXT           "Server : ",IDC_STATIC,5,3,150,17
-    EDITTEXT        IDET_WEB_SERVER,40,3,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Port   : ",IDC_STATIC,5,18,100,17
-    EDITTEXT        IDET_WEB_PORT,40,18,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Close",IDCANCEL,110,50,45,14,WS_TABSTOP
-    DEFPUSHBUTTON   "OK",ID_WEB_OK,50,50,50,14,WS_TABSTOP
-    PUSHBUTTON      "SSL (https)",IDCB_WEB_SECURE,20,35,100,14,BS_AUTOCHECKBOX | BST_CHECKED |WS_TABSTOP
-END
-
-IDD_SELECT_COUNTRY DIALOGEX 0, 0, 220, 250
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Search Country"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-
-    LTEXT           "Enter Name : ",IDC_STATIC,8,12,80,17
-    EDITTEXT		IDET_COUNTRY_SEARCH_NAME, 55, 10, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON 		"Search", IDPB_SEARCH_COUNTRY, 160, 10, 50, 14, WS_TABSTOP
-    CONTROL         "List1",IDC_LIST_COUNTRY,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
-            		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
-	PUSHBUTTON 		"Select", IDPB_SELECT_COUNTRY, 170, 230, 40, 14, WS_TABSTOP
-END
-
-IDD_SELECT_STATE DIALOGEX 0, 0, 220, 250
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Search Fed. State"
-FONT 8, "Tahoma", 400, 0, 0x0
-BEGIN
-
-    LTEXT           "Enter Name : ",IDC_STATIC,8,12,80,17
-    EDITTEXT		IDET_STATE_SEARCH_NAME, 55, 10, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON 		"Search", IDPB_STATE_SEARCH, 160, 10, 50, 14, WS_TABSTOP
-
-    CONTROL         "List1",IDC_LIST_STATE,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
-            		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
-	PUSHBUTTON 		"Select", IDPB_SELECT_STATE, 170, 230, 40, 14, WS_TABSTOP
-END
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png
deleted file mode 100644
index 1b7461953a1..00000000000
Binary files a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png and /dev/null differ
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp
deleted file mode 100644
index 4e40d9e989a..00000000000
Binary files a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp and /dev/null differ
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py
deleted file mode 100644
index 68d62fc7060..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# rc2py.py
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-__author__="Adam Walker"
-__doc__=""""
-Converts an .rc windows resource source file into a python source file
-with the same basic public interface as the rcparser module.
-"""
-import sys, os, stat
-import rcparser
-
-def convert(inputFilename = None, outputFilename = None):
-    """See the module doc string"""
-    if inputFilename is None:
-        inputFilename = "dialogs.rc"
-    if outputFilename is None:
-        outputFilename = "test.py"
-    rcp = rcparser.ParseDialogs(inputFilename)
-    in_stat = os.stat(inputFilename)
-
-    out = open(outputFilename, "wt")
-    out.write("#%s\n" % outputFilename)
-    out.write("#This is a generated file. Please edit %s instead.\n" % inputFilename)
-    out.write("_rc_size_=%d\n_rc_mtime_=%d\n" % (in_stat[stat.ST_SIZE], in_stat[stat.ST_MTIME]))
-    out.write("class FakeParser:\n")
-    out.write("\tdialogs = "+repr(rcp.dialogs)+"\n")
-    out.write("\tids = "+repr(rcp.ids)+"\n")
-    out.write("\tnames = "+repr(rcp.names)+"\n")
-    out.write("\tbitmaps = "+repr(rcp.bitmaps)+"\n")
-    out.write("def ParseDialogs(s):\n")
-    out.write("\treturn FakeParser()\n")
-    out.close()
-
-if __name__=="__main__":
-    if len(sys.argv)>1:
-        convert(sys.argv[1], sys.argv[2])
-    else:
-        convert()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py
deleted file mode 100644
index ed20f80e3d4..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py
+++ /dev/null
@@ -1,379 +0,0 @@
-# Windows dialog .RC file parser, by Adam Walker.
-
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-__author__="Adam Walker"
-
-import sys, os, shlex
-import win32con
-#import win32gui
-import commctrl
-
-_controlMap = {"DEFPUSHBUTTON":0x80,
-               "PUSHBUTTON":0x80,
-               "Button":0x80,
-               "GROUPBOX":0x80,
-               "Static":0x82,
-               "CTEXT":0x82,
-               "RTEXT":0x82,
-               "LTEXT":0x82,
-               "LISTBOX":0x83,
-               "SCROLLBAR":0x84,
-               "COMBOBOX":0x85,
-               "EDITTEXT":0x81,
-               }
-
-_addDefaults = {"EDITTEXT":win32con.WS_BORDER,
-                "GROUPBOX":win32con.BS_GROUPBOX,
-                "LTEXT":win32con.SS_LEFT,
-                "DEFPUSHBUTTON":win32con.BS_DEFPUSHBUTTON,
-                "CTEXT":win32con.SS_CENTER,
-                "RTEXT":win32con.SS_RIGHT}
-
-defaultControlStyle = win32con.WS_CHILD | win32con.WS_VISIBLE
-class DialogDef:
-    name = ""
-    id = 0
-    style = 0
-    styleEx = None
-    caption = ""
-    font = "MS Sans Serif"
-    fontSize = 8
-    x = 0
-    y = 0
-    w = 0
-    h = 0
-    template = None
-    def __init__(self, n, i):
-        self.name = n
-        self.id = i
-        self.styles = []
-        self.stylesEx = []
-        self.controls = []
-        #print "dialog def for ",self.name, self.id
-    def createDialogTemplate(self):
-        t = None
-        self.template = [[self.caption, (self.x,self.y,self.w,self.h), self.style, self.styleEx, (self.fontSize, self.font)]]
-        # Add the controls
-        for control in self.controls:
-            self.template.append(control.createDialogTemplate())
-        return self.template
-
-class ControlDef:
-    id = ""
-    controlType = ""
-    subType = ""
-    idNum = 0
-    style = defaultControlStyle
-    label = ""
-    x = 0
-    y = 0
-    w = 0
-    h = 0
-    def __init__(self):
-        self.styles = []
-    def toString(self):
-        s = "<Control id:"+self.id+" controlType:"+self.controlType+" subType:"+self.subType\
-            +" idNum:"+str(self.idNum)+" style:"+str(self.style)+" styles:"+str(self.styles)+" label:"+self.label\
-            +" x:"+str(self.x)+" y:"+str(self.y)+" w:"+str(self.w)+" h:"+str(self.h)+">"
-        return s
-    def createDialogTemplate(self):
-        ct = self.controlType
-        if "CONTROL"==ct:
-            ct = self.subType
-        if ct in _addDefaults:
-            self.style |= _addDefaults[ct]
-        if ct in _controlMap:
-            ct = _controlMap[ct]
-        t = [ct, self.label, self.idNum, (self.x, self.y, self.w, self.h), self.style]
-        #print t
-        return t
-
-
-class RCParser:
-    next_id = 1001
-    dialogs = {}
-    _dialogs = {}
-    debugEnabled = False;
-    token = ""
-
-    def __init__(self):
-        self.ids = {"IDOK":1, "IDCANCEL":2, "IDC_STATIC": -1}
-        self.names = {1:"IDOK", 2:"IDCANCEL", -1:"IDC_STATIC"}
-        self.bitmaps = {}
-
-    def debug(self, *args):
-        if self.debugEnabled:
-            print args
-
-    def getToken(self):
-        self.token = self.lex.get_token()
-        self.debug("getToken returns:", self.token)
-        if self.token=="":
-            self.token = None
-        return self.token
-
-    def getCommaToken(self):
-        tok = self.getToken()
-        assert tok == ",", "Token '%s' should be a comma!" % tok
-
-    def loadDialogs(self, rcFileName):
-        """
-        RCParser.loadDialogs(rcFileName) -> None
-        Load the dialog information into the parser. Dialog Definations can then be accessed
-        using the "dialogs" dictionary member (name->DialogDef). The "ids" member contains the dictionary of id->name.
-        The "names" member contains the dictionary of name->id
-        """
-        hFileName = rcFileName[:-2]+"h"
-        try:
-            h = open(hFileName, "rU")
-            self.parseH(h)
-            h.close()
-        except OSError:
-            print "No .h file. ignoring."
-        f = open(rcFileName)
-        self.open(f)
-        self.getToken()
-        while self.token!=None:
-            self.parse()
-            self.getToken()
-        f.close()
-    def open(self, file):
-        self.lex = shlex.shlex(file)
-        self.lex.commenters = "//#"
-
-    def parseH(self, file):
-        lex = shlex.shlex(file)
-        lex.commenters = "//"
-        token = " "
-        while token is not None:
-            token = lex.get_token()
-            if token == "" or token is None:
-                token = None
-            else:
-                if token=='define':
-                    n = lex.get_token()
-                    i = int(lex.get_token())
-                    self.ids[n] = i
-                    if self.names.has_key(i):
-                        # ignore AppStudio special ones.
-                        if not n.startswith("_APS_"):
-                            print "Duplicate id",i,"for",n,"is", self.names[i]
-                    else:
-                        self.names[i] = n
-                    if self.next_id<=i:
-                        self.next_id = i+1
-
-    def parse(self):
-        deep = 0
-        if self.token == None:
-            more == None
-        elif "BEGIN" == self.token:
-            deep = 1
-            while deep!=0:
-                self.getToken()
-                if "BEGIN" == self.token:
-                    deep += 1
-                elif "END" == self.token:
-                    deep -= 1
-        elif "IDD_" == self.token[:4]:
-            possibleDlgName = self.token
-            #print "possible dialog:", possibleDlgName
-            self.getToken()
-            if "DIALOG" == self.token or "DIALOGEX" == self.token:
-                self.dialog(possibleDlgName)
-        elif "IDB_" == self.token[:4]:
-            possibleBitmap = self.token
-            self.getToken()
-            if "BITMAP" == self.token:
-                self.getToken()
-                if self.token=="MOVEABLE":
-                    self.getToken() # PURE
-                    self.getToken() # bmpname
-                bmf = self.token[1:-1] # quotes
-                self.bitmaps[possibleBitmap] = bmf
-                print "BITMAP", possibleBitmap, bmf
-                #print win32gui.LoadImage(0, bmf, win32con.IMAGE_BITMAP,0,0,win32con.LR_DEFAULTCOLOR|win32con.LR_LOADFROMFILE)
-
-    def addId(self, id_name):
-        if id_name in self.ids:
-            id = self.ids[id_name]
-        else:
-            id = self.next_id
-            self.next_id += 1
-            self.ids[id_name] = id
-            self.names[id] = id_name
-        return id
-
-    def lang(self):
-        while self.token[0:4]=="LANG" or self.token[0:7]=="SUBLANG" or self.token==',':
-            self.getToken();
-
-    def dialog(self, name):
-        dlg = DialogDef(name,self.addId(name))
-        assert len(dlg.controls)==0
-        self._dialogs[name] = dlg
-        extras = []
-        self.getToken()
-        while not self.token.isdigit():
-            self.debug("extra", self.token)
-            extras.append(self.token)
-            self.getToken()
-        dlg.x = int(self.token)
-        self.getCommaToken()
-        self.getToken() # number
-        dlg.y = int(self.token)
-        self.getCommaToken()
-        self.getToken() # number
-        dlg.w = int(self.token)
-        self.getCommaToken()
-        self.getToken() # number
-        dlg.h = int(self.token)
-        self.getToken()
-        while not (self.token==None or self.token=="" or self.token=="END"):
-            if self.token=="STYLE":
-                self.dialogStyle(dlg)
-            elif self.token=="EXSTYLE":
-                self.dialogExStyle(dlg)
-            elif self.token=="CAPTION":
-                self.dialogCaption(dlg)
-            elif self.token=="FONT":
-                self.dialogFont(dlg)
-            elif self.token=="BEGIN":
-                self.controls(dlg)
-            else:
-                break
-        self.dialogs[name] = dlg.createDialogTemplate()
-
-    def dialogStyle(self, dlg):
-        dlg.style, dlg.styles = self.styles( [], win32con.WS_VISIBLE | win32con.DS_SETFONT)
-    def dialogExStyle(self, dlg):
-        self.getToken()
-        dlg.styleEx, dlg.stylesEx = self.styles( [], 0)
-
-    def styles(self, defaults, defaultStyle):
-        list = defaults
-        style = defaultStyle
-
-        if "STYLE"==self.token:
-            self.getToken()
-        i = 0
-        Not = False
-        while ((i%2==1 and ("|"==self.token or "NOT"==self.token)) or (i%2==0)) and not self.token==None:
-            Not = False;
-            if "NOT"==self.token:
-                Not = True
-                self.getToken()
-            i += 1
-            if self.token!="|":
-                if self.token in win32con.__dict__:
-                    value = getattr(win32con,self.token)
-                else:
-                    if self.token in commctrl.__dict__:
-                        value = getattr(commctrl,self.token)
-                    else:
-                        value = 0
-                if Not:
-                    list.append("NOT "+self.token)
-                    self.debug("styles add Not",self.token, value)
-                    style &= ~value
-                else:
-                    list.append(self.token)
-                    self.debug("styles add", self.token, value)
-                    style |= value
-            self.getToken()
-        self.debug("style is ",style)
-
-        return style, list
-
-    def dialogCaption(self, dlg):
-        if "CAPTION"==self.token:
-            self.getToken()
-        self.token = self.token[1:-1]
-        self.debug("Caption is:",self.token)
-        dlg.caption = self.token
-        self.getToken()
-    def dialogFont(self, dlg):
-        if "FONT"==self.token:
-            self.getToken()
-        dlg.fontSize = int(self.token)
-        self.getCommaToken()
-        self.getToken() # Font name
-        dlg.font = self.token[1:-1] # it's quoted
-        self.getToken()
-        while "BEGIN"!=self.token:
-            self.getToken()
-    def controls(self, dlg):
-        if self.token=="BEGIN": self.getToken()
-        while self.token!="END":
-            control = ControlDef()
-            control.controlType = self.token;
-            #print self.token
-            self.getToken()
-            if self.token[0:1]=='"':
-                control.label = self.token[1:-1]
-                self.getCommaToken()
-                self.getToken()
-            elif self.token.isdigit():
-                control.label = self.token
-                self.getCommaToken()
-                self.getToken()
-            # msvc seems to occasionally replace "IDC_STATIC" with -1
-            if self.token=='-':
-                if self.getToken() != '1':
-                    raise RuntimeError, \
-                          "Negative literal in rc script (other than -1) - don't know what to do"
-                self.token = "IDC_STATIC"
-            control.id = self.token
-            control.idNum = self.addId(control.id)
-            self.getCommaToken()
-            if control.controlType == "CONTROL":
-                self.getToken()
-                control.subType = self.token[1:-1]
-                # Styles
-                self.getCommaToken()
-                self.getToken()
-                control.style, control.styles = self.styles([], defaultControlStyle)
-                #self.getToken() #,
-            # Rect
-            control.x = int(self.getToken())
-            self.getCommaToken()
-            control.y = int(self.getToken())
-            self.getCommaToken()
-            control.w = int(self.getToken())
-            self.getCommaToken()
-            self.getToken()
-            control.h = int(self.token)
-            self.getToken()
-            if self.token==",":
-                self.getToken()
-                control.style, control.styles = self.styles([], defaultControlStyle)
-            #print control.toString()
-            dlg.controls.append(control)
-def ParseDialogs(rc_file):
-    rcp = RCParser()
-    try:
-        rcp.loadDialogs(rc_file)
-    except:
-        lex = getattr(rcp, "lex", None)
-        if lex:
-            print "ERROR parsing dialogs at line", lex.lineno
-            print "Next 10 tokens are:"
-            for i in range(10):
-                print lex.get_token(),
-            print
-        raise
-
-    return rcp
-
-if __name__=='__main__':
-    rc_file = os.path.join(os.path.dirname(__file__), "dialogs.rc")
-    d = ParseDialogs(rc_file)
-    import pprint
-    for id, ddef in d.dialogs.items():
-        print "Dialog %s (%d controls)" % (id, len(ddef))
-        pprint.pprint(ddef)
-        print
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/eml.py b/addons/outlook/plugin/openerp-outlook-plugin/eml.py
deleted file mode 100644
index 47e66689c71..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/eml.py
+++ /dev/null
@@ -1,95 +0,0 @@
-##############################################################################
-#
-#    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/>.
-#
-##############################################################################
-
- #!/usr/bin/python
- #-*- encoding: utf-8 -*-
-
-import sys
-import chilkat
-import os
-from manager import ustr
-import email
-cemail = chilkat.CkEmail()
-dt = chilkat.SYSTEMTIME()
-def generateEML(mail):
-    sub = (mail.Subject).replace(' ','')
-    body = mail.Body.encode("utf-8")
-    recipients = mail.Recipients
-    sender_email = mail.SenderEmailAddress
-    attachments=mail.Attachments
-
-    cemail = chilkat.CkEmail()
-    cemail.put_Subject (ustr(sub).encode('iso-8859-1'))
-    cemail.put_Body (ustr(body).encode('utf-8'))
-    cemail.put_FromAddress (ustr(sender_email).encode('iso-8859-1'))
-    cemail.put_From (ustr(sender_email).encode('iso-8859-1'))
-
-    for i in xrange(1, recipients.Count+1):
-        name = ustr(recipients.Item(i).Name).encode('iso-8859-1')
-        address = ustr(recipients.Item(i).Address).encode('iso-8859-1')
-        cemail.AddTo(name,address)
-
-    eml_name= ustr(sub).encode('iso-8859-1')+'-'+str(mail.EntryID)[-9:]
-    ls = ['*', '/', '\\', '<', '>', ':', '?', '"', '|', '\t', '\n']
-    mails_folder_path = os.path.abspath("%temp%\\dialogs\\resources\\mails\\")
-    attachments_folder_path = mails_folder_path + "\\attachments\\"
-    if not os.path.exists(attachments_folder_path):
-        os.makedirs(attachments_folder_path)
-    for i in xrange(1, attachments.Count+1):
-        fn = eml_name + '-' + ustr(attachments[i].FileName).encode('iso-8859-1')
-        for c in ls:
-            fn = fn.replace(c,'')
-        if len(fn) > 64:
-            l = 64 - len(fn)
-            f = fn.split('-')
-            fn = '-'.join(f[1:])
-            if len(fn) > 64:
-                l = 64 - len(fn)
-                f = fn.split('.')
-                fn = f[0][0:l] + '.' + f[-1]
-        att_file = os.path.join(attachments_folder_path, fn)
-        if os.path.exists(att_file):
-            os.remove(att_file)
-        attachments[i].SaveAsFile(att_file)
-        contentType = cemail.addFileAttachment(att_file)
-        if (contentType == None ):
-            print mail.lastErrorText()
-            sys.exit()
-
-
-    if not os.path.exists(mails_folder_path):
-        os.makedirs(mails_folder_path)
-    for c in ls:
-        eml_name = eml_name.replace(c,'')
-    if len(eml_name) > 64:
-       l = 64 - len(eml_name)
-       f = eml_name.split('-')
-       eml_name = f[0][0:l] + '.' + f[-1]
-    eml_path = ustr(os.path.join(mails_folder_path,eml_name+".eml")).encode('iso-8859-1')
-    success = cemail.SaveEml(eml_path)
-    fp = open(eml_path, 'rb')
-    new_mail = email.message_from_file(fp)
-    fp.close()
-    if (success == False):
-        print cemail.lastErrorText()
-        sys.exit()
-    return new_mail, eml_path
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/manager.py b/addons/outlook/plugin/openerp-outlook-plugin/manager.py
deleted file mode 100644
index 643a5c40e58..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/manager.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# This module is part of the spambayes project, which is Copyright 2003
-# The Python Software Foundation and is covered by the Python Software
-# Foundation license.
-
-# -*- 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 os
-import sys
-import win32api, win32con
-import win32com.client
-import pythoncom
-
-try:
-    True, False
-except NameError:
-    # Maintain compatibility with Python 2.2
-    True, False = 1, 0
-
-try:
-    filesystem_encoding = sys.getfilesystemencoding()
-except AttributeError:
-    filesystem_encoding = "mbcs"
-
-# Work out our "application directory", which is
-# the directory of our main .py/.dll/.exe file we
-# are running from.
-if hasattr(sys, "frozen"):
-    assert sys.frozen == "dll", "outlook only supports inproc servers"
-    this_filename = win32api.GetModuleFileName(sys.frozendllhandle)
-else:
-    try:
-        this_filename = os.path.abspath(__file__)
-    except NameError: # no __file__ - means Py2.2 and __name__=='__main__'
-        this_filename = os.path.abspath(sys.argv[0])
-# See if we can use the new bsddb module. (The old one is unreliable
-# on Windows, so we don't use that)
-try:
-    import bsddb3 as bsddb
-    # bsddb3 is definitely not broken
-    use_db = True
-except ImportError:
-    # Not using the 3rd party bsddb3, so try the one in the std library
-    try:
-        import bsddb
-        use_db = hasattr(bsddb, "db") # This name is not in the old one.
-    except ImportError:
-        # No DB library at all!
-        assert not hasattr(sys, "frozen"), \
-               "Don't build binary versions without bsddb!"
-        use_db = False
-
-def ustr(value):
-    """This method is similar to the builtin `str` method, except
-    it will return Unicode string.
-
-    @param value: the value to convert
-
-    @rtype: unicode
-    @return: unicode string
-    """
-    if isinstance(value, unicode):
-        return value
-
-    if hasattr(value, '__unicode__'):
-        return unicode(value)
-    if not isinstance(value, str):
-        value = str(value)
-    try: # first try utf-8
-        return unicode(value, 'utf-8')
-    except:
-        pass
-
-    try: # then extened iso-8858
-        return unicode(value, 'iso-8859-15')
-    except:
-        pass
-    filesystem_encoding = sys.getfilesystemencoding()
-    d = unicode(value, filesystem_encoding)
-    return d
-
-class OpenERPManager:
-    def __init__(self, config_base="default", outlook=None, verbose=0):
-        self.outlook = outlook
-        self.dialog_parser = None
-        self.application_directory = os.path.dirname(this_filename)
-        self.windows_data_directory = self.LocateDataDirectory()
-        self.data_directory = self.windows_data_directory
-        self.default_objects = [('Partners','res.partner',''),('Account Invoices','account.invoice',''), \
-                                ('Products', 'product.product',''),('Sale Orders','sale.order',''), \
-                               ('Leads','crm.lead','')]
-
-        self.config=self.LoadConfig()
-
-    def WorkerThreadStarting(self):
-        pythoncom.CoInitialize()
-
-    def WorkerThreadEnding(self):
-        pythoncom.CoUninitialize()
-
-    def LocateDataDirectory(self):
-        # Locate the best directory for our data files.
-        from win32com.shell import shell, shellcon
-        try:
-            appdata = shell.SHGetFolderPath(0,shellcon.CSIDL_APPDATA,0,0)
-            path = os.path.join(appdata, "OpenERP-Plugin")
-            if not os.path.isdir(path):
-                os.makedirs(path)
-            return path
-        except pythoncom.com_error:
-            # Function doesn't exist on early win95,
-            # and it may just fail anyway!
-            return self.application_directory
-        except EnvironmentError:
-            # Can't make the directory.
-            return self.application_directory
-
-    def ShowManager(self, id="IDD_MANAGER"):
-        import dialogs
-        dialogs.ShowDialog(0, self, self.config, id)
-
-    def LoadConfig(self):
-        import win32ui
-        path = os.path.join(self.data_directory, 'tiny.ini')
-        data = {'server' : 'localhost', 'port' : '8069', 'protocol' : 'http://', 'database' : '', 'objects' : self.default_objects, 'uname':'admin', 'pwd':'a', 'login':False,'webserver':'localhost','webport':'8080', 'webprotocol' : 'http:\\'}
-        if os.path.exists(path):
-            fp = open(path, 'r')
-            data = fp.readlines()
-            try:
-                data = eval(data[0])
-                return data
-            except e:
-                return data
-        else:
-            return data
-
-    def SaveConfig(self):
-        path = os.path.join(self.data_directory, 'tiny.ini')
-        fp = open(path, 'w')
-        fp.write(str(self.config))
-        fp.close()
-_mgr = None
-
-def GetManager(outlook = None):
-    global _mgr
-    if _mgr is None:
-        if outlook is None:
-            outlook = win32com.client.Dispatch("Outlook.Application")
-        _mgr = OpenERPManager(outlook=outlook)
-    return _mgr
-
-def ShowManager(mgr):
-    mgr.c()
-
-def main(verbose_level = 1):
-    mgr = GetManager()
-    ShowManager(mgr)
-    return 0
-
-def usage():
-    print "Usage: manager [-v ...]"
-    sys.exit(1)
-
-if __name__=='__main__':
-    verbose = 1
-    import getopt
-    opts, args = getopt.getopt(sys.argv[1:], "v")
-    if args:
-        usage()
-    for opt, val in opts:
-        if opt=="-v":
-            verbose += 1
-        else:
-            usage()
-    sys.exit(main(verbose))
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/setup.iss b/addons/outlook/plugin/openerp-outlook-plugin/setup.iss
deleted file mode 100644
index d19cc66f556..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/setup.iss
+++ /dev/null
@@ -1,105 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{AF02E62E-3A5A-4E86-B4CF-03F2B2AC25BF}
-AppName=Openerp Outlook Addin
-AppVersion=1.0
-AppVerName=Openerp Outlook Addin 1.0
-AppPublisher=Openerp SA
-AppPublisherURL=http://www.openerp.com/
-AppSupportURL=http://www.openerp.com/
-AppUpdatesURL=http://www.openerp.com/
-DefaultDirName={pf}\Openerp Outlook Addin
-DefaultGroupName=Openerp Outlook Addin
-DisableProgramGroupPage=true
-OutputBaseFilename=openerp-outlook-addin
-Compression=lzma
-SolidCompression=true
-UserInfoPage=true
-UninstallDisplayIcon={app}\*
-VersionInfoVersion=1.0
-VersionInfoCompany=OpenERP
-VersionInfoDescription=OpenERP Outlook Addin
-ChangesAssociations=true
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
-Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
-Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
-Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
-Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
-Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-Name: "german"; MessagesFile: "compiler:Languages\German.isl"
-Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
-Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
-Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
-Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
-Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
-Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
-Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
-Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
-Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
-Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
-
-[Files]
-Source: "C:\openerp-outlook-plugin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Messages]
-AboutSetupNote=Inno Setup Preprocessor home page:%nhttp://ispp.sourceforge.net/
-
-
-[Run]
-Filename: "{app}\Register-plugin.bat"; StatusMsg: "Registering Outlook Addin";
-[UninstallDelete]
-Type: files; Name: "{app}\Openerp Outlook Addin\*"
-Type: dirifempty; Name: "{app}\Openerp Outlook Addin"
-
-[UninstallRun]
-Filename: "{app}\Unregister-plugin.bat"; StatusMsg: "Unregistering Outlook Addin";
-
-
-[Code]
-function InitializeSetup(): Boolean;
-begin
-    Result := true;
-
-    if not RegKeyExists( HKLM, 'Software\Python\PythonCore') then begin
-        Result := MsgBox(
-              'Python appears to not be installed.' + #13 + #13 +
-              'This addin requires Python 2.5 or above installed with compatible pywin32 for python for working.'+ #13 + #13 +
-              'If you know that Python is installed, you may with to continue.' + #13 + #13 +
-              'Continue with installation?',
-              mbConfirmation, MB_YESNO) = idYes;
-    end;
-    if not RegKeyExists( HKCU, 'Software\Microsoft\Office\Outlook') then begin
-        Result := MsgBox(
-              'Outlook appears to not be installed.' + #13 + #13 +
-              'This addin only works with Microsoft Outlook 2000 and later - it' + #13 +
-              'does not work with Outlook express.' + #13 + #13 +
-              'If you know that Outlook is installed, you may with to continue.' + #13 + #13 +
-              'Continue with installation?',
-              mbConfirmation, MB_YESNO) = idYes;
-    end;
-    while Result  do begin
-        if not CheckForMutexes('_outlook_mutex_') then
-            break;
-
-          Result := MsgBox(
-              'You must close Outlook before OpenERP Outlook Addin can be installed.' + #13 + #13 +
-              'Please close all Outlook Windows (using "File->Exit and Log off"' + #13 +
-              'if available) and click Retry, or click Cancel to exit the installation.'+ #13 + #13 +
-              'If this message persists after closing all Outlook windows, you may' + #13 +
-              'need to log off from Windows, and try again.',
-              mbConfirmation, MB_RETRYCANCEL) = idRetry;
-    end;
-end;
-
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
deleted file mode 100644
index 9cbcb14d40e..00000000000
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ /dev/null
@@ -1,573 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import xmlrpclib
-import binascii
-import base64
-import sys
-import socket
-import os
-import time
-from manager import ustr
-from win32com.mapi import mapitags
-import pythoncom
-import win32com
-import win32ui
-waittime = 10
-wait_count = 0
-wait_limit = 12
-def execute(connector, method, *args):
-    global wait_count
-    res = False
-    try:
-        res = getattr(connector,method)(*args)
-    except socket.error,e:
-        if e.args[0] == 111:
-            if wait_count > wait_limit:
-               print "Server is taking too long to start, it has exceeded the maximum limit of %d seconds."%(wait_limit)
-            clean()
-            sys.exit(1)
-            print 'Please wait %d sec to start server....'%(waittime)
-            wait_count += 1
-            time.sleep(waittime)
-            res = execute(connector, method, *args)
-        else:
-            return res
-    wait_count = 0
-    return res
-
-class XMLRpcConn(object):
-    __name__ = 'XMLRpcConn'
-    _com_interfaces_ = ['_IDTExtensibility2']
-    _public_methods_ = ['GetDBList', 'login', 'GetAllObjects', 'GetObjList', 'InsertObj', 'DeleteObject', 'GetCSList', \
-    'ArchiveToOpenERP', 'IsCRMInstalled', 'GetPartners', 'GetObjectItems', \
-    'CreateCase', 'MakeAttachment', 'CreateContact', 'CreatePartner', 'getitem', 'setitem', \
-    'SearchPartnerDetail', 'WritePartnerValues', 'GetAllState', 'GetAllCountry', 'SearchPartner', 'SearchEmailResources', \
-    'GetCountry', 'GetStates', 'FindCountryForState','CreateEmailAttachment','SearchPartners']
-    _reg_clsctx_ = pythoncom.CLSCTX_INPROC_SERVER
-    _reg_clsid_ = "{C6399AFD-763A-400F-8191-7F9D0503CAE2}"
-    _reg_progid_ = "Python.OpenERP.XMLRpcConn"
-    _reg_policy_spec_ = "win32com.server.policy.EventHandlerPolicy"
-    def __init__(self,server='localhost',port=8069,uri='http://localhost:8069',webserver='localhost', webport=8080):
-        self._server=server
-        self._port=port
-        self._uri=uri
-        self._webserver=webserver
-        self._webport=webport
-        self._obj_list=[]
-        self._dbname=''
-        self._uname='admin'
-        self._pwd='a'
-        self._login=False
-        self._running=False
-        self._uid=False
-        self._iscrm=True
-        self.partner_id_list=None
-        self.protocol=None
-        self._webprotocol=None
-        self._weburi=None
-
-    def getitem(self, attrib):
-        v=self.__getattribute__(attrib)
-        return str(v)
-
-    def setitem(self, attrib, value):
-    	return self.__setattr__(attrib, value)
-
-    def GetDBList(self):
-        conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/db')
-        try:
-            db_list = execute(conn, 'list')
-            if db_list == False:
-                self._running=False
-                return []
-            else:
-                self._running=True
-        except:
-            db_list=-1
-            self._running=True
-        return db_list
-
-    def login(self,dbname, user, pwd):
-        self._dbname = dbname
-        self._uname = user
-        self._pwd = pwd
-        conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
-        try:
-            uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
-        except:
-            return False
-        return uid
-
-    def GetAllObjects(self):
-        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
-        objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
-        obj_list = [item['model'] for item in objects]
-        return obj_list
-
-    def GetObjList(self):
-    	self._obj_list=list(self._obj_list)
-    	self._obj_list.sort(reverse=True)
-    	return self._obj_list
-
-    def InsertObj(self, obj_title,obj_name,image_path):
-    	self._obj_list=list(self._obj_list)
-    	self._obj_list.append((obj_title,obj_name,ustr(image_path)))
-    	self._obj_list.sort(reverse=True)
-
-    def DeleteObject(self,sel_text):
-    	self._obj_list=list(self._obj_list)
-    	for obj in self._obj_list:
-    		if obj[0] == sel_text:
-    			self._obj_list.remove(obj)
-    			break
-
-    def ArchiveToOpenERP(self, recs, mail):
-    	import win32con
-        import win32ui
-    	conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/object')
-    	flag = False
-    	new_msg =  ext_msg =""
-    	message_id = referances  = None
-        context = {}
-    	try:
-            session = win32com.client.Dispatch("MAPI.session")
-            session.Logon('Outlook')
-            objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
-            objFields = objMessage.Fields
-            strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
-            strheader = ustr(strheader).encode('iso-8859-1')
-            headers = {}
-            strheader = strheader.replace("\n ", " ").splitlines()
-            for line in strheader:
-            	split_here = line.find(":")
-            	headers[line[:split_here]] = line[split_here:]
-            temp1 = headers.get('Message-ID')
-            temp2 = headers.get('Message-Id')
-            referances = headers.get('References')
-            if temp1 == None:    message_id = temp2
-            if temp2 == None:    message_id = temp1
-            startCut = message_id.find("<")
-            endCut = message_id.find(">")
-            message_id = message_id[startCut:endCut+1]
-            if not referances == None:
-            	startCut = referances.find("<")
-            	endCut = referances.find(">")
-            	referances = referances[startCut:endCut+1]
-    	except Exception,e:
-    		win32ui.MessageBox(str(e),"Archive To OpenERP")
-    		return
-    	attachments=mail.Attachments
-    	for rec in recs: #[('res.partner', 3, 'Agrolait')]
-            model = rec[0]
-            res_id = rec[1]
-            #Check if mail installed
-            object_id = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','mail.message')])
-            if not object_id:
-            	win32ui.MessageBox("Mail is not installed on your configured database '%s' !!\n\nPlease install it to archive the mail."%(self._dbname),"Mail not installed",win32con.MB_ICONERROR)
-            	return
-            object_ids = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=',model)])
-            object_name  = execute( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',object_ids,['name'])[0]['name']
-            #Reading the Object ir.model Name
-            ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mail.message','search',[('message_id','=',message_id),('model','=',model),('res_id','=',res_id)])
-            if ext_ids:
-            	name = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,model,'read',res_id,['name'])['name']
-            	ext_msg += """This mail is already archived to {0} '{1}'.\n""".format(object_name,name)
-            	flag = True
-            	continue
-            msg = {
-            	'subject':mail.Subject,
-            	'date':str(mail.ReceivedTime),
-            	'body':mail.Body,
-            	'cc':mail.CC,
-            	'from':mail.SenderEmailAddress,
-            	'to':mail.To,
-            	'message-id':message_id,
-            	'references':ustr(referances),
-            }
-            result = {}
-            context['thread_model'] = model
-            if attachments:
-            	result = self.MakeAttachment([rec], mail)
-            execute(conn, 'execute', self. _dbname, int(self._uid), self._pwd,
-                    'mail.thread','message_append',[res_id],
-                    msg.get('subject', False),
-                    msg.get('body', False),
-                    msg.get('to', False),
-                    msg.get('from', False),
-                    msg.get('cc', False),
-                    False, # BCC
-                    False, #reply-to
-                    msg.get('date', False),
-                    msg.get('message-id'),\
-                    msg.get('references', False),
-                    result, #attachments
-                    #FIXME: properly handle plaintext/html body variants?
-                    False, #body_html
-                    False, #subtype
-                    False, #headers
-                    False, #original
-                    context)
-
-            new_msg += """- {0} : {1}\n""".format(object_name,str(rec[2]))
-            flag = True
-
-    	if flag:
-    		t = """Mail archived Successfully with attachments.\n"""+ext_msg
-    		t += "\n"+new_msg
-    		win32ui.MessageBox(t,"Archived to OpenERP",win32con.MB_ICONINFORMATION)
-    	return flag
-
-    def IsCRMInstalled(self):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','crm.lead')])
-    	return id
-
-    def GetCSList(self):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids = execute(conn,'execute',self._dbname,int(int(self._uid)),self._pwd,'crm.case.section','search',[])
-    	objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'crm.case.section','read',ids,['name'])
-    	obj_list = [ustr(item['name']).encode('iso-8859-1') for item in objects]
-    	return obj_list
-
-    def GetPartners(self, search_partner=''):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids=[]
-    	obj_list=[]
-    	domain = []
-    	if not search_partner.strip() == '':
-    		domain.append(('name','ilike',ustr(search_partner)))
-    	ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','search',domain)
-    	if ids:
-    		ids.sort()
-    		obj_list.append((-999, ustr('')))
-    		for id in ids:
-    			object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','read',[id],['id','name'])[0]
-    			obj_list.append((object['id'], ustr(object['name'])))
-    		obj_list.sort(lambda x, y: cmp(x[1],y[1]))
-    	return obj_list
-
-    def GetObjectItems(self, search_list=[], search_text=''):
-    	res = []
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	for obj in search_list:
-    		object_ids = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=',obj)])
-    		object_name = execute( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',object_ids,['name'])[0]['name']
-    		if obj == "res.partner.address":
-    			ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'search',['|',('name','ilike',ustr(search_text)),('email','ilike',ustr(search_text))])
-    			recs = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'read',ids,['id','name','street','city'])
-    			for rec in recs:
-    				name = ustr(rec['name'])
-    				if rec['street']:
-    					name += ', ' + ustr(rec['street'])
-    				if rec['city']:
-    					name += ', ' + ustr(rec['city'])
-    				res.append((obj,rec['id'],name,object_name))
-    		else:
-    			ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'search',[('name','ilike',ustr(search_text))])
-    			recs = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'read',ids,['id','name'])
-    			for rec in recs:
-    				name = ustr(rec['name'])
-    				res.append((obj,rec['id'],name,object_name))
-    	return res
-
-    def CreateCase(self, section, mail, partner_ids, with_attachments=True):
-    	import eml
-    	flag = False
-    	id = -1
-    	try:
-            conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-            email, path = eml.generateEML(mail)
-            message_id   = None
-            session = win32com.client.Dispatch("MAPI.session")
-            session.Logon('Outlook')
-            objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
-            objFields = objMessage.Fields
-            strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
-            strheader = ustr(strheader).encode('iso-8859-1')
-            headers = {}
-            strheader = strheader.replace("\n ", " ").splitlines()
-            for line in strheader:
-                split_here = line.find(":")
-                headers[line[:split_here]] = line[split_here:]
-            temp1 = headers.get('Message-ID')
-            temp2 = headers.get('Message-Id')
-            if temp1 == None:    message_id = temp2
-            if temp2 == None:    message_id = temp1
-            startCut = message_id.find("<")
-            endCut = message_id.find(">")
-            message_id = message_id[startCut:endCut+1]
-            email.replace_header('Message-Id',message_id)
-            id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mail.thread','message_process',section, str(email))
-            if id > 0:
-            	flag = True
-            	return flag
-            else:
-            	flag = False
-            	return flag
-        except Exception,e:
-    		win32ui.MessageBox("Create Case\n"+str(e),"Mail Reading Error")
-    		return flag
-
-    def MakeAttachment(self, recs, mail):
-        attachments = mail.Attachments
-        attachment = {}
-        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        att_folder_path = os.path.abspath(os.path.dirname("%temp%\\"))
-        if not os.path.exists(att_folder_path):
-    		os.makedirs(att_folder_path)
-    	for rec in recs: #[('res.partner', 3, 'Agrolait')]
-            obj = rec[0]
-            obj_id = rec[1]
-            for i in xrange(1, attachments.Count+1):
-            	fn = ustr(attachments[i].FileName)
-            	if len(fn) > 64:
-            		l = 64 - len(fn)
-            		f = fn.split('.')
-            		fn = f[0][0:l] + '.' + f[-1]
-                att_path = os.path.join(att_folder_path,fn)
-                attachments[i].SaveAsFile(att_path)
-                f=open(att_path,"rb")
-                content = "".join(f.readlines())
-                f.close()
-                attachment[fn] = content
-        return attachment
-
-    def CreateContact(self, res=None):
-    	res=eval(str(res))
-    	partner = res['partner_id']
-    	state = res['state_id']
-    	country = res['country_id']
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	if not partner.strip() == '':
-    		partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
-    		res.update({'partner_id' : partner_id[0]})
-    	else:
-    		res.pop('partner_id')
-    	if not state == "":
-    		country_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [('name','=',ustr(country))])
-    		res.update({'country_id' : country_id[0]})
-    	else:
-    		res.pop('country_id')
-    	if not country == "":
-    		state_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [('name','=',ustr(state))])
-    		res.update({'state_id' : state_id[0]})
-    	else:
-    		res.pop('state_id')
-    	id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner.address','create',res)
-    	return id
-
-    def CreatePartner(self, res):
-    	res=eval(str(res))
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','search',[('name','=',res['name'])])
-    	if ids:
-    		return False
-    	id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','create',res)
-    	return id
-
-    def SearchPartnerDetail(self, search_email_id):
-    	res_vals = []
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	address_id = execute(conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','ilike',ustr(search_email_id))])
-    	if not address_id :
-    		return
-    	address = execute(conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address','read',address_id[0],['id','partner_id','name','street','street2','city','state_id','country_id','phone','mobile','email','fax','zip'])
-    	for key, vals in address.items():
-    		res_vals.append([key,vals])
-    	return res_vals
-
-    def WritePartnerValues(self, new_vals):
-    	flag = -1
-    	new_dict = dict(new_vals)
-    	email=new_dict['email']
-    	partner = new_dict['partner']
-    	country_val = new_dict['country']
-    	state_val = new_dict['state']
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
-    	country_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [('name','=',ustr(country_val))])
-    	state_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [('name','=',ustr(state_val))])
-    	address_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(email))])
-    	if not partner_id or not address_id or not country_id or not state_id:
-    		return flag
-    	vals_res_address={
-    					   'partner_id' : partner_id[0],
-    					   'name' : new_dict['name'],
-    					   'street':new_dict['street'],
-    					   'street2' : new_dict['street2'],
-    					   'city' : new_dict['city'],
-    					   'phone' : new_dict['phone'],
-    					   'mobile' : new_dict['mobile'],
-    					   'fax' : new_dict['fax'],
-    					   'zip' : new_dict['zip'],
-    					   'country_id' : country_id[0],
-    					   'state_id' : state_id[0]
-    					 }
-    	temp = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'write', address_id, vals_res_address)
-    	if temp:
-    		flag=1
-    	else:
-    		flag=0
-    	return flag
-
-    def GetAllState(self):
-    	state_list = []
-    	state_ids = []
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	state_ids = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [])
-    	for state_id in state_ids:
-    		obj = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'read', [state_id],['id','name'])[0]
-    		state_list.append((obj['id'], ustr(obj['name'])))
-    	return state_list
-
-    def GetAllCountry(self):
-    	country_list = []
-    	country_ids = []
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	country_ids = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [])
-    	for country_id in country_ids:
-    		obj = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country','read', [country_id], ['id','name'])[0]
-    		country_list.append((obj['id'], ustr(obj['name'])))
-    	return country_list
-
-    def SearchPartner(self, mail_id = ""):
-        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(mail_id))])
-        if not address:
-        	return False
-        add_rec = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'read', address[0])
-        partner = add_rec.get('partner_id',False)
-        if partner:  return partner[0]
-        else:  return partner
-
-    def SearchEmailResources(self, message_id):
-        import win32ui
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	res_vals = []
-    	mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message', 'search', [('message_id','=',message_id)])
-        ref_mail_id = None
-    	if not mail_id:
-            ref_mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message', 'search', [('references','like','%'+message_id+'%')])
-            if ref_mail_id:
-                address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message','read',ref_mail_id[0],['model','res_id'])
-                for key, vals in address.items():
-                    res_vals.append([key,vals])
-                return res_vals
-            return None
-    	address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mail.message','read',mail_id[0],['model','res_id'])
-    	for key, vals in address.items():
-    		res_vals.append([key,vals])
-    	return res_vals
-
-
-    def GetCountry(self, country_search=''):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids=[]
-    	obj_list=[]
-    	domain = []
-    	if not country_search.strip() == '':
-    		domain.append(('name','ilike',ustr(country_search)))
-    	ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','search',domain)
-    	if ids:
-    		ids.sort()
-    		for id in ids:
-    			object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','read',[id],['id','name'])[0]
-    			obj_list.append((object['id'], ustr(object['name'])))
-    		obj_list.sort(lambda x, y: cmp(x[1],y[1]))
-    	return obj_list
-
-    def GetStates(self, state_search='', country=None):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids = []
-    	c_id = []
-    	obj_list = []
-    	domain = []
-    	if not state_search.strip() == '':
-    		domain.append(('name','ilike',ustr(state_search)))
-
-    	if country == None:
-    		ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',domain)
-    	if not country == None:
-    		c_id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','search',[('name','=',ustr(country))])
-    		domain.append(('country_id','=',c_id[0]))
-    		ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',domain)
-    	if ids:
-    		ids.sort()
-    		for id in ids:
-    			object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','read',[id],['id','name'])[0]
-    			obj_list.append((object['id'], ustr(object['name'])))
-    		obj_list.sort(lambda x, y: cmp(x[1],y[1]))
-    	return obj_list
-
-    def FindCountryForState(self, state_search=''):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',[('name','=',ustr(state_search))])
-    	if not ids:
-    		return None
-    	object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','read',ids)[0]
-    	country = object['country_id'][1]
-    	return country
-
-    def CreateEmailAttachment(self, rec, mail):
-        import eml
-        email, path = eml.generateEML(mail)
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        obj = rec[0]
-        obj_id = rec[1]
-        res = {}
-        res['res_model'] = obj
-        ls = ['*', '/', '\\', '<', '>', ':', '?', '"', '|', '\t', '\n',':','~']
-        fn = (mail.Subject).replace(' ','')
-        for c in ls:
-        	fn = fn.replace(c,'')
-        if len(fn) > 64:
-        	l = 64 - len(fn)
-        	f = fn.split('-')
-        	fn = '-'.join(f[1:])
-        	if len(fn) > 64:
-        		l = 64 - len(fn)
-        		f = fn.split('.')
-        		fn = f[0][0:l] + '.' + f[-1]
-        fn = fn[:-4]+".eml"
-        f = open(path)
-        content = "".join(f.readlines()).encode('base64')
-        f.close()
-        res['name'] = fn
-        res['datas_fname'] = fn
-        res['datas'] = content
-        res['res_id'] = obj_id
-        id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.attachment','create',res)
-        return id
-
-    def SearchPartners(self):
-        res = []
-        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-        obj = 'res.partner'
-        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'search',[])
-        recs = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'read',ids,['id','name'])
-        for rec in recs:
-            name = ustr(rec['name'])
-            res.append((obj,rec['id'],name,obj))
-        return res
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/static/openerp-outlook-plugin/CookComputing.XmlRpcV2.dll b/addons/outlook/static/openerp-outlook-plugin/CookComputing.XmlRpcV2.dll
new file mode 100644
index 00000000000..be76352b13d
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/CookComputing.XmlRpcV2.dll differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Model.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Model.cs
new file mode 100644
index 00000000000..e163b5442a4
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Model.cs
@@ -0,0 +1,78 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Linq;
+
+namespace OpenERPClient
+{
+    public class Model
+    {
+        public string model;
+        public string name;
+        protected OpenERPConnect openerp_connect;
+        public OpenERPConnect Connection
+        {
+            set
+            {
+                this.openerp_connect = value;
+            }
+            get
+            {
+                return this.openerp_connect;
+            }
+        }
+        public Model()
+        {
+        }
+        public Model(string model)
+        {
+            /*
+            It gives the model name only.
+            :param model : madel name
+            */
+
+            this.model = model;
+        }
+        public Model(string model, string name)
+        {
+            /*
+            It gives the model names with their descriptions.
+            :param model : model name
+            :param name : description of model
+            */
+
+            this.name = name;
+            this.model = model;
+        }
+        public override string ToString()
+        {
+            /*
+            It overrides the name of model into ToString.
+            
+            :return : String
+            */ 
+
+            if (this.name != null) return this.name;
+            return this.model;
+        }
+      
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj
new file mode 100644
index 00000000000..75fe271e5d6
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenERPClient</RootNamespace>
+    <AssemblyName>OpenERPClient</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="CookComputing.XmlRpcV2, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\OpenERPOutlookPlugin\bin\Release\CookComputing.XmlRpcV2.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Model.cs" />
+    <Compile Include="OpenERPConnect.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Record.cs" />
+    <Compile Include="XMLRPCClient.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs
new file mode 100644
index 00000000000..d6672828ed0
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs
@@ -0,0 +1,397 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Windows.Forms;
+using System.Collections;
+using CookComputing.XmlRpc;
+
+namespace OpenERPClient
+{
+    public class ServiceUrl : System.Attribute
+    {
+        string _url;
+        public ServiceUrl(string url)
+        {
+            /*
+            It will contain the ServiceUrl.
+            :param url : url with server and port.
+            */
+
+            this._url = url;
+        }
+        public string Url
+        {
+            /*
+            It will get and return the Url for the connection.
+             
+            :return : String 
+            */
+
+            get
+            {
+                return _url;
+            }
+        }
+        public override string ToString()
+        {
+            /*
+            It will override the Tostring and return the _url.
+            */
+
+            return this._url;
+        }
+    }
+    public enum OpenERPService
+    {
+        [ServiceUrl("/xmlrpc/object")]
+        Object = 1,
+        [ServiceUrl("/xmlrpc/db")]
+        DB = 2,
+        [ServiceUrl("/xmlrpc/common")]
+        Common = 3
+    }
+    public class OpenERPConnect
+    {
+        int uid;
+        string url;
+        string dbname;
+        string login;
+        string pwd;
+        bool chkpwd;
+        string password;
+        public string URL
+        {
+            /*
+            It will get and set the value of the url.
+            
+            :return : String
+            */
+
+            get
+            {
+                return url;
+            }
+            set
+            {
+                url = value;
+            }
+        }
+        public string DBName
+        {
+            /*
+            It will get and set the value of the Database Name.
+            
+            :return : String
+            */
+
+            get
+            {
+                return dbname;
+            }
+            set
+            {
+                dbname = value;
+            }
+        }
+        public string UserId
+        {
+            /*
+            It will get and set the value of the UserId.
+            
+            :return : String
+            */
+
+            get
+            {
+                return login;
+            }
+            set
+            {
+                login = value;
+            }
+        }
+        public string pswrd
+        {
+            /*
+            It will get and set the value of the Password.
+            
+            :return : String
+            */
+
+            get
+            {
+                return password;
+            }
+            set
+            {
+                password = value;
+            }
+        }
+
+        public bool rempwd
+        {
+            /*
+            It will get and set the value of the Remember Password.
+            
+            :return : True or False
+            */
+
+            get
+            {
+                return chkpwd;
+            }
+            set
+            {
+                chkpwd = value;
+            }
+        }
+
+        public string version;
+        XMLRPCClient rpcclient;
+
+        public void Open(Enum service)
+        {
+            /*
+            It opens the connetion by the url and service url.
+            :param service : enum service.
+            */
+
+            string url = null;
+            Type type = service.GetType();
+
+            ServiceUrl[] _urls =
+               type.GetField(service.ToString()).GetCustomAttributes(typeof(ServiceUrl),
+                                       false) as ServiceUrl[];
+            if (_urls.Length > 0)
+            {
+                url = _urls[0].Url;
+            }
+
+            this.Open(url);
+
+
+        }
+
+        void Open(string service_url)
+        {
+            /*
+            It opens rpcclient by service url.
+            :param service_url : service url
+            */
+
+            this.rpcclient = new XMLRPCClient(this.url + service_url);
+
+        }
+        void Close()
+        {
+            /*
+            It closes rpcclient.
+            */
+
+            this.rpcclient = null;
+
+        }
+        public OpenERPConnect()
+        {
+        }
+        public OpenERPConnect(string url)
+        {
+            /*
+             It will contain the url wit the server and port.
+             :param url : url with the server and port.
+            */
+
+            this.url = url;
+        }
+        public OpenERPConnect(string url, string dbname, string login, string pwd)
+        {
+            /*
+             It will do the connection with OpenERP server.
+             :param url : url with the server and port.
+             :param dbname : the list of database.
+             :param login : user name.
+             :param pwd : password.
+            */
+
+            this.url = url;
+            this.dbname = dbname;
+            this.login = login;
+            this.pwd = pwd;
+            this.version = ServerVersion();
+        }
+        public Boolean isLoggedIn
+        {
+            /*
+            It will check whether successfully login to OpenERP is done or not.
+            
+            :return : True or False.
+            */
+
+            get
+            {
+                if (this.uid > 0) { return true; }
+                return false;
+            }
+        }
+
+        public int Login(string dbname, string userid, string pwd)
+        {
+            /*
+             It will check whether the entered dbname, userid and password are correct or not
+             and on that basis it will allow the user for connecting to OpenERP.
+             :param dbname : list of database
+             :param userid : userid 
+             :param pwd : password of the user
+             
+             :return : Integer
+            */
+
+            this.Open(OpenERPClient.OpenERPService.Common);
+            object isLogin = this.rpcclient.Login(dbname, userid, pwd);
+            this.uid = 0;
+            if (Convert.ToBoolean(isLogin))
+            {
+                this.uid = Convert.ToInt32(isLogin);
+            }
+            this.pwd = pwd;
+            if (this.uid <= 0)
+            {
+                MessageBox.Show("Authentication Error!\nBad username and password.", Form.ActiveForm.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+            this.Close();
+            return this.uid;
+
+        }
+        XmlRpcStruct ConvertAs(Hashtable value)
+        {
+            /*
+             It will convert the Hashtable into XmlRpcStruct and vise-versa.
+             
+             :param value : Hasheable value.
+              
+             :retutn : Hashtable values and vise versa the XmlRpcStruct value.
+            */
+
+            XmlRpcStruct new_value;
+            new_value = new XmlRpcStruct();
+            foreach (string key in value.Keys)
+            {
+                object res;
+                if (value[key] == null)
+                {
+                    res = "";
+                }
+                if (value[key].GetType() == typeof(Hashtable))
+                {
+                    res = this.ConvertAs((Hashtable)value[key]);
+                }
+                else
+                {
+                    res = value[key];
+                }
+                new_value.Add(key, res);
+            }
+            return new_value;
+        }
+        object[] ConvertArgs(object[] args)
+        {
+            /*
+            It will convert the arguments which are of type Hashtable into new arguments.
+            
+            :param args : Objet value of arguments
+              
+            :return : Object value of arguments.
+            */
+
+            for (int i = 0; i < args.Length; i++)
+            {
+                object arg = args[i];
+                XmlRpcStruct new_arg;
+                if (arg.GetType() == typeof(Hashtable))
+                {
+                    new_arg = this.ConvertAs((Hashtable)arg);
+                    args[i] = new_arg;
+                }
+            }
+            return args;
+        }
+        public object Execute(string model, string method, params object[] args)
+        {
+            /*
+            It executes the model name, the method name and also the list of arrays arguments.
+            :param model : model name.
+            :param method : method name.
+            :params args : list of arrays of arguments.
+            
+            :return : Object
+            */
+
+            args = this.ConvertArgs(args);
+            this.Open(OpenERPClient.OpenERPService.Object);
+
+            object res = this.rpcclient.Execute(this.dbname, this.uid, this.pwd, model, method, args);
+            this.Close();
+            return res;
+        }
+        public object[] DBList()
+        {
+            /*
+            It will return the list of the database which will be created.
+             
+            :return : Database List 
+            */
+
+            this.Open(OpenERPClient.OpenERPService.DB);
+            object[] res = this.rpcclient.DBList();
+            this.Close();
+            return res;
+        }
+        public string ServerVersion()
+        {
+            /*
+            It will give the version of the server which the user is using.
+              
+            :return : String
+            */
+
+            this.Open(OpenERPClient.OpenERPService.DB);
+            string version = this.rpcclient.ServerVersion();
+            this.Close();
+            return version;
+        }
+
+        public bool check_connectivity()
+        {
+            /*
+            It will check connection on given server url.
+        	
+            :return : True or False.
+            */
+
+            this.Open(OpenERPClient.OpenERPService.Common);
+            bool flag = this.rpcclient.check_connectivity();
+            this.Close();
+            return flag;
+        }
+
+
+    }
+
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Properties/AssemblyInfo.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..def21a9bf91
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenERPClient")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenERPClient")]
+[assembly: AssemblyCopyright("Copyright ©  2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("0b69b9a4-1bfc-45d5-9788-983fbf57a505")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Record.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Record.cs
new file mode 100644
index 00000000000..4069b43f74c
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Record.cs
@@ -0,0 +1,69 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System.Collections;
+
+namespace OpenERPClient
+{
+    public class Record
+    {
+        public long id;
+        public string name;
+        public Model model;
+        public Hashtable columns;
+        public Record(long id, string name, Model model)
+        {
+            /*
+            It gives the record of id, name and model.
+            :param id : record id.
+            :param name : record name.
+            :param model : model name.
+            */
+
+            this.id = id;
+            this.name = name;
+            this.model = model;
+        }
+        public Record(Hashtable columns, Model model)
+        {
+            /*
+            It gives the records in hashtable columns and also model name.
+            :param columns : hashtable column values.
+            :param model : model name.
+            */
+
+            this.id = long.Parse(columns["id"].ToString());
+            if (columns.ContainsKey("name"))
+            {
+                this.name = columns["name"].ToString();
+            }
+            this.model = model;
+            this.columns = columns;
+        }
+        public override string ToString()
+        {
+            /*
+            It will override the Tostring.
+            */
+
+            if (this.name != null) return this.name;
+            return this.id.ToString();
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs
new file mode 100644
index 00000000000..ebe9ec142e2
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs
@@ -0,0 +1,388 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Text;
+using CookComputing.XmlRpc;
+
+namespace OpenERPClient
+{
+    public interface IOpenERPCommon : IXmlRpcProxy
+    {
+        [XmlRpcMethod("login")]
+        object Login(string dbname, string username, string pwd);
+
+    }
+    public interface IOpenERPObject : IXmlRpcProxy
+    {
+
+        [XmlRpcMethod("execute")]
+        Object Execute(string dbName, long userId, string pwd, string model, string method, params Object[] args);
+
+
+
+    }
+    public interface IOpenERPDB : IXmlRpcProxy
+    {
+
+        [XmlRpcMethod("list")]
+        Object[] DBList();
+
+        [XmlRpcMethod("server_version")]
+        string ServerVersion();
+
+        [XmlRpcMethod("check_connectivity")]
+        bool check_connectivity();
+
+
+    }
+    public interface Ixmlrpcconnect : IOpenERPCommon, IOpenERPDB, IOpenERPObject
+    {
+    }
+    public class XMLRPCClient : Ixmlrpcconnect
+    {
+        Ixmlrpcconnect rpcclient = (Ixmlrpcconnect)XmlRpcProxyGen.Create(typeof(Ixmlrpcconnect));
+        public XMLRPCClient(string ServiceUrl)
+        {
+            rpcclient.Url = ServiceUrl;
+        }
+
+        #region Ixmlrpcconnect Members
+
+        public object Login(string dbname, string username, string pwd)
+        {
+            return rpcclient.Login(dbname, username, pwd);
+        }
+
+        public object Execute(string dbName, long userId, string pwd, string model, string method, params object[] args)
+        {
+            return rpcclient.Execute(dbName, userId, pwd, model, method, args);
+        }
+
+        public object[] DBList()
+        {
+            return rpcclient.DBList();
+        }
+
+        public string ServerVersion()
+        {
+            return rpcclient.ServerVersion();
+        }
+
+        public bool check_connectivity()
+        {
+            return rpcclient.check_connectivity();
+        }
+        #endregion
+
+
+        #region IXmlRpcProxy Members
+
+        public bool AllowAutoRedirect
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public System.Security.Cryptography.X509Certificates.X509CertificateCollection ClientCertificates
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public string ConnectionGroupName
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public System.Net.CookieContainer CookieContainer
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public System.Net.ICredentials Credentials
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool EnableCompression
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool Expect100Continue
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public System.Net.WebHeaderCollection Headers
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public Guid Id
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public int Indentation
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool KeepAlive
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public XmlRpcNonStandard NonStandard
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool PreAuthenticate
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public Version ProtocolVersion
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public System.Net.IWebProxy Proxy
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public System.Net.CookieCollection ResponseCookies
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public System.Net.WebHeaderCollection ResponseHeaders
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public int Timeout
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public string Url
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool UseEmptyParamsTag
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool UseIndentation
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool UseIntTag
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public bool UseStringTag
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public string UserAgent
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public Encoding XmlEncoding
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public string XmlRpcMethod
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public string[] SystemListMethods()
+        {
+            throw new NotImplementedException();
+        }
+
+        public object[] SystemMethodSignature(string MethodName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string SystemMethodHelp(string MethodName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public event XmlRpcRequestEventHandler RequestEvent;
+
+        public event XmlRpcResponseEventHandler ResponseEvent;
+
+        #endregion
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln
new file mode 100644
index 00000000000..f4705664cf4
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln
@@ -0,0 +1,30 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenERPOutlookPlugin", "OpenERPOutlookPlugin\OpenERPOutlookPlugin.csproj", "{F4B2219B-F235-400F-81B4-92F15250BBA4}"
+EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "OpenERPOutlookPluginSetup", "OpenERPOutlookPluginSetup\OpenERPOutlookPluginSetup.vdproj", "{96333293-0156-4998-9065-42721CEB0368}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenERPClient", "OpenERPClient\OpenERPClient.csproj", "{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F4B2219B-F235-400F-81B4-92F15250BBA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4B2219B-F235-400F-81B4-92F15250BBA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4B2219B-F235-400F-81B4-92F15250BBA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4B2219B-F235-400F-81B4-92F15250BBA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96333293-0156-4998-9065-42721CEB0368}.Debug|Any CPU.ActiveCfg = Debug
+		{96333293-0156-4998-9065-42721CEB0368}.Release|Any CPU.ActiveCfg = Release
+		{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/AssemblyInfo.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/AssemblyInfo.cs
new file mode 100644
index 00000000000..6f5be64b3ae
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/AssemblyInfo.cs
@@ -0,0 +1,52 @@
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Revision
+//      Build Number
+//
+// You can specify all the value or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified - the assembly cannot be signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. 
+//   (*) If the key file and a key name attributes are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP - that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the file is installed into the CSP and used.
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Cache.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Cache.cs
new file mode 100644
index 00000000000..b4e4d25d3f4
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Cache.cs
@@ -0,0 +1,55 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System.Collections;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    static public  class Cache
+    {
+        static private OpenERPOutlookPlugin _openerp;
+        static public OpenERPOutlookPlugin OpenERPOutlookPlugin
+        {
+            get
+            {
+                return _openerp;
+            }
+            set
+            {
+
+                _openerp = value;
+            }
+        }
+        static private Model[] document_models;
+        static public Model[] DocumentModelList
+        {
+            get
+            {
+                return document_models;
+            }
+            set
+            {
+
+                document_models = value;
+            }
+        }        
+
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/ConfigManager.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/ConfigManager.cs
new file mode 100644
index 00000000000..6ce61be577b
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/ConfigManager.cs
@@ -0,0 +1,109 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Windows.Forms;
+using System.Text.RegularExpressions;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    public class ConfigManager
+    {
+        string openerp_config_file = "openerp_config.ini";
+
+        public void SaveConfigurationSetting()
+        {
+            string filepath = Tools.GetAppFolderPath();
+            OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+            OpenERPConnect openerp_connect = openerp_outlook.Connection;
+            filepath = Path.Combine(filepath, openerp_config_file);
+            string[] datas = { "url=" + openerp_connect.URL, "userid=" + openerp_connect.UserId, "dbname=" + openerp_connect.DBName,"rempwd="+openerp_connect.rempwd,"pswrd=" + openerp_connect.pswrd };
+            StreamWriter userfile = new StreamWriter(filepath, false);
+
+            foreach (string data in datas)
+            {
+                userfile.WriteLine(data);
+            }
+            userfile.Close();
+
+        }
+        public void LoadConfigurationSetting()
+        {
+
+            string filePath = Tools.GetAppFolderPath();
+            filePath = Path.Combine(filePath, this.openerp_config_file);
+            OpenERPConnect openerp_connect=null;
+            OpenERPOutlookPlugin openerp_outlook=null;
+            openerp_outlook = Cache.OpenERPOutlookPlugin;
+            if (openerp_outlook == null)
+            {
+
+                openerp_outlook = new OpenERPOutlookPlugin(openerp_connect);
+            }
+                openerp_connect = openerp_outlook.Connection;
+                if (openerp_connect == null)
+            {
+               openerp_connect = new OpenERPConnect();
+            }
+            
+            if (File.Exists(filePath))
+            {
+
+                string line;
+
+                using (StreamReader file = new StreamReader(filePath))
+                {
+                    while ((line = file.ReadLine()) != null)
+                    {
+                        char[] delimiters = new char[] { '=' };
+                        string[] parts = line.Split(delimiters, 2);
+
+                        for (int i = 0; i < parts.Length; i += 2)
+                        {
+                            if (parts[i] == "url")
+                                openerp_connect.URL = parts[i + 1].Trim();
+                            else if (parts[i] == "userid")
+                                openerp_connect.UserId = parts[i + 1].Trim();
+                            else if (parts[i] == "dbname")
+                                openerp_connect.DBName = parts[i + 1].Trim();                          
+                            else if (parts[i] == "pswrd")
+                                openerp_connect.pswrd = parts[i + 1].Trim();
+                            else if (parts[i] == "rempwd")
+                            {
+                                openerp_connect.rempwd = false;
+                                if (parts[i + 1].Trim().ToLower() == "true")
+                                    openerp_connect.rempwd = true;
+                            }
+
+                        }
+                    }
+                    file.Close();
+                }
+            }
+            openerp_outlook.Connection = openerp_connect;
+            Cache.OpenERPOutlookPlugin = openerp_outlook;
+        }        
+
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs
new file mode 100644
index 00000000000..1336c7f7695
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs
@@ -0,0 +1,354 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+
+namespace OpenERPOutlookPlugin
+{
+    using System;
+    using System.Reflection;
+    using System.Runtime.InteropServices;
+    using System.Windows.Forms;
+    using office = Microsoft.Office.Core;
+    using outlook = Microsoft.Office.Interop.Outlook;
+    using OpenERPClient;
+
+
+    
+
+    #region Read me for Add-in installation and setup information.
+    // When run, the Add-in wizard prepared the registry for the Add-in.
+    // At a later time, if the Add-in becomes unavailable for reasons such as:
+    //   1) You moved this project to a computer other than which is was originally created on.
+    //   2) You chose 'Yes' when presented with a message asking if you wish to remove the Add-in.
+    //   3) Registry corruption.
+    // you will need to re-register the Add-in by building the OpenERPOutlookPluginSetup project, 
+    // right click the project in the Solution Explorer, then choose install.
+    #endregion
+
+    /// <summary>
+    ///   The object for implementing an Add-in.
+    /// </summary>
+    /// <seealso class='IDTExtensibility2' />
+
+    [GuidAttribute("C86B5760-1254-4F40-BD25-2094A2A678C4"), ProgId("OpenERPOutlookPlugin.Connect")]
+    public class Connect : Object, Extensibility.IDTExtensibility2
+    {
+        /// <summary>
+        ///		Implements the constructor for the Add-in object.
+        ///		Place your initialization code within this method.
+        /// </summary>
+
+        public Connect()
+        {
+
+        }
+
+        public int cnt_mail = 0;
+
+        /// <summary>
+        ///      Implements the OnConnection method of the IDTExtensibility2 interface.
+        ///      Receives notification that the Add-in is being loaded.
+        /// </summary>
+        /// <param term='application'>
+        ///      Root object of the host application.
+        /// </param>
+        /// <param term='connectMode'>
+        ///      Describes how the Add-in is being loaded.
+        /// </param>
+        /// <param term='addInInst'>
+        ///      Object representing this Add-in.
+        /// </param>
+        /// <seealso class='IDTExtensibility2' />
+        public void OnConnection(object application, Extensibility.ext_ConnectMode connectMode, object addInInst, ref System.Array custom)
+        {
+            applicationObject = application;
+            addInInstance = addInInst;
+
+            if (connectMode != Extensibility.ext_ConnectMode.ext_cm_Startup)
+            {
+                OnStartupComplete(ref custom);
+                
+            }
+        }
+
+        /// <summary>
+        ///     Implements the OnDisconnection method of the IDTExtensibility2 interface.
+        ///     Receives notification that the Add-in is being unloaded.
+        /// </summary>
+        /// <param term='disconnectMode'>
+        ///      Describes how the Add-in is being unloaded.
+        /// </param>
+        /// <param term='custom'>
+        ///      Array of parameters that are host application specific.
+        /// </param>
+        /// <seealso class='IDTExtensibility2' />
+        public void OnDisconnection(Extensibility.ext_DisconnectMode disconnectMode, ref System.Array custom)
+        {
+            if (disconnectMode != Extensibility.ext_DisconnectMode.ext_dm_HostShutdown)
+            {
+                OnBeginShutdown(ref custom);
+            }
+            applicationObject = null;
+        }
+
+        /// <summary>
+        ///      Implements the OnAddInsUpdate method of the IDTExtensibility2 interface.
+        ///      Receives notification that the collection of Add-ins has changed.
+        /// </summary>
+        /// <param term='custom'>
+        ///      Array of parameters that are host application specific.
+        /// </param>
+        /// <seealso class='IDTExtensibility2' />
+        public void OnAddInsUpdate(ref System.Array custom)
+        {
+        }
+
+        /// <summary>
+        ///      Implements the OnStartupComplete method of the IDTExtensibility2 interface.
+        ///      Receives notification that the host application has completed loading.
+        /// </summary>
+        /// <param term='custom'>
+        ///      Array of parameters that are host application specific.
+        /// </param>
+        /// <seealso class='IDTExtensibility2' />
+        /// 
+        private office.CommandBarButton btn_open_partner;
+        private office.CommandBarButton btn_open_document;
+        private office.CommandBarButton btn_open_configuration_form;
+        private office.CommandBars oCommandBars;
+        private office.CommandBar menuBar;
+        private office.CommandBarPopup newMenuBar;
+
+        public int countMail()
+        {
+            /*
+             
+             * Gives the number of selected mail.
+             * returns: Number of selected mail.
+             
+             */
+            cnt_mail = 0;
+            Microsoft.Office.Interop.Outlook.Application app = null;
+
+            app = new Microsoft.Office.Interop.Outlook.Application();
+            foreach (var selection in app.ActiveExplorer().Selection)
+            {
+                cnt_mail = app.ActiveExplorer().Selection.Count;
+            }
+
+            return cnt_mail;
+        }
+      
+        public void OnStartupComplete(ref System.Array custom)
+        {
+            /*
+             
+             * When outlook is opened it loads a Menu if Outlook plugin is installed.
+             * OpenERP - > Push, Partner ,Documents, Configuration
+             
+             */
+            Microsoft.Office.Interop.Outlook.Application app = null;
+            try
+            {
+                app = new Microsoft.Office.Interop.Outlook.Application();
+                object omissing = System.Reflection.Missing.Value;
+                menuBar = app.ActiveExplorer().CommandBars.ActiveMenuBar;
+                ConfigManager config = new ConfigManager();
+                config.LoadConfigurationSetting();
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                try
+                {
+                    if (openerp_connect.URL != null && openerp_connect.DBName != null && openerp_connect.UserId != null && openerp_connect.pswrd != "")
+                    {                        
+                        string decodpwd = Tools.DecryptB64Pwd(openerp_connect.pswrd);
+                        openerp_connect.Login(openerp_connect.DBName, openerp_connect.UserId, decodpwd);                            
+                    }
+                }
+                catch(Exception )
+                {
+                    MessageBox.Show("Unable to connect remote Server ' " + openerp_connect.URL + " '.", "OpenERP Connection",MessageBoxButtons.OK,MessageBoxIcon.Exclamation);
+                }
+                newMenuBar = (office.CommandBarPopup)menuBar.Controls.Add(office.MsoControlType.msoControlPopup, omissing, omissing, omissing, true);
+                if (newMenuBar != null)
+                {
+                    newMenuBar.Caption = "OpenERP";
+                    newMenuBar.Tag = "My";
+
+                    btn_open_partner = (office.CommandBarButton)newMenuBar.Controls.Add(office.MsoControlType.msoControlButton, omissing, omissing, 1, true);
+                    btn_open_partner.Style = office.MsoButtonStyle.msoButtonIconAndCaption;
+                    btn_open_partner.Caption = "Contact";
+                    //Face ID will use to show the ICON in the left side of the menu.
+                    btn_open_partner.FaceId = 3710;
+                    newMenuBar.Visible = true;
+                    btn_open_partner.Click += new Microsoft.Office.Core._CommandBarButtonEvents_ClickEventHandler(this.btn_open_partner_Click);
+
+                    btn_open_document = (office.CommandBarButton)newMenuBar.Controls.Add(office.MsoControlType.msoControlButton, omissing, omissing, 2, true);
+                    btn_open_document.Style = office.MsoButtonStyle.msoButtonIconAndCaption;
+                    btn_open_document.Caption = "Documents";
+                    //Face ID will use to show the ICON in the left side of the menu.
+                    btn_open_document.FaceId = 258;
+                    newMenuBar.Visible = true;
+                    btn_open_document.Click += new Microsoft.Office.Core._CommandBarButtonEvents_ClickEventHandler(this.btn_open_document_Click);
+
+                    btn_open_configuration_form = (office.CommandBarButton)newMenuBar.Controls.Add(office.MsoControlType.msoControlButton, omissing, omissing, 3, true);
+                    btn_open_configuration_form.Style = office.MsoButtonStyle.msoButtonIconAndCaption;
+                    btn_open_configuration_form.Caption = "Configuration";
+                    //Face ID will use to show the ICON in the left side of the menu.
+                    btn_open_configuration_form.FaceId = 5644;
+                    newMenuBar.Visible = true;
+                    btn_open_configuration_form.Click += new Microsoft.Office.Core._CommandBarButtonEvents_ClickEventHandler(this.btn_open_configuration_form_Click);
+
+                }
+
+            }
+            catch (Exception)
+            {
+                object oActiveExplorer;
+                oActiveExplorer = applicationObject.GetType().InvokeMember("ActiveExplorer", BindingFlags.GetProperty, null, applicationObject, null);
+                oCommandBars = (office.CommandBars)oActiveExplorer.GetType().InvokeMember("CommandBars", BindingFlags.GetProperty, null, oActiveExplorer, null);
+            }
+                 
+
+        }
+
+        void btn_open_configuration_form_Click(Microsoft.Office.Core.CommandBarButton Ctrl, ref bool CancelDefault)
+        {
+            frm_openerp_configuration frm_config = new frm_openerp_configuration();
+            frm_config.Show();
+
+        }
+
+
+        public static bool isLoggedIn()
+        {
+            /*
+             
+             * This will check that it is connecting with server or not.
+             * If wrong server name or port is given then it will throw the message.
+             * returns true If conneted with server, otherwise False.
+             
+             */
+            if (Cache.OpenERPOutlookPlugin == null || Cache.OpenERPOutlookPlugin.isLoggedIn == false)
+            {
+                throw new Exception("OpenERP Server is not connected!\nPlease connect OpenERP Server from Configuration Menu.");
+
+            }
+            return true;
+        }
+
+        public static void handleException(Exception e)
+        {
+            string Title;
+            if (Form.ActiveForm != null)
+            {
+                Title = Form.ActiveForm.Text;
+            }
+            else
+            {
+                Title = "OpenERP Addin";
+            }
+            MessageBox.Show(e.Message, Title, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+        }
+        public static void displayMessage(string message)
+        {
+            string Title;
+            if (Form.ActiveForm != null)
+            {
+                Title = Form.ActiveForm.Text;
+            }
+            else
+            {
+                Title = "OpenERP Addin";
+            }
+            MessageBox.Show(message, Title, MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
+        public void CheckMailCount()
+        {
+            if (countMail() == 0)
+            {
+                throw new Exception("No email selected.\nPlease select one email.");
+            }
+            if (countMail() > 1)
+            {
+                throw new Exception("Multiple selction is not allowed.\nPlease select only one email.");
+            }
+
+        }
+       
+        void btn_open_partner_Click(Microsoft.Office.Core.CommandBarButton Ctrl, ref bool CancelDefault)
+        {
+            try
+            {
+                Connect.isLoggedIn();
+                this.CheckMailCount(); 
+                if (countMail() == 1)
+                {
+
+                    foreach (outlook.MailItem mailitem in Tools.MailItems())
+                    {
+
+                        Object[] contact = Cache.OpenERPOutlookPlugin.RedirectPartnerPage(mailitem);
+                        if ((int)contact[1] > 0)
+                        {
+                            Cache.OpenERPOutlookPlugin.RedirectWeb(contact[2]);
+                        }
+                        else
+                        {
+                            frm_contact contact_form = new frm_contact(mailitem.SenderName, mailitem.SenderEmailAddress);
+                            contact_form.Show();
+                        }
+
+                    }
+                }
+
+            }
+            catch (Exception e)
+            {
+                Connect.handleException(e);
+            }
+
+        }
+
+        void btn_open_document_Click(Microsoft.Office.Core.CommandBarButton Ctrl, ref bool CancelDefault)
+        {
+            try
+            {
+                Connect.isLoggedIn();
+                this.CheckMailCount(); 
+                if (countMail() == 1)
+                {
+                    frm_choose_document_opt frm_doc = new frm_choose_document_opt();    
+                }
+            }
+            catch (Exception e)
+            {
+                Connect.handleException(e);
+            }
+
+        }
+
+        
+        public void OnBeginShutdown(ref System.Array custom)
+        {
+        }
+        private object applicationObject;
+        private object addInInstance;
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
new file mode 100644
index 00000000000..cf1578d903b
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
@@ -0,0 +1,223 @@
+/*
+
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Linq;
+using OpenERPClient;
+using outlook = Microsoft.Office.Interop.Outlook;
+using System.Windows.Forms;
+namespace OpenERPOutlookPlugin
+{
+
+    public class OpenERPOutlookPlugin : Model
+    {
+        public Boolean isLoggedIn
+        {
+            /*
+             
+             * This will check that user is logged in or not and gets the value
+             * returns : True if loggedIn, False otherwise.
+             
+             */
+            get
+            {
+                if (this.Connection != null) { return this.Connection.isLoggedIn; }
+                return false;
+            }
+        }
+
+        public OpenERPOutlookPlugin(OpenERPConnect connection)
+        {
+            this.Connection = connection;
+            //this.set_server_method();
+        }
+
+        public Record[] SearchRecord(string name,string model)
+        {
+            /*
+             * Gives name and model for search record.
+             */
+            ArrayList object_list = new ArrayList();
+            Model parent_model;
+            parent_model = new Model(model);
+            ArrayList args = new ArrayList();
+            args.Add(parent_model.model);
+            if (name != null)
+            {
+                args.Add(name);
+            }
+            else
+            {
+                args.Add("");
+            }
+            object[] objects = (object[])this.openerp_connect.Execute("plugin.handler", "list_document_get", args.ToArray());
+            foreach (object obj in objects)
+            {
+                Hashtable document = new Hashtable();
+                object[] names = (object[])obj;
+                document.Add("id", names[0].ToString());
+                document.Add("name", names[1].ToString());
+                object_list.Add(new Record(document,parent_model));
+            }
+            return (Record[])object_list.ToArray(typeof(Record));            
+        }
+
+        public string Name_get(outlook.MailItem mail)
+        {
+
+                string email = Tools.GetHeader(mail);
+                object doc = this.openerp_connect.Execute("plugin.handler", "document_get", email);
+                object[] name = (object[])doc;
+                return name[3].ToString();
+     
+        }
+
+        public void RedirectWeb(object web_url)
+        {
+            /*
+             * Will open the url into the web browser.
+             */
+
+            System.Diagnostics.Process.Start(web_url.ToString());
+        }
+
+
+        public object[] RedirectPartnerPage(outlook.MailItem mail)
+        {
+            /*
+             
+             * Will Redirect to the web-browser and open partner.
+             * If it will not found partner in res.partner.address (in contact) then 
+               it will open the contact form to create a partner.
+               :Param outlook.MailItem mailItem : Outlook Mail item
+             */
+            string email_id = mail.SenderEmailAddress.ToString();
+            Object[] contact = (Object[])this.openerp_connect.Execute("plugin.handler", "partner_get", email_id);
+            return contact;
+
+        }
+
+        public void Open_Document(outlook.MailItem mail)
+        {
+            /*
+             * To open document attached in a url.returns the model_id and res_id of the document
+               :Param outlook.MailItem mail: Outlook mails.
+             */
+
+            string email = Tools.GetHeader(mail);
+            object doc = this.openerp_connect.Execute("plugin.handler", "document_get", email);
+            object[] url = (object[])doc;            
+            this.RedirectWeb(url[2].ToString());
+        }       
+
+        public Boolean PushMail(outlook.MailItem mail, string model, int thread_id)
+        {
+            /*
+             
+              * This will push the mail as per the selected items from the list.
+                :Param outlook.MailItem mail: selected mail from the outlook.
+                :Param string model : Model name to push.
+                :Param int thread_id : Thread id of the mail.
+              * If mail pushed successfully then it returns true.
+              * return False if mail Already Exist.
+             
+             */
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                ArrayList args = new ArrayList();               
+                Hashtable vals = new Hashtable();
+                string email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message
+                args.Add(model);
+                args.Add(email.ToString());
+                args.Add(thread_id);              
+                Hashtable attachments = Tools.GetAttachments(mail);                
+                args.Add(mail.Body);
+                args.Add(mail.HTMLBody);
+                args.Add(attachments);
+                object push_mail = this.Connection.Execute("plugin.handler", "push_message_outlook", args.ToArray());
+                object[] push = (object[])push_mail;
+                this.RedirectWeb(push[2].ToString());               
+                return true;            
+
+        }       
+        public long CreatePartnerRecord(string name)
+        {
+            /*
+             
+             * Creates a partner record in res.partner as per the name given in the plugin form.
+               :Param String name: Name given to create a partner in the database.
+             * Returns a Long value : Partner id.
+             
+             */
+            Record[] partenr_list = this.SearchRecord(name,"res.partner");
+            int partner_id = 0;
+            foreach (Record partner in partenr_list)
+            {
+                partner_id = Convert.ToInt16(partner.id);
+            }
+
+            return partner_id;
+        }
+        public void CreateContactRecord(int partner_id, string name, string email_id)
+        {
+            /*
+             
+            * Creates a Contact record in the res.partner.address as per the details given in the 
+              plugin form of openERP outlook Plugin.
+              :Param string partner_id : Partner id for which it creates a contact
+              :Param string name : Contact name 
+              :Param string email_id : Email address 
+           
+            */
+            Hashtable values = new Hashtable();
+            values.Add("name", name);
+            values.Add("email", email_id);            
+            ArrayList args = new ArrayList();
+            args.Add(values);
+            args.Add(partner_id);
+            object[] contact = (object[])this.openerp_connect.Execute("plugin.handler", "contact_create", args.ToArray());
+            this.RedirectWeb(contact[2].ToString());
+
+          }
+   
+        public Model[] GetMailModels()
+        {
+            /*
+             
+            * function to get objects to display in combo box
+            * returns the Array list of models.
+            
+           */
+            ArrayList obj_list = new ArrayList();
+            object mail_models = this.Connection.Execute("plugin.handler", "document_type");           
+            foreach (object model in (object[])mail_models)
+            {
+                Model open_model;
+                string[] models = (string[])model;
+                open_model = new Model(models[0], models[1]);
+                open_model.Connection = this.Connection;
+                obj_list.Add(open_model);
+            }
+            return (Model[])obj_list.ToArray(typeof(Model));
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj
new file mode 100644
index 00000000000..8fbcb0a2ec4
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F4B2219B-F235-400F-81B4-92F15250BBA4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <StartupObject>
+    </StartupObject>
+    <NoStandardLibraries>false</NoStandardLibraries>
+    <AssemblyName>OpenERPOutlookPlugin</AssemblyName>
+    <RootNamespace>OpenERPOutlookPlugin</RootNamespace>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <Optimize>false</Optimize>
+    <OutputPath>.\bin\Debug\</OutputPath>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>4</WarningLevel>
+    <IncrementalBuild>false</IncrementalBuild>
+    <RegisterForComInterop>true</RegisterForComInterop>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>false</DebugSymbols>
+    <Optimize>true</Optimize>
+    <OutputPath>.\bin\Release\</OutputPath>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>4</WarningLevel>
+    <IncrementalBuild>false</IncrementalBuild>
+    <RegisterForComInterop>true</RegisterForComInterop>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="CookComputing.XmlRpcV2">
+      <HintPath>..\CookComputing.XmlRpcV2.dll</HintPath>
+    </Reference>
+    <Reference Include="Extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="System">
+      <HintPath>System.dll</HintPath>
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data">
+      <HintPath>System.Data.dll</HintPath>
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.XML">
+      <HintPath>System.XML.dll</HintPath>
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Cache.cs" />
+    <Compile Include="ConfigManager.cs" />
+    <Compile Include="frm_contact.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_contact.designer.cs">
+      <DependentUpon>frm_contact.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frm_create_doc.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_create_doc.Designer.cs">
+      <DependentUpon>frm_create_doc.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frm_openerp_connection.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_openerp_connection.Designer.cs">
+      <DependentUpon>frm_openerp_connection.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frm_push_mail.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_push_mail.designer.cs">
+      <DependentUpon>frm_push_mail.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frm_select_partner.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_select_partner.Designer.cs">
+      <DependentUpon>frm_select_partner.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frm_choose_document_opt.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_choose_document_opt.Designer.cs">
+      <DependentUpon>frm_choose_document_opt.cs</DependentUpon>
+    </Compile>
+    <Compile Include="OpenERPOutlookPlugin.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Tools.cs" />
+    <Compile Include="Connect.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="frm_openerp_configuration.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frm_openerp_configuration.Designer.cs">
+      <DependentUpon>frm_openerp_configuration.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="frm_contact.resx">
+      <DependentUpon>frm_contact.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_create_doc.resx">
+      <DependentUpon>frm_create_doc.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_openerp_configuration.resx">
+      <DependentUpon>frm_openerp_configuration.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_openerp_connection.resx">
+      <DependentUpon>frm_openerp_connection.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_push_mail.resx">
+      <DependentUpon>frm_push_mail.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_select_partner.resx">
+      <DependentUpon>frm_select_partner.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frm_choose_document_opt.resx">
+      <DependentUpon>frm_choose_document_opt.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="Microsoft.Office.Core">
+      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
+      <VersionMajor>2</VersionMajor>
+      <VersionMinor>4</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+    <COMReference Include="Microsoft.Office.Interop.Outlook">
+      <Guid>{00062FFF-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>9</VersionMajor>
+      <VersionMinor>3</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+    <COMReference Include="stdole">
+      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>2</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\195737_152643643962_3595480_n.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\Account.png" />
+    <Content Include="Resources\Archive.png" />
+    <Content Include="Resources\Case.png" />
+    <Content Include="Resources\Contact.png" />
+    <Content Include="Resources\Create.png" />
+    <Content Include="Resources\developped_by.png" />
+    <Content Include="Resources\Error.gif" />
+    <Content Include="Resources\Invoice.png" />
+    <Content Include="Resources\logo.png" />
+    <Content Include="Resources\Move.gif" />
+    <Content Include="Resources\MoveDown.png" />
+    <Content Include="Resources\MoveLeft.png" />
+    <Content Include="Resources\openerp.png" />
+    <Content Include="Resources\Partner.png" />
+    <Content Include="Resources\perform.gif" />
+    <Content Include="Resources\Product.png" />
+    <Content Include="Resources\Project.png" />
+    <Content Include="Resources\Sale.png" />
+    <Content Include="Resources\Search.gif" />
+    <Content Include="Resources\settings.png" />
+    <Content Include="Resources\Success.gif" />
+    <Content Include="Resources\Task.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenERPClient\OpenERPClient.csproj">
+      <Project>{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}</Project>
+      <Name>OpenERPClient</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user
new file mode 100644
index 00000000000..be11fa35423
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <StartWorkingDirectory>C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\</StartWorkingDirectory>
+    <StartProgram>C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\devenv.exe</StartProgram>
+    <StartAction>Program</StartAction>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <StartWorkingDirectory>C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\</StartWorkingDirectory>
+    <StartProgram>C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\devenv.exe</StartProgram>
+    <StartAction>Program</StartAction>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.Designer.cs
new file mode 100644
index 00000000000..5135996facd
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.Designer.cs
@@ -0,0 +1,119 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.1433
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenERPOutlookPlugin.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenERPOutlookPlugin.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static System.Drawing.Bitmap _195737_152643643962_3595480_n {
+            get {
+                object obj = ResourceManager.GetObject("195737_152643643962_3595480_n", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Archive {
+            get {
+                object obj = ResourceManager.GetObject("Archive", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Create {
+            get {
+                object obj = ResourceManager.GetObject("Create", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Error {
+            get {
+                object obj = ResourceManager.GetObject("Error", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap MoveDown {
+            get {
+                object obj = ResourceManager.GetObject("MoveDown", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap MoveLeft {
+            get {
+                object obj = ResourceManager.GetObject("MoveLeft", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Search {
+            get {
+                object obj = ResourceManager.GetObject("Search", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Success {
+            get {
+                object obj = ResourceManager.GetObject("Success", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.resx
new file mode 100644
index 00000000000..c43e150f921
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.resx
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="MoveLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MoveLeft.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Archive.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Create" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Create.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Success" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Success.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="195737_152643643962_3595480_n" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\195737_152643643962_3595480_n.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Error" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Error.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Search.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="MoveDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MoveDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.Designer.cs
new file mode 100644
index 00000000000..125ba326671
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.3053
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenERPOutlookPlugin.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.settings b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.settings
new file mode 100644
index 00000000000..15034e76c4c
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.settings
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+</SettingsFile>
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg
new file mode 100644
index 00000000000..610defc9232
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.ico b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.ico
new file mode 100644
index 00000000000..acea3ab0169
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.ico differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png
new file mode 100644
index 00000000000..b13f2b0f523
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png
new file mode 100644
index 00000000000..5aa6a958d37
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png
new file mode 100644
index 00000000000..9b950b8ea9d
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png
new file mode 100644
index 00000000000..9bd6f9f6059
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png
new file mode 100644
index 00000000000..1ab240c32cb
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif
new file mode 100644
index 00000000000..38c3523781b
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png
new file mode 100644
index 00000000000..4551107ec3b
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif
new file mode 100644
index 00000000000..401bf861213
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png
new file mode 100644
index 00000000000..3761ff1e747
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png
new file mode 100644
index 00000000000..031d7532673
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/OpenERP_icon.ico b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/OpenERP_icon.ico
new file mode 100644
index 00000000000..8f6dc9edabc
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/OpenERP_icon.ico differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png
new file mode 100644
index 00000000000..c661339598e
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png
new file mode 100644
index 00000000000..51451e422ae
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png
new file mode 100644
index 00000000000..0f8ea2af8f5
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png
new file mode 100644
index 00000000000..1b0b44f890e
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif
new file mode 100644
index 00000000000..b29c3cf1054
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif
new file mode 100644
index 00000000000..fb3bff729c5
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png
new file mode 100644
index 00000000000..52056b1e713
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png
new file mode 100644
index 00000000000..e4004e3d178
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png
new file mode 100644
index 00000000000..d6dbd9d83d1
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png
new file mode 100644
index 00000000000..326798df2ec
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif
new file mode 100644
index 00000000000..16cc3873858
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png
new file mode 100644
index 00000000000..ad0298af667
Binary files /dev/null and b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Tools.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Tools.cs
new file mode 100644
index 00000000000..5d102c73dd2
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Tools.cs
@@ -0,0 +1,173 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Drawing;
+using System.IO;
+using outlook = Microsoft.Office.Interop.Outlook;
+
+
+namespace OpenERPOutlookPlugin
+{
+    static public class Tools
+    {
+        static public outlook.MailItem[] MailItems()
+        {
+            Microsoft.Office.Interop.Outlook.Application app = null;
+            app = new Microsoft.Office.Interop.Outlook.Application();
+            ArrayList mailItems = new ArrayList();
+            foreach (var selection in app.ActiveExplorer().Selection)
+            {
+                if (selection is outlook.MailItem)
+                {
+                    mailItems.Add((outlook.MailItem)selection);
+                }
+            }
+            return (outlook.MailItem[])mailItems.ToArray(typeof(outlook.MailItem));
+        }
+        
+        static public string[] SplitURL(string url)
+        {
+            /*
+             
+             * Split the url in three parts protocal host and port number.
+               :Param string url : url to split.
+             * returnts the string array which contains the protocol, host name and port number.
+             
+             */
+            string protocall = "";
+            string host = "localhost";
+            string port = "8069";
+            if (url != "")
+            {
+                string[] server = url.Split("://".ToCharArray());
+                protocall = server[0];
+
+                host = server[3];
+                port = "";
+                if (server.Length > 4) port = server[4];
+            }
+            return new string[] { protocall, host, port };
+
+        }
+        static public string JoinURL(string host, string port, bool ssl)
+        {
+            /*
+             
+             * Join the url as per the host, port and protocols are given.
+               :Param string host : host name  
+               :Param string port : port number 
+               :Param boolean ssl : protocol
+             * reruns a string url combination of host, port and protocol.
+             
+             */
+            string protocall = "http";
+            if (ssl) protocall = "https";
+            string url = protocall + "://" + host;
+            if (port != "") url += ":" + port;
+            return url;
+        }
+        static public Hashtable GetAttachments(outlook.MailItem mail)
+        {
+            /*
+             
+             * Gets the attachments of selected mail of outlook mail items.
+               :Param outlook.MailItem mail : gives the selected mail item from the outlook.
+             * returns the hashtable (dictionary) value of the attachemts.
+             */
+            System.IO.FileStream inFile;
+            Hashtable attach = new Hashtable();
+            string[] strattch = new string[4];
+            foreach (outlook.Attachment attach1 in mail.Attachments)
+            {
+                string filename = Tools.GetAppFolderPath() + attach1.FileName;
+                attach1.SaveAsFile(filename);
+                inFile = new System.IO.FileStream(filename, System.IO.FileMode.Open, System.IO.FileAccess.Read);
+                byte[] datas = new Byte[inFile.Length];
+                long bytesRead = inFile.Read(datas, 0, (int)inFile.Length);
+                inFile.Close();
+                string fdata = System.Convert.ToBase64String(datas);
+                attach.Add(attach1.FileName, fdata);
+                strattch[0] = attach1.FileName;
+                System.IO.File.Delete(filename);
+            }
+            return attach;
+        }
+        static public string GetAppFolderPath()
+        {
+            /*
+             
+             * Gets the path of Applicaion folder.
+             * returns String value of file path.
+              
+            */
+            string filePath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+            filePath = System.IO.Path.Combine(filePath, "OpenERPOutlook");
+            if (!Directory.Exists(filePath))
+            {
+                Directory.CreateDirectory(filePath);
+            }
+            return filePath;
+        }        
+
+        static public string GetMessageId(outlook.MailItem mail)
+        {
+            var propertyAccessor = mail.PropertyAccessor;
+            string message_id = propertyAccessor.GetProperty("http://schemas.microsoft.com/mapi/proptag/0x1035001E").ToString();
+            return message_id;
+        }
+        static public string GetHeader(outlook.MailItem mail)
+        {
+            var propertyAccessor = mail.PropertyAccessor;
+            //string HEADERS = propertyAccessor.GetProperty("http://schemas.microsoft.com/mapi/string/{3f0a69e0-7f56-11d2-b536-00aa00bbb6e6}/urn:schemas:httpmail:content-disposition-type").ToString(); 
+            string HEADERS = propertyAccessor.GetProperty("http://schemas.microsoft.com/mapi/proptag/0x007D001E").ToString();
+            return HEADERS;
+
+        }
+      
+        static public string EncryptB64Pwd(string pwd)
+        {
+            /*
+             
+             * Accepts the string password and encrypt it into the base64 format.
+               :Param string pwd : A normal string Password.
+             * returns the encrypted base64 passwod from the normal string value.
+             
+             */
+            byte[] encbuff = System.Text.Encoding.UTF8.GetBytes(pwd);
+            string encodepwd = Convert.ToBase64String(encbuff);
+            return "[" + encodepwd + "]";
+
+        }
+        static public string DecryptB64Pwd(string pwd)
+        {
+            /*
+             
+             * Accept the base64 fromat string value and decrypt it to normal string. 
+               :Param : string pwd : A base64 value password.
+             * returns the decrypted string value from the base64 value.
+             */
+            string pswd = pwd.Substring(1, (pwd.Length - 2));
+            byte[] decbuff = Convert.FromBase64String(pswd);
+            string decodpwd = System.Text.Encoding.UTF8.GetString(decbuff);
+            return decodpwd;
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.Designer.cs
new file mode 100644
index 00000000000..396ed9ef0f9
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.Designer.cs
@@ -0,0 +1,137 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_choose_document_opt
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_choose_document_opt));
+            this.btn_doc = new System.Windows.Forms.Button();
+            this.btn_cncl = new System.Windows.Forms.Button();
+            this.btn_push = new System.Windows.Forms.Button();
+            this.btn_newdoc = new System.Windows.Forms.Button();
+            this.lbl_docname = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // btn_doc
+            // 
+            this.btn_doc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_doc.Image = global::OpenERPOutlookPlugin.Properties.Resources.Archive;
+            this.btn_doc.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btn_doc.Location = new System.Drawing.Point(31, 146);
+            this.btn_doc.Name = "btn_doc";
+            this.btn_doc.Size = new System.Drawing.Size(169, 32);
+            this.btn_doc.TabIndex = 0;
+            this.btn_doc.Text = "&Open an existing Document";
+            this.btn_doc.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.btn_doc.UseVisualStyleBackColor = true;
+            this.btn_doc.Click += new System.EventHandler(this.btn_doc_Click);
+            // 
+            // btn_cncl
+            // 
+            this.btn_cncl.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.btn_cncl.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_cncl.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btn_cncl.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btn_cncl.Location = new System.Drawing.Point(463, 146);
+            this.btn_cncl.Name = "btn_cncl";
+            this.btn_cncl.Size = new System.Drawing.Size(105, 32);
+            this.btn_cncl.TabIndex = 1;
+            this.btn_cncl.Text = "&Cancel";
+            this.btn_cncl.UseVisualStyleBackColor = true;
+            this.btn_cncl.Click += new System.EventHandler(this.btn_cncl_Click);
+            // 
+            // btn_push
+            // 
+            this.btn_push.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.btn_push.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_push.Image = ((System.Drawing.Image)(resources.GetObject("btn_push.Image")));
+            this.btn_push.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btn_push.Location = new System.Drawing.Point(231, 146);
+            this.btn_push.Name = "btn_push";
+            this.btn_push.Size = new System.Drawing.Size(199, 32);
+            this.btn_push.TabIndex = 2;
+            this.btn_push.Text = "P&ush to an existing Document";
+            this.btn_push.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.btn_push.UseVisualStyleBackColor = true;
+            this.btn_push.Click += new System.EventHandler(this.btn_push_Click);
+            // 
+            // btn_newdoc
+            // 
+            this.btn_newdoc.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.btn_newdoc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_newdoc.Image = global::OpenERPOutlookPlugin.Properties.Resources.Create;
+            this.btn_newdoc.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btn_newdoc.Location = new System.Drawing.Point(31, 146);
+            this.btn_newdoc.Name = "btn_newdoc";
+            this.btn_newdoc.Size = new System.Drawing.Size(169, 32);
+            this.btn_newdoc.TabIndex = 3;
+            this.btn_newdoc.Text = "Create a &new Document";
+            this.btn_newdoc.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.btn_newdoc.UseVisualStyleBackColor = true;
+            this.btn_newdoc.Click += new System.EventHandler(this.btn_newdoc_Click);
+            // 
+            // lbl_docname
+            // 
+            this.lbl_docname.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.lbl_docname.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lbl_docname.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbl_docname.Location = new System.Drawing.Point(12, 20);
+            this.lbl_docname.Name = "lbl_docname";
+            this.lbl_docname.Size = new System.Drawing.Size(570, 94);
+            this.lbl_docname.TabIndex = 7;
+            this.lbl_docname.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // frm_choose_document_opt
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(594, 204);
+            this.Controls.Add(this.lbl_docname);
+            this.Controls.Add(this.btn_newdoc);
+            this.Controls.Add(this.btn_push);
+            this.Controls.Add(this.btn_cncl);
+            this.Controls.Add(this.btn_doc);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.Name = "frm_choose_document_opt";
+            this.Text = "Document";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btn_doc;
+        private System.Windows.Forms.Button btn_cncl;
+        private System.Windows.Forms.Button btn_push;
+        private System.Windows.Forms.Button btn_newdoc;
+        private System.Windows.Forms.Label lbl_docname;
+    }
+}
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.cs
new file mode 100644
index 00000000000..e364922844b
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.cs
@@ -0,0 +1,98 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using OpenERPClient;
+using outlook = Microsoft.Office.Interop.Outlook;
+using System.Collections;
+
+namespace OpenERPOutlookPlugin
+{
+    public partial class frm_choose_document_opt : Form
+    {
+        public frm_choose_document_opt()
+        {
+            InitializeComponent();
+            try
+            {
+                foreach (outlook.MailItem mail in Tools.MailItems())
+                {
+
+                    string name_get = Cache.OpenERPOutlookPlugin.Name_get(mail);
+                    this.Show();
+                    if (name_get != "")
+                    {
+                        lbl_docname.Text = name_get;
+                        btn_newdoc.Visible = false;
+
+                    }
+                    else
+                    {
+                        lbl_docname.Text = mail.Subject;
+                        btn_doc.Visible = false;
+                    }
+                }
+
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+
+        }
+
+        private void btn_doc_Click(object sender, EventArgs e)
+        {
+            foreach (outlook.MailItem mailitem in Tools.MailItems())
+            {
+                Cache.OpenERPOutlookPlugin.Open_Document(mailitem);
+               
+            }
+            this.Close();
+        }
+
+
+        private void btn_push_Click(object sender, EventArgs e)
+        {
+            frm_push_mail frm_push_mail = new frm_push_mail();
+            frm_push_mail.Show();
+            this.Close();
+        }
+
+        private void btn_cncl_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btn_newdoc_Click(object sender, EventArgs e)
+        {
+            frm_create_doc create_doc = new frm_create_doc();
+            create_doc.Show();
+            this.Close();
+        }
+
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.resx
new file mode 100644
index 00000000000..bbe4f00b972
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btn_push.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIMAAG3E8G2t10a17BaL0ymp6kq78SB7uHa75UCr4zSi4R12sxZmpTy08B6Z3n7J8AAA
+        ACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIZwAfCBxIsKDBgwgHBjCQsKCBAwwb
+        CjQAAEBEggsNaNQIgIBFhwEOiHTgQAABBg4uPjAQYMCABgROFiggIOVAli9lzhQgAMGCmwcSIBAwc6dP
+        jAqSKqV5tKGCnj8lPo0qMQBViVizBgQAOw==
+</value>
+  </data>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAACAgICAAAAKwAAAGw8PDykT09Pu1BQULpAQEChAAAAYgAAAB0AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAFBQUNAAAAanFxcdygoaH/l5eX/5OTk/+ZmJj/o6Kj/6alpv93d3jbCAgIVwkJ
+        CQMAAAAAAAAAAAAAAAAHBwcKIyQkhLCwr/2IiIv+Q0NH/zc4PP9KSlD/b29w/3l5eP+VlJX/srKy/rCw
+        sf87OztxEBAQAgAAAAD///8ADQ0NYMfGxf5lZXv+BwdS/hISdv8MDGb/EBBw/wgIUf8rK0D/X19g/4yM
+        jP7CwsL+xsbG/ywsLEYAAAAAAAAAFqioqdykpLn+ERGH/hsbo/8vMEj/srK5/4OEpP8cHJr/GRmh/w8P
+        Qv9RUVP/nJuc/trZ2f69vb7aAAAAAiQkI1D49/X/YWGp/yUlzv8WFo3/bW1w/9vb2//x8O//oqPH/yUl
+        xv8jI87/Dw9C/2loaP/Ly8v/8vLy/3FxcD2jo6OR/////1tbyf8uLuf/HByh/2VlaP/e3t7//f39////
+        //9dXc//LS3n/yIi0f8rKzj/pqal//7+/v/W1taEycnJqv////9wcOX/ODj3/ygoz/9ERE3/xMTE//v7
+        +//+/v//09Pz/zMz8v80NPn/EBBx/4KCgf/09PT/7e3to9bW1qn/////oqL6/0JC//9BQf//Hx9G/5aW
+        lP/u7u7///////////9MTPf/Ojr8/yIivv9hYWv/7u7u//X19aTY2NmI//////Hx/P84OPD/QED7/xkZ
+        kf9iYmb/xcXF//r6+v//////fX3n/zc3+/8pKdz/WVlm//Pz8//6+vmIvb29O//////////+jIzV/zMz
+        6P8rK+H/KChP/4yMiv/X19f/+Pj4/42Nyf8pKev/ICDN/3JygP7/////9/f3PgAAAAD5+fnd/////v//
+        //9SUqn/JCTH/xUVmv9SUmn/pqaj/8nJxv9LS4H/Hh7P/w4Oj/7KytH+/v7+5QAAAAAAAAAA5OTkNP//
+        ///+/v7//////2Fhkv8PD4T/DQ1//yYmXP8xMVz/DAyA/xAQmf9iYob///////z8/DsAAAAAAAAAAAAA
+        AAD8/Pxc/v7+//7+/v7////+xcXL/0xMbP8ICEf/AAA+/xISS/6AgJD+//////7+/mgAAAAAAAAAAAAA
+        AAAAAAAAAAAAAPv7+zX+/v7m//////7+/v/////+/////v//////////////7P7+/j4AAAAA+fn5AAAA
+        AAAAAAAAAAAAAAAAAAD///8AAAAAAP7+/kj+/v6S/v7+s/7+/rT+/v6U/v7+TQAAAAAAAAAAAAAAAAAA
+        AAAAAAAA/D8AAPAPAADABwAAwAMAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAOAH
+        AADwDwAA/D8AAA==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.cs
new file mode 100644
index 00000000000..e984c8d711b
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.cs
@@ -0,0 +1,77 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Windows.Forms;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    public partial class frm_contact : Form
+    {
+
+        public frm_contact()
+        {
+            InitializeComponent();
+        }
+
+        public frm_contact(string contact_name, string email_id)
+        {
+            InitializeComponent();
+            txt_contactname_create_contact.Text = contact_name;
+            txtemail.Text = email_id;
+
+        }
+      
+        private void btncancel_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btnCreate_partner_Click(object sender, EventArgs e)
+        {
+
+            try
+            {
+                Cache.OpenERPOutlookPlugin.CreateContactRecord(0, txt_contactname_create_contact.Text, txtemail.Text);
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btnLink_partner_Click(object sender, EventArgs e)
+        {
+            frm_select_partner select_partner = new frm_select_partner();
+            select_partner.parent_form = this;
+            select_partner.Show();
+            this.Close();
+        }
+
+       
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.designer.cs
new file mode 100644
index 00000000000..af6c4756875
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.designer.cs
@@ -0,0 +1,166 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_contact
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_contact));
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnCreate_partner = new System.Windows.Forms.Button();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.txtemail = new System.Windows.Forms.TextBox();
+            this.lblemail = new System.Windows.Forms.Label();
+            this.txt_contactname_create_contact = new System.Windows.Forms.TextBox();
+            this.lblname = new System.Windows.Forms.Label();
+            this.btnLink_partner = new System.Windows.Forms.Button();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnCancel.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btnCancel.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btnCancel.Location = new System.Drawing.Point(306, 127);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(70, 23);
+            this.btnCancel.TabIndex = 14;
+            this.btnCancel.Text = "&Cancel ";
+            this.btnCancel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnCreate_partner
+            // 
+            this.btnCreate_partner.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnCreate_partner.Image = global::OpenERPOutlookPlugin.Properties.Resources.Success;
+            this.btnCreate_partner.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+            this.btnCreate_partner.Location = new System.Drawing.Point(189, 127);
+            this.btnCreate_partner.Name = "btnCreate_partner";
+            this.btnCreate_partner.Size = new System.Drawing.Size(109, 23);
+            this.btnCreate_partner.TabIndex = 15;
+            this.btnCreate_partner.Text = "Create &Partner";
+            this.btnCreate_partner.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btnCreate_partner.UseVisualStyleBackColor = true;
+            this.btnCreate_partner.Click += new System.EventHandler(this.btnCreate_partner_Click);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.txtemail);
+            this.groupBox1.Controls.Add(this.lblemail);
+            this.groupBox1.Controls.Add(this.txt_contactname_create_contact);
+            this.groupBox1.Controls.Add(this.lblname);
+            this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.groupBox1.Location = new System.Drawing.Point(12, 9);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(369, 110);
+            this.groupBox1.TabIndex = 16;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Address Detail";
+            // 
+            // txtemail
+            // 
+            this.txtemail.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txtemail.Location = new System.Drawing.Point(97, 66);
+            this.txtemail.Name = "txtemail";
+            this.txtemail.Size = new System.Drawing.Size(255, 20);
+            this.txtemail.TabIndex = 35;
+            // 
+            // lblemail
+            // 
+            this.lblemail.AutoSize = true;
+            this.lblemail.Location = new System.Drawing.Point(59, 69);
+            this.lblemail.Name = "lblemail";
+            this.lblemail.Size = new System.Drawing.Size(41, 13);
+            this.lblemail.TabIndex = 34;
+            this.lblemail.Text = "Email:";
+            // 
+            // txt_contactname_create_contact
+            // 
+            this.txt_contactname_create_contact.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_contactname_create_contact.Location = new System.Drawing.Point(97, 26);
+            this.txt_contactname_create_contact.Name = "txt_contactname_create_contact";
+            this.txt_contactname_create_contact.Size = new System.Drawing.Size(255, 20);
+            this.txt_contactname_create_contact.TabIndex = 33;
+            // 
+            // lblname
+            // 
+            this.lblname.AutoSize = true;
+            this.lblname.Location = new System.Drawing.Point(9, 29);
+            this.lblname.Name = "lblname";
+            this.lblname.Size = new System.Drawing.Size(91, 13);
+            this.lblname.TabIndex = 27;
+            this.lblname.Text = "Contact Name:";
+            // 
+            // btnLink_partner
+            // 
+            this.btnLink_partner.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnLink_partner.Image = global::OpenERPOutlookPlugin.Properties.Resources.Search;
+            this.btnLink_partner.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btnLink_partner.Location = new System.Drawing.Point(63, 127);
+            this.btnLink_partner.Name = "btnLink_partner";
+            this.btnLink_partner.Size = new System.Drawing.Size(118, 23);
+            this.btnLink_partner.TabIndex = 19;
+            this.btnLink_partner.Text = "&Link To Partner";
+            this.btnLink_partner.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btnLink_partner.UseVisualStyleBackColor = true;
+            this.btnLink_partner.Click += new System.EventHandler(this.btnLink_partner_Click);
+            // 
+            // frm_contact
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(394, 159);
+            this.Controls.Add(this.btnLink_partner);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.btnCreate_partner);
+            this.Controls.Add(this.btnCancel);
+            this.Cursor = System.Windows.Forms.Cursors.Default;
+            this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.Name = "frm_contact";
+            this.Text = "Create Contact";
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnCreate_partner;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.TextBox txt_contactname_create_contact;
+        private System.Windows.Forms.Label lblname;
+        private System.Windows.Forms.TextBox txtemail;
+        private System.Windows.Forms.Label lblemail;
+        private System.Windows.Forms.Button btnLink_partner;
+    }
+}
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.resx
new file mode 100644
index 00000000000..9477f7baa89
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAxO+0UHsorMtUkJMo6LOY5JN81HsdDLM4/JMdINcBISKJCSpA+RpM9SJo6RJsxPJg2PJ84PKU4OadA
+        Pbs7L8lANd8qJNUiJtIZKModMNcUJOIUHu0iJvsaIOUaJsQuQMkXHNcvNOciJsstLNAvItJSQekqG6xQ
+        QchYSNKOg/3Cw//Q2f/P1f/S2P/T3P/R2P+iqP+7vv9vct8zM6k0Lbg6NcwcGroyN9oiLs4eLdccKOQg
+        KvMkKfYaIuEbJsgnOMkdGuUeHd4+PeseHLxAONI9N7p4edSzt//W1v/k4//h6P/f5v/Dw/+2tf+1t/+0
+        tv/Kzv/Y3f/S1f/U2P/Fyf8iKJlOVNMtM8IuM9UjKtgdJd0aI98bJN8nMOUqNN8dKc0pIPMnIOUvK9g5
+        N8w4NLWGiObR4P/k9//k7//K0/+JkeRWW8I5N78uKcAvLL4wMrxCR8hTWNKOlP/a4v/Z4//W4v+Ai+cx
+        OaooKr4mJ88sLuAjKNsWIMwoMt4yOusZI9QnHO42Le8lIME+Pb2Dg+fk7//o///b9/ff8v+OnN5ET6sx
+        NrE3MdIyKdcvKsszNscxOL0uN7YkKqdvduPc6f/Y6v/f8P/F0v9PUMg1MMc0MNY4OOQlK9AdJs4iLN4c
+        J90sIucvKdovL7lcX8fm6v/q9v/m/vbl//yQocxRXa8jLp4sML83MeIsJNwnJsoxNckjLrRATNBARNIo
+        K6srN4/c7f/a7f/k8//Kzf9pZN0nHrQrJskyNNgkLNMbJdYgK+AxK9wxL8k+RK/N1f/s8v/r9v/Y6uvq
+        +/9UW6o2ObMlKbgpK88vKuMqJt0sL801PcwwP8QaJ7MjIsY1MdBDRL54gtDm9//Y6fzq8//AwP9jWdU0
+        KMAxLdIwMt4hLtgcLdc3NdsfIauFkODo9P/x+v/p8vzx/f+uteY7OKw2L8wtLtYpK90nKeIpKt4qLs0l
+        Lr4iML4yPdUrJ94xKN0yLMc3OKavuuzt+//c5vfv9P/Z0/9rYN8tJsMoKNIjL9UYK9A9Od4hJKS9y//n
+        9//0///x9/z09v+dl+g8LsoyI+InJ98iKd4iKN8kKtspLdIpMM0qNdMcI8wpJucqH+c8L+kzKL5MTaXs
+        8//0///w+v/x8f++uf8vKLM0M9YlL9MkNNoxK9Y2OLrc7P/t///4//f7///28v+EeNw8JtkuHu4kJuMe
+        Kd4gKd4iKdwpKdkpKdknK90gJNssKu4iGeUuH+wvIdM9MrCmpOr0/f/r9uz2/P/q7f+XlP8zMcYhKMsf
+        LNYmHtc4OsTk8v/x//73/+39//v28P99b9U7JdssHu4gKOAcK9seKd4iJ+ApJOUrIucmIegjIuYwMu8b
+        GtwiGOczJOowHsVYS7709P/5//r6//Xy/P/d4P87PbkiJMghJdspI+AvML7b6f/x//79//L+/vj68v+N
+        f+Q7J9crIeoeKtwZLtccKtwiJ+IrIeksH+0oHu0iH+YuNOsdItsdGuU3LPgzHt42I7XY0P/6/f/2/+np
+        +ejq8/92fN8rLcgqKeMsKuEyNcDc6f/z//////j///779P+Ngds7LM4rJeIcLdcXMNQbLNsiJ+IsIucu
+        IOouJOwhHt8lL+AfLNwaIuEtLPI0Juo1I8SajOr49f/1/+z4//Dt+//J0v8vLsAvKt8gJc44QMPj7//w
+        +f/8/Pz//P/88v9zabw7L8cpKdscL9QXMNIbLNsiKN8sJeIwJOIzK+QjJdcfK9cdLtsWJt0eJ+MuJ+Y5
+        K9B8bNzv5v/z+fT6//Ln9/3k7/8wMrYsJtEcK70yQbXj8P/w9//79P//+P/78P98csU5McQnK9gbL9QX
+        MNQbLNkkK9kuKtcyK9IxL88qL9EcKNQYKtsXK94YKNknK9g1L8pjVM3m2f/6+P/6//7j8fff7P9fYdcs
+        KsMsN88tOLHb5//z+//////89/n79f+kn+o5NL8nLNUbLtUVL9cbLNsiKtssKtgyK9QsJ8oyM9ceJtcV
+        JdwYLuQWLd0hLtYrL8MxK6LWzv/49//w9fbz///q9v+lqP83NrYjHNk7Oszk7f/d7ez9/+T8/9/2+v/e
+        4P8wMKwyN9kLHMcgNukZKeAdJuIrJu0uIek1I+IyJOAlJeMbJuYQKOYQKuIXLtgkNcYmL5fm7v/z/P/1
+        /vv2///x9//Y1v9FQKMoHuM3M8+epO/x/f/7/+n9/+T4///f4f8xMqQxOM8WJNAZKt8aKuEaJeEhIOYw
+        Je01IeYzI+InJ98bKd8QKuIOKuIVKt8iMc4wOK/Axv/v9v/4/v/4/v/w8//o5/9APY0pKtg4Os5dX77t
+        8P/19f/7+v/69v/t6P9OTrgxNsEoMtYWJdUfLt4bKNgdJNEwMNwzJ9kyKtUlMc0bM8sSMdQSLdwZJecl
+        JeM3Lc2Shvzq4//49v/4+v/q7v/s7f8/P40iKtEzOc5BQbXi3v/27v/48P/58v/z7v+OjesuMLQuMtcf
+        KN0iKuEcKNQkMckrMcowKtcsK9UkNcYbOMIVNskXMNQgJeUsJOM6Kc6Zhv/u5P/69//2+//t8//h4v9B
+        P5gbJdYiKcw3N8GLhOz06//79P/z8f/09f/Pzf80MK0qItMsJu8hIOYgJtcwQssjMLwrJ94pJuAiMssc
+        OcAbOMIeNccnLNUzLNBAMrXLvv/4+f/6//vy/frv+P+mpvpAOqkhL+YXIc0xMspEPrXZ0v/49P/6/f/2
+        /P/t7v9cWMIsIcswJO4kGugkJt82RNMiMb0nKtklKN4gMsseNsQgNcYlMsouLNI7L8dBM6Ps5f/5//76
+        //Hu/Pjs9f90btlIPckhMe8YI9gsLtAyLq+PjNzh4f/4///2//zv9/+lp/VFO80yI98tIe0tJustMNgo
+        M8skMssiM8ogNMkiMsskLdUrKNs1JtxALcpNPajy7f/y+/j4//Tt+f/o7f9OQspGM+AUKd8bKdslKNE4
+        NcY/OqOsqefz+f/0///v/P/n8f9hYsozLcI6L+MzK+ohHNUtMd4iMc4gMs0iLtQkKdwpIucwIec7JN5F
+        LsZrXbv08v/0//3z//7n8v/P0P8tH7swG9sYMdUaLNMpLNs0LdQ6LMBbTsGxrfTv9f/s/P/o/P/T5f89
+        S54jKKkwLNI4L/EpIukbINsmLOksJ/gmGvYrFPg6IPZEK99FMrevqPPw9f/k8Prt+//m7v97eOUxI8g0
+        IeIaL9EcLNMnKuAwKOEwINI8K8htYdeene3T3//k/P/J5PnK4/82Rp8uM7ciHcwnH+IsLe0aGuIdFO0x
+        H/4zHPQqFNE9L71jXL3s8f/e7P/q+//m9P+DiN0xLqw3LNY8LewiLdslLN8pKuYvJ+owH+UwHNk5Kc5F
+        Pb+Ume7N3v/d+f/R8P/G3/9FV7A5QcQwM9IqLdwjJd4xKuk8MuosJMUwLqp9hdLa6v/m/f/b9f/j9v+z
+        v/9ARLQrKLk5MdwfFc0oKuMoKeUoJeYoIuUsIusyJe0zJeEvJspBQMBMVLG1y//a9P/Y8f/C2f+Ek/o9
+        SsRATdEyPsYoL7oyN7hXW8uNmOrF2P/h+P/X8v/d9f+KmuYgKpU4OcVEQeQXEsE8N+wqIOksI+gnIuEg
+        H9kiI98tLOgvKuksJ94kIMU8PcsvN6hUYL6Jm+7W6P/E1f/T6P/F5f/R9P/U8P/U6//U5v/d7v/d7//Y
+        6f+zw/9DULg1PMEtL8oSEL0uKuE6NO0nItsxIugyJ+kvKuMlKdshKNsgKd4hJeIhI+AzMegkIcosK8Ex
+        Nbk9Q7ouNqdmceFHV7e00P+du+yNpd+brO+uuv+epv9kac8rMKM9QsYeJbgoLc8yNuMsLeMoJ+EiHtsl
+        H9w4Ktw1K9wxL90rMd4hL9wZKdoXJdscJt4fI9k8POwnJM41MNM5NNMiGro1Lc5GQNswLbkuKrE2MLdE
+        O8hLPNM/L9A0JM8sIdEjIc8wNd4pNNYcKcsVHsUgJdQ0M+0uKeg1KNAuJs0oJ9EnLtkdLtkWKdgWKt0i
+        MOYeJ9wZGs4zLuMwJdktIdVFNuwvH9gxIdo8KdxBLd1AK9s9Jdc6H9o7IOI5H+40IO4lH+I3O/EQH8IZ
+        Lcg2ROQeJ88eHtYoI+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.Designer.cs
new file mode 100644
index 00000000000..88ed53cbe94
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.Designer.cs
@@ -0,0 +1,127 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_create_doc
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_create_doc));
+            this.grp_create_bx = new System.Windows.Forms.GroupBox();
+            this.btn_main_close = new System.Windows.Forms.Button();
+            this.cmboboxcreate = new System.Windows.Forms.ComboBox();
+            this.btn_create_doc = new System.Windows.Forms.Button();
+            this.lbtypedoc = new System.Windows.Forms.Label();
+            this.grp_create_bx.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // grp_create_bx
+            // 
+            this.grp_create_bx.Controls.Add(this.btn_main_close);
+            this.grp_create_bx.Controls.Add(this.cmboboxcreate);
+            this.grp_create_bx.Controls.Add(this.btn_create_doc);
+            this.grp_create_bx.Controls.Add(this.lbtypedoc);
+            this.grp_create_bx.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.grp_create_bx.Location = new System.Drawing.Point(12, 12);
+            this.grp_create_bx.Name = "grp_create_bx";
+            this.grp_create_bx.Size = new System.Drawing.Size(438, 104);
+            this.grp_create_bx.TabIndex = 0;
+            this.grp_create_bx.TabStop = false;
+            this.grp_create_bx.Text = "Create Document";
+            // 
+            // btn_main_close
+            // 
+            this.btn_main_close.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_main_close.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btn_main_close.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_main_close.Location = new System.Drawing.Point(353, 63);
+            this.btn_main_close.Name = "btn_main_close";
+            this.btn_main_close.Size = new System.Drawing.Size(63, 23);
+            this.btn_main_close.TabIndex = 9;
+            this.btn_main_close.Text = "&Close ";
+            this.btn_main_close.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_main_close.UseVisualStyleBackColor = true;
+            this.btn_main_close.Click += new System.EventHandler(this.btn_main_close_Click);
+            // 
+            // cmboboxcreate
+            // 
+            this.cmboboxcreate.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cmboboxcreate.FormattingEnabled = true;
+            this.cmboboxcreate.Items.AddRange(new object[] {
+            ""});
+            this.cmboboxcreate.Location = new System.Drawing.Point(127, 30);
+            this.cmboboxcreate.Name = "cmboboxcreate";
+            this.cmboboxcreate.Size = new System.Drawing.Size(289, 21);
+            this.cmboboxcreate.TabIndex = 6;
+            // 
+            // btn_create_doc
+            // 
+            this.btn_create_doc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_create_doc.Image = global::OpenERPOutlookPlugin.Properties.Resources.Archive;
+            this.btn_create_doc.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_create_doc.Location = new System.Drawing.Point(279, 63);
+            this.btn_create_doc.Name = "btn_create_doc";
+            this.btn_create_doc.Size = new System.Drawing.Size(68, 23);
+            this.btn_create_doc.TabIndex = 5;
+            this.btn_create_doc.Text = "&Create ";
+            this.btn_create_doc.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_create_doc.UseVisualStyleBackColor = true;
+            this.btn_create_doc.Click += new System.EventHandler(this.btn_create_doc_Click);
+            // 
+            // lbtypedoc
+            // 
+            this.lbtypedoc.AutoSize = true;
+            this.lbtypedoc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbtypedoc.Location = new System.Drawing.Point(6, 33);
+            this.lbtypedoc.Name = "lbtypedoc";
+            this.lbtypedoc.Size = new System.Drawing.Size(119, 13);
+            this.lbtypedoc.TabIndex = 4;
+            this.lbtypedoc.Text = "Type of Document :";
+            // 
+            // frm_create_doc
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(462, 135);
+            this.Controls.Add(this.grp_create_bx);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "frm_create_doc";
+            this.Text = "Create new Document";
+            this.grp_create_bx.ResumeLayout(false);
+            this.grp_create_bx.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox grp_create_bx;
+        private System.Windows.Forms.ComboBox cmboboxcreate;
+        private System.Windows.Forms.Button btn_create_doc;
+        private System.Windows.Forms.Label lbtypedoc;
+        private System.Windows.Forms.Button btn_main_close;
+    }
+}
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.cs
new file mode 100644
index 00000000000..d35e6524a68
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.cs
@@ -0,0 +1,79 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    public partial class frm_create_doc : Form
+    {
+        public frm_create_doc()
+        {
+            InitializeComponent();           
+            
+            foreach (Model model in Cache.OpenERPOutlookPlugin.GetMailModels())
+            {
+                if (model.ToString() != "")
+                {                   
+                    cmboboxcreate.Items.Add(model);
+                    cmboboxcreate.Items.Remove("");
+                }
+            }
+        }
+
+        private void btn_create_doc_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (cmboboxcreate.SelectedItem == null)
+                {
+                    throw new Exception("Please select a document from the document list.");
+                }
+                else
+                {
+                    frm_push_mail pushmail = new frm_push_mail();
+                    Model model = (Model)cmboboxcreate.SelectedItem;
+                    pushmail.push_mail(model.model, 0);
+                    this.Close();
+                }
+
+            }
+
+            catch (Exception ex)
+            {
+
+                Connect.handleException(ex);
+            }
+
+        }
+
+        private void btn_main_close_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.resx
new file mode 100644
index 00000000000..3c294eb0444
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.resx
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAACAgICAAAAKwAAAGw8PDykT09Pu1BQULpAQEChAAAAYgAAAB0AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAFBQUNAAAAanFxcdygoaH/l5eX/5OTk/+ZmJj/o6Kj/6alpv93d3jbCAgIVwkJ
+        CQMAAAAAAAAAAAAAAAAHBwcKIyQkhLCwr/2IiIv+Q0NH/zc4PP9KSlD/b29w/3l5eP+VlJX/srKy/rCw
+        sf87OztxEBAQAgAAAAD///8ADQ0NYMfGxf5lZXv+BwdS/hISdv8MDGb/EBBw/wgIUf8rK0D/X19g/4yM
+        jP7CwsL+xsbG/ywsLEYAAAAAAAAAFqioqdykpLn+ERGH/hsbo/8vMEj/srK5/4OEpP8cHJr/GRmh/w8P
+        Qv9RUVP/nJuc/trZ2f69vb7aAAAAAiQkI1D49/X/YWGp/yUlzv8WFo3/bW1w/9vb2//x8O//oqPH/yUl
+        xv8jI87/Dw9C/2loaP/Ly8v/8vLy/3FxcD2jo6OR/////1tbyf8uLuf/HByh/2VlaP/e3t7//f39////
+        //9dXc//LS3n/yIi0f8rKzj/pqal//7+/v/W1taEycnJqv////9wcOX/ODj3/ygoz/9ERE3/xMTE//v7
+        +//+/v//09Pz/zMz8v80NPn/EBBx/4KCgf/09PT/7e3to9bW1qn/////oqL6/0JC//9BQf//Hx9G/5aW
+        lP/u7u7///////////9MTPf/Ojr8/yIivv9hYWv/7u7u//X19aTY2NmI//////Hx/P84OPD/QED7/xkZ
+        kf9iYmb/xcXF//r6+v//////fX3n/zc3+/8pKdz/WVlm//Pz8//6+vmIvb29O//////////+jIzV/zMz
+        6P8rK+H/KChP/4yMiv/X19f/+Pj4/42Nyf8pKev/ICDN/3JygP7/////9/f3PgAAAAD5+fnd/////v//
+        //9SUqn/JCTH/xUVmv9SUmn/pqaj/8nJxv9LS4H/Hh7P/w4Oj/7KytH+/v7+5QAAAAAAAAAA5OTkNP//
+        ///+/v7//////2Fhkv8PD4T/DQ1//yYmXP8xMVz/DAyA/xAQmf9iYob///////z8/DsAAAAAAAAAAAAA
+        AAD8/Pxc/v7+//7+/v7////+xcXL/0xMbP8ICEf/AAA+/xISS/6AgJD+//////7+/mgAAAAAAAAAAAAA
+        AAAAAAAAAAAAAPv7+zX+/v7m//////7+/v/////+/////v//////////////7P7+/j4AAAAA+fn5AAAA
+        AAAAAAAAAAAAAAAAAAD///8AAAAAAP7+/kj+/v6S/v7+s/7+/rT+/v6U/v7+TQAAAAAAAAAAAAAAAAAA
+        AAAAAAAA/D8AAPAPAADABwAAwAMAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAOAH
+        AADwDwAA/D8AAA==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs
new file mode 100644
index 00000000000..547cdab9354
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs
@@ -0,0 +1,334 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_openerp_configuration
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_openerp_configuration));
+            this.btn_main_close = new System.Windows.Forms.Button();
+            this.tbabout = new System.Windows.Forms.TabPage();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+            this.tbconfigsetting = new System.Windows.Forms.TabPage();
+            this.pnconfig = new System.Windows.Forms.Panel();
+            this.chkpwd = new System.Windows.Forms.CheckBox();
+            this.txt_dbname = new System.Windows.Forms.TextBox();
+            this.combo_config_database = new System.Windows.Forms.ComboBox();
+            this.btn_openerp_connect = new System.Windows.Forms.Button();
+            this.txt_password = new System.Windows.Forms.TextBox();
+            this.txt_username = new System.Windows.Forms.TextBox();
+            this.btn_open_server_url_form = new System.Windows.Forms.Button();
+            this.txt_server_config = new System.Windows.Forms.TextBox();
+            this.lbn_password = new System.Windows.Forms.Label();
+            this.lbn_username = new System.Windows.Forms.Label();
+            this.lbn_dbname = new System.Windows.Forms.Label();
+            this.lbn_server = new System.Windows.Forms.Label();
+            this.tb1 = new System.Windows.Forms.TabControl();
+            this.tbabout.SuspendLayout();
+            this.groupBox3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.tbconfigsetting.SuspendLayout();
+            this.pnconfig.SuspendLayout();
+            this.tb1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btn_main_close
+            // 
+            this.btn_main_close.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_main_close.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btn_main_close.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_main_close.Location = new System.Drawing.Point(801, 420);
+            this.btn_main_close.Name = "btn_main_close";
+            this.btn_main_close.Size = new System.Drawing.Size(63, 23);
+            this.btn_main_close.TabIndex = 8;
+            this.btn_main_close.Text = "Close ";
+            this.btn_main_close.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_main_close.UseVisualStyleBackColor = true;
+            this.btn_main_close.Click += new System.EventHandler(this.btn_main_close_Click);
+            // 
+            // tbabout
+            // 
+            this.tbabout.Controls.Add(this.groupBox3);
+            this.tbabout.Location = new System.Drawing.Point(4, 22);
+            this.tbabout.Name = "tbabout";
+            this.tbabout.Padding = new System.Windows.Forms.Padding(3);
+            this.tbabout.Size = new System.Drawing.Size(434, 315);
+            this.tbabout.TabIndex = 2;
+            this.tbabout.Text = "About";
+            this.tbabout.UseVisualStyleBackColor = true;
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.pictureBox1);
+            this.groupBox3.Controls.Add(this.richTextBox1);
+            this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.groupBox3.Location = new System.Drawing.Point(3, 3);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(428, 309);
+            this.groupBox3.TabIndex = 0;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "OpenERP Outlook Plugin";
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+            this.pictureBox1.Location = new System.Drawing.Point(109, 92);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(194, 50);
+            this.pictureBox1.TabIndex = 1;
+            this.pictureBox1.TabStop = false;
+            // 
+            // richTextBox1
+            // 
+            this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.richTextBox1.Location = new System.Drawing.Point(3, 16);
+            this.richTextBox1.Name = "richTextBox1";
+            this.richTextBox1.ReadOnly = true;
+            this.richTextBox1.Size = new System.Drawing.Size(422, 290);
+            this.richTextBox1.TabIndex = 0;
+            this.richTextBox1.Text = resources.GetString("richTextBox1.Text");
+            this.richTextBox1.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.richTextBox1_LinkClicked);
+            // 
+            // tbconfigsetting
+            // 
+            this.tbconfigsetting.Controls.Add(this.pnconfig);
+            this.tbconfigsetting.Location = new System.Drawing.Point(4, 22);
+            this.tbconfigsetting.Name = "tbconfigsetting";
+            this.tbconfigsetting.Padding = new System.Windows.Forms.Padding(3);
+            this.tbconfigsetting.Size = new System.Drawing.Size(434, 315);
+            this.tbconfigsetting.TabIndex = 0;
+            this.tbconfigsetting.Text = "Configuration Settings";
+            this.tbconfigsetting.UseVisualStyleBackColor = true;
+            // 
+            // pnconfig
+            // 
+            this.pnconfig.Controls.Add(this.chkpwd);
+            this.pnconfig.Controls.Add(this.txt_dbname);
+            this.pnconfig.Controls.Add(this.combo_config_database);
+            this.pnconfig.Controls.Add(this.btn_openerp_connect);
+            this.pnconfig.Controls.Add(this.txt_password);
+            this.pnconfig.Controls.Add(this.txt_username);
+            this.pnconfig.Controls.Add(this.btn_open_server_url_form);
+            this.pnconfig.Controls.Add(this.txt_server_config);
+            this.pnconfig.Controls.Add(this.lbn_password);
+            this.pnconfig.Controls.Add(this.lbn_username);
+            this.pnconfig.Controls.Add(this.lbn_dbname);
+            this.pnconfig.Controls.Add(this.lbn_server);
+            this.pnconfig.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnconfig.Location = new System.Drawing.Point(3, 3);
+            this.pnconfig.Name = "pnconfig";
+            this.pnconfig.Size = new System.Drawing.Size(428, 309);
+            this.pnconfig.TabIndex = 53;
+            // 
+            // chkpwd
+            // 
+            this.chkpwd.AutoSize = true;
+            this.chkpwd.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.chkpwd.Location = new System.Drawing.Point(105, 142);
+            this.chkpwd.Name = "chkpwd";
+            this.chkpwd.Size = new System.Drawing.Size(143, 17);
+            this.chkpwd.TabIndex = 67;
+            this.chkpwd.Text = "Remember Password";
+            this.chkpwd.UseVisualStyleBackColor = true;
+            // 
+            // txt_dbname
+            // 
+            this.txt_dbname.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_dbname.Location = new System.Drawing.Point(105, 57);
+            this.txt_dbname.Name = "txt_dbname";
+            this.txt_dbname.Size = new System.Drawing.Size(269, 20);
+            this.txt_dbname.TabIndex = 58;
+            this.txt_dbname.Visible = false;
+            // 
+            // combo_config_database
+            // 
+            this.combo_config_database.AllowDrop = true;
+            this.combo_config_database.Location = new System.Drawing.Point(105, 57);
+            this.combo_config_database.Name = "combo_config_database";
+            this.combo_config_database.Size = new System.Drawing.Size(269, 21);
+            this.combo_config_database.TabIndex = 59;
+            // 
+            // btn_openerp_connect
+            // 
+            this.btn_openerp_connect.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_openerp_connect.Image = global::OpenERPOutlookPlugin.Properties.Resources.Success;
+            this.btn_openerp_connect.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_openerp_connect.Location = new System.Drawing.Point(295, 137);
+            this.btn_openerp_connect.Name = "btn_openerp_connect";
+            this.btn_openerp_connect.Size = new System.Drawing.Size(79, 23);
+            this.btn_openerp_connect.TabIndex = 62;
+            this.btn_openerp_connect.Text = "C&onnect ";
+            this.btn_openerp_connect.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_openerp_connect.UseVisualStyleBackColor = true;
+            this.btn_openerp_connect.Click += new System.EventHandler(this.btn_openerp_connect_Click);
+            // 
+            // txt_password
+            // 
+            this.txt_password.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_password.Location = new System.Drawing.Point(105, 111);
+            this.txt_password.Name = "txt_password";
+            this.txt_password.PasswordChar = '*';
+            this.txt_password.Size = new System.Drawing.Size(269, 20);
+            this.txt_password.TabIndex = 61;
+            // 
+            // txt_username
+            // 
+            this.txt_username.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_username.Location = new System.Drawing.Point(105, 84);
+            this.txt_username.Name = "txt_username";
+            this.txt_username.Size = new System.Drawing.Size(269, 20);
+            this.txt_username.TabIndex = 60;
+            // 
+            // btn_open_server_url_form
+            // 
+            this.btn_open_server_url_form.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_open_server_url_form.Image = global::OpenERPOutlookPlugin.Properties.Resources.Search;
+            this.btn_open_server_url_form.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_open_server_url_form.Location = new System.Drawing.Point(299, 28);
+            this.btn_open_server_url_form.Name = "btn_open_server_url_form";
+            this.btn_open_server_url_form.Size = new System.Drawing.Size(75, 23);
+            this.btn_open_server_url_form.TabIndex = 57;
+            this.btn_open_server_url_form.Text = "C&hange ";
+            this.btn_open_server_url_form.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_open_server_url_form.UseVisualStyleBackColor = true;
+            this.btn_open_server_url_form.Click += new System.EventHandler(this.btn_open_server_url_form_Click);
+            // 
+            // txt_server_config
+            // 
+            this.txt_server_config.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_server_config.Location = new System.Drawing.Point(105, 30);
+            this.txt_server_config.Name = "txt_server_config";
+            this.txt_server_config.ReadOnly = true;
+            this.txt_server_config.Size = new System.Drawing.Size(186, 20);
+            this.txt_server_config.TabIndex = 56;
+            this.txt_server_config.TabStop = false;
+            this.txt_server_config.TextChanged += new System.EventHandler(this.txt_server_config_TextChanged);
+            // 
+            // lbn_password
+            // 
+            this.lbn_password.AutoSize = true;
+            this.lbn_password.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbn_password.Location = new System.Drawing.Point(33, 114);
+            this.lbn_password.Name = "lbn_password";
+            this.lbn_password.Size = new System.Drawing.Size(69, 13);
+            this.lbn_password.TabIndex = 66;
+            this.lbn_password.Text = "Password :";
+            // 
+            // lbn_username
+            // 
+            this.lbn_username.AutoSize = true;
+            this.lbn_username.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbn_username.Location = new System.Drawing.Point(34, 86);
+            this.lbn_username.Name = "lbn_username";
+            this.lbn_username.Size = new System.Drawing.Size(71, 13);
+            this.lbn_username.TabIndex = 65;
+            this.lbn_username.Text = "Username :";
+            // 
+            // lbn_dbname
+            // 
+            this.lbn_dbname.AutoSize = true;
+            this.lbn_dbname.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbn_dbname.Location = new System.Drawing.Point(34, 57);
+            this.lbn_dbname.Name = "lbn_dbname";
+            this.lbn_dbname.Size = new System.Drawing.Size(69, 13);
+            this.lbn_dbname.TabIndex = 64;
+            this.lbn_dbname.Text = "Database :";
+            // 
+            // lbn_server
+            // 
+            this.lbn_server.AutoSize = true;
+            this.lbn_server.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lbn_server.Location = new System.Drawing.Point(34, 30);
+            this.lbn_server.Name = "lbn_server";
+            this.lbn_server.Size = new System.Drawing.Size(72, 13);
+            this.lbn_server.TabIndex = 63;
+            this.lbn_server.Text = "Server      :";
+            // 
+            // tb1
+            // 
+            this.tb1.Controls.Add(this.tbconfigsetting);
+            this.tb1.Controls.Add(this.tbabout);
+            this.tb1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tb1.Location = new System.Drawing.Point(0, 0);
+            this.tb1.Name = "tb1";
+            this.tb1.SelectedIndex = 0;
+            this.tb1.Size = new System.Drawing.Size(442, 341);
+            this.tb1.TabIndex = 40;
+            this.tb1.Tag = "";
+            // 
+            // frm_openerp_configuration
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(442, 341);
+            this.Controls.Add(this.btn_main_close);
+            this.Controls.Add(this.tb1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.Name = "frm_openerp_configuration";
+            this.Text = "OpenERP Configuration";
+            this.Load += new System.EventHandler(this.frm_openerp_configuration_Load);
+            this.tbabout.ResumeLayout(false);
+            this.groupBox3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.tbconfigsetting.ResumeLayout(false);
+            this.pnconfig.ResumeLayout(false);
+            this.pnconfig.PerformLayout();
+            this.tb1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btn_main_close;
+        private System.Windows.Forms.TabPage tbabout;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.RichTextBox richTextBox1;
+        private System.Windows.Forms.TabPage tbconfigsetting;
+        private System.Windows.Forms.Panel pnconfig;
+        private System.Windows.Forms.CheckBox chkpwd;
+        private System.Windows.Forms.TextBox txt_dbname;
+        private System.Windows.Forms.ComboBox combo_config_database;
+        private System.Windows.Forms.Button btn_openerp_connect;
+        private System.Windows.Forms.TextBox txt_password;
+        private System.Windows.Forms.TextBox txt_username;
+        private System.Windows.Forms.Button btn_open_server_url_form;
+        private System.Windows.Forms.TextBox txt_server_config;
+        private System.Windows.Forms.Label lbn_password;
+        private System.Windows.Forms.Label lbn_username;
+        private System.Windows.Forms.Label lbn_dbname;
+        private System.Windows.Forms.Label lbn_server;
+        private System.Windows.Forms.TabControl tb1;
+
+    }
+}
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.cs
new file mode 100644
index 00000000000..f5f4909511d
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.cs
@@ -0,0 +1,216 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Diagnostics;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+
+
+    public partial class frm_openerp_configuration : Form
+    {
+        public string combodb_val;
+        public string url;
+        private ConfigManager config_manager;
+        
+        public frm_openerp_configuration()
+        {
+            InitializeComponent();
+
+        }            
+            
+        void load_dbname_list()
+        {            
+            combo_config_database.Items.Clear();            
+            OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+            OpenERPConnect openerp_connect = openerp_outlook.Connection;
+            try
+            {
+                if (openerp_connect.URL != null && openerp_connect.URL != "")
+                {
+                    object[] res_dblist = openerp_connect.DBList();
+                    foreach (var selection in res_dblist)
+                    {
+                        combo_config_database.Items.Add(selection);
+                    }
+                }
+            }
+            catch
+            {
+                this.setdblist(openerp_connect.DBName);
+            }
+        }
+        public void setdblist(string dbname)
+        {
+            txt_dbname.Visible = true;
+            txt_dbname.Text = dbname;
+            combo_config_database.Visible = false;
+        }
+        private void frm_openerp_configuration_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                this.config_manager = new ConfigManager();
+                this.config_manager.LoadConfigurationSetting();
+                
+
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                if (this.txt_server_config.Text != "")
+                {
+                    openerp_connect.URL = this.txt_server_config.Text;
+                }
+                if (openerp_connect.rempwd == true)
+                {
+                    this.txt_password.Text = Tools.DecryptB64Pwd(openerp_connect.pswrd);
+                    this.chkpwd.Checked = true;
+                }
+                if (openerp_connect.URL != null)
+                {
+                    this.txt_server_config.Text = openerp_connect.URL;
+                    this.txt_username.Text = openerp_connect.UserId;                                        
+                    try
+                    {
+                        object[] res_dblist = openerp_connect.DBList();
+                        foreach (string selection in res_dblist)
+                        {
+                            if (openerp_connect.DBName != "" && selection == openerp_connect.DBName)
+                                this.combo_config_database.SelectedText = openerp_connect.DBName;
+
+                        }
+                        this.load_dbname_list();
+                    }
+                    catch
+                    {
+                        this.setdblist(openerp_connect.DBName);
+                    }
+                 
+                }
+                
+                
+            }
+            catch(Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+
+        }       
+
+        private void btn_main_close_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btn_openerp_connect_Click(object sender, EventArgs e)
+        {
+
+            try
+            {
+                url = txt_server_config.Text;
+                string dbname;
+                if (txt_dbname.Visible == true)
+                {
+                    dbname = txt_dbname.Text;
+                }
+                else
+                {
+                    dbname = combo_config_database.Text;
+                }
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                openerp_connect.URL = url;
+                openerp_connect.DBName = dbname;
+                openerp_connect.UserId = txt_username.Text;               
+                openerp_connect.rempwd = chkpwd.Checked;
+                if (chkpwd.Checked)
+                {
+                    openerp_connect.pswrd = Tools.EncryptB64Pwd(txt_password.Text);
+                }
+                else
+                    openerp_connect.pswrd = "";
+                if (openerp_connect.Login(openerp_connect.DBName, openerp_connect.UserId, txt_password.Text) != 0)
+                {
+                    openerp_outlook.Connection = openerp_connect;
+                    Cache.OpenERPOutlookPlugin = openerp_outlook;
+                    this.config_manager.SaveConfigurationSetting();
+                    
+                    Connect.displayMessage("Successfully login to OpenERP.");                    
+                    this.Close();
+                }
+
+            }
+            catch (Exception)
+            {
+                MessageBox.Show("Authentication Error!\nInvalid Database.", Form.ActiveForm.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+
+        }
+
+        private void btn_open_server_url_form_Click(object sender, EventArgs e)
+        {
+            frm_openerp_connection openerp_connection = new frm_openerp_connection(this.txt_server_config);
+
+            openerp_connection.Show();
+
+        }        
+
+        private void txt_server_config_TextChanged(object sender, EventArgs e)
+        {
+            try
+            {
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                openerp_connect.URL = txt_server_config.Text;
+                this.combo_config_database.Text = "";
+                this.txt_dbname.Text = "";
+                try
+                {
+                    openerp_connect.DBList();
+                    this.load_dbname_list();
+                    if (txt_dbname.Visible)
+                        txt_dbname.Visible = false;
+                    combo_config_database.Visible = true;
+                }
+                catch
+                {
+                    if (combo_config_database.Visible)
+                        combo_config_database.Visible = false;
+                    this.txt_dbname.Visible = true;
+                }        
+                this.txt_username.Text = "";
+                this.txt_password.Text = "";                
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+
+        private void richTextBox1_LinkClicked(object sender, LinkClickedEventArgs e)
+        {
+            System.Diagnostics.Process.Start("http://www.openerp.com",e.LinkText);
+        }       
+    }
+
+}
+
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.resx
new file mode 100644
index 00000000000..ff190785fec
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.resx
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAL4AAAAuCAYAAACWEqPeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAFERJREFUeF7tnWus
+        VcUVx9vEL37zm59M4web1tKIzxqx1JKQlNaQ2MSm1NpGTUhpKWithlLbWqKmvtAYn41W4rsG0JJiLbX4
+        AIpWqYAvRLgCl/cFvPeC78d0fsP5b9eZO3P23oeDveUekp19z95rr1mz5j9r1mP25vPOuc91/3U1MOI0
+        APC7R1cHIw0DXdB3J/6IxMCI7PRIs27d/g5d0bvA71r8EYmBEdnprgXsxjRd4Hct/ojEQEc63f/aa65v
+        /jy3/eab3NYrZrltf7jK7bz9Vrd78T/d3p07vYE9tCzMypUr3WWXXebGjRvnrrvuutL+PfLII+7KK690
+        W7dubaJ9+eWX3VlnneWOOuooN2bMGHfqqad27Dj22GPdueee617zY5PT/6JFi0K7o0aNqt3+ySef7MaO
+        HesmTpzopk2b5u67774h/asy7jfecIMbPXq0g187/T/zzDNDP+GzfPny0rGQTG0Df3DjRrfjzj+6jZO+
+        59Yd/1X3xpePceuO+4pbd+LocOb3G6O+5DZO/HaYCP2rV1UWqorCOknT39/vdmzf7vbs2ZOVcf369e7y
+        yy8Pg33kkUe6ww47jAKIO/roo91TTz0VngPcDB5gBgiS8aKLLgq0M2bMGML/jjvuCPy43+njxBNOcC++
+        +GJLvSPT4YcffkBtowt4HHPMMW7SpElu8eLFDp1WGSP0Cnilz3Z1QPvocfz48e6WW25xu3fvbtl+beDv
+        3bUrAHndSaP3g90Dfdv117g9y5a6gTfecIObNrqBta+73Yv+7nqnTN4/AaDzk4PVoIoyPiua3t5eN3Pm
+        zGBxjzjiiHDWwFkZnnvuOYcFTQ0KA3b++ecHqxPfP/vss93s2bPDwE6dOjUAg0lhee/0KyLX2h3wVs8B
+        /BUrVrTU+erVq4PF73T76HHDhg2VxvuBBx4I+u+kDOj6iSeeyLZfC/iA+80J4wtr3jt9qhvcti3LfK+3
+        oLg8Aj8rwKbJF1RSxsEG/9q1a92ECROyYAa0WCPkuPrqqw9oUAA9fJhAskqySLg/TIxODrp4VQE+EyM3
+        qQ9UJqyvdNhqPO+5556OAx/ZWQW0GsftVwb+rgV/Ca5LAPGxX3SAvgo4WSGw9IXl927QlhmXVnq2Cv92
+        aACd3I9Wg4sbw7KJRW9Fd8kllwQF4+ak6LB+khPXg5UFl4lryJICPhME4HLgA9c58JflepT5vTng4/sj
+        tw4Mgf2Nb3/GGWcE+VpZa4xGmdsxZ86cITxYSVlFiR8wHPbg2uTJk4M86A4Zcu4ausCNbQv4u/+x6FOr
+        7UGP1d83MFAZvLg/co2YAOtPO8Xteebpys+3A+5Wzzz++OMdsbC4CAwAvr2W9QULFjhAwqTRYAAMrFoM
+        flYcBiXlJl188cUHpJ/nn38+gCVn8SRLDviPPvpo5fb7+voc7goTOp74rCatAmzkSAEf3fX09FSWYY0P
+        4hmLOFbgN4mI2sAfWL+uCbQErvjvdcC4d8cOt9mvENbl6f35T2vxqNNeK1qsD6BqZcGxtvjdZAqWLFni
+        Nm3aFICLlWb55h7KfOihhwJwcZvuuusut3pVcwDPc7fddlvw7ZkcVi4CQLk9TJRYHlakTvW5FZ8c8G1w
+        XlUOnkkF6rh4rXjkgF82YVI8Wali8KP/2sDv/dlPmqz9hrO/W3tA8PW333D9p3y81e/55ljH9apK7RQd
+        1omAFuUooGU5BHykJnEN4uzORp/BIiVJGtPKsWzZMnfNNdc47r/00kthoqyKwA89bRLExn2YO3ducLlI
+        i8bAnz59+meimxdeeCHp4997772129/m471UvMAkbwf4r776am0Z0GcMfFaPWsB/6z8rmsCKj7/z/voK
+        AeCkPguLj7sz5lT31vP/TnYMemIKAuEdt948hGbf4GB4duusy93Gc38QznsTflxK2ft8zLHl4T+7Z8+Z
+        5J75+hi36pzvu76SFezp2de7u79wVAjUY55Y+1c8eAbmz3VPnn6ae+aC82pNaFYM/OX/lcXvJPA3vPlm
+        WN3ivpTFGTmL3w7wMSIx8HE7awEfQDWB9ZQTHPn7utY3CXzv5xM7xLz6V77oNnowql3qAJaGeKFpFWrU
+        C5C1lVy4W9tvvMH1nHx8qDP0nnic2+TjFQ6u7bxnzpDnSc8y+US36bwfDQH1vmeXh1oF8kIH350PPVhZ
+        R7msDgHcEN343Dj5cR26T3B9++23V27T8s0Bvx1XB3cuDnQBHYW6dix+HR+fVRr3M+Xjo5/KwAcob37n
+        W01uDsWquqCHPqQ15/ypeRJ97SS362+PFfyCO+Qrv3ai8Te1ALVJOpUgmdoBK4albZUmfcu7Lz3jx4Vs
+        FG3Ajwm0+cJpn04wv3KwknCPwD2kYT29bQN623/qF7G8yGX7VaavHPABEKDBgnJOHdxTQEn2qayt1P0c
+        8HHDqvLDMuM+prI7gDGVVbG8c1kdXM+77747HMRQOvhN4Y+MEQU4sjupwJqVB9crVU/IpjP75j5cVGSV
+        wmy3ABVA7a1t0+phMjuDvpC0+RcXup6xpzmsqi16bbv26jAABNRkg2SZ9zz1ZBM/XJ7UQO3664KCjsKb
+        pdn12MJPge8nNXIO+qILvJCFswU/fQgT2fvrWy79ZYhTSM32fOP0gg8xEFs4qoKmU3n8O++8s3KbVrYc
+        8AEMbgMpS4J6e+gaaUQAl6u6wqOKu5IC/oHWEPR8bgJngR+sobV4+PcP3t+WcgNQPEAs8AEWrgSDgHsj
+        S9z/6isFHdYTd4jMEilUwK5BYwsEll88mTAx2IgDtJ0CQMbFNvYX6XncJ55/y7suAvieJc8U2y+CJfcT
+        BRpArxVmcMuW8Lf4xKtC2QQYrsA/UOCR6o2TATldHAzgMxlJNuTazAI/uAaN7Qbad9Nu7h3AWUsOP4Cc
+        EgqwqV1oCLBZDfp8QGrpY+CTLrX3adNOtjgGCLGCT6nSFn1N9c3WL7D+PMME7Z06pWiLyVVUsz0vTeAy
+        wOt+DvhkInAdyg7VCkibVm2zisVvF/ikM3F74g15rWTrJPABPPUR0tCt2swCv9hopr02PiDs9ym7dpSL
+        K2PdAbJDgDnmhY+969H5RXWYGEO7PYdYc++327pA7Ibh1+s+LomtPeDS4PYE0PuVJ+eTs8KJx5Zf/ypM
+        Pqy7zSBZVyqsCgv/WktHOeBPmTIlVDzxjzdv3pw8uAcNleWbbtofu9Q9cq4OFpuaBe6ODn7j5qSqpMQb
+        1DrKqrQp+XI+PpVw237qb2QiFY2+8PtJK1fRQR74jR2X1t/G5ajCdAhIvVVs8u8JbBMACRvgZl9XAJ/J
+        l/XdNUEalWC7IhCc2kAZN0eBKytI8N39c6wSbKjL9Yn4QpVmVixWiDgTZWMX2hlYs6aWjnLAr1PAokaQ
+        qhNUGasc8OfNm5ftB1mSGPxY2qVLl9bqu+TrROW2Sl8tTWVXBxC2A/xgXQXmxuoRpyglECuDdYmCj5/I
+        scc8cTUs4IgdBG6Au+GsiSHFCHBpGxeobPUa8Dnpwnf3sQ7ZpNiNwb+XuxQyUBX3L9kByAF/uBewCHZj
+        d4jMU1WLa3XQycpt1QmQBX7wj01wC/DLwJJqFDDb1CMASuXMeRbAWtpUwBro/MpDarUITE3Kk/tYdbs3
+        iIkBaHF/ZPnLFESQixtU1BP8KhEXyYb49zfdWNviDVfg271FKV2xDQGgx+Bn3xFbNcr0WwX4VTJCddqp
+        ZPFZ0i148MtTBadWDYf8vS8MFW4OBaMf/zCrFPL0ol3vi2Xk/lP8bUU5+NXe7bF0+OxNfBLFqTKFFbFG
+        YzdqqoIcdqw2VjFSrX0+dVrGN77//wp8+pEqWDER6tYUOlm5rar/rMXHMtoKKtY/zoOXNYIFVzqR53E5
+        cq8ixkUuAtJUPjyuCaQmkp1sqYlRJjd9V/ALsHGPSLnGz9n9RyF/71OxZbyrAj/1tlZd3gBz4cL9Kdjc
+        kfPxyyy++KW2VOPvl+0KHbYWH8FsgQfgAsaqrsI+H3BZf50MDcWh3ACQftx8ycVNhaAUbb8vf8sdIg0Z
+        g43AFutcZeWAPylKXBbbL1wpK7ty/FaeQZ9pIa1p3S1b+a26AS9n8SkMkbGIMytlWQ7u8wwb7wAgO0gP
+        JvDZq5Tan0Nx6/XX84mDYQ18hKNY05Q2/N1vSq0aG8GKoM9PmJAD94FgqwEgmNQWCeIJ0ocxfcj6NLYJ
+        BCuc2QMSb4+Ic/zwDSuMT1fCRwUrtYfLtd5nntTv+D50uFt2SwfpWXhu9fqhiFX1JftOFbByr0XyfkA7
+        wK+zO5M0Ymq7Au8DsGOzbKVKvYFF1og99mXPtnu/NO+LFWNQLfi3zJzhCFrjRrG2xAG4NNDj5mjLQZmA
+        BM42FsDNssC2e3kCsPwkyPHk6w42fYocTKQ9/1oW0qgUs6grICcFs5gPGaBixSCGSPjutNEUAzUSAewt
+        YhKX9Vf32bJ8sN65BTxlwM+9c1tnrw59IahNbV2YNWtWaaqVVSmeOMjObs+qeqxLVwp8GAJ+rCiuThM4
+        vSVnoEn74eMWL6A3Xi+s+mWFULgygaJtA8uLS8OZI67gpjrMBrutv/9tc+XZVKFxlXJ8wvYKP0kkA5Mj
+        FWuEANpkvZhIcZBdZTDYcHWwvrLAKjB/fnPgH8vEJrJUQYqi0JoaNQk2iuX27OB25Xx+VgS2ZaeeJUYp
+        2+BWRccpmkrA14NYWSz61quuCOlEAMlkIF1IkIklxaLi/9YRCLDZYBJXB8DpgDfpyDp8cbeCK+PlRD7O
+        uCHI3ypOwSXj3QEqwQA5N3kHetaHekCoEXijUNW1sXph1yCfLFHlkVfnOnVggXE1Wn1eZIV/jwAaaON2
+        AWPZaqG+8DUDKqdUkFPyEwCzs5LVLcYFE5PnOOBhn2cylW1proMzS1sL+O02UvYcAabNy7e7/bmsne79
+        +lsaDlWdDQvgU3XV3iDOWOZDVeHdfg2PyTcsgN9UcMKP9+8CdAEyPAByqI5DKfApP7OvWv4ZZ35z2Dwt
+        f+u69mHHz0ITl7NtijLslqRwldhhp3bj3LCuW77QiE73OUse5EuV1SU/g237kmsz1oHlq7YEHP1Wu4Vc
+        jZfQA69GMMmGM+mQADPWKzxFEwegos9tWoOXfcaOp72OLGpXvHipPt5jLzni9lJy2LbFy/ZNvLhnJ5xo
+        +xq64sxzouNsZS/TAbxbAp+trrz7SQDGpika4ysCBCC6xutfMOJrA9Bw5uAaO/yg1U4/rse7/kiL2g1l
+        5MZjKwNY4E2bVDQ1CalKwh++nFWltDJIXs6SR/R6r5SvAKiftAHQ4Udb0Mbvn1odQMMzyGT7qrboCy9b
+        S07pq5Cr8eUG7tNHDT6/eRb6WK8MtNWHQEfuXbSpd2YlB7z1TNl4apx51vZJYwQm4GcnKjqR7jQmcdvo
+        XOMgWundYiSFQbUpXUKvv8t0ILmzwEcwOgToPv7447D/AqWy+47rfPOEjAF/I/C1114bPs/x0UcfhYMG
+        +CQHz3AADGi4ZoEdtjXoTSpe1o42nNkJxN+ffPJJeB65aJuMAu1xtrLQFnSSlzNtQwM9uWPRiw/95Hjn
+        nXfCPbIa0H7wwQdNMlsdYF2gpYLJWf1TWzIK5LOtbsSDPDo0Aj6DyDUBP6VXC0DpQzzoV0pm7vN6IulT
+        eOvLB2orN57oA9kBoO2TxlDPqx+MNVhBLuR47733Qv/itrnOfatn9UE6zGFQbcoYQ6/xhl8rHZQCn9kI
+        kAEBxOyUgynpJ858jYzO0DgvH9AwM5dB0YxFIHhwcC0FfFtsCgWv6L1Y2ibXSzvw1zdaNPjvv/9+kI+z
+        5KOdVsDnWfgBbPVHfKQYeMED2vi7MAKtrCF8NFlSwOejTfDDKskypoAPH+Ri56MFPv2moKSiUkofyK3J
+        zLjE7gL34cObSYyH3tEViFLjCeCZIMjEl9XKgC9LnNpVmWo7Bnr8WxjUmMQYRF/QWOCX6aAU+FgGOi5C
+        DQYKYlAYdGjkWwn4CGEHn+tYE5QHP2vxrX9PNgc3R++12lWBv1kxZK0AIgOIHDb20IQsAz6fu4OWz+yp
+        P3GOWcBH3rj4ItCyyiATfdMKlAL+u+++G+7Tf62iKeCTswaUTJAY+FavKX1wjZWJVVhGwupQKxOARz/Q
+        cF/AT42n3Cb6ySdNyoCvVS/+clqu7TLgk/tvhUFkkowydK10YPWRdXVkpZjxgIKZhRAMjlydDz/80DGo
+        MBTYaFiugWYiNAyodQV4JrwX67c/UPWlkqqXz2PQAxo+6S1FAVb2uNBp+bKc+c11WU7kxqJzHRk0cMjH
+        csxgiw+AgF4TQEswtFquJZdAiy40cRh0+qgB4KztubiCrIpyDaG1Lpj6BQhl1Szw4cWKpFUJax7rAx5Y
+        XPqJ1ROwJbP0g+UGUHJ3rKsTj6dcV7WbAv5LDbdMrg4YQa9acYglcm2XAZ+do5ITPhgEi0GeZ6xlpMp0
+        UAn4KJCZri/TMog0Hg+YmDE4CKCDQbBLEFY/Bn4M8Nxv+Xo8jxz6TwewJCyhXEchWn24r4nGfVUv7cDx
+        v4HwHIDkOVljrinIsv2xskkH3Ie/XB0qsZIHfeh7LkwqaNEloMQtygGfe5JdBiXWa04fapsznze0MtM/
+        VidADMBlNGIf3Y6nJrGuSX+SZ553v2LggxHGSDQEt7m2y4Cfw6CNgWT1JWsrHVQCPkQoqRE8FQFrw8IX
+        ll7MGgEtyg7/oMNaKtDVc3GgWAX8DYsb+Iofz8FT8hGEafXhnuThvq432g6AaFgx987bb7v3PB+e179G
+        XFP8bvxRrI7qC9fhrz7xnNWX4iOAFtMm9FjEU0aXRT+sbFYfDd5BNrXNOV6l6F9Mi9zqq2S142l1zfUP
+        9sdTxT9+v7s/Bixkh0795Tpy5NputFWsZKnfPK9+SX4zPkW/JWsrHahvnEvz+Ja4+3e3qHSoYKALfD/7
+        D5XB7Paj+lh2B70L/BGJgf8CyTGQGzlDYYgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="richTextBox1.Text" xml:space="preserve">
+    <value>
+
+
+ This Outlook  Plugin For OpenERP Presently (2011-Today) developed By OpenERP SA.
+
+
+                      		
+
+
+                                              
+
+
+		For More Information, Please Visit Our Website
+
+			http://www.openerp.com/
+
+	        Copyright 2006-TODAY OpenERP SA ALL Rights Reserved.</value>
+  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>39</value>
+  </metadata>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAQEAAAAEAGAAoMgAAFgAAACgAAABAAAAAgAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAD////////////////////////////+/v7+/v79/f37+/v7+/v7+/v7+/v9/f39/f3+/v7+/v7+/v7+
+        /v7+/v7+/v7+/v7+/v79/f39/f39/f79/f79/f79/f7+/v79/f3+/v7////9/f38/Pz+/v7+/v7+/v7/
+        ///+/v7+/v7+/v7+/v7+/v7////+/v7+/v7+/v79/f3+/v7+/v7+/v7/////////////////////////
+        ///////////////////////////////////////////////+/v7////+/v719fXw8PDx8fH09PT7+/v/
+        ///////9/f39/f39/f3+/v39/f3+/v7t7u3d3dv8/Pr///7///3///39/f78/f3u7u7q6ur8/P35+fro
+        6en7+/v////+/v7+/v7+/v79/f39/f3+/v7+/v7+/v7+/v7+/v79/f3////////+/v7+/v7/////////
+        ///////////////////////////////////////////////////////////////9/f3+/v7U1NRvb29e
+        Xl5hYWFycnKTk5O1tbXS0tLo6Oj9/f3////////7/P/u7/7AwdRmZnS2tczV1f/S0//U1f/X2P3a2/OS
+        kpC3t7T////AwLqHiIP09PX+/v77+/z9/f39/f3////////+/v7+/v7+/v79/f3////7+/utra3q6ur/
+        ///9/f3////////////////////////////////////////////////////////////////////////8
+        /Pz+/v6goKAAAAAAAAAAAAAAAAAAAAAHBwcoKChNTU14eHioqKayssePkeJtb+xYWvNCRMpBQok7Pa0u
+        MKM+QbJKTNVaW7ZPUJ55e/SrrN1wcYLMzdz////////////////////GxsaOjo78/Pz////9/f38/Pz/
+        //+goKAAAAC2trb////7+/v/////////////////////////////////////////////////////////
+        ///////////////9/f3+/v7Ly8shISEAAAABAQEAAAAAAAAAAAAAAAAAAAAAAAAQEA4XFyQQEToUFVMV
+        FmccHFsRESAEBBcAABIHBhsQETk6O300NsQqLKJAQXw3OcdPUfWIi++5uc2urquSkpJhYWEjIyMVFRX4
+        +Pj////7+/v///+6uroMDAxSUlLr6+v////9/f3/////////////////////////////////////////
+        ///////////////////////////////9/f39/f34+Phubm4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
+        AQEAAAEAAAAJCQAKChEBAQAAAAAAAAAAAAEAAAABAQALCxUUFCE3OHkuMd0zNegxM50dHkATExgSEhEK
+        CgoCAgIAAABjY2X////6+vn////CwsITExNkZGTr6+v////9/f3+/v7/////////////////////////
+        ///////////////////////////////////////////////+/v79/f3////S0tIqKioAAAABAQIAAAAA
+        AAAAAAAAAAAAAAEAAAAAAAAoKDg5O8EuL4ADAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFjU+P5YmJjwE
+        BAYAAAEAAAACAgIEBAQAAAANDRDl5eX////////GxsYSEhJra2vx8fH7+/v+/v7+/v7+/v7/////////
+        ///////////////////////////////////////////////////////////////+/v7+/v39/f3///+4
+        uLQXFxgAAAEAAAAAAAEAAAAAAAAAAAASEgw1NnwyNOMjJuUpKo8GBgAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAABAQAAAAAAAAAAAAEBAQEAAAAAAAEAAAEAAAEPDxWBg9vu7v/IyMQPDxBnZ2f29vb7+/v9/f3+/v7+
+        /v7////+/v7////////////////////////////////////////////////////////////+/v7////9
+        /f7+/v79/f79/f25uv9BRLYiIkALCxYEBBAHBxIUFCMqK2M6PcUrLuodINclKNhoadVCQkUAAAAAAAAB
+        AQEBAQEAAAAAAAAAAABHR0hmZmgODg4AAAAAAAAAAAAAAAERESFDRZ0WFh8dHmtNT68TEwhiYmT7+/r+
+        /v79/f3+/v7+/v7////+/v7/////////////////////////////////////////////////////////
+        ///+/v/////+/v7+/v/9/f38/P6ys/EqLdggI+QwNOI1N8ElJ6csLrQyNNQsL+khJOEaHdVDRt6ys/H/
+        ///b29plZWUuLi4VFRUFBQUAAAAAAAAAAACWlpb///+Li4sxMTEjIyQ1NTNNTWQ1N7slKfYyNJcREQMN
+        DQshImOho/H5+f7//v3+/v7+/v7+/v7////+/v7/////////////////////////////////////////
+        ///////////////////////+/v/+/v79/f79/f7ExfQzNtscINgkJ9chJNojJuIlKOQkJ+MiJd4jJtgY
+        G9VgYuPc3Pj////9/f3////////b29uvr6+NjY1nZ2dJSUlra2vf39/////////f39/Gxsbj4+L09P+W
+        mPUnKtksLuMzNFwpK3gvM+YjJt2Iiun39/3+/v7+/v7+/v7+/v7////+/v//////////////////////
+        ///////////////////////////////+/v////7+/v/9/f79/f7p6ftKTd8ZHNclKNkkJ9olKNkkJ9gk
+        J9gjJtclKNgVGdZlaOTo6Pr////8/P3+/v79/f3+/v7////////////5+fno6Ojz8/P////9/f39/f3/
+        //////////////7+/v21t/EqLt0tMNQrL90iJdwhJNcdINiAguj7/P39/f3+/v7+/v7+/v/////+/v//
+        ///////////////////////////////////////////////////+/v/+/v77+/3///+Bg+kUF9YmKdkk
+        J9kkJ9klKNolKNokJ9omKdoZHNdQU+Hf4Pn8/f79/f3+/v7+/v/////+/v7+/v79/f3+/v7+/v79/f3+
+        /v7+/v7+/v7+/v7+/v7+/v79/f7+/v79/f7///+/wPMgItkhJNklKNkkJ9kkJ9kYG9eIiur////7+/3+
+        /v7+/v/+/v////7///////////////////////////////////////////////////7+/v/9/f7////Q
+        0fcfItgiJdklKNokJ9klKNokJ9kkJ9kkJ9kgI9gxM9vGxvX///79/f3+/v7+/v////7////+/v7////+
+        /v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7////////+/v/+/v7+/v78/P7///+ur/AUGNcmKdokJ9kkJ9km
+        KdkWGdaen+7////8/P7+/v7+/v7////+/v7/////////////////////////////////////////////
+        ///+/v78/P3///9hY+MUF9YoK9kkJ9klKNokJ9olKNolKNokJ9kgI9mIier+/v79/f7+/v7+/v/////+
+        /v/////////////////////////////////////////////////////+/v7////+/v7///77+/7///9/
+        gekSFdYnKtkjJtgkJ9klKNoYG9fAwfT////8/P7+/v7+/v7///////7/////////////////////////
+        //////////////7+/v/8/P7////X1/gdINglKNkkJ9klKNokJ9klKNokJ9olKNkjJtk9P93Y2fj////+
+        /v7+/v7////+/v////////////////////////////////////////////////////////////////7+
+        /v/+/v/+/v7+/v7y8/xGSd8ZHNcmKdkjJtkmKdkhJNkxNNvi4/n////9/f7+/v7+/v7/////////////
+        ///////////////////////+/v/////+/v78/f7///99f+gUGNYoK9okJ9klKNolKNolKNokJ9kmKdkg
+        I9iEhen////+/v79/f7+/v/+/v7/////////////////////////////////////////////////////
+        ///////////+/v/////+/v/+/v78/P39/f65uvIgI9kiJdklKNkjJtknKtkcH9heYeP4+P3///79/f7+
+        /v7+/v7////////////////////////////////////+/v/9/f7///76+v09QN0gI9glKNolKNokJ9kk
+        J9olKNokJ9omKdksL9rQ0fb////8/P3+/v7+/v//////////////////////////////////////////
+        ///////////////////////////////+/v/////+/v7+/v79/f7z8/xqbOUZHdclKNklKNojJtgmKdkg
+        I9iYmu3////+/v7+/v7////+/v7///////////////////////////////7+/v/9/f7////KzPUhJdgm
+        KdokJ9klKNolKNolKNokJ9omKdofIthYWuL///////79/f7+/v7/////////////////////////////
+        ///////////////////////////////////////////////////+/v7////9/f/9/f3///6+vvMsL9oh
+        JNkkJ9okJ9kkJ9khJNg9QN3W1/f////+/v7+/v7////////////////////////////////////+/v78
+        /P3///+Ymu0bHtcnKtokJ9olKNolKNolKNokJ9ooK9oXGteVl+z////8/P3+/v7+/v////7/////////
+        ///////////////////////////////////////////////////////////////////////////+/v/9
+        /f3+/v7v8PxiZOQeIdgkJ9klKNokJ9klKNkdINh7fej29v39/f7+/v7////+/v7/////////////////
+        ///////////+/v7+/v7///91duccH9gnKtokJ9okJ9olKNokJ9okJ9klKNogI9nKy/X////9/f7/////
+        ///+/v//////////////////////////////////////////////////////////////////////////
+        ///////+/v/////9/f79/f3///+nqO8lKNkkJ9kkJ9okJ9kkJ9khJNgsL9rJyvX////+/v7+/v7/////
+        ///////////////////////////+/v7//v7///5bXeIgI9kmKdokJ9olKNolKNokJ9olKNohJNgwM9v3
+        9/3///79/f7+/v//////////////////////////////////////////////////////////////////
+        ///////////////////////////+/v/+/v79/f3///7i4vlER94iJdklKNolKNokJ9kmKNkXGdZrbuXy
+        8vz8/P7+/v////7////////////////////////////+/v7///729v1GSN8jJtkkJ9olKNolKNokJ9ok
+        J9omKdobHtdRVOD//////v7+/v7////+/v//////////////////////////////////////////////
+        ///////////////////////////////////////////////+/v/+/v7+/v7///96fOgfItkmKdkkJ9kk
+        J9okJ9ohJNggI9jLy/X+/v79/f3+/v7////+/v/////////////////////+/v7///7w8Pw8P90lKNkk
+        J9klKNolKNolKNokJ9onKtoVGNdwc+b////9/f3+/v7/////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////+/v78/P7///+3
+        ufIjJtknKtkkJ9klKNokJ9knKtkTFtZuceb8/P78/P7+/v7+/v/////////////////////////9/f7/
+        ///j5Po5O9wlKNkkJ9olKNolKNolKNokJ9ooK9oQFNaHiOr////7+/7+/v7/////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        //7+/v/9/f7////q6vo6PN0kJtkkJ9olKNklKNolKNogI9kkJ9nf3/n////9/f7+/v////7/////////
+        ///////////9/f7////e3/k2OdwkJ9kkJ9olKNolKNokJ9okJ9ooK9oSFtadnu3////7+/7+/v////7/
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////////+/v/+/v7+/v7///9laOQcINgmKdokJ9olKNokJ9knKtoRFNaGiOn////7+/3+
+        /v7////+/v/////////////////9/f7////o6Po6PdwlKNkkJ9olKNolKNolKNokJ9onKtoTFtaipO7/
+        ///7+/7/////////////////////////////////////////////////////////////////////////
+        ///////////////////////////////+/v/////+/v78/P3///+am+0WGtcoK9okJ9olKNokJ9klKNoe
+        Idg2Odz09P3///79/f7+/v/////////////////////+/v7///7y8vw9P90lKNkkJ9klKNolKNolKNok
+        J9omKdoWGdewsfH////8/P7////+/v//////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////9/f7////Cw/QeIdgmKdok
+        J9kkJ9klKNokJ9knKtkWGda5ufL////8/P7///////7////////////////+/v7///739/1HSt8jJtgl
+        KNokJ9olKNolKNokJ9omKdoZHNe/wPP////8/P7/////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////+/v/9/f7/
+        ///t7fsrLtoiJdklKNokJ9okJ9kkJ9onKtoXGtZvceX////8/P3+/v7////+/v/////////////+/v7/
+        //7///5bXuMgI9kmKdokJ9olKNolKNokJ9omKdoWGdexsvH////8/P7/////////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///+/v/////+/v7///7///9DRd4eIdgmKdokJ9olKNokJ9olKNohJNk5PNz09P3////9/f7/////////
+        ///////////+/v7+/v7///9xdOYdINgmKdokJ9olKNolKNokJ9onKtoTFtaio+7////7+/7/////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////////////////+/v7+/v7///9kZuQXGtcnKtokJ9okJ9olKNokJ9kmKdogI9jMzfX/
+        ///8/P7+/v////7////////////+/v78/P7///+LjesaHdcnKtokJ9olKNokJ9okJ9ooK9oTFtahou7/
+        ///7+/7////+/v7/////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////+/v77/P3///9+f+gSFdYoK9okJ9olKNolKNok
+        J9onKtobHteZmu3////8/P7///7///////////////7+/v/8/P7///+ztPEeIdgnKtokJ9olKNolKNok
+        J9ooK9oQE9aOkOv////7+/7+/v7/////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////77+/7///+TlOwRFNYo
+        K9okJ9olKNolKNokJ9omKdocH9d0dub////+/v7+/v7////////////////////9/f7////h4fkmKdkm
+        KdokJ9klKNolKNokJ9ooK9oSFdZ6fOf////8/P3+/v7/////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////+/v7////7
+        +/7///+io+8TFtYnKtokJ9okJ9olKNokJ9olKNogI9hVV+H9/f7///7+/v7////////////+/v/////+
+        /v7///7///5ISt8eIdgmKdokJ9okJ9okJ9onKtoXG9djZeT////+/v7+/v7/////////////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////8/P7///+3uPIXGtcmKdokJ9olKNolKNolKNokJ9okJ9k+Qd3x8fz///79/f7/////
+        ///////////////+/v/7+/7///97fegWGdYnKtokJ9okJ9kkJ9omKdoeIdhFSN7///////7+/v7/////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////////////////////8/P7///+9vvIYG9cmKdokJ9olKNolKNolKNokJ9kkJ9k3Odzg
+        4Pn////9/f7////////////////////////8/P7////Cw/MXGtcmKdkkJ9klKNolKNolKNojJtksLtrx
+        8fz////9/f7////+/v//////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////8/P7///+8vfIYG9cmKdokJ9olKNolKNol
+        KNokJ9olKdkwNNvQ0Pb////9/f7////////////////////+/v/9/f7///739/07Pt0dINgmKdokJ9kl
+        KNokJ9kmKdogI9jKy/X////8/P7///////7/////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////8/P7///+8vfIYG9cm
+        KdokJ9olKNolKNolKNokJ9olKNkvMtvMzfb////9/f7////////////////+/v/////+/v77+/3///+E
+        hekRFNYnKtokJ9klKNokJ9ooK9oXGtebne3////8/P7+/v7////+/v//////////////////////////
+        ///////////////////////////////////////////////////////////////////////+/v/////8
+        /P7///+9vvMYG9cmKdokJ9olKNolKNolKNokJ9olKNkwMtvNzvb////9/f7/////////////////////
+        //7+/v/9/f7////X2PcfItgiJdklKNolKNokJ9kmKdodINhpa+T////+/v7+/v7+/v//////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////+/v/7+/7///+2t/IXGtcmKdokJ9olKNolKNolKNokJ9olKNkwMtvNzvb////9/f7/////
+        ///////////////////+/v/+/v78/P75+v5hY+MUGNYnKtkkJ9klKNolKNojJtk/Qd3w8Pz///79/f7+
+        /v////7/////////////////////////////////////////////////////////////////////////
+        //////////////////////////7////7+/7///+jpO4TFtYnKtokJ9olKNolKNolKNokJ9olKNkvMtvN
+        zfX////9/f7////////////////////+/v/////+/v78/P3+/v6+vvMaHtcjJdklKNokKNokJ9knKtkl
+        J9m9vfP////8/P3+/v7/////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////+/v77+/3///+MjesQE9YoK9okJ9olKNolKNol
+        KNokJ9olKNk1N9za2vj////9/f7///////////////////////////////7+/v/8/P7t7vxWWeIXGtcm
+        KdkkJ9kjJtolKNkgItiAgen////+/v79/f7+/v//////////////////////////////////////////
+        ///////////////////////////////////////////////////////////+/v79/f3///9vceUVGNYn
+        KtokJ9olKNolKNolKNokJ9kkKNk7Pt3t7fv///79/f7////////////////////////////////+/v79
+        /f7+/v60tfIiJdkjJtklKNklKNkkJ9oiJdlFR9/j4/r///79/f3+/v7///7/////////////////////
+        //////////////////////////////////////////////////////////////////////7////+/v7/
+        //7///9IS+AdINcmKdokJ9olKNolKNokJ9olKNoiJdhQUuH7+/7///7+/v7/////////////////////
+        //////////7+/v/+/v7+/v7s7PtgYuMcH9ckJ9kkJ9klKNolKNkmKdmoqfD////9/f39/f7////+/v//
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////+/v79/f7////o6PopLNojJtklKNolKNolKNokJ9kkJ9omKdodINdxc+b////+/v7+/v7/////
+        ///////////////////////+/v/////+/v7+/v7///+8vfMuMdoiJdkkJ9klKNokJ9keIdhfYePt7fv/
+        /v79/f3+/v//////////////////////////////////////////////////////////////////////
+        ///////////////+/v/////+/v78/P3///+vsPEaHdcnKtokJ9klKNolKNolKNokJ9knKtobHteZm+3/
+        ///8/P7+/v7////////////////////////////////+/v7////+/v7+/v77+/53eeceIdgmKdkkJ9kk
+        J9oiJdknKtm1tvL///79/f79/f/////+/v7/////////////////////////////////////////////
+        ///////////////////////////////////+/v/+/v79/f7///9xc+YbHtgnKtokJ9olKNolKNolKNok
+        J9kmKdoiJdjQ0Pf////8/P7+/v////7////////////////////////////////+/v7+/v7+/v7////i
+        4vk8P90iJdklKNkkJ9klKNkaHddfYePv8Pz9/f7+/v/+/v7////+/v7/////////////////////////
+        /////////////////////////////////////////////////////v/9/f7////l5Pk3OdwkJ9klKNok
+        J9olKNokJ9kkJ9omKdoeIdhHSt////7///79/f7+/v//////////////////////////////////////
+        ///+/v7+/v79/f7///+ztfEdINgoK9okJ9klKNkjJtkbHtiur/D9/f78/P7///7+/v7////+/v//////
+        ///////////////////////////////////////////////////////////+/v/+/v7+/v79/f3///+X
+        mO0gI9gmKdkkJ9klKNolKNolKNokJ9koK9oUF9aNj+v////8/P7+/v/////+/v//////////////////
+        ///////////////////////+/v7+/v79/f7///+Ag+kTFtYoK9ojJtgmKdkcH9g2Otzo6Pr///79/f7+
+        /v/+/v/////+/v/////////////////////////////////////////////////////////+/v/////+
+        /v/+/v7///7m5/pHSt8iJdklKNokJ9klKNokJ9klKNolKNojJtkkJ9nm5vr////9/f3+/v7/////////
+        //////////////////////////////////////7+/v/+/v/+/v7+/v7///9bXuIXGtcnKtkjJtgoK9kS
+        FdZjZeP7+/78/P7+/v7+/v/+/v7///7////////////////////////////////////////////////+
+        /v/////+/v79/f/+/v7+/v7///+PkewgJNglKNkkJ9klKNokJ9klKNokJ9knKtkTFtZ5e+f////8/P3+
+        /v7////+/v7////////////////////////////////////////+/v/////+/v/+/v79/f7///7u7/xJ
+        S+AaHdcmKdkkJ9koK9oRFNaDhOn7+/79/f79/f7+/v7+/v7+/v7////+/v//////////////////////
+        ///////////+/v7////+/v/+/v/+/v79/f3+/v7Cw/QyNNsgI9gkJ9klKNokJ9klKNokJ9klKNoeItgr
+        Ltrj5Pr///79/f7///////7////////////////////////////////////////////////+/v/////+
+        /v7+/v78/P7///7e3vlER98aHdclKNkkJ9kmKdoWGdaOj+v29v3///79/f79/f7///7+/v7////////+
+        /v/////////////////+/v/////////+/v7+/v7+/v78/P3+/v7X2PhMT+AaHdclKNkkJ9olKNolKNok
+        J9kkJ9kkJ9kWGdecne3////8/P3+/v/+/v7/////////////////////////////////////////////
+        ///////////+/v7////+/v7+/v79/f7+//7R0vdKTd8ZHNcmKNklJ9kkJ9kfIth6e+fs7Pv////9/f79
+        /f7+/v/////+/v////////////////7///7////+/v/+/v/+/v79/f77+/3////c3PlQUuEZHNclKNkk
+        J9kkJ9kkJ9klKNokJ9klKNkWGddjZeTx8fz+/v7+/v7+/v/////+/v//////////////////////////
+        ///////////////////////////////+/v7////9/f7+/v79/v7+/v7Z2fhXWeIWGdYmKdklKNojJtkg
+        I9hWWOHIyfX///////78/P78/P79/f7+/v7+/v7+/v7+/v/+/v/+/v7+/v79/f78/P7+/v7////HyPVF
+        SN8bHtclKNkkJ9kkJ9klKNolKNokJ9kmKdkZHdhCRd7V1vj9/f7+/v7+/v7+/v//////////////////
+        //////////////////////////////////////////////////////7+/v/9/f7+/v7+/v7///7r7Ptx
+        c+YUF9YjJtkoK9okJ9kgI9gqLdp6fOjk5Pr///////7///78/f38/P78/P78/P78/P78/P39/f7///7/
+        ///4+f2PkessL9sgI9glKNkkJ9kkJ9klKNolKNojJtknKtkeIdg1ONzHyPX+/v79/v7+/v7+/v7////+
+        /v/////////////////////////////////////////////////////////////////+/v////7+/v/+
+        /v7+/v7+/v78/P3///+kpe8iJtgXG9coK9omKdolKNkaHdcoK9pwcubExfT09Pz///7///7/////////
+        //////7////l5vqam+0+Qd0bHtgmKdkkJ9kkJ9klKNolKNokJ9kkJ9koK9oeIdgxM9vIyfX////9/f3+
+        /v79/f7////+/v7/////////////////////////////////////////////////////////////////
+        ///////////+/v7////+/v7+/v79/f77+/3////h4fldX+MaHdggI9gmKdkoK9okJ9kWGtYVGNYyNdxZ
+        W+F9fuiUleyZmu2Vlu13eOdPUeAmKdoTFtYfItgnKtkkJ9okJ9klKNolKNokJ9olKNkmKdkaHddKTd/d
+        3vn////8/P3+/v7+/v////7+/v//////////////////////////////////////////////////////
+        ///////////////////////////////+/v7////+/v7+/v7+/v78/P7///////61tvJPUeAmKdofItgi
+        JdkmKdknKtkfItgXG9cTF9YRFNUQE9UQE9UTFtYYG9chJdgoK9olKNokJ9klKNolKNolKNkjJtkiJdke
+        ItgtMNuIiur8/P3////8/P3+/v7+/v/+/v7/////////////////////////////////////////////
+        ///////////////////////////////////////////////////+/v7////+/v/+/v/+/v79/f79/f7/
+        ///4+P21tvJsbuU8Pt0kJ9kcH9ceIdghJNgkJ9kmKdknKtkoK9ooK9onKtomKdolKNokJ9kjJtkgI9kd
+        IdgcH9ghJdg7Pt11d+fT0/f////+/v78/P7+/v7+/v/+/v7////+/v//////////////////////////
+        ///////////////////////////////////////////////////////////////////////+/v//////
+        ///+/v7////9/f39/f7///7////9/f7T1Pepq/B8fuhVV+E5O90oK9obHtcYG9cXG9cXGtcXGtcXG9cX
+        GtcXGtcbHdcpLNlAQt5oauScne3V1vf///7////8/P3+/v7+/v7+/v7////////+/v//////////////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////+/v7////+/v7+/v7+/v79/f79/f7+/v7///7////5+v3l5fnU1ffCwvSurvCanO2K
+        jOp9fuh+f+h9f+iBg+mTleyrrPDDxfTZ2fjv7/v////////+/v79/f79/f3////+/v7////+/v7/////
+        ////////////////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////+/v7+/v7+/v7+/v79/f79/f39/f79/f7+
+        /v7////+/v77+/74+P319f319f319f329v35+f79/f7////+/v78/P79/f7+/v7+/v7+/v7+/v7/////
+        ///+/v7/////////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////+/v7////////+/v/+/v/+
+        /v/+/v7+/v7+/v79/f39/f79/f79/f78/P78/P78/P78/P78/P78/P79/f7+/v79/f7+/v/+/v7///7+
+        /v7+/v7////+/v7///////////////////////////////////////////////////8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs
new file mode 100644
index 00000000000..aeca33da72f
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs
@@ -0,0 +1,162 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_openerp_connection
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_openerp_connection));
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.chkSSL = new System.Windows.Forms.CheckBox();
+            this.txt_server_port = new System.Windows.Forms.TextBox();
+            this.txt_server_host = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.btn_server_ok = new System.Windows.Forms.Button();
+            this.btn_server_close = new System.Windows.Forms.Button();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.chkSSL);
+            this.groupBox1.Controls.Add(this.txt_server_port);
+            this.groupBox1.Controls.Add(this.txt_server_host);
+            this.groupBox1.Controls.Add(this.label3);
+            this.groupBox1.Controls.Add(this.label2);
+            this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.groupBox1.Location = new System.Drawing.Point(22, 13);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(202, 123);
+            this.groupBox1.TabIndex = 14;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Connection Parameter";
+            // 
+            // chkSSL
+            // 
+            this.chkSSL.AutoSize = true;
+            this.chkSSL.Location = new System.Drawing.Point(15, 86);
+            this.chkSSL.Name = "chkSSL";
+            this.chkSSL.Size = new System.Drawing.Size(89, 17);
+            this.chkSSL.TabIndex = 19;
+            this.chkSSL.Text = "SSL (https)";
+            this.chkSSL.UseVisualStyleBackColor = true;
+            // 
+            // txt_server_port
+            // 
+            this.txt_server_port.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_server_port.Location = new System.Drawing.Point(58, 60);
+            this.txt_server_port.Name = "txt_server_port";
+            this.txt_server_port.Size = new System.Drawing.Size(138, 20);
+            this.txt_server_port.TabIndex = 18;
+            this.txt_server_port.Text = "8069";
+            // 
+            // txt_server_host
+            // 
+            this.txt_server_host.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_server_host.Location = new System.Drawing.Point(58, 34);
+            this.txt_server_host.Name = "txt_server_host";
+            this.txt_server_host.Size = new System.Drawing.Size(138, 20);
+            this.txt_server_host.TabIndex = 17;
+            this.txt_server_host.Text = "localhost";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(24, 59);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(34, 13);
+            this.label3.TabIndex = 16;
+            this.label3.Text = "Port:";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(12, 34);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(48, 13);
+            this.label2.TabIndex = 15;
+            this.label2.Text = "Server:";
+            // 
+            // btn_server_ok
+            // 
+            this.btn_server_ok.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_server_ok.Image = global::OpenERPOutlookPlugin.Properties.Resources.Success;
+            this.btn_server_ok.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+            this.btn_server_ok.Location = new System.Drawing.Point(96, 149);
+            this.btn_server_ok.Name = "btn_server_ok";
+            this.btn_server_ok.Size = new System.Drawing.Size(49, 23);
+            this.btn_server_ok.TabIndex = 13;
+            this.btn_server_ok.Text = "&OK ";
+            this.btn_server_ok.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_server_ok.UseVisualStyleBackColor = true;
+            this.btn_server_ok.Click += new System.EventHandler(this.btn_server_ok_Click);
+            // 
+            // btn_server_close
+            // 
+            this.btn_server_close.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_server_close.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btn_server_close.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_server_close.Location = new System.Drawing.Point(160, 149);
+            this.btn_server_close.Name = "btn_server_close";
+            this.btn_server_close.Size = new System.Drawing.Size(64, 23);
+            this.btn_server_close.TabIndex = 12;
+            this.btn_server_close.Text = "&Close ";
+            this.btn_server_close.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_server_close.UseVisualStyleBackColor = true;
+            this.btn_server_close.Click += new System.EventHandler(this.btn_server_close_Click);
+            // 
+            // frm_openerp_connection
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(246, 184);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.btn_server_ok);
+            this.Controls.Add(this.btn_server_close);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "frm_openerp_connection";
+            this.Text = "OpenERP Connection";
+            this.Load += new System.EventHandler(this.frm_openerp_connection_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btn_server_ok;
+        private System.Windows.Forms.Button btn_server_close;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.CheckBox chkSSL;
+        private System.Windows.Forms.TextBox txt_server_port;
+        private System.Windows.Forms.TextBox txt_server_host;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+    }
+}
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs
new file mode 100644
index 00000000000..1c663f58fe2
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs
@@ -0,0 +1,79 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Windows.Forms;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    public partial class frm_openerp_connection : Form
+    {
+        TextBox txtServerURL;
+        public frm_openerp_connection()
+        {
+            InitializeComponent();            
+        }
+        public frm_openerp_connection(TextBox txt)
+        {
+            InitializeComponent();
+            this.txtServerURL = txt;
+        }
+
+        private void frm_openerp_connection_Load(object sender, EventArgs e)
+        {
+            if (this.txtServerURL.Text != "")
+            {
+                string[] url = Tools.SplitURL(this.txtServerURL.Text);
+                this.txt_server_port.Text = url[2];
+                this.txt_server_host.Text = url[1];
+                if (url[0] == "https")
+                    this.chkSSL.Checked = true;
+                else
+                    this.chkSSL.Checked = false;
+            }
+        }
+
+
+        private void btn_server_ok_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+                string url = Tools.JoinURL(this.txt_server_host.Text, this.txt_server_port.Text, this.chkSSL.Checked);
+                this.txtServerURL.Text = url;
+                openerp_connect.check_connectivity();
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+
+        private void btn_server_close_Click(object sender, EventArgs e)
+        {
+
+            this.Close();
+        }
+
+
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.resx
new file mode 100644
index 00000000000..9477f7baa89
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAxO+0UHsorMtUkJMo6LOY5JN81HsdDLM4/JMdINcBISKJCSpA+RpM9SJo6RJsxPJg2PJ84PKU4OadA
+        Pbs7L8lANd8qJNUiJtIZKModMNcUJOIUHu0iJvsaIOUaJsQuQMkXHNcvNOciJsstLNAvItJSQekqG6xQ
+        QchYSNKOg/3Cw//Q2f/P1f/S2P/T3P/R2P+iqP+7vv9vct8zM6k0Lbg6NcwcGroyN9oiLs4eLdccKOQg
+        KvMkKfYaIuEbJsgnOMkdGuUeHd4+PeseHLxAONI9N7p4edSzt//W1v/k4//h6P/f5v/Dw/+2tf+1t/+0
+        tv/Kzv/Y3f/S1f/U2P/Fyf8iKJlOVNMtM8IuM9UjKtgdJd0aI98bJN8nMOUqNN8dKc0pIPMnIOUvK9g5
+        N8w4NLWGiObR4P/k9//k7//K0/+JkeRWW8I5N78uKcAvLL4wMrxCR8hTWNKOlP/a4v/Z4//W4v+Ai+cx
+        OaooKr4mJ88sLuAjKNsWIMwoMt4yOusZI9QnHO42Le8lIME+Pb2Dg+fk7//o///b9/ff8v+OnN5ET6sx
+        NrE3MdIyKdcvKsszNscxOL0uN7YkKqdvduPc6f/Y6v/f8P/F0v9PUMg1MMc0MNY4OOQlK9AdJs4iLN4c
+        J90sIucvKdovL7lcX8fm6v/q9v/m/vbl//yQocxRXa8jLp4sML83MeIsJNwnJsoxNckjLrRATNBARNIo
+        K6srN4/c7f/a7f/k8//Kzf9pZN0nHrQrJskyNNgkLNMbJdYgK+AxK9wxL8k+RK/N1f/s8v/r9v/Y6uvq
+        +/9UW6o2ObMlKbgpK88vKuMqJt0sL801PcwwP8QaJ7MjIsY1MdBDRL54gtDm9//Y6fzq8//AwP9jWdU0
+        KMAxLdIwMt4hLtgcLdc3NdsfIauFkODo9P/x+v/p8vzx/f+uteY7OKw2L8wtLtYpK90nKeIpKt4qLs0l
+        Lr4iML4yPdUrJ94xKN0yLMc3OKavuuzt+//c5vfv9P/Z0/9rYN8tJsMoKNIjL9UYK9A9Od4hJKS9y//n
+        9//0///x9/z09v+dl+g8LsoyI+InJ98iKd4iKN8kKtspLdIpMM0qNdMcI8wpJucqH+c8L+kzKL5MTaXs
+        8//0///w+v/x8f++uf8vKLM0M9YlL9MkNNoxK9Y2OLrc7P/t///4//f7///28v+EeNw8JtkuHu4kJuMe
+        Kd4gKd4iKdwpKdkpKdknK90gJNssKu4iGeUuH+wvIdM9MrCmpOr0/f/r9uz2/P/q7f+XlP8zMcYhKMsf
+        LNYmHtc4OsTk8v/x//73/+39//v28P99b9U7JdssHu4gKOAcK9seKd4iJ+ApJOUrIucmIegjIuYwMu8b
+        GtwiGOczJOowHsVYS7709P/5//r6//Xy/P/d4P87PbkiJMghJdspI+AvML7b6f/x//79//L+/vj68v+N
+        f+Q7J9crIeoeKtwZLtccKtwiJ+IrIeksH+0oHu0iH+YuNOsdItsdGuU3LPgzHt42I7XY0P/6/f/2/+np
+        +ejq8/92fN8rLcgqKeMsKuEyNcDc6f/z//////j///779P+Ngds7LM4rJeIcLdcXMNQbLNsiJ+IsIucu
+        IOouJOwhHt8lL+AfLNwaIuEtLPI0Juo1I8SajOr49f/1/+z4//Dt+//J0v8vLsAvKt8gJc44QMPj7//w
+        +f/8/Pz//P/88v9zabw7L8cpKdscL9QXMNIbLNsiKN8sJeIwJOIzK+QjJdcfK9cdLtsWJt0eJ+MuJ+Y5
+        K9B8bNzv5v/z+fT6//Ln9/3k7/8wMrYsJtEcK70yQbXj8P/w9//79P//+P/78P98csU5McQnK9gbL9QX
+        MNQbLNkkK9kuKtcyK9IxL88qL9EcKNQYKtsXK94YKNknK9g1L8pjVM3m2f/6+P/6//7j8fff7P9fYdcs
+        KsMsN88tOLHb5//z+//////89/n79f+kn+o5NL8nLNUbLtUVL9cbLNsiKtssKtgyK9QsJ8oyM9ceJtcV
+        JdwYLuQWLd0hLtYrL8MxK6LWzv/49//w9fbz///q9v+lqP83NrYjHNk7Oszk7f/d7ez9/+T8/9/2+v/e
+        4P8wMKwyN9kLHMcgNukZKeAdJuIrJu0uIek1I+IyJOAlJeMbJuYQKOYQKuIXLtgkNcYmL5fm7v/z/P/1
+        /vv2///x9//Y1v9FQKMoHuM3M8+epO/x/f/7/+n9/+T4///f4f8xMqQxOM8WJNAZKt8aKuEaJeEhIOYw
+        Je01IeYzI+InJ98bKd8QKuIOKuIVKt8iMc4wOK/Axv/v9v/4/v/4/v/w8//o5/9APY0pKtg4Os5dX77t
+        8P/19f/7+v/69v/t6P9OTrgxNsEoMtYWJdUfLt4bKNgdJNEwMNwzJ9kyKtUlMc0bM8sSMdQSLdwZJecl
+        JeM3Lc2Shvzq4//49v/4+v/q7v/s7f8/P40iKtEzOc5BQbXi3v/27v/48P/58v/z7v+OjesuMLQuMtcf
+        KN0iKuEcKNQkMckrMcowKtcsK9UkNcYbOMIVNskXMNQgJeUsJOM6Kc6Zhv/u5P/69//2+//t8//h4v9B
+        P5gbJdYiKcw3N8GLhOz06//79P/z8f/09f/Pzf80MK0qItMsJu8hIOYgJtcwQssjMLwrJ94pJuAiMssc
+        OcAbOMIeNccnLNUzLNBAMrXLvv/4+f/6//vy/frv+P+mpvpAOqkhL+YXIc0xMspEPrXZ0v/49P/6/f/2
+        /P/t7v9cWMIsIcswJO4kGugkJt82RNMiMb0nKtklKN4gMsseNsQgNcYlMsouLNI7L8dBM6Ps5f/5//76
+        //Hu/Pjs9f90btlIPckhMe8YI9gsLtAyLq+PjNzh4f/4///2//zv9/+lp/VFO80yI98tIe0tJustMNgo
+        M8skMssiM8ogNMkiMsskLdUrKNs1JtxALcpNPajy7f/y+/j4//Tt+f/o7f9OQspGM+AUKd8bKdslKNE4
+        NcY/OqOsqefz+f/0///v/P/n8f9hYsozLcI6L+MzK+ohHNUtMd4iMc4gMs0iLtQkKdwpIucwIec7JN5F
+        LsZrXbv08v/0//3z//7n8v/P0P8tH7swG9sYMdUaLNMpLNs0LdQ6LMBbTsGxrfTv9f/s/P/o/P/T5f89
+        S54jKKkwLNI4L/EpIukbINsmLOksJ/gmGvYrFPg6IPZEK99FMrevqPPw9f/k8Prt+//m7v97eOUxI8g0
+        IeIaL9EcLNMnKuAwKOEwINI8K8htYdeene3T3//k/P/J5PnK4/82Rp8uM7ciHcwnH+IsLe0aGuIdFO0x
+        H/4zHPQqFNE9L71jXL3s8f/e7P/q+//m9P+DiN0xLqw3LNY8LewiLdslLN8pKuYvJ+owH+UwHNk5Kc5F
+        Pb+Ume7N3v/d+f/R8P/G3/9FV7A5QcQwM9IqLdwjJd4xKuk8MuosJMUwLqp9hdLa6v/m/f/b9f/j9v+z
+        v/9ARLQrKLk5MdwfFc0oKuMoKeUoJeYoIuUsIusyJe0zJeEvJspBQMBMVLG1y//a9P/Y8f/C2f+Ek/o9
+        SsRATdEyPsYoL7oyN7hXW8uNmOrF2P/h+P/X8v/d9f+KmuYgKpU4OcVEQeQXEsE8N+wqIOksI+gnIuEg
+        H9kiI98tLOgvKuksJ94kIMU8PcsvN6hUYL6Jm+7W6P/E1f/T6P/F5f/R9P/U8P/U6//U5v/d7v/d7//Y
+        6f+zw/9DULg1PMEtL8oSEL0uKuE6NO0nItsxIugyJ+kvKuMlKdshKNsgKd4hJeIhI+AzMegkIcosK8Ex
+        Nbk9Q7ouNqdmceFHV7e00P+du+yNpd+brO+uuv+epv9kac8rMKM9QsYeJbgoLc8yNuMsLeMoJ+EiHtsl
+        H9w4Ktw1K9wxL90rMd4hL9wZKdoXJdscJt4fI9k8POwnJM41MNM5NNMiGro1Lc5GQNswLbkuKrE2MLdE
+        O8hLPNM/L9A0JM8sIdEjIc8wNd4pNNYcKcsVHsUgJdQ0M+0uKeg1KNAuJs0oJ9EnLtkdLtkWKdgWKt0i
+        MOYeJ9wZGs4zLuMwJdktIdVFNuwvH9gxIdo8KdxBLd1AK9s9Jdc6H9o7IOI5H+40IO4lH+I3O/EQH8IZ
+        Lcg2ROQeJ88eHtYoI+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.cs
new file mode 100644
index 00000000000..37caf4067a3
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.cs
@@ -0,0 +1,77 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Windows.Forms;
+using OpenERPClient;
+
+namespace OpenERPOutlookPlugin
+{
+    public partial class frm_partner : Form
+    {
+
+        public frm_partner()
+        {
+            InitializeComponent();
+        }
+
+        public Form parent_form = null;
+
+        private void btnsave_Click(object sender, EventArgs e)
+        {
+            try
+            {
+
+                if (txt_create_partner.Text == "")
+                {
+                    throw new Exception ("You must enter a Partner Name.");
+                }
+
+                else
+                {
+
+
+                    Record[] partners = Cache.OpenERPOutlookPlugin.SearchPartnerByName(txt_create_partner.Text);
+                    if (partners != null && partners.Length > 0)
+                    {
+                        throw new Exception("Partner already exist.");
+                    }
+                    else
+                    {
+                        frm_select_partner sel_partner = (frm_select_partner)this.parent_form;
+                        sel_partner.SelectPartnerText = txt_create_partner.Text;
+                        sel_partner.search_lst_partner();
+                        this.Close();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+
+                Connect.handleException(ex);
+            }
+
+        }
+
+        private void btncncl_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.designer.cs
new file mode 100644
index 00000000000..41861ea5b62
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.designer.cs
@@ -0,0 +1,106 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_partner
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_partner));
+            this.txt_create_partner = new System.Windows.Forms.TextBox();
+            this.lablname = new System.Windows.Forms.Label();
+            this.btncncl = new System.Windows.Forms.Button();
+            this.btnsave = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // txt_create_partner
+            // 
+            this.txt_create_partner.Location = new System.Drawing.Point(87, 26);
+            this.txt_create_partner.Name = "txt_create_partner";
+            this.txt_create_partner.Size = new System.Drawing.Size(185, 20);
+            this.txt_create_partner.TabIndex = 0;
+            // 
+            // lablname
+            // 
+            this.lablname.AutoSize = true;
+            this.lablname.Location = new System.Drawing.Point(43, 29);
+            this.lablname.Name = "lablname";
+            this.lablname.Size = new System.Drawing.Size(38, 13);
+            this.lablname.TabIndex = 1;
+            this.lablname.Text = "Name:";
+            // 
+            // btncncl
+            // 
+            this.btncncl.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btncncl.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btncncl.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btncncl.Location = new System.Drawing.Point(205, 75);
+            this.btncncl.Name = "btncncl";
+            this.btncncl.Size = new System.Drawing.Size(67, 23);
+            this.btncncl.TabIndex = 3;
+            this.btncncl.Text = "&Cancel";
+            this.btncncl.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btncncl.UseVisualStyleBackColor = true;
+            this.btncncl.Click += new System.EventHandler(this.btncncl_Click);
+            // 
+            // btnsave
+            // 
+            this.btnsave.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnsave.Image = global::OpenERPOutlookPlugin.Properties.Resources.Success;
+            this.btnsave.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+            this.btnsave.Location = new System.Drawing.Point(139, 75);
+            this.btnsave.Name = "btnsave";
+            this.btnsave.Size = new System.Drawing.Size(60, 23);
+            this.btnsave.TabIndex = 2;
+            this.btnsave.Text = "&Save ";
+            this.btnsave.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btnsave.UseVisualStyleBackColor = true;
+            this.btnsave.Click += new System.EventHandler(this.btnsave_Click);
+            // 
+            // frm_partner
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(284, 110);
+            this.Controls.Add(this.btncncl);
+            this.Controls.Add(this.btnsave);
+            this.Controls.Add(this.lablname);
+            this.Controls.Add(this.txt_create_partner);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "frm_partner";
+            this.Text = "Create a new Partner";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox txt_create_partner;
+        private System.Windows.Forms.Label lablname;
+        private System.Windows.Forms.Button btnsave;
+        private System.Windows.Forms.Button btncncl;
+    }
+}
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.resx
new file mode 100644
index 00000000000..9477f7baa89
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAxO+0UHsorMtUkJMo6LOY5JN81HsdDLM4/JMdINcBISKJCSpA+RpM9SJo6RJsxPJg2PJ84PKU4OadA
+        Pbs7L8lANd8qJNUiJtIZKModMNcUJOIUHu0iJvsaIOUaJsQuQMkXHNcvNOciJsstLNAvItJSQekqG6xQ
+        QchYSNKOg/3Cw//Q2f/P1f/S2P/T3P/R2P+iqP+7vv9vct8zM6k0Lbg6NcwcGroyN9oiLs4eLdccKOQg
+        KvMkKfYaIuEbJsgnOMkdGuUeHd4+PeseHLxAONI9N7p4edSzt//W1v/k4//h6P/f5v/Dw/+2tf+1t/+0
+        tv/Kzv/Y3f/S1f/U2P/Fyf8iKJlOVNMtM8IuM9UjKtgdJd0aI98bJN8nMOUqNN8dKc0pIPMnIOUvK9g5
+        N8w4NLWGiObR4P/k9//k7//K0/+JkeRWW8I5N78uKcAvLL4wMrxCR8hTWNKOlP/a4v/Z4//W4v+Ai+cx
+        OaooKr4mJ88sLuAjKNsWIMwoMt4yOusZI9QnHO42Le8lIME+Pb2Dg+fk7//o///b9/ff8v+OnN5ET6sx
+        NrE3MdIyKdcvKsszNscxOL0uN7YkKqdvduPc6f/Y6v/f8P/F0v9PUMg1MMc0MNY4OOQlK9AdJs4iLN4c
+        J90sIucvKdovL7lcX8fm6v/q9v/m/vbl//yQocxRXa8jLp4sML83MeIsJNwnJsoxNckjLrRATNBARNIo
+        K6srN4/c7f/a7f/k8//Kzf9pZN0nHrQrJskyNNgkLNMbJdYgK+AxK9wxL8k+RK/N1f/s8v/r9v/Y6uvq
+        +/9UW6o2ObMlKbgpK88vKuMqJt0sL801PcwwP8QaJ7MjIsY1MdBDRL54gtDm9//Y6fzq8//AwP9jWdU0
+        KMAxLdIwMt4hLtgcLdc3NdsfIauFkODo9P/x+v/p8vzx/f+uteY7OKw2L8wtLtYpK90nKeIpKt4qLs0l
+        Lr4iML4yPdUrJ94xKN0yLMc3OKavuuzt+//c5vfv9P/Z0/9rYN8tJsMoKNIjL9UYK9A9Od4hJKS9y//n
+        9//0///x9/z09v+dl+g8LsoyI+InJ98iKd4iKN8kKtspLdIpMM0qNdMcI8wpJucqH+c8L+kzKL5MTaXs
+        8//0///w+v/x8f++uf8vKLM0M9YlL9MkNNoxK9Y2OLrc7P/t///4//f7///28v+EeNw8JtkuHu4kJuMe
+        Kd4gKd4iKdwpKdkpKdknK90gJNssKu4iGeUuH+wvIdM9MrCmpOr0/f/r9uz2/P/q7f+XlP8zMcYhKMsf
+        LNYmHtc4OsTk8v/x//73/+39//v28P99b9U7JdssHu4gKOAcK9seKd4iJ+ApJOUrIucmIegjIuYwMu8b
+        GtwiGOczJOowHsVYS7709P/5//r6//Xy/P/d4P87PbkiJMghJdspI+AvML7b6f/x//79//L+/vj68v+N
+        f+Q7J9crIeoeKtwZLtccKtwiJ+IrIeksH+0oHu0iH+YuNOsdItsdGuU3LPgzHt42I7XY0P/6/f/2/+np
+        +ejq8/92fN8rLcgqKeMsKuEyNcDc6f/z//////j///779P+Ngds7LM4rJeIcLdcXMNQbLNsiJ+IsIucu
+        IOouJOwhHt8lL+AfLNwaIuEtLPI0Juo1I8SajOr49f/1/+z4//Dt+//J0v8vLsAvKt8gJc44QMPj7//w
+        +f/8/Pz//P/88v9zabw7L8cpKdscL9QXMNIbLNsiKN8sJeIwJOIzK+QjJdcfK9cdLtsWJt0eJ+MuJ+Y5
+        K9B8bNzv5v/z+fT6//Ln9/3k7/8wMrYsJtEcK70yQbXj8P/w9//79P//+P/78P98csU5McQnK9gbL9QX
+        MNQbLNkkK9kuKtcyK9IxL88qL9EcKNQYKtsXK94YKNknK9g1L8pjVM3m2f/6+P/6//7j8fff7P9fYdcs
+        KsMsN88tOLHb5//z+//////89/n79f+kn+o5NL8nLNUbLtUVL9cbLNsiKtssKtgyK9QsJ8oyM9ceJtcV
+        JdwYLuQWLd0hLtYrL8MxK6LWzv/49//w9fbz///q9v+lqP83NrYjHNk7Oszk7f/d7ez9/+T8/9/2+v/e
+        4P8wMKwyN9kLHMcgNukZKeAdJuIrJu0uIek1I+IyJOAlJeMbJuYQKOYQKuIXLtgkNcYmL5fm7v/z/P/1
+        /vv2///x9//Y1v9FQKMoHuM3M8+epO/x/f/7/+n9/+T4///f4f8xMqQxOM8WJNAZKt8aKuEaJeEhIOYw
+        Je01IeYzI+InJ98bKd8QKuIOKuIVKt8iMc4wOK/Axv/v9v/4/v/4/v/w8//o5/9APY0pKtg4Os5dX77t
+        8P/19f/7+v/69v/t6P9OTrgxNsEoMtYWJdUfLt4bKNgdJNEwMNwzJ9kyKtUlMc0bM8sSMdQSLdwZJecl
+        JeM3Lc2Shvzq4//49v/4+v/q7v/s7f8/P40iKtEzOc5BQbXi3v/27v/48P/58v/z7v+OjesuMLQuMtcf
+        KN0iKuEcKNQkMckrMcowKtcsK9UkNcYbOMIVNskXMNQgJeUsJOM6Kc6Zhv/u5P/69//2+//t8//h4v9B
+        P5gbJdYiKcw3N8GLhOz06//79P/z8f/09f/Pzf80MK0qItMsJu8hIOYgJtcwQssjMLwrJ94pJuAiMssc
+        OcAbOMIeNccnLNUzLNBAMrXLvv/4+f/6//vy/frv+P+mpvpAOqkhL+YXIc0xMspEPrXZ0v/49P/6/f/2
+        /P/t7v9cWMIsIcswJO4kGugkJt82RNMiMb0nKtklKN4gMsseNsQgNcYlMsouLNI7L8dBM6Ps5f/5//76
+        //Hu/Pjs9f90btlIPckhMe8YI9gsLtAyLq+PjNzh4f/4///2//zv9/+lp/VFO80yI98tIe0tJustMNgo
+        M8skMssiM8ogNMkiMsskLdUrKNs1JtxALcpNPajy7f/y+/j4//Tt+f/o7f9OQspGM+AUKd8bKdslKNE4
+        NcY/OqOsqefz+f/0///v/P/n8f9hYsozLcI6L+MzK+ohHNUtMd4iMc4gMs0iLtQkKdwpIucwIec7JN5F
+        LsZrXbv08v/0//3z//7n8v/P0P8tH7swG9sYMdUaLNMpLNs0LdQ6LMBbTsGxrfTv9f/s/P/o/P/T5f89
+        S54jKKkwLNI4L/EpIukbINsmLOksJ/gmGvYrFPg6IPZEK99FMrevqPPw9f/k8Prt+//m7v97eOUxI8g0
+        IeIaL9EcLNMnKuAwKOEwINI8K8htYdeene3T3//k/P/J5PnK4/82Rp8uM7ciHcwnH+IsLe0aGuIdFO0x
+        H/4zHPQqFNE9L71jXL3s8f/e7P/q+//m9P+DiN0xLqw3LNY8LewiLdslLN8pKuYvJ+owH+UwHNk5Kc5F
+        Pb+Ume7N3v/d+f/R8P/G3/9FV7A5QcQwM9IqLdwjJd4xKuk8MuosJMUwLqp9hdLa6v/m/f/b9f/j9v+z
+        v/9ARLQrKLk5MdwfFc0oKuMoKeUoJeYoIuUsIusyJe0zJeEvJspBQMBMVLG1y//a9P/Y8f/C2f+Ek/o9
+        SsRATdEyPsYoL7oyN7hXW8uNmOrF2P/h+P/X8v/d9f+KmuYgKpU4OcVEQeQXEsE8N+wqIOksI+gnIuEg
+        H9kiI98tLOgvKuksJ94kIMU8PcsvN6hUYL6Jm+7W6P/E1f/T6P/F5f/R9P/U8P/U6//U5v/d7v/d7//Y
+        6f+zw/9DULg1PMEtL8oSEL0uKuE6NO0nItsxIugyJ+kvKuMlKdshKNsgKd4hJeIhI+AzMegkIcosK8Ex
+        Nbk9Q7ouNqdmceFHV7e00P+du+yNpd+brO+uuv+epv9kac8rMKM9QsYeJbgoLc8yNuMsLeMoJ+EiHtsl
+        H9w4Ktw1K9wxL90rMd4hL9wZKdoXJdscJt4fI9k8POwnJM41MNM5NNMiGro1Lc5GQNswLbkuKrE2MLdE
+        O8hLPNM/L9A0JM8sIdEjIc8wNd4pNNYcKcsVHsUgJdQ0M+0uKeg1KNAuJs0oJ9EnLtkdLtkWKdgWKt0i
+        MOYeJ9wZGs4zLuMwJdktIdVFNuwvH9gxIdo8KdxBLd1AK9s9Jdc6H9o7IOI5H+40IO4lH+I3O/EQH8IZ
+        Lcg2ROQeJ88eHtYoI+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.cs
new file mode 100644
index 00000000000..b3aa195b68c
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.cs
@@ -0,0 +1,149 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Drawing;
+using System.Windows.Forms;
+using OpenERPClient;
+using outlook = Microsoft.Office.Interop.Outlook;
+
+namespace OpenERPOutlookPlugin
+{
+
+    public partial class frm_push_mail : Form
+    {
+
+        public frm_push_mail()
+        {
+          
+                InitializeComponent();                
+                cmboboxcreate.Items.Remove("");
+        }
+
+       public bool push_mail(string model, int thread_id)
+        {
+            foreach (outlook.MailItem mailItem in Tools.MailItems())
+            {
+                Cache.OpenERPOutlookPlugin.PushMail(mailItem, model, thread_id);
+
+            }
+            return true;
+        }
+
+        private void btn_attach_mail_to_partner_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (lstview_object.SelectedItems.Count <= 0)
+                {
+                    throw new Exception("Plese select item from the list to push");
+                }
+                foreach (ListViewItem lv in lstview_object.SelectedItems)
+                {                   
+                    this.push_mail(lv.SubItems[1].Name, Convert.ToInt32(lv.Name));                                           
+                }                
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+       
+
+        private void frm_push_mail_Load(object sender, EventArgs e)
+        {
+            try
+            {
+
+                Model[] document_models = Cache.OpenERPOutlookPlugin.GetMailModels();
+                OpenERPOutlookPlugin openerp_outlook = Cache.OpenERPOutlookPlugin;
+                OpenERPConnect openerp_connect = openerp_outlook.Connection;
+
+                foreach (Model model in document_models)
+                {
+                    ListViewItem item = new ListViewItem();
+                    item.Name = model.model;
+                    item.Text = model.name;
+                    cmboboxcreate.Items.Add(model);
+                }
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+        private void add_item_recordlist(Record record)
+        {
+            ListViewItem item = new ListViewItem(record.name);
+            item.Name = record.id.ToString();
+            item.Text = record.name;
+            ListViewItem.ListViewSubItem subitem = new ListViewItem.ListViewSubItem();
+            subitem.Name = record.model.model;
+            subitem.Text = cmboboxcreate.SelectedItem.ToString();
+            item.SubItems.Add(subitem);            
+            lstview_object.Items.Add(item);
+        }
+
+        void load_data_list()
+        {
+            lstview_object.Items.Clear();
+
+            Model model = (Model)cmboboxcreate.SelectedItem;
+            ArrayList condition_list = new ArrayList();
+            string name = null;
+            if (txt_doc_search.Text != "")
+            {
+                name = txt_doc_search.Text;                
+            }
+            
+            foreach (Record record in Cache.OpenERPOutlookPlugin.SearchRecord(name,model.model))
+            {
+                this.add_item_recordlist(record);
+            }
+            if (lstview_object.Items.Count <= 0)
+            {
+                Connect.displayMessage("No matching Document(s) found.");
+            }
+            lstview_object.Sort();
+        }
+
+        private void cmboboxcreate_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            try
+            {
+                this.load_data_list();
+            }
+            catch (Exception ex)
+            { Connect.handleException(ex); }
+        }
+
+        private void btn_search_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                this.load_data_list();
+            }
+            catch
+            { Connect.displayMessage("Please Enter Search Text"); }
+        }
+    }
+}
+
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.designer.cs
new file mode 100644
index 00000000000..f6282eed6b7
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.designer.cs
@@ -0,0 +1,202 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_push_mail
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_push_mail));
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.btn_search = new System.Windows.Forms.Button();
+            this.txt_doc_search = new System.Windows.Forms.TextBox();
+            this.lbtsrch = new System.Windows.Forms.Label();
+            this.cmboboxcreate = new System.Windows.Forms.ComboBox();
+            this.lbtypedoc = new System.Windows.Forms.Label();
+            this.lstview_object = new System.Windows.Forms.ListView();
+            this.colheadname = new System.Windows.Forms.ColumnHeader();
+            this.colheadmodelname = new System.Windows.Forms.ColumnHeader();
+            this.btn_attach_mail_to_partner = new System.Windows.Forms.Button();
+            this.lbldocs = new System.Windows.Forms.Label();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.btn_search);
+            this.groupBox1.Controls.Add(this.txt_doc_search);
+            this.groupBox1.Controls.Add(this.lbtsrch);
+            this.groupBox1.Controls.Add(this.cmboboxcreate);
+            this.groupBox1.Controls.Add(this.lbtypedoc);
+            this.groupBox1.Controls.Add(this.lstview_object);
+            this.groupBox1.Controls.Add(this.btn_attach_mail_to_partner);
+            this.groupBox1.Controls.Add(this.lbldocs);
+            this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.groupBox1.Location = new System.Drawing.Point(13, 12);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(440, 460);
+            this.groupBox1.TabIndex = 3;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Link to an Existing Document";
+            // 
+            // btn_search
+            // 
+            this.btn_search.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_search.Image = global::OpenERPOutlookPlugin.Properties.Resources.Search;
+            this.btn_search.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_search.Location = new System.Drawing.Point(364, 59);
+            this.btn_search.Name = "btn_search";
+            this.btn_search.Size = new System.Drawing.Size(70, 23);
+            this.btn_search.TabIndex = 15;
+            this.btn_search.Text = "&Search ";
+            this.btn_search.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_search.UseVisualStyleBackColor = true;
+            this.btn_search.Click += new System.EventHandler(this.btn_search_Click);
+            // 
+            // txt_doc_search
+            // 
+            this.txt_doc_search.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txt_doc_search.Location = new System.Drawing.Point(104, 59);
+            this.txt_doc_search.Name = "txt_doc_search";
+            this.txt_doc_search.Size = new System.Drawing.Size(254, 20);
+            this.txt_doc_search.TabIndex = 14;
+            // 
+            // lbtsrch
+            // 
+            this.lbtsrch.AutoSize = true;
+            this.lbtsrch.Location = new System.Drawing.Point(32, 59);
+            this.lbtsrch.Name = "lbtsrch";
+            this.lbtsrch.Size = new System.Drawing.Size(51, 13);
+            this.lbtsrch.TabIndex = 13;
+            this.lbtsrch.Text = "Search:";
+            // 
+            // cmboboxcreate
+            // 
+            this.cmboboxcreate.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cmboboxcreate.FormattingEnabled = true;
+            this.cmboboxcreate.Items.AddRange(new object[] {
+            ""});
+            this.cmboboxcreate.Location = new System.Drawing.Point(104, 24);
+            this.cmboboxcreate.Name = "cmboboxcreate";
+            this.cmboboxcreate.Size = new System.Drawing.Size(330, 21);
+            this.cmboboxcreate.TabIndex = 12;
+            this.cmboboxcreate.SelectedIndexChanged += new System.EventHandler(this.cmboboxcreate_SelectedIndexChanged);
+            // 
+            // lbtypedoc
+            // 
+            this.lbtypedoc.AutoSize = true;
+            this.lbtypedoc.Location = new System.Drawing.Point(15, 24);
+            this.lbtypedoc.Name = "lbtypedoc";
+            this.lbtypedoc.Size = new System.Drawing.Size(68, 13);
+            this.lbtypedoc.TabIndex = 11;
+            this.lbtypedoc.Text = "Document:";
+            // 
+            // lstview_object
+            // 
+            this.lstview_object.Alignment = System.Windows.Forms.ListViewAlignment.Default;
+            this.lstview_object.AllowColumnReorder = true;
+            this.lstview_object.BackgroundImageTiled = true;
+            this.lstview_object.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.colheadname,
+            this.colheadmodelname});
+            this.lstview_object.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lstview_object.FullRowSelect = true;
+            this.lstview_object.GridLines = true;
+            this.lstview_object.HideSelection = false;
+            this.lstview_object.Location = new System.Drawing.Point(9, 110);
+            this.lstview_object.Name = "lstview_object";
+            this.lstview_object.Size = new System.Drawing.Size(425, 299);
+            this.lstview_object.TabIndex = 10;
+            this.lstview_object.UseCompatibleStateImageBehavior = false;
+            this.lstview_object.View = System.Windows.Forms.View.Details;
+            // 
+            // colheadname
+            // 
+            this.colheadname.Text = "Name";
+            this.colheadname.Width = 247;
+            // 
+            // colheadmodelname
+            // 
+            this.colheadmodelname.Text = "Model Name";
+            this.colheadmodelname.Width = 400;
+            // 
+            // btn_attach_mail_to_partner
+            // 
+            this.btn_attach_mail_to_partner.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_attach_mail_to_partner.Image = global::OpenERPOutlookPlugin.Properties.Resources.Archive;
+            this.btn_attach_mail_to_partner.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_attach_mail_to_partner.Location = new System.Drawing.Point(377, 424);
+            this.btn_attach_mail_to_partner.Name = "btn_attach_mail_to_partner";
+            this.btn_attach_mail_to_partner.Size = new System.Drawing.Size(57, 23);
+            this.btn_attach_mail_to_partner.TabIndex = 4;
+            this.btn_attach_mail_to_partner.Text = "P&ush ";
+            this.btn_attach_mail_to_partner.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_attach_mail_to_partner.UseVisualStyleBackColor = true;
+            this.btn_attach_mail_to_partner.Click += new System.EventHandler(this.btn_attach_mail_to_partner_Click);
+            // 
+            // lbldocs
+            // 
+            this.lbldocs.AutoSize = true;
+            this.lbldocs.Location = new System.Drawing.Point(9, 91);
+            this.lbldocs.Name = "lbldocs";
+            this.lbldocs.Size = new System.Drawing.Size(74, 13);
+            this.lbldocs.TabIndex = 0;
+            this.lbldocs.Text = "Documents:";
+            // 
+            // frm_push_mail
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(467, 484);
+            this.Controls.Add(this.groupBox1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.KeyPreview = true;
+            this.MaximizeBox = false;
+            this.Name = "frm_push_mail";
+            this.Text = "Push Mail";
+            this.Load += new System.EventHandler(this.frm_push_mail_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.ListView lstview_object;
+        private System.Windows.Forms.ColumnHeader colheadname;
+        private System.Windows.Forms.ColumnHeader colheadmodelname;
+        private System.Windows.Forms.Button btn_attach_mail_to_partner;
+        private System.Windows.Forms.Label lbldocs;
+        private System.Windows.Forms.ComboBox cmboboxcreate;
+        private System.Windows.Forms.Label lbtypedoc;
+        private System.Windows.Forms.Button btn_search;
+        private System.Windows.Forms.TextBox txt_doc_search;
+        private System.Windows.Forms.Label lbtsrch;
+
+    }
+}
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.resx
new file mode 100644
index 00000000000..3c294eb0444
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.resx
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAACAgICAAAAKwAAAGw8PDykT09Pu1BQULpAQEChAAAAYgAAAB0AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAFBQUNAAAAanFxcdygoaH/l5eX/5OTk/+ZmJj/o6Kj/6alpv93d3jbCAgIVwkJ
+        CQMAAAAAAAAAAAAAAAAHBwcKIyQkhLCwr/2IiIv+Q0NH/zc4PP9KSlD/b29w/3l5eP+VlJX/srKy/rCw
+        sf87OztxEBAQAgAAAAD///8ADQ0NYMfGxf5lZXv+BwdS/hISdv8MDGb/EBBw/wgIUf8rK0D/X19g/4yM
+        jP7CwsL+xsbG/ywsLEYAAAAAAAAAFqioqdykpLn+ERGH/hsbo/8vMEj/srK5/4OEpP8cHJr/GRmh/w8P
+        Qv9RUVP/nJuc/trZ2f69vb7aAAAAAiQkI1D49/X/YWGp/yUlzv8WFo3/bW1w/9vb2//x8O//oqPH/yUl
+        xv8jI87/Dw9C/2loaP/Ly8v/8vLy/3FxcD2jo6OR/////1tbyf8uLuf/HByh/2VlaP/e3t7//f39////
+        //9dXc//LS3n/yIi0f8rKzj/pqal//7+/v/W1taEycnJqv////9wcOX/ODj3/ygoz/9ERE3/xMTE//v7
+        +//+/v//09Pz/zMz8v80NPn/EBBx/4KCgf/09PT/7e3to9bW1qn/////oqL6/0JC//9BQf//Hx9G/5aW
+        lP/u7u7///////////9MTPf/Ojr8/yIivv9hYWv/7u7u//X19aTY2NmI//////Hx/P84OPD/QED7/xkZ
+        kf9iYmb/xcXF//r6+v//////fX3n/zc3+/8pKdz/WVlm//Pz8//6+vmIvb29O//////////+jIzV/zMz
+        6P8rK+H/KChP/4yMiv/X19f/+Pj4/42Nyf8pKev/ICDN/3JygP7/////9/f3PgAAAAD5+fnd/////v//
+        //9SUqn/JCTH/xUVmv9SUmn/pqaj/8nJxv9LS4H/Hh7P/w4Oj/7KytH+/v7+5QAAAAAAAAAA5OTkNP//
+        ///+/v7//////2Fhkv8PD4T/DQ1//yYmXP8xMVz/DAyA/xAQmf9iYob///////z8/DsAAAAAAAAAAAAA
+        AAD8/Pxc/v7+//7+/v7////+xcXL/0xMbP8ICEf/AAA+/xISS/6AgJD+//////7+/mgAAAAAAAAAAAAA
+        AAAAAAAAAAAAAPv7+zX+/v7m//////7+/v/////+/////v//////////////7P7+/j4AAAAA+fn5AAAA
+        AAAAAAAAAAAAAAAAAAD///8AAAAAAP7+/kj+/v6S/v7+s/7+/rT+/v6U/v7+TQAAAAAAAAAAAAAAAAAA
+        AAAAAAAA/D8AAPAPAADABwAAwAMAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAOAH
+        AADwDwAA/D8AAA==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.Designer.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.Designer.cs
new file mode 100644
index 00000000000..95c478fbb1e
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.Designer.cs
@@ -0,0 +1,141 @@
+namespace OpenERPOutlookPlugin
+{
+    partial class frm_select_partner
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_select_partner));
+            this.txt_select_partner = new System.Windows.Forms.TextBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.lstbox_select_partner = new System.Windows.Forms.ListBox();
+            this.btn_select_partner_select = new System.Windows.Forms.Button();
+            this.btn_select_partner_close = new System.Windows.Forms.Button();
+            this.btn_select_partner_search = new System.Windows.Forms.Button();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // txt_select_partner
+            // 
+            this.txt_select_partner.Location = new System.Drawing.Point(19, 20);
+            this.txt_select_partner.Name = "txt_select_partner";
+            this.txt_select_partner.Size = new System.Drawing.Size(209, 20);
+            this.txt_select_partner.TabIndex = 0;
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.lstbox_select_partner);
+            this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.groupBox1.Location = new System.Drawing.Point(13, 51);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(307, 368);
+            this.groupBox1.TabIndex = 7;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Partner Name";
+            // 
+            // lstbox_select_partner
+            // 
+            this.lstbox_select_partner.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lstbox_select_partner.FormattingEnabled = true;
+            this.lstbox_select_partner.Location = new System.Drawing.Point(6, 27);
+            this.lstbox_select_partner.Name = "lstbox_select_partner";
+            this.lstbox_select_partner.Size = new System.Drawing.Size(295, 329);
+            this.lstbox_select_partner.TabIndex = 4;
+            // 
+            // btn_select_partner_select
+            // 
+            this.btn_select_partner_select.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_select_partner_select.Image = global::OpenERPOutlookPlugin.Properties.Resources.Success;
+            this.btn_select_partner_select.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_select_partner_select.Location = new System.Drawing.Point(192, 432);
+            this.btn_select_partner_select.Name = "btn_select_partner_select";
+            this.btn_select_partner_select.Size = new System.Drawing.Size(53, 23);
+            this.btn_select_partner_select.TabIndex = 6;
+            this.btn_select_partner_select.Text = "&Link";
+            this.btn_select_partner_select.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_select_partner_select.UseVisualStyleBackColor = true;
+            this.btn_select_partner_select.Click += new System.EventHandler(this.btn_select_partner_select_Click);
+            // 
+            // btn_select_partner_close
+            // 
+            this.btn_select_partner_close.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_select_partner_close.Image = global::OpenERPOutlookPlugin.Properties.Resources.Error;
+            this.btn_select_partner_close.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+            this.btn_select_partner_close.Location = new System.Drawing.Point(251, 432);
+            this.btn_select_partner_close.Name = "btn_select_partner_close";
+            this.btn_select_partner_close.Size = new System.Drawing.Size(64, 23);
+            this.btn_select_partner_close.TabIndex = 5;
+            this.btn_select_partner_close.Text = "&Close ";
+            this.btn_select_partner_close.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_select_partner_close.UseVisualStyleBackColor = true;
+            this.btn_select_partner_close.Click += new System.EventHandler(this.btn_select_partner_close_Click);
+            // 
+            // btn_select_partner_search
+            // 
+            this.btn_select_partner_search.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btn_select_partner_search.Image = ((System.Drawing.Image)(resources.GetObject("btn_select_partner_search.Image")));
+            this.btn_select_partner_search.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btn_select_partner_search.Location = new System.Drawing.Point(245, 19);
+            this.btn_select_partner_search.Name = "btn_select_partner_search";
+            this.btn_select_partner_search.Size = new System.Drawing.Size(75, 23);
+            this.btn_select_partner_search.TabIndex = 1;
+            this.btn_select_partner_search.Text = "&Search ";
+            this.btn_select_partner_search.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.btn_select_partner_search.UseVisualStyleBackColor = true;
+            this.btn_select_partner_search.Click += new System.EventHandler(this.btn_select_partner_search_Click);
+            // 
+            // frm_select_partner
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(350, 467);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.btn_select_partner_select);
+            this.Controls.Add(this.btn_select_partner_close);
+            this.Controls.Add(this.btn_select_partner_search);
+            this.Controls.Add(this.txt_select_partner);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.Name = "frm_select_partner";
+            this.Text = "Select Partner";
+            this.Load += new System.EventHandler(this.frm_select_partner_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox txt_select_partner;
+        private System.Windows.Forms.Button btn_select_partner_search;
+        private System.Windows.Forms.Button btn_select_partner_close;
+        private System.Windows.Forms.Button btn_select_partner_select;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.ListBox lstbox_select_partner;
+    }
+}
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.cs b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.cs
new file mode 100644
index 00000000000..4e3af054c3e
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.cs
@@ -0,0 +1,121 @@
+/*
+    OpenERP, Open Source Business Applications
+    Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
+
+    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/>.
+*/
+
+
+using System;
+using System.Collections;
+using System.Windows.Forms;
+using OpenERPClient;
+using outlook = Microsoft.Office.Interop.Outlook;
+
+namespace OpenERPOutlookPlugin
+{
+
+    public partial class frm_select_partner : Form
+    {
+        public frm_select_partner()
+        {
+            InitializeComponent();
+           
+        }
+        public Form parent_form = null;
+
+        private void btn_select_partner_select_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (lstbox_select_partner.SelectedItem == null)
+                {
+                    throw new Exception("Please select a partner from the list.");
+                }
+                else
+                {
+                    txt_select_partner.Text = lstbox_select_partner.SelectedItem.ToString();
+                    int partner_id = (int)Cache.OpenERPOutlookPlugin.CreatePartnerRecord(lstbox_select_partner.SelectedItem.ToString());
+                    foreach (outlook.MailItem mailItem in Tools.MailItems())
+                    {
+                        Cache.OpenERPOutlookPlugin.CreateContactRecord(partner_id, mailItem.SenderName, mailItem.SenderEmailAddress);
+                    }
+                    this.Close();
+                }
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+
+        private void btn_select_partner_close_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        public void search_lst_partner()
+        {
+            /*
+            * Will search the list of partners as per the given search criteria.
+            */
+            try
+            {
+                lstbox_select_partner.Items.Clear();
+                foreach (Record oo in Cache.OpenERPOutlookPlugin.SearchRecord(txt_select_partner.Text, "res.partner"))
+                {
+                    lstbox_select_partner.Items.Add(oo.name);
+                }
+                if (lstbox_select_partner.Items.Count == 0)
+                {
+                    Connect.displayMessage("No matching Partner(s) found.");
+                }
+            }
+            catch (Exception ex)
+            {
+                Connect.handleException(ex);
+            }
+        }
+
+        private void btn_select_partner_search_Click(object sender, EventArgs e)
+        {
+            search_lst_partner();
+        }
+
+        public string SelectPartnerText
+        {
+            /*
+             * Will gets and sets the selected partner from the list of partners.
+             */
+            get
+            {
+                return this.txt_select_partner.Text;
+            }
+            set
+            {
+                this.txt_select_partner.Text = value;
+            }
+        }
+
+        private void frm_select_partner_Load(object sender, EventArgs e)
+        {
+            Record[] partenr_list = Cache.OpenERPOutlookPlugin.SearchRecord(null,"res.partner");
+
+            foreach (Record partner in partenr_list)
+            {
+                lstbox_select_partner.Items.Add(partner.name);
+            }
+        }
+    }
+}
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.resx b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.resx
new file mode 100644
index 00000000000..17f1d222db0
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.resx
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btn_select_partner_search.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAPYAAPb29v7+/v39/fr6+t///+P//+T//9zc3IKDkfP//8X3//Pz99P//5Zxf5qqwZiZ
+        nc98R5K03KS83aG60bbr/8f5/7C61fX09OXm5rzx/////qzI6sr2/7TO6vr//7vt/9n//7rt/+Xl5LLm
+        //2rRKihla683sx6SXp/iuzs9P/+/aC4xd/w+LHl/4+ewuTk5Ih1jpKhucjh7cHAwaGepcfH2bHe+2ps
+        ft7f4Pz8/Ih1jZmYot7d3PPy+Nb//9T//4WJm97f38v5/8LE3cD0/8v9///pybnb8fjgv9z///////v7
+        +/urRnt7hLnk/9Tk86zg/5mZpn+Ajbvm//j+/7nt///aof/58f/589v//5m75dH//8P3/8L3/2trg8z8
+        /4uiwadtSIGMrMaAXZ6hvqKhouz///ysRbvr//39/v/XnZaotvPOmbSwtpl0hv2mOcjO5bu7vry8yd7e
+        7K+tsLC83ZiuzqyEacrW6P///wAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAHkALAAAAAAQABAAAAejgHmC
+        g4SFhoILFnYSJjUAh3lpQyw+RB9aZBeGAXBPVE5QI1wRcoY9HRxTIRVCXwoOA4VzRxQtRVkFBCArj4Qp
+        GxlVPwYJZgRrvYMBdTZdDAUeSjJAsYNXSHEuaFtJBnheM4QaaiR3TWJgEzE3ZTmDKkZnEA07PG00dAdL
+        g1hWTGMwpGDIE0CAgEJs3pzQgeIFJEElwrhBIOKhIBwPogSxyNFQIAA7
+</value>
+  </data>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAxO+0UHsorMtUkJMo6LOY5JN81HsdDLM4/JMdINcBISKJCSpA+RpM9SJo6RJsxPJg2PJ84PKU4OadA
+        Pbs7L8lANd8qJNUiJtIZKModMNcUJOIUHu0iJvsaIOUaJsQuQMkXHNcvNOciJsstLNAvItJSQekqG6xQ
+        QchYSNKOg/3Cw//Q2f/P1f/S2P/T3P/R2P+iqP+7vv9vct8zM6k0Lbg6NcwcGroyN9oiLs4eLdccKOQg
+        KvMkKfYaIuEbJsgnOMkdGuUeHd4+PeseHLxAONI9N7p4edSzt//W1v/k4//h6P/f5v/Dw/+2tf+1t/+0
+        tv/Kzv/Y3f/S1f/U2P/Fyf8iKJlOVNMtM8IuM9UjKtgdJd0aI98bJN8nMOUqNN8dKc0pIPMnIOUvK9g5
+        N8w4NLWGiObR4P/k9//k7//K0/+JkeRWW8I5N78uKcAvLL4wMrxCR8hTWNKOlP/a4v/Z4//W4v+Ai+cx
+        OaooKr4mJ88sLuAjKNsWIMwoMt4yOusZI9QnHO42Le8lIME+Pb2Dg+fk7//o///b9/ff8v+OnN5ET6sx
+        NrE3MdIyKdcvKsszNscxOL0uN7YkKqdvduPc6f/Y6v/f8P/F0v9PUMg1MMc0MNY4OOQlK9AdJs4iLN4c
+        J90sIucvKdovL7lcX8fm6v/q9v/m/vbl//yQocxRXa8jLp4sML83MeIsJNwnJsoxNckjLrRATNBARNIo
+        K6srN4/c7f/a7f/k8//Kzf9pZN0nHrQrJskyNNgkLNMbJdYgK+AxK9wxL8k+RK/N1f/s8v/r9v/Y6uvq
+        +/9UW6o2ObMlKbgpK88vKuMqJt0sL801PcwwP8QaJ7MjIsY1MdBDRL54gtDm9//Y6fzq8//AwP9jWdU0
+        KMAxLdIwMt4hLtgcLdc3NdsfIauFkODo9P/x+v/p8vzx/f+uteY7OKw2L8wtLtYpK90nKeIpKt4qLs0l
+        Lr4iML4yPdUrJ94xKN0yLMc3OKavuuzt+//c5vfv9P/Z0/9rYN8tJsMoKNIjL9UYK9A9Od4hJKS9y//n
+        9//0///x9/z09v+dl+g8LsoyI+InJ98iKd4iKN8kKtspLdIpMM0qNdMcI8wpJucqH+c8L+kzKL5MTaXs
+        8//0///w+v/x8f++uf8vKLM0M9YlL9MkNNoxK9Y2OLrc7P/t///4//f7///28v+EeNw8JtkuHu4kJuMe
+        Kd4gKd4iKdwpKdkpKdknK90gJNssKu4iGeUuH+wvIdM9MrCmpOr0/f/r9uz2/P/q7f+XlP8zMcYhKMsf
+        LNYmHtc4OsTk8v/x//73/+39//v28P99b9U7JdssHu4gKOAcK9seKd4iJ+ApJOUrIucmIegjIuYwMu8b
+        GtwiGOczJOowHsVYS7709P/5//r6//Xy/P/d4P87PbkiJMghJdspI+AvML7b6f/x//79//L+/vj68v+N
+        f+Q7J9crIeoeKtwZLtccKtwiJ+IrIeksH+0oHu0iH+YuNOsdItsdGuU3LPgzHt42I7XY0P/6/f/2/+np
+        +ejq8/92fN8rLcgqKeMsKuEyNcDc6f/z//////j///779P+Ngds7LM4rJeIcLdcXMNQbLNsiJ+IsIucu
+        IOouJOwhHt8lL+AfLNwaIuEtLPI0Juo1I8SajOr49f/1/+z4//Dt+//J0v8vLsAvKt8gJc44QMPj7//w
+        +f/8/Pz//P/88v9zabw7L8cpKdscL9QXMNIbLNsiKN8sJeIwJOIzK+QjJdcfK9cdLtsWJt0eJ+MuJ+Y5
+        K9B8bNzv5v/z+fT6//Ln9/3k7/8wMrYsJtEcK70yQbXj8P/w9//79P//+P/78P98csU5McQnK9gbL9QX
+        MNQbLNkkK9kuKtcyK9IxL88qL9EcKNQYKtsXK94YKNknK9g1L8pjVM3m2f/6+P/6//7j8fff7P9fYdcs
+        KsMsN88tOLHb5//z+//////89/n79f+kn+o5NL8nLNUbLtUVL9cbLNsiKtssKtgyK9QsJ8oyM9ceJtcV
+        JdwYLuQWLd0hLtYrL8MxK6LWzv/49//w9fbz///q9v+lqP83NrYjHNk7Oszk7f/d7ez9/+T8/9/2+v/e
+        4P8wMKwyN9kLHMcgNukZKeAdJuIrJu0uIek1I+IyJOAlJeMbJuYQKOYQKuIXLtgkNcYmL5fm7v/z/P/1
+        /vv2///x9//Y1v9FQKMoHuM3M8+epO/x/f/7/+n9/+T4///f4f8xMqQxOM8WJNAZKt8aKuEaJeEhIOYw
+        Je01IeYzI+InJ98bKd8QKuIOKuIVKt8iMc4wOK/Axv/v9v/4/v/4/v/w8//o5/9APY0pKtg4Os5dX77t
+        8P/19f/7+v/69v/t6P9OTrgxNsEoMtYWJdUfLt4bKNgdJNEwMNwzJ9kyKtUlMc0bM8sSMdQSLdwZJecl
+        JeM3Lc2Shvzq4//49v/4+v/q7v/s7f8/P40iKtEzOc5BQbXi3v/27v/48P/58v/z7v+OjesuMLQuMtcf
+        KN0iKuEcKNQkMckrMcowKtcsK9UkNcYbOMIVNskXMNQgJeUsJOM6Kc6Zhv/u5P/69//2+//t8//h4v9B
+        P5gbJdYiKcw3N8GLhOz06//79P/z8f/09f/Pzf80MK0qItMsJu8hIOYgJtcwQssjMLwrJ94pJuAiMssc
+        OcAbOMIeNccnLNUzLNBAMrXLvv/4+f/6//vy/frv+P+mpvpAOqkhL+YXIc0xMspEPrXZ0v/49P/6/f/2
+        /P/t7v9cWMIsIcswJO4kGugkJt82RNMiMb0nKtklKN4gMsseNsQgNcYlMsouLNI7L8dBM6Ps5f/5//76
+        //Hu/Pjs9f90btlIPckhMe8YI9gsLtAyLq+PjNzh4f/4///2//zv9/+lp/VFO80yI98tIe0tJustMNgo
+        M8skMssiM8ogNMkiMsskLdUrKNs1JtxALcpNPajy7f/y+/j4//Tt+f/o7f9OQspGM+AUKd8bKdslKNE4
+        NcY/OqOsqefz+f/0///v/P/n8f9hYsozLcI6L+MzK+ohHNUtMd4iMc4gMs0iLtQkKdwpIucwIec7JN5F
+        LsZrXbv08v/0//3z//7n8v/P0P8tH7swG9sYMdUaLNMpLNs0LdQ6LMBbTsGxrfTv9f/s/P/o/P/T5f89
+        S54jKKkwLNI4L/EpIukbINsmLOksJ/gmGvYrFPg6IPZEK99FMrevqPPw9f/k8Prt+//m7v97eOUxI8g0
+        IeIaL9EcLNMnKuAwKOEwINI8K8htYdeene3T3//k/P/J5PnK4/82Rp8uM7ciHcwnH+IsLe0aGuIdFO0x
+        H/4zHPQqFNE9L71jXL3s8f/e7P/q+//m9P+DiN0xLqw3LNY8LewiLdslLN8pKuYvJ+owH+UwHNk5Kc5F
+        Pb+Ume7N3v/d+f/R8P/G3/9FV7A5QcQwM9IqLdwjJd4xKuk8MuosJMUwLqp9hdLa6v/m/f/b9f/j9v+z
+        v/9ARLQrKLk5MdwfFc0oKuMoKeUoJeYoIuUsIusyJe0zJeEvJspBQMBMVLG1y//a9P/Y8f/C2f+Ek/o9
+        SsRATdEyPsYoL7oyN7hXW8uNmOrF2P/h+P/X8v/d9f+KmuYgKpU4OcVEQeQXEsE8N+wqIOksI+gnIuEg
+        H9kiI98tLOgvKuksJ94kIMU8PcsvN6hUYL6Jm+7W6P/E1f/T6P/F5f/R9P/U8P/U6//U5v/d7v/d7//Y
+        6f+zw/9DULg1PMEtL8oSEL0uKuE6NO0nItsxIugyJ+kvKuMlKdshKNsgKd4hJeIhI+AzMegkIcosK8Ex
+        Nbk9Q7ouNqdmceFHV7e00P+du+yNpd+brO+uuv+epv9kac8rMKM9QsYeJbgoLc8yNuMsLeMoJ+EiHtsl
+        H9w4Ktw1K9wxL90rMd4hL9wZKdoXJdscJt4fI9k8POwnJM41MNM5NNMiGro1Lc5GQNswLbkuKrE2MLdE
+        O8hLPNM/L9A0JM8sIdEjIc8wNd4pNNYcKcsVHsUgJdQ0M+0uKeg1KNAuJs0oJ9EnLtkdLtkWKdgWKt0i
+        MOYeJ9wZGs4zLuMwJdktIdVFNuwvH9gxIdo8KdxBLd1AK9s9Jdc6H9o7IOI5H+40IO4lH+I3O/EQH8IZ
+        Lcg2ROQeJ88eHtYoI+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup/OpenERPOutlookPluginSetup.vdproj b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup/OpenERPOutlookPluginSetup.vdproj
new file mode 100644
index 00000000000..2ecd6c494cf
--- /dev/null
+++ b/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup/OpenERPOutlookPluginSetup.vdproj
@@ -0,0 +1,988 @@
+"DeployProject"
+{
+"VSVersion" = "3:800"
+"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
+"IsWebType" = "8:FALSE"
+"ProjectName" = "8:OpenERPOutlookPluginSetup"
+"LanguageId" = "3:1033"
+"CodePage" = "3:1252"
+"UILanguageId" = "3:1033"
+"SccProjectName" = "8:"
+"SccLocalPath" = "8:"
+"SccAuxPath" = "8:"
+"SccProvider" = "8:"
+    "Hierarchy"
+    {
+        "Entry"
+        {
+        "MsmKey" = "8:_6AC61E6DAA74BD8A62A56739851214E7"
+        "OwnerKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7588D46F3D97B108090A11D1415DE5EC"
+        "OwnerKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_9BA1227571F16B6ABCB102A098A4B13F"
+        "OwnerKey" = "8:_6AC61E6DAA74BD8A62A56739851214E7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_9BA1227571F16B6ABCB102A098A4B13F"
+        "OwnerKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B66CD6B8E834B37C2AFA64398688811D"
+        "OwnerKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B66CD6B8E834B37C2AFA64398688811D"
+        "OwnerKey" = "8:_7588D46F3D97B108090A11D1415DE5EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_7588D46F3D97B108090A11D1415DE5EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_9BA1227571F16B6ABCB102A098A4B13F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_6AC61E6DAA74BD8A62A56739851214E7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_B66CD6B8E834B37C2AFA64398688811D"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_D219AD7AB7924D44B7E2945648C76CF7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+    }
+    "Configurations"
+    {
+        "Debug"
+        {
+        "DisplayName" = "8:Debug"
+        "IsDebugOnly" = "11:TRUE"
+        "IsReleaseOnly" = "11:FALSE"
+        "OutputFilename" = "8:Debug\\OpenERPOutlookPluginSetup.msi"
+        "PackageFilesAs" = "3:2"
+        "PackageFileSize" = "3:-2147483648"
+        "CabType" = "3:1"
+        "Compression" = "3:2"
+        "SignOutput" = "11:FALSE"
+        "CertificateFile" = "8:"
+        "PrivateKeyFile" = "8:"
+        "TimeStampServer" = "8:"
+        "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.3.5"
+                    {
+                    "Name" = "8:.NET Framework 3.5"
+                    "ProductCode" = "8:Microsoft.Net.Framework.3.5"
+                    }
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
+                    {
+                    "Name" = "8:Windows Installer 3.1"
+                    "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
+                    }
+                }
+            }
+        }
+        "Release"
+        {
+        "DisplayName" = "8:Release"
+        "IsDebugOnly" = "11:FALSE"
+        "IsReleaseOnly" = "11:TRUE"
+        "OutputFilename" = "8:Release\\OpenERPOutlookPluginSetup.msi"
+        "PackageFilesAs" = "3:2"
+        "PackageFileSize" = "3:-2147483648"
+        "CabType" = "3:1"
+        "Compression" = "3:2"
+        "SignOutput" = "11:FALSE"
+        "CertificateFile" = "8:"
+        "PrivateKeyFile" = "8:"
+        "TimeStampServer" = "8:"
+        "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.3.5"
+                    {
+                    "Name" = "8:.NET Framework 3.5"
+                    "ProductCode" = "8:Microsoft.Net.Framework.3.5"
+                    }
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
+                    {
+                    "Name" = "8:Windows Installer 3.1"
+                    "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
+                    }
+                }
+            }
+        }
+    }
+    "Deployable"
+    {
+        "CustomAction"
+        {
+        }
+        "DefaultFeature"
+        {
+        "Name" = "8:DefaultFeature"
+        "Title" = "8:"
+        "Description" = "8:"
+        }
+        "ExternalPersistence"
+        {
+            "LaunchCondition"
+            {
+                "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_BFDD92B2291E48D1A8B52DFCA8631CD4"
+                {
+                "Name" = "8:.NET Framework"
+                "Message" = "8:[VSDNETMSG]"
+                "Version" = "8:3.5.21022"
+                "AllowLaterVersions" = "11:FALSE"
+                "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=76617"
+                }
+            }
+        }
+        "File"
+        {
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6AC61E6DAA74BD8A62A56739851214E7"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:TRUE"
+            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Interop.Outlook, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c"
+                "ScatterAssemblies"
+                {
+                    "_6AC61E6DAA74BD8A62A56739851214E7"
+                    {
+                    "Name" = "8:Microsoft.Office.Interop.Outlook.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Microsoft.Office.Interop.Outlook.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F8355F1930014BA7AC04125197F9FCF8"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7588D46F3D97B108090A11D1415DE5EC"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:OpenERPClient, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_7588D46F3D97B108090A11D1415DE5EC"
+                    {
+                    "Name" = "8:OpenERPClient.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:OpenERPClient.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F8355F1930014BA7AC04125197F9FCF8"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9BA1227571F16B6ABCB102A098A4B13F"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:TRUE"
+            "AssemblyAsmDisplayName" = "8:office, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c"
+                "ScatterAssemblies"
+                {
+                    "_9BA1227571F16B6ABCB102A098A4B13F"
+                    {
+                    "Name" = "8:office.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:office.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F8355F1930014BA7AC04125197F9FCF8"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B66CD6B8E834B37C2AFA64398688811D"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:CookComputing.XmlRpcV2, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_B66CD6B8E834B37C2AFA64398688811D"
+                    {
+                    "Name" = "8:CookComputing.XmlRpcV2.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:CookComputing.XmlRpcV2.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F8355F1930014BA7AC04125197F9FCF8"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+        }
+        "FileType"
+        {
+        }
+        "Folder"
+        {
+            "{1525181F-901A-416C-8A58-119130FE478E}:_0AB219A94AD9480C8B328A36290F8500"
+            {
+            "Name" = "8:#1916"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:DesktopFolder"
+                "Folders"
+                {
+                }
+            }
+            "{1525181F-901A-416C-8A58-119130FE478E}:_BE76AEAED62647E882A7E7E462208B6C"
+            {
+            "Name" = "8:#1919"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:ProgramMenuFolder"
+                "Folders"
+                {
+                }
+            }
+            "{3C67513D-01DD-4637-8A68-80971EB9504F}:_F8355F1930014BA7AC04125197F9FCF8"
+            {
+            "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"
+            "Name" = "8:#1925"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:TARGETDIR"
+                "Folders"
+                {
+                }
+            }
+        }
+        "LaunchCondition"
+        {
+        }
+        "Locator"
+        {
+        }
+        "MsiBootstrapper"
+        {
+        "LangId" = "3:1033"
+        "RequiresElevation" = "11:FALSE"
+        }
+        "Product"
+        {
+        "Name" = "8:Microsoft Visual Studio"
+        "ProductName" = "8:OpenERPOutlookPluginSetup"
+        "ProductCode" = "8:{DB110066-1D22-421E-AE6E-008EFC7D9BA3}"
+        "PackageCode" = "8:{01C16D46-10C4-4867-9DA7-158EA0851BA2}"
+        "UpgradeCode" = "8:{D423841B-05E6-4B05-93A7-3AF0D3F87416}"
+        "RestartWWWService" = "11:FALSE"
+        "RemovePreviousVersions" = "11:FALSE"
+        "DetectNewerInstalledVersion" = "11:TRUE"
+        "InstallAllUsers" = "11:FALSE"
+        "ProductVersion" = "8:1.0.0"
+        "Manufacturer" = "8:OpenERP"
+        "ARPHELPTELEPHONE" = "8:"
+        "ARPHELPLINK" = "8:"
+        "Title" = "8:OpenERPOutlookPluginSetup"
+        "Subject" = "8:"
+        "ARPCONTACT" = "8:OpenERP"
+        "Keywords" = "8:"
+        "ARPCOMMENTS" = "8:"
+        "ARPURLINFOABOUT" = "8:"
+        "ARPPRODUCTICON" = "8:"
+        "ARPIconIndex" = "3:0"
+        "SearchPath" = "8:"
+        "UseSystemSearchPath" = "11:TRUE"
+        "TargetPlatform" = "3:0"
+        "PreBuildEvent" = "8:"
+        "PostBuildEvent" = "8:"
+        "RunPostBuildEvent" = "3:0"
+        }
+        "Registry"
+        {
+            "HKLM"
+            {
+                "Keys"
+                {
+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_85BD67F9F053414A885B4BD155C3503A"
+                    {
+                    "Name" = "8:Software"
+                    "Condition" = "8:"
+                    "AlwaysCreate" = "11:FALSE"
+                    "DeleteAtUninstall" = "11:FALSE"
+                    "Transitive" = "11:FALSE"
+                        "Keys"
+                        {
+                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_EBCD33B942DF4A239ACC7022DD3FEAA6"
+                            {
+                            "Name" = "8:Microsoft"
+                            "Condition" = "8:"
+                            "AlwaysCreate" = "11:TRUE"
+                            "DeleteAtUninstall" = "11:FALSE"
+                            "Transitive" = "11:FALSE"
+                                "Keys"
+                                {
+                                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_5B7FCC91FAAA4F64BB7C83492A6F2AF0"
+                                    {
+                                    "Name" = "8:Office"
+                                    "Condition" = "8:"
+                                    "AlwaysCreate" = "11:TRUE"
+                                    "DeleteAtUninstall" = "11:FALSE"
+                                    "Transitive" = "11:FALSE"
+                                        "Keys"
+                                        {
+                                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_1064D50BF01A4D51B868E982FC220247"
+                                            {
+                                            "Name" = "8:Outlook"
+                                            "Condition" = "8:"
+                                            "AlwaysCreate" = "11:TRUE"
+                                            "DeleteAtUninstall" = "11:FALSE"
+                                            "Transitive" = "11:FALSE"
+                                                "Keys"
+                                                {
+                                                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_137204EE56DC497088E348674D3D8B7F"
+                                                    {
+                                                    "Name" = "8:AddIns"
+                                                    "Condition" = "8:"
+                                                    "AlwaysCreate" = "11:TRUE"
+                                                    "DeleteAtUninstall" = "11:FALSE"
+                                                    "Transitive" = "11:FALSE"
+                                                        "Keys"
+                                                        {
+                                                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_D274EDB843AA45D79536215DBFA689AE"
+                                                            {
+                                                            "Name" = "8:OpenERPOutlookPlugin.Connect"
+                                                            "Condition" = "8:"
+                                                            "AlwaysCreate" = "11:TRUE"
+                                                            "DeleteAtUninstall" = "11:FALSE"
+                                                            "Transitive" = "11:FALSE"
+                                                                "Keys"
+                                                                {
+                                                                }
+                                                                "Values"
+                                                                {
+                                                                    "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_7DAB0B878C2B4AD6961544515CF9F67F"
+                                                                    {
+                                                                    "Name" = "8:LoadBehavior"
+                                                                    "Condition" = "8:"
+                                                                    "Transitive" = "11:FALSE"
+                                                                    "ValueTypes" = "3:3"
+                                                                    "Value" = "3:3"
+                                                                    }
+                                                                    "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_E727FA9F9AE4473B86EC5F2749DA6E00"
+                                                                    {
+                                                                    "Name" = "8:Description"
+                                                                    "Condition" = "8:"
+                                                                    "Transitive" = "11:FALSE"
+                                                                    "ValueTypes" = "3:1"
+                                                                    "Value" = "8:OpenERP Outlook Plugin"
+                                                                    }
+                                                                    "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_F8A784A42EA24C908396CFE4B36C9F21"
+                                                                    {
+                                                                    "Name" = "8:FriendlyName"
+                                                                    "Condition" = "8:"
+                                                                    "Transitive" = "11:FALSE"
+                                                                    "ValueTypes" = "3:1"
+                                                                    "Value" = "8:OpenERP Outlook Plugin"
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                        "Values"
+                                                        {
+                                                        }
+                                                    }
+                                                }
+                                                "Values"
+                                                {
+                                                }
+                                            }
+                                        }
+                                        "Values"
+                                        {
+                                        }
+                                    }
+                                }
+                                "Values"
+                                {
+                                }
+                            }
+                        }
+                        "Values"
+                        {
+                        }
+                    }
+                }
+            }
+            "HKCU"
+            {
+                "Keys"
+                {
+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_65C75F62BA5342D88380AD586D8CB4A2"
+                    {
+                    "Name" = "8:Software"
+                    "Condition" = "8:"
+                    "AlwaysCreate" = "11:FALSE"
+                    "DeleteAtUninstall" = "11:FALSE"
+                    "Transitive" = "11:FALSE"
+                        "Keys"
+                        {
+                        }
+                        "Values"
+                        {
+                        }
+                    }
+                }
+            }
+            "HKCR"
+            {
+                "Keys"
+                {
+                }
+            }
+            "HKU"
+            {
+                "Keys"
+                {
+                }
+            }
+            "HKPU"
+            {
+                "Keys"
+                {
+                }
+            }
+        }
+        "Sequences"
+        {
+        }
+        "Shortcut"
+        {
+        }
+        "UserInterface"
+        {
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_05A1A869F1C748A0AA4687CF7DF17408"
+            {
+            "Name" = "8:#1902"
+            "Sequence" = "3:1"
+            "Attributes" = "3:3"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5F37EBB554844174BFF8F45DB2607A7D"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Finished"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "UpdateText"
+                            {
+                            "Name" = "8:UpdateText"
+                            "DisplayName" = "8:#1058"
+                            "Description" = "8:#1158"
+                            "Type" = "3:15"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1258"
+                            "DefaultValue" = "8:#1258"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_2237F99549C04193ADB5655D7E6FD5B4"
+            {
+            "Name" = "8:#1901"
+            "Sequence" = "3:1"
+            "Attributes" = "3:2"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8A6734448CF54465BD37D45C0CFF5000"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Progress"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "ShowProgress"
+                            {
+                            "Name" = "8:ShowProgress"
+                            "DisplayName" = "8:#1009"
+                            "Description" = "8:#1109"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_4B62B60C5A10485EBB000ABEF6F8B0E1"
+            {
+            "UseDynamicProperties" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_7355B2D19A0B4B13A75AFF1D63E8FA4E"
+            {
+            "Name" = "8:#1900"
+            "Sequence" = "3:1"
+            "Attributes" = "3:1"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_77890D6A5244491A93629AEBF7575094"
+                    {
+                    "Sequence" = "3:300"
+                    "DisplayName" = "8:Confirm Installation"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8B76EAAF28A844BBA54D063D07BA2FF8"
+                    {
+                    "Sequence" = "3:200"
+                    "DisplayName" = "8:Installation Folder"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "InstallAllUsersVisible"
+                            {
+                            "Name" = "8:InstallAllUsersVisible"
+                            "DisplayName" = "8:#1059"
+                            "Description" = "8:#1159"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A16110FB2319496FA65112471161C0FB"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Welcome"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "CopyrightWarning"
+                            {
+                            "Name" = "8:CopyrightWarning"
+                            "DisplayName" = "8:#1002"
+                            "Description" = "8:#1102"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1202"
+                            "DefaultValue" = "8:#1202"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "Welcome"
+                            {
+                            "Name" = "8:Welcome"
+                            "DisplayName" = "8:#1003"
+                            "Description" = "8:#1103"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1203"
+                            "DefaultValue" = "8:#1203"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_8BDB1DC6B45345D6A00F54A75DEF1A6B"
+            {
+            "Name" = "8:#1900"
+            "Sequence" = "3:2"
+            "Attributes" = "3:1"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_51562FA73CD74420B54B17BDC66F6983"
+                    {
+                    "Sequence" = "3:200"
+                    "DisplayName" = "8:Installation Folder"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_6E30DC2B3F284C148AE722C0E78228F8"
+                    {
+                    "Sequence" = "3:300"
+                    "DisplayName" = "8:Confirm Installation"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A66D47C411F0411780817D51CF722A22"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Welcome"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "CopyrightWarning"
+                            {
+                            "Name" = "8:CopyrightWarning"
+                            "DisplayName" = "8:#1002"
+                            "Description" = "8:#1102"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1202"
+                            "DefaultValue" = "8:#1202"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "Welcome"
+                            {
+                            "Name" = "8:Welcome"
+                            "DisplayName" = "8:#1003"
+                            "Description" = "8:#1103"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1203"
+                            "DefaultValue" = "8:#1203"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_A6A71D2398304B649269B7E50D8A0EC4"
+            {
+            "UseDynamicProperties" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_B854718158D047B6B2E6FE698112EC93"
+            {
+            "Name" = "8:#1901"
+            "Sequence" = "3:2"
+            "Attributes" = "3:2"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BD7FC1FCE04048D986EC3E4F21D525C6"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Progress"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "ShowProgress"
+                            {
+                            "Name" = "8:ShowProgress"
+                            "DisplayName" = "8:#1009"
+                            "Description" = "8:#1109"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_C3C153DE1CA647C6B2075A0C59ABBBA6"
+            {
+            "Name" = "8:#1902"
+            "Sequence" = "3:2"
+            "Attributes" = "3:3"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5E814962060F4BDBAEF5C6BD43D6DE3E"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Finished"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        "MergeModule"
+        {
+        }
+        "ProjectOutput"
+        {
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D219AD7AB7924D44B7E2945648C76CF7"
+            {
+            "SourcePath" = "8:..\\OpenERPOutlookPlugin\\obj\\Debug\\OpenERPOutlookPlugin.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F8355F1930014BA7AC04125197F9FCF8"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:2"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{F4B2219B-F235-400F-81B4-92F15250BBA4}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
+        }
+    }
+}
diff --git a/addons/pad/i18n/hr.po b/addons/pad/i18n/hr.po
new file mode 100644
index 00000000000..052831af21a
--- /dev/null
+++ b/addons/pad/i18n/hr.po
@@ -0,0 +1,77 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 12:58+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:32
+#, python-format
+msgid "Ok"
+msgstr "U redu"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:29
+#, python-format
+msgid "Name"
+msgstr "Naziv"
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr ""
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Organizacije"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
+
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr "Zapiši"
+
+#. module: pad
+#: model:ir.module.module,description:pad.module_meta_information
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client, lets "
+"the\n"
+"company customize which Pad installation should be used to link to new pads\n"
+"(by default, pad.openerp.com)\n"
+"    "
+msgstr ""
+
+#. module: pad
+#: field:res.company,pad_index:0
+msgid "Pad root URL"
+msgstr ""
+
+#. module: pad
+#: view:res.company:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad
+#: model:ir.module.module,shortdesc:pad.module_meta_information
+msgid "Enhanced support for (Ether)Pad attachments"
+msgstr ""
diff --git a/addons/pad_project/__openerp__.py b/addons/pad_project/__openerp__.py
index be7cb82af2e..2a0785d1863 100644
--- a/addons/pad_project/__openerp__.py
+++ b/addons/pad_project/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Project Specs as PADs',
+    'name': 'Specifications on PADs',
     'version': '1.0',
     "category": "Project Management",
     'complexity': "easy",
diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py
index 2b05305c5ce..e12bceb51bf 100644
--- a/addons/plugin/__openerp__.py
+++ b/addons/plugin/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'CRM Plugins',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'complexity': "easy",
     'description': """
 The common interface for pugin.
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index c4859771e35..1fccae814b2 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -12,13 +12,14 @@ class plugin_handler(osv.osv_memory):
 
     def _make_url(self, cr, uid, res_id, model, context=None):
         """
-            @param id: on which document the message is pushed
+            @param res_id: on which document the message is pushed
             @param model: name of the document linked with the mail
             @return url
         """
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
         if base_url:
-            base_url += '/?id=%s&model=%s'%(res_id,model)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            base_url += '/web/webclient/login?db=%s&login=%s&key=%s#id=%s&model=%s' % (cr.dbname, user.login, user.password, res_id, model)
         return base_url
 
     def is_installed(self, cr, uid):
@@ -35,28 +36,27 @@ class plugin_handler(osv.osv_memory):
             @param email: email is a standard RFC2822 email message
             @return Dictionary which contain id and the model name of the document linked with the mail
                 if no document is found the id = 0
-                (model_name, res_id, name_get, url) 
+                (model_name, res_id, url, name_get) 
         """
         mail_message_obj = self.pool.get('mail.message')
         model = False
         res_id = 0
         url = False
         name = ""
-
         msg = mail_message_obj.parse_message(email)
         references = [msg.get('message-id')]
         refs =  msg.get('references',False)
         if refs:
             references.extend(refs.split())
-
         msg_ids = mail_message_obj.search(cr, uid, [('message_id','in',references)])
         if msg_ids:
             msg = mail_message_obj.browse(cr, uid, msg_ids[0])
             res_id = msg.res_id
             model = msg.model
             url = self._make_url(cr, uid, res_id, model)
-            name =  self.pool.get(model).name_get(cr, uid, res_id)[1]
-        return (model, res_id, url, name)
+            name =  self.pool.get(model).name_get(cr, uid, [res_id])[0][1]
+        return (model,res_id, url,name)
+
 
     def document_type(self, cr, uid, context=None):
         """
@@ -90,11 +90,8 @@ class plugin_handler(osv.osv_memory):
         """
         mail_message = self.pool.get('mail.message')
         model_obj = self.pool.get(model)
-        
         msg = mail_message.parse_message(email)
         message_id = msg.get('message-id')
-         
-        
         mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
         if message_id and mail_ids :
             mail_record = mail_message.browse(cr, uid, mail_ids)[0]
@@ -130,8 +127,7 @@ class plugin_handler(osv.osv_memory):
         return ('res.partner', partner_id, url)
 
     # Specific to outlook rfc822 is not available so we split in arguments headerd,body,attachemnts
-    def push_message_outlook(self, cr, uid, model, headers, body_text, body_html, attachments):
-        pass
+    def push_message_outlook(self, cr, uid, model, headers,res_id=0 ,body_text=False, body_html=False, attachments=False):
         # ----------------------------------------
         # solution 1
         # construct a fake rfc822 from the separated arguement
@@ -142,12 +138,23 @@ class plugin_handler(osv.osv_memory):
         # solution 2
         # use self.pushmessage only with header and body
         # add attachemnt yourself after
-
-        #ir_attachment_obj = self.pool.get('ir.attachment')
-        #attachment_ids = ir_attachment_obj.search(cr, uid, [('res_model', '=', data.get('res_model')), ('res_id', '=', data.get('res_id')), ('datas_fname', '=', data.get('datas_fname'))])
-        #if attachment_ids:
-        #    return attachment_ids[0]
-        #else:
-        #    vals = {"res_model": data.get('res_model'), "res_id": data.get('res_id'), "name": data.get('name'), "datas" : data.get('datas'), "datas_fname" : data.get('datas_fname')}
-        #    return ir_attachment_obj.create(cr, uid, vals)
-        #return (model, res_id, url, notify)
+        mail_message = self.pool.get('mail.message')        
+        ir_attachment_obj = self.pool.get('ir.attachment')
+        attach_ids = []
+        msg = mail_message.parse_message(headers)
+        message_id = msg.get('message-id')    
+        push_mail = self.push_message(cr, uid, model, headers, res_id)
+        res_id = push_mail[1]
+        model =  push_mail[0]            
+        for name in attachments.keys():
+            attachment_ids = ir_attachment_obj.search(cr, uid, [('res_model', '=', model), ('res_id', '=', res_id), ('datas_fname', '=', name)])
+            if attachment_ids:
+                attach_ids.append( attachment_ids[0])
+            else:
+                vals = {"res_model": model, "res_id": res_id, "name": name, "datas" :attachments[name], "datas_fname" : name}
+                attach_ids.append(ir_attachment_obj.create(cr, uid, vals))
+        mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
+        if mail_ids:
+            ids =  mail_message.write(cr, uid,mail_ids[0],{ 'attachment_ids': [(6, 0, attach_ids)],'body_text':body_text,'body_html':body_html})
+        url = self._make_url(cr, uid, res_id, model)
+        return (model, res_id, url)
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 62df15f5954..e63acfb7881 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -52,7 +52,6 @@ Main features :
         'wizard/pos_close_statement.xml',
         'wizard/pos_box_entries.xml',
         'wizard/pos_payment_report_user_view.xml',
-        'wizard/pos_payment_report_date_view.xml',
         'wizard/pos_box_out.xml',
         'wizard/pos_sales_user.xml',
         'wizard/pos_receipt_view.xml',
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index b440f1101d9..24c7dd55f7e 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-08-03 08:43+0000\n"
+"PO-Revision-Date: 2011-12-19 17:53+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:00+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -24,7 +24,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by day"
-msgstr ""
+msgstr "Prodaje po danu"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
@@ -35,7 +35,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
 #: view:pos.discount:0
 msgid "Apply Discount"
-msgstr "Primjeni popust"
+msgstr "Apply Discount"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -45,7 +45,7 @@ msgstr "Stavi u pripremu"
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr ""
+msgstr "Product Nb."
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
@@ -55,12 +55,12 @@ msgstr "Blagajna"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Today"
-msgstr ""
+msgstr "Danas"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
 msgid "Add product :"
-msgstr ""
+msgstr "Dodaj proizvod :"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -70,20 +70,20 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Put Money"
-msgstr ""
+msgstr "Stavi novac"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
 #: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
 msgid "Register Analysis"
-msgstr ""
+msgstr "Register Analysis"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Details of Sales"
-msgstr ""
+msgstr "Detalji prodaje"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
@@ -103,18 +103,18 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
 msgid "Add payment :"
-msgstr ""
+msgstr "Dodaj plaćanje :"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "My Sales"
-msgstr ""
+msgstr "My Sales"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
@@ -135,7 +135,7 @@ msgstr ""
 #: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -145,7 +145,7 @@ msgstr "PDV"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Izvor"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -166,7 +166,7 @@ msgstr ""
 #: report:account.statement:0
 #: field:report.pos.order,partner_id:0
 msgid "Partner"
-msgstr "Stranka"
+msgstr "Partner"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -178,18 +178,18 @@ msgstr "Ukupno za dan"
 #: view:report.pos.order:0
 #: field:report.pos.order,average_price:0
 msgid "Average Price"
-msgstr ""
+msgstr "Prosječna cijena"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Disc. (%)"
-msgstr "Popust (%)"
+msgstr "Pop.(%)"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total discount"
-msgstr ""
+msgstr "Total discount"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -206,19 +206,19 @@ msgstr "Stanje"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 msgid "Add payment"
-msgstr ""
+msgstr "Dodaj plaćanje"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 msgid "Sales by month"
-msgstr ""
+msgstr "Prodaje po mjesecima"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
 #: view:report.sales.by.user.pos:0
 #: view:report.sales.by.user.pos.month:0
 msgid "Sales by User"
-msgstr ""
+msgstr "Prodaje po korisniku"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -230,13 +230,13 @@ msgstr "Pop.(%)"
 #: field:pos.box.entries,ref:0
 #: field:pos.box.out,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Vezna oznaka"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Total Price"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -247,7 +247,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
 #: report:pos.sales.user:0
 msgid "Sales Report"
-msgstr ""
+msgstr "Izveštaj prodaje"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_discount.py:52
@@ -269,7 +269,7 @@ msgstr ""
 #: view:pos.order:0
 #: view:pos.payment.report.date:0
 msgid "Dates"
-msgstr ""
+msgstr "Datumi"
 
 #. module: point_of_sale
 #: field:res.company,company_discount:0
@@ -296,13 +296,13 @@ msgstr ""
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,total:0
 #: field:report.sales.by.margin.pos.month,total:0
 msgid "Margin"
-msgstr ""
+msgstr "Marža"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
@@ -317,7 +317,7 @@ msgstr "Uk. količina"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
 msgid "Sales by user monthly"
-msgstr ""
+msgstr "Prodaje po korisniku mjesečno"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:54
@@ -341,17 +341,17 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "Način plaćanja"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr ""
+msgstr "Daily Operations"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Search Cash Statements"
-msgstr ""
+msgstr "Search Cash Statements"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -362,18 +362,18 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
 msgid "Sales by User Monthly"
-msgstr ""
+msgstr "Sales by User Monthly"
 
 #. module: point_of_sale
 #: field:pos.order,date_payment:0
@@ -385,13 +385,13 @@ msgstr "Datum plaćanja"
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Closing Date"
-msgstr ""
+msgstr "Datum zaključenja"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,am_out:0
@@ -432,7 +432,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Period"
-msgstr ""
+msgstr "Period"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -453,7 +453,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Output Operation"
-msgstr ""
+msgstr "Output Operation"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -465,7 +465,7 @@ msgstr ""
 #: view:pos.sales.user.today:0
 #: view:pos.sales.user.today.current_user:0
 msgid "Print Report"
-msgstr ""
+msgstr "Ispiši"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -496,7 +496,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
 msgid "Invoice Amount"
-msgstr ""
+msgstr "Iznos računa"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -510,25 +510,25 @@ msgstr ""
 #: field:report.cash.register,journal_id:0
 #: field:report.pos.order,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Payment"
-msgstr ""
+msgstr "Plaćanje"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Ending Balance"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
@@ -538,7 +538,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.payment.report.date:0
 msgid "Sale by Date and User"
-msgstr ""
+msgstr "Sale by Date and User"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
@@ -552,7 +552,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Taxes"
-msgstr ""
+msgstr "Mode of Taxes"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:48
@@ -563,14 +563,14 @@ msgstr ""
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Neispravan barkod!"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Open Statements"
-msgstr ""
+msgstr "Open Statements"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -580,13 +580,13 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.details:0
 msgid "Sales total(Revenue)"
-msgstr ""
+msgstr "Sales total(Revenue)"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total paid"
-msgstr "Uk. plaćeno"
+msgstr "Ukupno plaćeno"
 
 #. module: point_of_sale
 #: field:account.journal,check_dtls:0
@@ -597,7 +597,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Qty of product"
-msgstr "Kol."
+msgstr "Kol proizvoda"
 
 #. module: point_of_sale
 #: field:pos.order,contract_number:0
@@ -608,13 +608,13 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
 #: report:pos.user.product:0
 msgid "User's Product"
-msgstr ""
+msgstr "User's Product"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1043
@@ -629,14 +629,14 @@ msgstr ""
 #: view:pos.order:0
 #: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Podzbroj"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
 #: model:ir.model,name:point_of_sale.model_pos_close_statement
 #: view:pos.close.statement:0
 msgid "Close Statements"
-msgstr ""
+msgstr "Close Statements"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -647,12 +647,12 @@ msgstr ""
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: point_of_sale
 #: report:pos.payment.report.user:0
 msgid "Payment By User"
-msgstr ""
+msgstr "Plaćanja po korisniku"
 
 #. module: point_of_sale
 #: field:pos.order,type_rec:0
@@ -663,7 +663,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# linija"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_accepted
@@ -679,12 +679,12 @@ msgstr ""
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "St.Name"
-msgstr ""
+msgstr "St.Name"
 
 #. module: point_of_sale
 #: report:pos.details_summary:0
 msgid "Sales total"
-msgstr "Ukupno prodaja"
+msgstr "Ukupno prodaje"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
@@ -699,17 +699,17 @@ msgstr "Datum plaćanja"
 #. module: point_of_sale
 #: field:pos.order,lines:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Order Lines"
 
 #. module: point_of_sale
 #: field:pos.order.line,create_date:0
 msgid "Creation Date"
-msgstr "Datum Kreiranja"
+msgstr "Datum kreiranja"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
 msgid "Today's Sales"
-msgstr ""
+msgstr "Današnje prodaje"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
@@ -737,7 +737,7 @@ msgstr ""
 #: field:report.sales.by.margin.pos,product_name:0
 #: field:report.sales.by.margin.pos.month,product_name:0
 msgid "Product Name"
-msgstr ""
+msgstr "Naziv proizvoda"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
@@ -749,7 +749,7 @@ msgstr ""
 #: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
-msgstr "Cjenik"
+msgstr "Pricelist"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -761,7 +761,7 @@ msgstr "Ukupno računi"
 #: view:report.pos.order:0
 #: field:report.pos.order,product_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "# kol"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_return
@@ -771,7 +771,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
 msgid "Sales by margin monthly"
-msgstr ""
+msgstr "Prodaje po marži mjesečno"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -780,24 +780,24 @@ msgstr ""
 #: field:report.sales.by.user.pos,date_order:0
 #: field:report.sales.by.user.pos.month,date_order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum naloga"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr ""
+msgstr "Today's Closed Cashbox"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Nacrt računa"
 
 #. module: point_of_sale
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "Iznos vaučera mora biti jednak iznosu stavke izvoda banke/blagajne."
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
@@ -813,29 +813,29 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Komentar fiskalne pozicije:"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Datum otvaranja"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Taxes :"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
 msgid "Disc."
-msgstr ""
+msgstr "Popust"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -845,12 +845,12 @@ msgstr "PDV :"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order lines"
-msgstr ""
+msgstr "POS Order lines"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Receipt :"
-msgstr ""
+msgstr "Receipt :"
 
 #. module: point_of_sale
 #: field:pos.order,amount_return:0
@@ -881,7 +881,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
 msgid "transaction for the pos"
-msgstr ""
+msgstr "transaction for the pos"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
@@ -892,7 +892,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_entries
 msgid "Pos Box Entries"
-msgstr ""
+msgstr "Pos Box Unosi"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
@@ -904,7 +904,7 @@ msgstr ""
 #: field:pos.details,date_end:0
 #: field:pos.sale.user,date_end:0
 msgid "Date End"
-msgstr ""
+msgstr "Datum završetka"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -914,7 +914,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
 msgid "Number of Transaction"
-msgstr ""
+msgstr "broj transakcija"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -926,7 +926,7 @@ msgstr ""
 #: view:pos.receipt:0
 #: selection:report.pos.order,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -936,7 +936,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
 msgid "Sales (summary)"
-msgstr "Prodaje"
+msgstr "Prodaje (ukupno)"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -952,7 +952,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_report_cash_register
 #: view:report.cash.register:0
 msgid "Point of Sale Cash Register Analysis"
-msgstr ""
+msgstr "Point of Sale Cash Register Analysis"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
@@ -962,7 +962,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.payment.report:0
 msgid "Payment For Sale"
-msgstr ""
+msgstr "Plaćanje za prodaju"
 
 #. module: point_of_sale
 #: field:pos.order,first_name:0
@@ -977,19 +977,19 @@ msgstr "Ostalo"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
 msgid "Lines of Point of Sale"
-msgstr ""
+msgstr "Stavke POS-a"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:report.transaction.pos:0
 msgid "Amount total"
-msgstr ""
+msgstr "Uk. iznos"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
 #: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
 msgid "Cash Registers"
-msgstr ""
+msgstr "Blagajne"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -1002,7 +1002,7 @@ msgstr ""
 #: report:pos.invoice:0
 #: report:pos.lines:0
 msgid "Price"
-msgstr ""
+msgstr "Cijena"
 
 #. module: point_of_sale
 #: field:pos.scan.product,gencod:0
@@ -1016,12 +1016,12 @@ msgstr ""
 #: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
-msgstr ""
+msgstr "POS"
 
 #. module: point_of_sale
 #: field:report.cash.register,date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Kreiraj datum"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
@@ -1032,7 +1032,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Start Period"
-msgstr ""
+msgstr "Od perioda"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1040,12 +1040,12 @@ msgstr ""
 #: report:pos.sales.user.today:0
 #: report:pos.sales.user.today.current.user:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
 msgid "Open Cash Registers"
-msgstr ""
+msgstr "Open Cash Registers"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1055,17 +1055,17 @@ msgstr ""
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Naziv dnevnika mora biti jedinstven za jednu organizaciju!"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Povrat URA"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1073,17 +1073,17 @@ msgstr ""
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "POS Orders"
-msgstr ""
+msgstr "POS Orders"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
 msgid "All Closed CashBox"
-msgstr ""
+msgstr "All Closed CashBox"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1042
@@ -1106,7 +1106,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Base"
-msgstr ""
+msgstr "Osnovica"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -1127,7 +1127,7 @@ msgstr "Bilješke"
 #: field:pos.get.sale,picking_id:0
 #: view:pos.order:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Sale Order"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1140,7 +1140,7 @@ msgstr "Porezi"
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
-msgstr ""
+msgstr "Stavka prodaje"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
@@ -1154,12 +1154,12 @@ msgstr "Šifra"
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_product
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_products
 msgid "Products"
-msgstr ""
+msgstr "Proizvodi"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
 msgid "Payment Report For Sale"
-msgstr ""
+msgstr "Payment Report For Sale"
 
 #. module: point_of_sale
 #: field:account.journal,special_journal:0
@@ -1174,17 +1174,17 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatni podaci"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fax :"
-msgstr "Fax :"
+msgstr "Fax:"
 
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Connected Salesman"
-msgstr ""
+msgstr "Connected Salesman"
 
 #. module: point_of_sale
 #: model:ir.module.module,description:point_of_sale.module_meta_information
@@ -1210,7 +1210,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print the receipt of the sale"
-msgstr ""
+msgstr "Ispis računa POS-a"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_stock_picking
@@ -1233,14 +1233,14 @@ msgstr "Kol."
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "Month -1"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user
 #: model:ir.model,name:point_of_sale.model_pos_sale_user
 #: view:pos.payment.report.user:0
 msgid "Sale by User"
-msgstr ""
+msgstr "Prodaja po korisniku"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:558
@@ -1264,7 +1264,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "state"
-msgstr ""
+msgstr "stanje"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -1275,7 +1275,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:547
@@ -1286,7 +1286,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.pos.order,delay_validation:0
 msgid "Delay Validation"
-msgstr ""
+msgstr "Delay Validation"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
@@ -1296,18 +1296,18 @@ msgstr "Broj kopija"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr ""
+msgstr "POS plaćanje"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "End Period"
-msgstr ""
+msgstr "Do perioda"
 
 #. module: point_of_sale
 #: field:account.journal,auto_cash:0
 msgid "Automatic Opening"
-msgstr ""
+msgstr "Automatic Opening"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_ded:0
@@ -1331,7 +1331,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1341,7 +1341,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
-msgstr ""
+msgstr "Naziv izvoda"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -1350,17 +1350,17 @@ msgstr ""
 #: field:pos.box.out,journal_id:0
 #: field:pos.make.payment,journal:0
 msgid "Cash Register"
-msgstr ""
+msgstr "Blagajna MP"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_receipt
 msgid "Point of sale receipt"
-msgstr ""
+msgstr "Račun POS-a"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_payment.py:91
@@ -1371,7 +1371,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
 msgid "Sales by User Daily margin"
-msgstr ""
+msgstr "Sales by User Daily margin"
 
 #. module: point_of_sale
 #: field:pos.order,note_2:0
@@ -1387,7 +1387,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.cash.register,balance_start:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
@@ -1400,13 +1400,13 @@ msgstr "Plaćeno"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
 msgid "All sales lines"
-msgstr ""
+msgstr "Sve stavke prodaje"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Quotation"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -1420,17 +1420,17 @@ msgstr "Ukupno:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
 msgid "Sales by margin"
-msgstr ""
+msgstr "Prodaje po marži"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Journal Configuration"
-msgstr ""
+msgstr "Postava dnevnika"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Retci izvoda"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
@@ -1438,16 +1438,18 @@ msgid ""
 "Person who uses the the cash register. It could be a reliever, a student or "
 "an interim employee."
 msgstr ""
+"Person who uses the the cash register. It could be a reliever, a student or "
+"an interim employee."
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
 msgid "Nbr Invoice"
-msgstr ""
+msgstr "Račun br."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
-msgstr "Račun"
+msgstr "Receipt"
 
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
@@ -1458,7 +1460,7 @@ msgstr ""
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
@@ -1466,7 +1468,7 @@ msgstr ""
 #: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_get_sale
@@ -1477,12 +1479,12 @@ msgstr ""
 #: view:account.bank.statement:0
 #: selection:report.cash.register,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvoreno"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
 msgid "Order Ref"
-msgstr ""
+msgstr "Order Ref"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
@@ -1505,23 +1507,23 @@ msgstr ""
 #: field:report.sales.by.margin.pos,net_margin_per_qty:0
 #: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
 msgid "Net margin per Qty"
-msgstr ""
+msgstr "Neto marža po kol."
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
 #: view:report.sales.by.margin.pos.month:0
 msgid "Sales by User Margin"
-msgstr ""
+msgstr "Sales by User Margin"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Porezi:"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
 msgid "Point of Sale Orders Statistics"
-msgstr ""
+msgstr "Point of Sale Orders Statistics"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_product_product
@@ -1536,12 +1538,12 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
 msgid "Pos Lines"
-msgstr ""
+msgstr "Pos Lines"
 
 #. module: point_of_sale
 #: field:product.product,disc_controle:0
@@ -1551,29 +1553,29 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Završni saldo"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_details
 msgid "Sale Details"
-msgstr ""
+msgstr "Prodaja detaljno"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Date Ordered"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_user
 msgid "Sales lines by Users"
-msgstr ""
+msgstr "Sales lines by Users"
 
 #. module: point_of_sale
 #: field:res.company,max_diff:0
@@ -1585,7 +1587,7 @@ msgstr ""
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:744
@@ -1601,7 +1603,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Net Total :"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -1612,7 +1614,7 @@ msgstr ""
 #: field:pos.details,date_start:0
 #: field:pos.sale.user,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Datum početka"
 
 #. module: point_of_sale
 #: field:pos.order,amount_total:0
@@ -1623,23 +1625,23 @@ msgstr ""
 #: field:report.sales.by.user.pos,amount:0
 #: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: point_of_sale
 #: view:pos.sale.user:0
 msgid "Sale By User"
-msgstr ""
+msgstr "Sale By User"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
 msgid "Open Cash Register"
-msgstr ""
+msgstr "Otvori blagajnu"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: model:ir.actions.report.xml,name:point_of_sale.account_statement
 msgid "Statement"
-msgstr ""
+msgstr "Izvod"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
@@ -1657,7 +1659,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_payment_report
 #: view:pos.payment.report:0
 msgid "Payment Report"
-msgstr ""
+msgstr "Izvještaj plaćanja"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
@@ -1681,7 +1683,7 @@ msgstr ""
 #: report:pos.user.product:0
 #: field:report.pos.order,company_id:0
 msgid "Company"
-msgstr "Tvrtka"
+msgstr "Organizacija"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1705,7 +1707,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Reprint"
-msgstr ""
+msgstr "Reprint"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:558
@@ -1718,7 +1720,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
 msgid "Today's Payment By User"
-msgstr ""
+msgstr "Današnje plaćanje korisnika"
 
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
@@ -1735,7 +1737,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "No. Of Articles"
-msgstr "Komada"
+msgstr "Br.Artikala"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
@@ -1745,7 +1747,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,pickings:0
 msgid "Picking"
-msgstr ""
+msgstr "Skladišnice"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
@@ -1761,24 +1763,24 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Redak bankovnog izvoda"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Izvod banke"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Do datuma"
 
 #. module: point_of_sale
 #: view:report.sales.by.user.pos:0
 #: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS Report"
-msgstr ""
+msgstr "POS Izvještaj"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
@@ -1788,7 +1790,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
 msgid "Close Cash Register"
-msgstr ""
+msgstr "Close Cash Register"
 
 #. module: point_of_sale
 #: field:pos.order.line,qty_rfd:0
@@ -1804,7 +1806,7 @@ msgstr "Očitaj barkod"
 #: field:pos.box.entries,product_id:0
 #: field:pos.box.out,product_id:0
 msgid "Operation"
-msgstr ""
+msgstr "Operacija"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
@@ -1814,17 +1816,17 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,journal_entry:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Temeljnica"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Otkazani račun"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1836,7 +1838,7 @@ msgstr "Potvrdi"
 #. module: point_of_sale
 #: report:pos.payment.report.date:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Stavke prodaje"
 
 #. module: point_of_sale
 #: constraint:res.company:0
@@ -1867,7 +1869,7 @@ msgstr "Naziv plaćanja"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
 msgid "Reporting"
-msgstr "Izvještaji"
+msgstr "Izvještavanje"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
@@ -1882,12 +1884,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
 msgid "Pos Box Out"
-msgstr ""
+msgstr "Pos Box Out"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Šifra dnevnika mora biti jedinstvena (za organizaciju) !"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
@@ -1897,7 +1899,7 @@ msgstr "Postava"
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: point_of_sale
 #: field:pos.order,date_validation:0
@@ -1915,30 +1917,30 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
 msgid "Invoices"
-msgstr ""
+msgstr "Računi"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,total_discount:0
 msgid "Total Discount"
-msgstr ""
+msgstr "Total Discount"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Take Money"
-msgstr ""
+msgstr "Take Money"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user
 msgid "Sales Details"
-msgstr ""
+msgstr "Detalji prodaje"
 
 #. module: point_of_sale
 #: field:product.product,am_out:0
@@ -1961,7 +1963,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_order
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
-msgstr ""
+msgstr "POS blagajna"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1987,12 +1989,12 @@ msgstr "Fakturirano"
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
 msgid "Discount Notice"
-msgstr ""
+msgstr "Napomena popusta"
 
 #. module: point_of_sale
 #: view:pos.scan.product:0
@@ -2003,12 +2005,12 @@ msgstr "Dodaj"
 #: view:report.cash.register:0
 #: selection:report.pos.order,state:0
 msgid "Draft"
-msgstr "U pripremi"
+msgstr "Nacrt"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order line"
-msgstr ""
+msgstr "POS Order line"
 
 #. module: point_of_sale
 #: view:pos.open.statement:0
@@ -2018,12 +2020,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_date
 msgid "POS Payment Report according to date"
-msgstr ""
+msgstr "POS Payment Report according to date"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "PRO-FORMA"
-msgstr "Predračun"
+msgstr "Pro-forma"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:638
@@ -2071,23 +2073,23 @@ msgstr "Prodaje po korisniku"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print Receipt"
-msgstr ""
+msgstr "Print Receipt"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Orders lines"
-msgstr ""
+msgstr "POS Orders lines"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:340
@@ -2104,12 +2106,12 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
 msgid "Sales Journal"
-msgstr ""
+msgstr "Dnevnik prodaje"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Refund"
-msgstr "Povrat"
+msgstr "Povrat novca"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/report/pos_invoice.py:46
@@ -2122,19 +2124,19 @@ msgstr ""
 #: report:pos.sales.user.today:0
 #: field:report.pos.order,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Date Order"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_close_statement
 msgid "Close Cash Registers"
-msgstr ""
+msgstr "Close Cash Registers"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.payment.report.date:0
 #: report:pos.payment.report.user:0
 msgid "Disc(%)"
-msgstr ""
+msgstr "Pop(%)"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -2148,17 +2150,17 @@ msgstr ""
 #: view:pos.sales.user.today.current_user:0
 #: view:pos.scan.product:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Order lines"
-msgstr ""
+msgstr "Stavke narudžbe"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
 msgid "Subtotal w/o Tax"
-msgstr ""
+msgstr "Subtotal w/o Tax"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2168,22 +2170,22 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
 msgid "Pyament Report"
-msgstr ""
+msgstr "Izvještaj blagajne"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "Gotovinske temeljnice"
 
 #. module: point_of_sale
 #: view:pos.details:0
 msgid "POS Details :"
-msgstr ""
+msgstr "POS Detalji :"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr ""
+msgstr "Današnje prodaje po korisniku"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
@@ -2204,23 +2206,23 @@ msgstr ""
 #: report:pos.invoice:0
 #: report:pos.lines:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Sales lines"
-msgstr ""
+msgstr "Stavke prodaje"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne bilješke"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -2242,7 +2244,7 @@ msgstr ""
 #: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
 #: view:report.pos.order:0
 msgid "Point of Sale Analysis"
-msgstr ""
+msgstr "Analiza maloprodaje (POS-a)"
 
 #. module: point_of_sale
 #: field:pos.make.payment,partner_id:0
@@ -2250,7 +2252,7 @@ msgstr ""
 #: field:pos.order,partner_id:0
 #: view:report.pos.order:0
 msgid "Customer"
-msgstr ""
+msgstr "Kupac"
 
 #. module: point_of_sale
 #: field:pos.make.payment,is_acc:0
@@ -2264,12 +2266,12 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Danas    "
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:95
@@ -2293,12 +2295,12 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: point_of_sale
 #: field:pos.order,statement_ids:0
 msgid "Payments"
-msgstr ""
+msgstr "Plaćanja"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2312,17 +2314,17 @@ msgstr ""
 #: report:pos.sales.user.today.current.user:0
 #: report:pos.user.product:0
 msgid "Print Date"
-msgstr ""
+msgstr "Datum ispisa"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
 msgid "Sales by User Monthly margin"
-msgstr ""
+msgstr "Prodaja prema mjesečnoj marži korisnika"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Traži prodajne naloge"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
@@ -2336,13 +2338,13 @@ msgstr ""
 #: view:pos.order:0
 #, python-format
 msgid "Make Payment"
-msgstr ""
+msgstr "Plaćanje"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
 #: view:pos.sales.user.today:0
 msgid "Sales User Today"
-msgstr ""
+msgstr "Prodaja po korisniku"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2350,7 +2352,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #~ msgid "Discount :"
 #~ msgstr "Popust"
@@ -2391,9 +2393,6 @@ msgstr ""
 #~ msgid "E-mail :"
 #~ msgstr "E-mail :"
 
-#~ msgid "Discount"
-#~ msgstr "Popust"
-
 #~ msgid "Payment Name"
 #~ msgstr "Naziv plaćanja"
 
@@ -2420,3 +2419,6 @@ msgstr ""
 
 #~ msgid "Discount percentage"
 #~ msgstr "Postotak popusta"
+
+#~ msgid "Discount"
+#~ msgstr "Discount"
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 1afa10b1be3..1eb9a0865f7 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -174,6 +174,8 @@ class pos_order(osv.osv):
         move_obj = self.pool.get('stock.move')
 
         for order in self.browse(cr, uid, ids, context=context):
+            if not order.state=='draft':
+                continue
             addr = order.partner_id and partner_obj.address_get(cr, uid, [order.partner_id.id], ['delivery']) or {}
             picking_id = picking_obj.create(cr, uid, {
                 'origin': order.name,
@@ -325,7 +327,11 @@ class pos_order(osv.osv):
         }
         return abs
 
+    def action_invoice_state(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state':'invoiced'}, context=context)
+
     def action_invoice(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
         inv_ref = self.pool.get('account.invoice')
         inv_line_ref = self.pool.get('account.invoice.line')
         product_obj = self.pool.get('product.product')
@@ -341,7 +347,7 @@ class pos_order(osv.osv):
 
             acc = order.partner_id.property_account_receivable.id
             inv = {
-                'name': 'Invoice from POS: '+order.name,
+                'name': order.name,
                 'origin': order.name,
                 'account_id': acc,
                 'journal_id': order.sale_journal.id or None,
@@ -379,13 +385,15 @@ class pos_order(osv.osv):
                     and [(6, 0, inv_line['invoice_line_tax_id'])] or []
                 inv_line_ref.create(cr, uid, inv_line, context=context)
             inv_ref.button_reset_taxes(cr, uid, [inv_id], context=context)
+            wf_service.trg_validate(uid, 'pos.order', order.id, 'invoice', cr)
 
         if not inv_ids: return {}
+        
         mod_obj = self.pool.get('ir.model.data')
         res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
         res_id = res and res[1] or False
         return {
-            'name': _('PoS Invoices'),
+            'name': _('Customer Invoice'),
             'view_type': 'form',
             'view_mode': 'form',
             'view_id': res_id,
@@ -681,10 +689,44 @@ pos_order_line()
 
 class pos_category(osv.osv):
     _name = 'pos.category'
-    _inherit = 'product.category'
+    _description = "PoS Category"
+    _order = "sequence, name"
+    def _check_recursion(self, cr, uid, ids, context=None):
+        level = 100
+        while len(ids):
+            cr.execute('select distinct parent_id from pos_category where id IN %s',(tuple(ids),))
+            ids = filter(None, map(lambda x:x[0], cr.fetchall()))
+            if not level:
+                return False
+            level -= 1
+        return True
+
+    _constraints = [
+        (_check_recursion, 'Error ! You cannot create recursive categories.', ['parent_id'])
+    ]
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1]+' / '+name
+            res.append((record['id'], name))
+        return res
+
+    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = self.name_get(cr, uid, ids, context=context)
+        return dict(res)
+
     _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True),
+        'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
         'parent_id': fields.many2one('pos.category','Parent Category', select=True),
-        'child_id': fields.one2many('pos.category', 'parent_id', string='Child Categories'),
+        'child_id': fields.one2many('pos.category', 'parent_id', string='Children Categories'),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
     }
 pos_category()
 
@@ -695,7 +737,6 @@ class product_product(osv.osv):
         'expense_pdt': fields.boolean('PoS Cash Output', help="This is a product you can use to take cash from a statement for the point of sale backend, exemple: money lost, transfer to bank, etc."),
         'img': fields.binary('Product Image, must be 50x50', help="Use an image size of 50x50."),
         'pos_categ_id': fields.many2one('pos.category','PoS Category',
-            domain="[('type','=','normal')]",
             help="If you want to sell this product through the point of sale, select the category it belongs to.")
     }
 product_product()
diff --git a/addons/point_of_sale/point_of_sale_report.xml b/addons/point_of_sale/point_of_sale_report.xml
index b8d5456f1cd..41ce5232ac3 100644
--- a/addons/point_of_sale/point_of_sale_report.xml
+++ b/addons/point_of_sale/point_of_sale_report.xml
@@ -43,17 +43,6 @@
             rml="point_of_sale/report/pos_lines.rml"
              />
 
-        <report
-            id="pos_payment_report"
-            string="Payment Report For Sale"
-            model="pos.order"
-            name="pos.payment.report"
-            auto="False"
-            multi="True"
-            menu="True"
-            rml="point_of_sale/report/pos_payment_report.rml"
-             />
-
         <report
             id="pos_sales_user"
             string="Sales Report"
@@ -76,16 +65,6 @@
             rml="point_of_sale/report/pos_sales_user_today.rml"
              />
 
-        <report
-            id="pos_payment_report_date"
-            string="Payment Report"
-            model="pos.order"
-            name="pos.payment.report.date"
-            auto="False"
-            multi="True"
-            menu="False"
-            rml="point_of_sale/report/pos_payment_report_date.rml"
-             />
         <report
             id="pos_payment_report_user"
             string="Today's Payment By User"
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index b69305c1a30..ba760baeb09 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -16,8 +16,8 @@
                     <group col="7" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                        <button name="invoice" string="Invoice" icon="gtk-apply" type="workflow" states="paid" attrs="{'invisible': ['|',('partner_id','=',False),('state','&lt;&gt;','paid')]}"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
+                        <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sale Order">
@@ -587,9 +587,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                  <field name="categ_id" position="after">
-                      <field name="pos_categ_id"/>
-                  </field>
+                  <group name="status" position="after">
+                      <group colspan="2" col="2" name="pos">
+                          <separator string="Point-of-Sale" colspan="2"/>
+                          <field name="pos_categ_id"/>
+                      </group>
+                  </group>
             </field>
         </record>
 
@@ -609,6 +612,20 @@
         </record>
 
         <!-- Categories tree view -->
+        <record id="pos_category_form_view" model="ir.ui.view">
+            <field name="name">pos.category.form</field>
+            <field name="model">pos.category</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="PoS Categories">
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="parent_id"/>
+                        <field name="sequence"/>
+                    </group>
+                </form>
+            </field>
+        </record>
         <record id="pos_category_tree_view" model="ir.ui.view">
             <field name="name">pos.category.tree</field>
             <field name="model">pos.category</field>
@@ -616,7 +633,8 @@
             <field name="field_parent" eval="False"/>
             <field name="arch" type="xml">
                 <tree string="PoS Categories">
-                    <field name="name"/>
+                    <field name="sequence" invisible="1"/>
+                    <field name="complete_name"/>
                 </tree>
             </field>
         </record>
@@ -734,8 +752,6 @@
             <field name="domain">[('origin','like','POS')]</field>
         </record>
 
-        <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
-                id="menu_pos_payment_report_date" parent="menu_point_rep" sequence="8" groups="base.group_extended"/>
         <menuitem icon="STOCK_PRINT" action="action_report_pos_details"
                 id="menu_pos_details" parent="menu_point_rep" sequence="6" />
 
@@ -752,7 +768,7 @@
 
         <!-- use menuitem to add web_icon and web_icon_hover above -->
         <menuitem id="menu_point_root_touchscreen"
-            web_icon="images/pos.png" web_icon_hover="images/pos-hover.png"/>
+            web_icon="images/pos.png" web_icon_hover="images/pos-hover.png" groups="point_of_sale.group_pos_manager,point_of_sale.group_pos_user"/>
 
     </data>
 </openerp>
diff --git a/addons/point_of_sale/point_of_sale_workflow.xml b/addons/point_of_sale/point_of_sale_workflow.xml
index 4058af2696f..c8e05788d3d 100644
--- a/addons/point_of_sale/point_of_sale_workflow.xml
+++ b/addons/point_of_sale/point_of_sale_workflow.xml
@@ -18,8 +18,7 @@
     <record model="workflow.activity" id="act_paid">
       <field name="wkf_id" ref="wkf_pos"/>
       <field name="name">paid</field>
-      <field name="action">action_paid()</field>
-      <field name="kind">function</field>
+      <field name="kind">dummy</field>
     </record>
 
     <record model="workflow.activity" id="act_done">
@@ -34,7 +33,7 @@
       <field name="wkf_id" ref="wkf_pos"/>
       <field name="name">invoiced</field>
       <field name="flow_stop">True</field>
-      <field name="action">action_invoice()</field>
+      <field name="action">action_invoice_state()</field>
       <field name="kind">function</field>
     </record>
 
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
index 171f323e337..bc85fb31084 100644
--- a/addons/point_of_sale/report/__init__.py
+++ b/addons/point_of_sale/report/__init__.py
@@ -30,7 +30,6 @@ import pos_details_summary
 import pos_payment_report
 import pos_sales_user
 import pos_sales_user_today
-import pos_payment_report_date
 import pos_payment_report_user
 import pos_report
 import pos_order_report
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 4c23a005674..1590866836a 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -27,9 +27,9 @@ class pos_details(report_sxw.rml_parse):
     def _get_invoice(self,inv_id,user):
         res={}
         if inv_id:
-            self.cr.execute("select name from account_invoice as ac where id = %s", (inv_id,))
+            self.cr.execute("select number from account_invoice as ac where id = %s", (inv_id,))
             res = self.cr.fetchone()
-            return res[0]
+            return res[0] or 'Draft'
         else:
             return  ''
 
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 7aa2c3a8ea0..12e8618accb 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -199,13 +199,13 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="53.0,44.0,158.0,54.0,76.0,37.0,88.0" style="Table4">
+    <blockTable colWidths="108.0,54.0,159.0,54.0,75.0,30.0,69.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Code</para>
+          <para style="terp_tblheader_Details">Order</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Product</para>
@@ -226,7 +226,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]</para>
-      <blockTable colWidths="54.0,44.0,159.0,54.0,75.0,36.0,89.0" style="Table6">
+      <blockTable colWidths="108.0,54.0,159.0,54.0,75.0,30.0,69.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
@@ -258,7 +258,7 @@
     <blockTable colWidths="256.0,256.0" style="Table3">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Mode of Taxes</para>
+          <para style="terp_tblheader_Details">Taxes</para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -289,7 +289,7 @@
     <blockTable colWidths="257.0,255.0" style="Table9">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Mode of Payment</para>
+          <para style="terp_tblheader_Details">Payment</para>
         </td>
         <td>
           <para style="terp_default_8">
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index 494dceec93e..4ae53d0ad67 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -57,7 +57,7 @@
                             string="Invoiced"
                             domain="[('state','=',('invoiced'))]"/>
                         <filter icon="terp-dolar"
-                            string="Paid"
+                            string="Not Invoiced"
                             domain="[('state','=',('paid'))]"/>
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.py b/addons/point_of_sale/report/pos_payment_report_date.py
deleted file mode 100644
index 76cd9c12be7..00000000000
--- a/addons/point_of_sale/report/pos_payment_report_date.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from report import report_sxw
-
-class pos_payment_report_date(report_sxw.rml_parse):
-
-    def __init__(self, cr, uid, name, context):
-        super(pos_payment_report_date, self).__init__(cr, uid, name, context=context)
-        self.total = 0.0
-        self.localcontext.update({
-            'time': time,
-            'pos_payment_date': self.__pos_payment_date__,
-            'pos_payment_date_total':self.__pos_payment_date__total__,
-        })
-
-    def __pos_payment_date__(self,form):
-        dt1 = form['date_start'] + ' 00:00:00'
-        dt2 = form['date_end'] + ' 23:59:59'
-        data={}
-        if form['user_id']:
-            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
-                             "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
-                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
-                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
-                             "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id IN %s " \
-                    ,(dt1,dt2,tuple(form['user_id'])))
-        else:
-            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
-                             "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
-                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
-                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  and pu.id=pt.uom_id " \
-                             "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s" \
-                    ,(dt1,dt2))
-        data=self.cr.dictfetchall()
-        return data
-
-    def __pos_payment_date__total__(self,form):
-        dt1 = form['date_start'] + ' 00:00:00'
-        dt2 = form['date_end'] + ' 23:59:59'
-        res=[]
-        if 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 " \
-                             "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id IN %s " \
-                        ,(dt1,dt2,tuple(form['user_id'])))
-        else:
-            self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
-                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
-                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
-                             "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s" \
-                        ,(dt1,dt2))
-        res=self.cr.fetchone()[0] or 0.0
-        return res
-
-
-report_sxw.report_sxw('report.pos.payment.report.date', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_date.rml', parser=pos_payment_report_date,header='internal')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
deleted file mode 100644
index ba7764fed28..00000000000
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Payments.pdf">
-  <template pageSize="(595.0,842.0)" title="Payments" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <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="LINEAFTER" 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"/>
-    </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="LINEAFTER" 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"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="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"/>
-    <paraStyle name="List" fontName="Helvetica" 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="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
-    <para style="terp_header_Centre">Sales Lines</para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="256.0,256.0" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_General_Centre">Company</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Print Date</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="256.0,256.0" style="Table2">
-      <tr>
-        <td>
-          <para style="terp_default_Centre_8">[[ company.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="256.0,71.0,57.0,57.0,71.0" style="Table3">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Product</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Qty</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Right">Disc(%)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Right">Unit Price </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Right">Total </para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_1">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="256.0,71.0,57.0,57.0,71.0" style="Table6">
-        <tr>
-          <td>
-            <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount'], dp='Sale Price') ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="355.0,71.0,85.0" style="Table5">
-      <tr>
-        <td>
-          <para style="Table Contents">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Right">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_date_total(data['form']), dp='Sale Price') or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index e3b5583a499..55873887210 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -75,7 +75,7 @@
     <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
     <para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para>
     <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
-    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
+    <para style="terp_default_Centre_9">User : [[ o.user_id.name ]]</para>
     <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
     <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
     <para style="P4">
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 7642563ba57..9eb77e81244 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -1,73 +1,66 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_pos_config_journal","pos.config.journal","model_pos_config_journal","group_pos_user",1,0,0,0
-"access_pos_order","pos.order","model_pos_order","group_pos_user",1,1,1,1
-"access_pos_order_line","pos.order.line","model_pos_order_line","group_pos_user",1,1,1,1
-"access_pos_order_manager","pos.order manager","model_pos_order","group_pos_manager",1,0,0,0
-"access_pos_order_line_manager","pos.order.line manager","model_pos_order_line","group_pos_manager",1,0,0,0
-"access_report_transaction_pos","report.transaction.pos","model_report_transaction_pos","group_pos_manager",1,1,1,1
-"access_pos_config_journal_manager","pos.config.journal.manager","model_pos_config_journal","group_pos_manager",1,1,1,1
-"access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","group_pos_manager",1,1,1,0
-"access_account_journal_pos_user","account.journal pos_user","account.model_account_journal","group_pos_user",1,0,0,0
-"access_account_move_pos_user","account.move pos_user","account.model_account_move","group_pos_user",1,1,1,0
-"access_account_account_pos_user","account.account pos_user","account.model_account_account","group_pos_user",1,0,0,0
-"access_stock_picking_pos_user","stock.picking pos_user","stock.model_stock_picking","group_pos_user",1,1,1,1
-"access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","group_pos_user",1,0,0,0
-"access_sale_shop_pos_manager","sale.shop pos_manager","sale.model_sale_shop","group_pos_manager",1,0,0,0
-"access_sale_shop_pos_system","sale.shop pos_system","sale.model_sale_shop","group_pos_manager",1,0,0,0
-"access_pos_order_stock_worker","pos.order stock_worker","model_pos_order","stock.group_stock_user",1,0,0,0
-"access_stock_move_pos_user","stock.move pos_user","stock.model_stock_move","group_pos_user",1,1,1,1
-"access_report_sales_by_user_pos","report.sales.by.user.pos","model_report_sales_by_user_pos","group_pos_user",1,0,0,0
-"access_report_sales_by_user_pos_month","report.sales.by.user.pos.month","model_report_sales_by_user_pos_month","group_pos_user",1,0,0,0
-"access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","group_pos_user",1,0,0,0
-"access_report_sales_by_margin_pos_month","report.sales.by.margin.pos.month","model_report_sales_by_margin_pos_month","group_pos_user",1,0,0,0
-"access_report_pos_order","report.pos.order","model_report_pos_order","group_pos_user",1,1,1,1
-"access_report_pos_order","report.pos.order","model_report_pos_order","group_pos_manager",1,1,1,1
-"access_account_bank_statement","account.bank.statement","account.model_account_bank_statement","group_pos_user",1,1,1,0
-"access_account_bank_statement_manager","account.bank.statement manager","account.model_account_bank_statement","group_pos_manager",1,1,1,1
-"access_account_bank_statement_line","account.bank.statement.line","account.model_account_bank_statement_line","group_pos_user",1,1,1,0
-"access_account_invoice_pos","account.invoice pos user","account.model_account_invoice","group_pos_user",1,1,1,0
-"access_account_invoice_pos_manager","account.invoice pos manager","account.model_account_invoice","group_pos_manager",1,0,0,0
-"access_account_invoice_line_pos","account.invoice.line pos user","account.model_account_invoice_line","group_pos_user",1,1,1,0
-"access_account_invoice_line_pos_manager","account.invoice.line pos manager","account.model_account_invoice_line","group_pos_manager",1,0,0,0
-"access_account_invoice_tax_pos","account.invoice.tax pos user","account.model_account_invoice_tax","group_pos_user",1,1,1,0
-"access_account_invoice_tax_pos_manager","account.invoice.tax pos manager","account.model_account_invoice_tax","group_pos_manager",1,0,0,0
-"access_account_period_pos","account.period pos user","account.model_account_period","group_pos_user",1,1,1,0
-"access_account_period_pos_manager","account.period pos manager","account.model_account_period","group_pos_manager",1,0,0,0
-"access_account_fiscalyear_pos_user","account.fiscalyear user","account.model_account_fiscalyear","group_pos_user",1,1,1,0
-"access_account_fiscalyear_pos_manager","account.fiscalyear manager","account.model_account_fiscalyear","group_pos_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","account.model_account_cashbox_line","group_pos_user",1,1,1,0
-"access_account_cashbox_line_manager","account.cashbox.line manager","account.model_account_cashbox_line","group_pos_manager",1,1,1,1
-"access_product_product","product.product","product.model_product_product","group_pos_user",1,0,0,0
-"access_product_template_pos_user","product.template pos user","product.model_product_template","group_pos_user",1,0,0,0
-"access_product_product_pos_manager","product.product.pos manager","product.model_product_product","group_pos_manager",1,1,1,1
-"access_product_template_pos_manager","product.template pos manager","product.model_product_template","group_pos_manager",1,1,1,1
-"access_account_move_line","account.move.line","account.model_account_move_line","group_pos_user",1,1,1,0
-"access_account_move_line_manager","account.move.line manager","account.model_account_move_line","group_pos_manager",1,1,1,1
-"access_account_move","account.move","account.model_account_move","group_pos_manager",1,0,0,0
-"access_account_journal","account.journal","account.model_account_journal","group_pos_user",1,1,1,0
-"access_account_journal_manager","account.journal manager","account.model_account_journal","group_pos_manager",1,0,0,0
-"access_account_journal_period_user","account.journal.period user","account.model_account_journal_period","group_pos_user",1,1,1,1
-"access_account_journal_period_manager","account.journal.period manager","account.model_account_journal_period","group_pos_manager",1,0,0,0
-"access_account_journal_view","account.journal.view","account.model_account_journal_view","group_pos_user",1,1,1,0
-"access_account_journal_view_manager","account.journal.view manager","account.model_account_journal_view","group_pos_manager",1,0,0,0
-"access_account_analytic_line","account.analytic.line","analytic.model_account_analytic_line","group_pos_user",1,1,1,0
-"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","group_pos_user",1,1,1,0
-"access_account_journal_column","account.journal.column","account.model_account_journal_column","group_pos_user",1,1,1,0
-"access_account_journal_column_manager","account.journal.column manager","account.model_account_journal_column","group_pos_manager",1,0,0,0
-"access_report_check_register","report.cash.register","model_report_cash_register","group_pos_manager",1,1,1,1
-"access_ir_property_pos_manager","ir.property manager","base.model_ir_property","group_pos_manager",1,1,1,1
-"access_account_bank_statement_line_manager","account.bank.statement.line manager","account.model_account_bank_statement_line","group_pos_manager",1,1,1,1
-"access_account_invoice_manager","account.invoice manager","account.model_account_invoice","group_pos_manager",1,1,1,1
-"access_product_product_supplierinfo_manager","product.supplierinfo manager","product.model_product_supplierinfo","group_pos_manager",1,0,0,0
-"access_product_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","group_pos_user",1,0,0,0
-"access_product_product_packaging_user","product.packaging user","product.model_product_packaging","group_pos_user",1,0,0,0
-"access_product_product_packaging_manager","product.packaging manager","product.model_product_packaging","group_pos_manager",1,0,0,0
-"access_account_sequence_fiscalyear_manager","account.sequence.fiscalyear manager","account.model_account_sequence_fiscalyear","group_pos_manager",1,0,0,0
-"access_stock_warehouse_manager","stock.warehouse manager","stock.model_stock_warehouse","group_pos_manager",1,0,0,0
-"access_stock_location_manager","stock.location manager","stock.model_stock_location","group_pos_manager",1,0,0,0
-"access_product_uom_manager","product.uom manager","product.model_product_uom","group_pos_manager",1,1,1,1
-"access_res_partner_manager","res.partner manager","base.model_res_partner","group_pos_manager",1,0,0,0
-"access_product_category_manager","product.category manager","product.model_product_category","group_pos_manager",1,1,1,1
-"access_product_pricelist_manager","product.pricelist manager","product.model_product_pricelist","group_pos_manager",1,0,0,0
-"access_product_category_pos_manager","pos.category manager","model_pos_category","group_pos_manager",1,1,1,1"
-"access_product_category_pos_user","pos.category user","model_pos_category","group_pos_user",1,0,0,0"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_pos_config_journal,pos.config.journal,model_pos_config_journal,group_pos_user,1,0,0,0
+access_pos_order,pos.order,model_pos_order,group_pos_user,1,1,1,1
+access_pos_order_line,pos.order.line,model_pos_order_line,group_pos_user,1,1,1,1
+access_pos_order_manager,pos.order manager,model_pos_order,group_pos_manager,1,0,0,0
+access_pos_order_line_manager,pos.order.line manager,model_pos_order_line,group_pos_manager,1,0,0,0
+access_report_transaction_pos,report.transaction.pos,model_report_transaction_pos,group_pos_manager,1,1,1,1
+access_pos_config_journal_manager,pos.config.journal.manager,model_pos_config_journal,group_pos_manager,1,1,1,1
+access_account_journal_pos_user,account.journal pos_user,account.model_account_journal,group_pos_user,1,0,0,0
+access_account_move_pos_user,account.move pos_user,account.model_account_move,group_pos_user,1,1,1,0
+access_account_account_pos_user,account.account pos_user,account.model_account_account,group_pos_user,1,0,0,0
+access_stock_picking_pos_user,stock.picking pos_user,stock.model_stock_picking,group_pos_user,1,1,1,1
+access_sale_shop_pos_user,sale.shop pos_user,sale.model_sale_shop,group_pos_user,1,0,0,0
+access_pos_order_stock_worker,pos.order stock_worker,model_pos_order,stock.group_stock_user,1,0,0,0
+access_stock_move_pos_user,stock.move pos_user,stock.model_stock_move,group_pos_user,1,1,1,1
+access_report_sales_by_user_pos,report.sales.by.user.pos,model_report_sales_by_user_pos,group_pos_user,1,0,0,0
+access_report_sales_by_user_pos_month,report.sales.by.user.pos.month,model_report_sales_by_user_pos_month,group_pos_user,1,0,0,0
+access_report_sales_by_margin_pos,report.sales.by.margin.pos,model_report_sales_by_margin_pos,group_pos_user,1,0,0,0
+access_report_sales_by_margin_pos_month,report.sales.by.margin.pos.month,model_report_sales_by_margin_pos_month,group_pos_user,1,0,0,0
+access_report_pos_order,report.pos.order,model_report_pos_order,group_pos_user,1,1,1,1
+access_account_bank_statement,account.bank.statement,account.model_account_bank_statement,group_pos_user,1,1,1,0
+access_account_bank_statement_manager,account.bank.statement manager,account.model_account_bank_statement,group_pos_manager,1,1,1,1
+access_account_bank_statement_line,account.bank.statement.line,account.model_account_bank_statement_line,group_pos_user,1,1,1,0
+access_account_invoice_pos,account.invoice pos user,account.model_account_invoice,group_pos_user,1,1,1,0
+access_account_invoice_pos_manager,account.invoice pos manager,account.model_account_invoice,group_pos_manager,1,0,0,0
+access_account_invoice_line_pos,account.invoice.line pos user,account.model_account_invoice_line,group_pos_user,1,1,1,0
+access_account_invoice_line_pos_manager,account.invoice.line pos manager,account.model_account_invoice_line,group_pos_manager,1,0,0,0
+access_account_invoice_tax_pos,account.invoice.tax pos user,account.model_account_invoice_tax,group_pos_user,1,1,1,0
+access_account_invoice_tax_pos_manager,account.invoice.tax pos manager,account.model_account_invoice_tax,group_pos_manager,1,0,0,0
+access_account_period_pos,account.period pos user,account.model_account_period,group_pos_user,1,1,1,0
+access_account_period_pos_manager,account.period pos manager,account.model_account_period,group_pos_manager,1,0,0,0
+access_account_fiscalyear_pos_user,account.fiscalyear user,account.model_account_fiscalyear,group_pos_user,1,1,1,0
+access_account_fiscalyear_pos_manager,account.fiscalyear manager,account.model_account_fiscalyear,group_pos_manager,1,0,0,0
+access_account_cashbox_line,account.cashbox.line,account.model_account_cashbox_line,group_pos_user,1,1,1,0
+access_account_cashbox_line_manager,account.cashbox.line manager,account.model_account_cashbox_line,group_pos_manager,1,1,1,1
+access_product_product,product.product,product.model_product_product,group_pos_user,1,0,0,0
+access_product_template_pos_user,product.template pos user,product.model_product_template,group_pos_user,1,0,0,0
+access_product_product_pos_manager,product.product.pos manager,product.model_product_product,group_pos_manager,1,1,1,1
+access_product_template_pos_manager,product.template pos manager,product.model_product_template,group_pos_manager,1,1,1,1
+access_account_move_line,account.move.line,account.model_account_move_line,group_pos_user,1,1,1,0
+access_account_move_line_manager,account.move.line manager,account.model_account_move_line,group_pos_manager,1,1,1,1
+access_account_move,account.move,account.model_account_move,group_pos_manager,1,0,0,0
+access_account_journal,account.journal,account.model_account_journal,group_pos_user,1,1,1,0
+access_account_journal_period_user,account.journal.period user,account.model_account_journal_period,group_pos_user,1,1,1,1
+access_account_journal_period_manager,account.journal.period manager,account.model_account_journal_period,group_pos_manager,1,0,0,0
+access_account_journal_view,account.journal.view,account.model_account_journal_view,group_pos_user,1,1,1,0
+access_account_journal_view_manager,account.journal.view manager,account.model_account_journal_view,group_pos_manager,1,0,0,0
+access_account_analytic_line,account.analytic.line,analytic.model_account_analytic_line,group_pos_user,1,1,1,0
+access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,group_pos_user,1,1,1,0
+access_account_journal_column,account.journal.column,account.model_account_journal_column,group_pos_user,1,1,1,0
+access_account_journal_column_manager,account.journal.column manager,account.model_account_journal_column,group_pos_manager,1,0,0,0
+access_report_check_register,report.cash.register,model_report_cash_register,group_pos_manager,1,1,1,1
+access_ir_property_pos_manager,ir.property manager,base.model_ir_property,group_pos_manager,1,1,1,1
+access_account_bank_statement_line_manager,account.bank.statement.line manager,account.model_account_bank_statement_line,group_pos_manager,1,1,1,1
+access_account_invoice_manager,account.invoice manager,account.model_account_invoice,group_pos_manager,1,1,1,1
+access_product_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,group_pos_user,1,0,0,0
+access_product_product_packaging_user,product.packaging user,product.model_product_packaging,group_pos_user,1,0,0,0
+access_account_sequence_fiscalyear_manager,account.sequence.fiscalyear manager,account.model_account_sequence_fiscalyear,group_pos_manager,1,0,0,0
+access_stock_warehouse_manager,stock.warehouse manager,stock.model_stock_warehouse,group_pos_manager,1,0,0,0
+access_stock_location_manager,stock.location manager,stock.model_stock_location,group_pos_manager,1,0,0,0
+access_product_uom_manager,product.uom manager,product.model_product_uom,group_pos_manager,1,1,1,1
+access_res_partner_manager,res.partner manager,base.model_res_partner,group_pos_manager,1,0,0,0
+access_product_category_manager,product.category manager,product.model_product_category,group_pos_manager,1,1,1,1
+access_product_pricelist_manager,product.pricelist manager,product.model_product_pricelist,group_pos_manager,1,0,0,0
+access_product_category_pos_manager,pos.category manager,model_pos_category,group_pos_manager,1,1,1,"1"""
+access_product_category_pos_user,pos.category user,model_pos_category,group_pos_user,1,0,0,"0"""
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 14c9e96df9e..640a33d325b 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -3,11 +3,13 @@
 <data noupdate="1">
 
     <record id="group_pos_user" model="res.groups">
-        <field name="name">Point of Sale / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_point_of_sale"/>
     </record>
     <record id="group_pos_manager" model="res.groups">
-        <field name="name">Point of Sale / Manager</field>
-        <field name="implied_ids" eval="[(4, ref('group_pos_user'))]"/>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_point_of_sale"/>
+        <field name="implied_ids" eval="[(4, ref('group_pos_user')), (4, ref('stock.group_stock_user'))]"/>
     </record>
 
 </data>
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 24eb704b7dc..56f0e446394 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -16,7 +16,7 @@
     border-spacing: 0;
     border-collapse: collapse;
 }
-.point-of-sale td { 
+.point-of-sale td {
     border: 1px solid #e9eaec;
 }
 .point-of-sale input {
@@ -472,9 +472,41 @@
 .point-of-sale .pos-sale-ticket table td {
     border: 0;
 }
-.point-of-sale .pos-sale-ticket table td.receiptline-amount {
-    text-align: right;
-}
 .point-of-sale .pos-receipt-container {
     font-size: 0.75em;
 }
+
+.point-of-sale .oe_pos_synch-notification-button {
+    color: white;
+    border: 1px solid black;
+    border-radius: 3px;
+    padding: 2px 3px 2px 3px;
+    background-color: #D92A2A;
+}
+
+.receipt-buttons {
+	white-space: nowrap;
+}
+
+@media print {
+    #oe_header, #oe_menu, .point-of-sale #topheader, .point-of-sale #leftpane {
+        display: none;
+    }
+    .point-of-sale #content {
+        top: 0px;
+    }
+    .point-of-sale #rigthpane {
+        left: 0px;
+        background-color: white;
+    }
+    #receipt-screen header, #pos-finish-order {
+        display: none;
+    }
+    #receipt-screen {
+        text-align: left;
+    }
+    .pos-sale-ticket {
+        margin: 0;
+    }
+}
+
diff --git a/addons/point_of_sale/static/src/img/icon.png b/addons/point_of_sale/static/src/img/icon.png
new file mode 100644
index 00000000000..ada5b10f23c
Binary files /dev/null and b/addons/point_of_sale/static/src/img/icon.png differ
diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 05adcaf458a..90a6b03f330 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -22,62 +22,134 @@ openerp.point_of_sale = function(db) {
     QWeb.add_template("/point_of_sale/static/src/xml/pos.xml");
     var qweb_template = function(template) {
         return function(ctx) {
-            return QWeb.render(template, ctx);
+            return QWeb.render(template, _.extend({}, ctx,{
+                'currency': pos.get('currency'),
+                'format_amount': function(amount) {
+                    if (pos.get('currency').position == 'after') {
+                        return amount + ' ' + pos.get('currency').symbol;
+                    } else {
+                        return pos.get('currency').symbol + ' ' + amount;
+                    }
+                },
+                }));
         };
     };
+    var _t = db.web._t;
 
     /*
      Local store access. Read once from localStorage upon construction and persist on every change.
      There should only be one store active at any given time to ensure data consistency.
      */
-    var Store = (function() {
-        function Store() {
-            var store;
-            store = localStorage['pos'];
-            this.data = (store && JSON.parse(store)) || {};
-        }
-
-        Store.prototype.get = function(key) {
+    var Store = db.web.Class.extend({
+        init: function() {
+            this.data = {};
+        },
+        get: function(key, _default) {
+            if (this.data[key] === undefined) {
+                var stored = localStorage['oe_pos_' + key];
+                if (stored)
+                    this.data[key] = JSON.parse(stored);
+                else
+                    return _default;
+            }
             return this.data[key];
-        };
-        Store.prototype.set = function(key, value) {
+        },
+        set: function(key, value) {
             this.data[key] = value;
-            return localStorage['pos'] = JSON.stringify(this.data);
-        };
-        return Store;
-    })();
+            localStorage['oe_pos_' + key] = JSON.stringify(value);
+        },
+    });
     /*
      Gets all the necessary data from the OpenERP web client (session, shop data etc.)
      */
-    var Pos = (function() {
-        function Pos(session) {
+    var Pos = Backbone.Model.extend({
+        initialize: function(session, attributes) {
+            Backbone.Model.prototype.initialize.call(this, attributes);
+            this.store = new Store();
+            this.ready = $.Deferred();
+            this.flush_mutex = new $.Mutex();
             this.build_tree = _.bind(this.build_tree, this);
             this.session = session;
+            var attributes = {
+                'pending_operations': [],
+                'currency': {symbol: '$', position: 'after'},
+                'shop': {},
+                'company': {},
+                'user': {},
+            };
+            _.each(attributes, _.bind(function(def, attr) {
+                var to_set = {};
+                to_set[attr] = this.store.get(attr, def);
+                this.set(to_set);
+                this.bind('change:' + attr, _.bind(function(unused, val) {
+                    this.store.set(attr, val);
+                }, this));
+            }, this));
             $.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']),
                 this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'img'], [['pos_categ_id', '!=', 'false']]),
-                this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name']),
-                this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']))
-                .then(this.build_tree);
-        }
-
-        Pos.prototype.ready = $.Deferred();
-        Pos.prototype.store = new Store;
-        Pos.prototype.fetch = function(osvModel, fields, domain) {
+                this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
+                    [['state', '=', 'open'], ['user_id', '=', this.session.uid]]),
+                this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']),
+                this.get_app_data())
+                .pipe(_.bind(this.build_tree, this));
+        },
+        fetch: function(osvModel, fields, domain) {
             var dataSetSearch;
             var self = this;
-            var callback = function(result) {
-                return self.store.set(osvModel, result);
-            };
             dataSetSearch = new db.web.DataSetSearch(this, osvModel, {}, domain);
-            return dataSetSearch.read_slice(fields, 0).then(callback);
-        };
-        Pos.prototype.push = function(osvModel, record, callback, errorCallback) {
-            var dataSet;
-            dataSet = new db.web.DataSet(this, osvModel, null);
-            return dataSet.create(record, callback, errorCallback);
-        };
-        Pos.prototype.categories = {};
-        Pos.prototype.build_tree = function() {
+            return dataSetSearch.read_slice(fields, 0).then(function(result) {
+                return self.store.set(osvModel, result);
+            });
+        },
+        get_app_data: function() {
+            var self = this;
+            return $.when(new db.web.Model("sale.shop").get_func("search_read")([]).pipe(function(result) {
+                self.set({'shop': result[0]});
+                var company_id = result[0]['company_id'][0];
+                return new db.web.Model("res.company").get_func("read")(company_id, ['currency_id', 'name', 'phone']).pipe(function(result) {
+                    self.set({'company': result});
+                    var currency_id = result['currency_id'][0]
+                    return new db.web.Model("res.currency").get_func("read")([currency_id],
+                            ['symbol', 'position']).pipe(function(result) {
+                        self.set({'currency': result[0]});
+                        
+                    });
+                });
+            }), new db.web.Model("res.users").get_func("read")(this.session.uid, ['name']).pipe(function(result) {
+                self.set({'user': result});
+            }));
+        },
+        push: function(osvModel, record) {
+            var ops = _.clone(this.get('pending_operations'));
+            ops.push({model: osvModel, record: record});
+            this.set({pending_operations: ops});
+            return this.flush();
+        },
+        flush: function() {
+            return this.flush_mutex.exec(_.bind(function() {
+                return this._int_flush();
+            }, this));
+        },
+        _int_flush : function() {
+            var ops = this.get('pending_operations');
+            if (ops.length === 0)
+                return $.when();
+            var op = ops[0];
+            var dataSet = new db.web.DataSet(this, op.model, null);
+            /* we prevent the default error handler and assume errors
+             * are a normal use case, except we stop the current iteration
+             */
+            return dataSet.create(op.record).fail(function(unused, event) {
+                event.preventDefault();
+            }).pipe(_.bind(function() {
+                console.debug('saved 1 record');
+                var ops2 = this.get('pending_operations');
+                this.set({'pending_operations': _.without(ops2, op)});
+                return this._int_flush();
+            }, this), function() {return $.when()});
+        },
+        categories: {},
+        build_tree: function() {
             var c, id, _i, _len, _ref, _ref2;
             _ref = this.store.get('pos.category');
             for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -124,14 +196,14 @@ openerp.point_of_sale = function(db) {
                 }).call(this)
             };
             return this.ready.resolve();
-        };
-        Pos.prototype.build_ancestors = function(parent) {
+        },
+        build_ancestors: function(parent) {
             if (parent != null) {
                 this.current_category.ancestors.unshift(parent);
                 return this.build_ancestors(this.categories[parent].parent);
             }
-        };
-        Pos.prototype.build_subtree = function(category) {
+        },
+        build_subtree: function(category) {
             var c, _i, _len, _ref, _results;
             _ref = category.children;
             _results = [];
@@ -141,9 +213,8 @@ openerp.point_of_sale = function(db) {
                 _results.push(this.build_subtree(this.categories[c]));
             }
             return _results;
-        };
-        return Pos;
-    })();
+        }
+    });
 
     /* global variable */
     var pos;
@@ -210,26 +281,28 @@ openerp.point_of_sale = function(db) {
      To add more of the same product, just update the quantity accordingly.
      The Order also contains payment information.
      */
-    var Orderline = (function() {
-        __extends(Orderline, Backbone.Model);
-        function Orderline() {
-            Orderline.__super__.constructor.apply(this, arguments);
-        }
-
-        Orderline.prototype.defaults = {
+    var Orderline = Backbone.Model.extend({
+        defaults: {
             quantity: 1,
             list_price: 0,
             discount: 0
-        };
-        Orderline.prototype.incrementQuantity = function() {
+        },
+        initialize: function(attributes) {
+            Backbone.Model.prototype.initialize.apply(this, arguments);
+            this.bind('change:quantity', function(unused, qty) {
+                if (qty == 0)
+                    this.trigger('killme');
+            }, this);
+        },
+        incrementQuantity: function() {
             return this.set({
                 quantity: (this.get('quantity')) + 1
             });
-        };
-        Orderline.prototype.getTotal = function() {
+        },
+        getTotal: function() {
             return (this.get('quantity')) * (this.get('list_price')) * (1 - (this.get('discount')) / 100);
-        };
-        Orderline.prototype.exportAsJSON = function() {
+        },
+        exportAsJSON: function() {
             var result;
             result = {
                 qty: this.get('quantity'),
@@ -238,18 +311,11 @@ openerp.point_of_sale = function(db) {
                 product_id: this.get('id')
             };
             return result;
-        };
-        return Orderline;
-    })();
-    var OrderlineCollection = (function() {
-        __extends(OrderlineCollection, Backbone.Collection);
-        function OrderlineCollection() {
-            OrderlineCollection.__super__.constructor.apply(this, arguments);
-        }
-
-        OrderlineCollection.prototype.model = Orderline;
-        return OrderlineCollection;
-    })();
+        },
+    });
+    var OrderlineCollection = Backbone.Collection.extend({
+        model: Orderline,
+    });
     /*
      Every PaymentLine has all the attributes of the corresponding CashRegister.
      */
@@ -268,7 +334,7 @@ openerp.point_of_sale = function(db) {
         Paymentline.prototype.exportAsJSON = function() {
             var result;
             result = {
-                name: "Payment line",
+                name: db.web.datetime_to_str(new Date()),
                 statement_id: this.get('id'),
                 account_id: (this.get('account_id'))[0],
                 journal_id: (this.get('journal_id'))[0],
@@ -324,9 +390,13 @@ openerp.point_of_sale = function(db) {
             var existing;
             existing = (this.get('orderLines')).get(product.id);
             if (existing != null) {
-                return existing.incrementQuantity();
+                existing.incrementQuantity();
             } else {
-                return (this.get('orderLines')).add(new Orderline(product.toJSON()));
+                var line = new Orderline(product.toJSON());
+                this.get('orderLines').add(line);
+                line.bind('killme', function() {
+                    this.get('orderLines').remove(line);
+                }, this);
             }
         };
         Order.prototype.addPaymentLine = function(cashRegister) {
@@ -432,21 +502,12 @@ openerp.point_of_sale = function(db) {
      The numpad handles both the choice of the property currently being modified
      (quantity, price or discount) and the edition of the corresponding numeric value.
      */
-    var NumpadState = (function() {
-        __extends(NumpadState, Backbone.Model);
-        function NumpadState() {
-            NumpadState.__super__.constructor.apply(this, arguments);
-        }
-
-        NumpadState.prototype.defaults = {
+    var NumpadState = Backbone.Model.extend({
+        defaults: {
             buffer: "0",
             mode: "quantity"
-        };
-        NumpadState.prototype.initialize = function(options) {
-            this.shop = options.shop;
-            return this.shop.bind('change:selectedOrder', this.reset, this);
-        };
-        NumpadState.prototype.appendNewChar = function(newChar) {
+        },
+        appendNewChar: function(newChar) {
             var oldBuffer;
             oldBuffer = this.get('buffer');
             if (oldBuffer === '0') {
@@ -462,9 +523,9 @@ openerp.point_of_sale = function(db) {
                     buffer: (this.get('buffer')) + newChar
                 });
             }
-            return this.updateTarget();
-        };
-        NumpadState.prototype.deleteLastChar = function() {
+            this.updateTarget();
+        },
+        deleteLastChar: function() {
             var tempNewBuffer;
             tempNewBuffer = (this.get('buffer')).slice(0, -1) || "0";
             if (isNaN(tempNewBuffer)) {
@@ -473,38 +534,36 @@ openerp.point_of_sale = function(db) {
             this.set({
                 buffer: tempNewBuffer
             });
-            return this.updateTarget();
-        };
-        NumpadState.prototype.switchSign = function() {
+            this.updateTarget();
+        },
+        switchSign: function() {
             var oldBuffer;
             oldBuffer = this.get('buffer');
             this.set({
                 buffer: oldBuffer[0] === '-' ? oldBuffer.substr(1) : "-" + oldBuffer
             });
-            return this.updateTarget();
-        };
-        NumpadState.prototype.changeMode = function(newMode) {
-            return this.set({
+            this.updateTarget();
+        },
+        changeMode: function(newMode) {
+            this.set({
                 buffer: "0",
                 mode: newMode
             });
-        };
-        NumpadState.prototype.reset = function() {
-            return this.set({
-                buffer: "0"
+        },
+        reset: function() {
+            this.set({
+                buffer: "0",
+                mode: "quantity"
             });
-        };
-        NumpadState.prototype.updateTarget = function() {
+        },
+        updateTarget: function() {
             var bufferContent, params;
             bufferContent = this.get('buffer');
             if (bufferContent && !isNaN(bufferContent)) {
-                params = {};
-                params[this.get('mode')] = parseFloat(bufferContent);
-                return (this.shop.get('selectedOrder')).selected.set(params);
+            	this.trigger('setValue', parseFloat(bufferContent));
             }
-        };
-        return NumpadState;
-    })();
+        },
+    });
     /*
      ---
      Views
@@ -513,9 +572,11 @@ openerp.point_of_sale = function(db) {
     var NumpadWidget = db.web.Widget.extend({
         init: function(parent, options) {
             this._super(parent);
-            this.state = options.state;
+            this.state = new NumpadState();
         },
         start: function() {
+            this.state.bind('change:mode', this.changedMode, this);
+            this.changedMode();
             this.$element.find('button#numpad-backspace').click(_.bind(this.clickDeleteLastChar, this));
             this.$element.find('button#numpad-minus').click(_.bind(this.clickSwitchSign, this));
             this.$element.find('button.number-char').click(_.bind(this.clickAppendNewChar, this));
@@ -533,12 +594,14 @@ openerp.point_of_sale = function(db) {
             return this.state.appendNewChar(newChar);
         },
         clickChangeMode: function(event) {
-            var newMode;
-            $('.selected-mode').removeClass('selected-mode');
-            $(event.currentTarget).addClass('selected-mode');
-            newMode = event.currentTarget.attributes['data-mode'].nodeValue;
+            var newMode = event.currentTarget.attributes['data-mode'].nodeValue;
             return this.state.changeMode(newMode);
-        }
+        },
+        changedMode: function() {
+            var mode = this.state.get('mode');
+            $('.selected-mode').removeClass('selected-mode');
+            $(_.str.sprintf('.mode-button[data-mode="%s"]', mode), this.$element).addClass('selected-mode');
+        },
     });
     /*
      Gives access to the payment methods (aka. 'cash registers')
@@ -617,7 +680,7 @@ openerp.point_of_sale = function(db) {
      Shopping carts.
      */
     var OrderlineWidget = db.web.Widget.extend({
-        tagName: 'tr',
+        tag_name: 'tr',
         template_fct: qweb_template('pos-orderline-template'),
         init: function(parent, options) {
             this._super(parent);
@@ -630,14 +693,12 @@ openerp.point_of_sale = function(db) {
                 return this.$element.remove();
             }, this));
             this.order = options.order;
-            this.numpadState = options.numpadState;
         },
         start: function() {
             this.$element.click(_.bind(this.clickHandler, this));
         },
         clickHandler: function() {
-            this.numpadState.reset();
-            return this.select();
+            this.select();
         },
         render_element: function() {
             this.select();
@@ -648,48 +709,74 @@ openerp.point_of_sale = function(db) {
         select: function() {
             $('tr.selected').removeClass('selected');
             this.$element.addClass('selected');
-            return this.order.selected = this.model;
+            this.order.selected = this.model;
+            this.on_selected();
         },
+        on_selected: function() {},
     });
     var OrderWidget = db.web.Widget.extend({
         init: function(parent, options) {
             this._super(parent);
             this.shop = options.shop;
-            this.numpadState = options.numpadState;
+            this.setNumpadState(options.numpadState);
             this.shop.bind('change:selectedOrder', this.changeSelectedOrder, this);
             this.bindOrderLineEvents();
         },
+        setNumpadState: function(numpadState) {
+        	if (this.numpadState) {
+        		this.numpadState.unbind('setValue', this.setValue);
+        	}
+        	this.numpadState = numpadState;
+        	if (this.numpadState) {
+        		this.numpadState.bind('setValue', this.setValue, this);
+        		this.numpadState.reset();
+        	}
+        },
+        setValue: function(val) {
+        	var param = {};
+        	param[this.numpadState.get('mode')] = val;
+        	this.shop.get('selectedOrder').selected.set(param);
+        },
         changeSelectedOrder: function() {
             this.currentOrderLines.unbind();
             this.bindOrderLineEvents();
-            return this.render_element();
+            this.render_element();
         },
         bindOrderLineEvents: function() {
             this.currentOrderLines = (this.shop.get('selectedOrder')).get('orderLines');
             this.currentOrderLines.bind('add', this.addLine, this);
-            this.currentOrderLines.bind('change', this.render_element, this);
-            return this.currentOrderLines.bind('remove', this.render, this);
+            this.currentOrderLines.bind('remove', this.render_element, this);
         },
         addLine: function(newLine) {
             var line = new OrderlineWidget(null, {
                     model: newLine,
-                    order: this.shop.get('selectedOrder'),
-                    numpadState: this.numpadState
+                    order: this.shop.get('selectedOrder')
             });
+            line.on_selected.add(_.bind(this.selectedLine, this));
+            this.selectedLine();
             line.appendTo(this.$element);
-            return this.updateSummary();
+            this.updateSummary();
+        },
+        selectedLine: function() {
+        	var reset = false;
+        	if (this.currentSelected !== this.shop.get('selectedOrder').selected) {
+        		reset = true;
+        	}
+        	this.currentSelected = this.shop.get('selectedOrder').selected;
+        	if (reset && this.numpadState)
+        		this.numpadState.reset();
         },
         render_element: function() {
             this.$element.empty();
             this.currentOrderLines.each(_.bind( function(orderLine) {
                 var line = new OrderlineWidget(null, {
                         model: orderLine,
-                        order: this.shop.get('selectedOrder'),
-                        numpadState: this.numpadState
+                        order: this.shop.get('selectedOrder')
                 });
+            	line.on_selected.add(_.bind(this.selectedLine, this));
                 line.appendTo(this.$element);
             }, this));
-            return this.updateSummary();
+            this.updateSummary();
         },
         updateSummary: function() {
             var currentOrder, tax, total, totalTaxExcluded;
@@ -699,7 +786,7 @@ openerp.point_of_sale = function(db) {
             tax = currentOrder.getTax();
             $('#subtotal').html(totalTaxExcluded.toFixed(2)).hide().fadeIn();
             $('#tax').html(tax.toFixed(2)).hide().fadeIn();
-            return $('#total').html(total.toFixed(2)).hide().fadeIn();
+            $('#total').html(total.toFixed(2)).hide().fadeIn();
         },
     });
     /*
@@ -790,27 +877,32 @@ openerp.point_of_sale = function(db) {
         init: function(parent, options) {
             this._super(parent);
             this.model = options.model;
-            this.model.bind('change', this.render_element, this);
-        },
-        start: function () {
-            this.$element.addClass('paymentline');
-            $('input', this.$element).keyup(_.bind(this.changeAmount, this));
+            this.model.bind('change', this.changedAmount, this);
         },
+        on_delete: function() {},
         changeAmount: function(event) {
             var newAmount;
             newAmount = event.currentTarget.value;
             if (newAmount && !isNaN(newAmount)) {
-                return this.model.set({
-                    amount: parseFloat(newAmount)
+            	this.amount = parseFloat(newAmount);
+                this.model.set({
+                    amount: this.amount,
                 });
             }
         },
+        changedAmount: function() {
+        	if (this.amount !== this.model.get('amount'))
+        		this.render_element();
+        },
         render_element: function() {
+        	this.amount = this.model.get('amount');
             this.$element.html(this.template_fct({
                 name: (this.model.get('journal_id'))[1],
-                amount: this.model.get('amount')
+                amount: this.amount,
             }));
-            return this;
+            this.$element.addClass('paymentline');
+            $('input', this.$element).keyup(_.bind(this.changeAmount, this));
+            $('.delete-payment-line', this.$element).click(this.on_delete);
         },
     });
     var PaymentWidget = db.web.Widget.extend({
@@ -831,16 +923,18 @@ openerp.point_of_sale = function(db) {
         validateCurrentOrder: function() {
             var callback, currentOrder;
             currentOrder = this.shop.get('selectedOrder');
-            callback = _.bind(function() {
+            $('button#validate-order', this.$element).attr('disabled', 'disabled');
+            pos.push('pos.order', currentOrder.exportAsJSON()).then(_.bind(function() {
+                $('button#validate-order', this.$element).removeAttr('disabled');
                 return currentOrder.set({
                     validated: true
                 });
-            }, this);
-            pos.push('pos.order', currentOrder.exportAsJSON(), callback);
+            }, this));
         },
         bindPaymentLineEvents: function() {
             this.currentPaymentLines = (this.shop.get('selectedOrder')).get('paymentLines');
             this.currentPaymentLines.bind('add', this.addPaymentLine, this);
+            this.currentPaymentLines.bind('remove', this.render_element, this);
             this.currentPaymentLines.bind('all', this.updatePaymentSummary, this);
         },
         bindOrderLineEvents: function() {
@@ -858,18 +952,19 @@ openerp.point_of_sale = function(db) {
             var x = new PaymentlineWidget(null, {
                     model: newPaymentLine
                 });
+            x.on_delete.add(_.bind(this.deleteLine, this, x));
             x.appendTo(this.paymentLineList());
         },
         render_element: function() {
             this.paymentLineList().empty();
             this.currentPaymentLines.each(_.bind( function(paymentLine) {
-                var x = new PaymentlineWidget(null, {
-                    model: paymentLine
-                });
-                this.paymentLineList().append(x);
+                this.addPaymentLine(paymentLine);
             }, this));
             this.updatePaymentSummary();
         },
+        deleteLine: function(lineWidget) {
+        	this.currentPaymentLines.remove([lineWidget.model]);
+        },
         updatePaymentSummary: function() {
             var currentOrder, dueTotal, paidTotal, remaining, remainingAmount;
             currentOrder = this.shop.get('selectedOrder');
@@ -881,21 +976,24 @@ openerp.point_of_sale = function(db) {
             remaining = remainingAmount > 0 ? 0 : (-remainingAmount).toFixed(2);
             $('#payment-remaining').html(remaining);
         },
-    });
-    /*
-     "Receipt" step.
-     */
-    var ReceiptLineWidget = db.web.Widget.extend({
-        tag_name: 'tr',
-        template_fct: qweb_template('pos-receiptline-template'),
-        init: function(parent, options) {
-            this._super(parent);
-            this.model = options.model;
-            this.model.bind('change', this.render_element, this);
+        setNumpadState: function(numpadState) {
+        	if (this.numpadState) {
+        		this.numpadState.unbind('setValue', this.setValue);
+        		this.numpadState.unbind('change:mode', this.setNumpadMode);
+        	}
+        	this.numpadState = numpadState;
+        	if (this.numpadState) {
+        		this.numpadState.bind('setValue', this.setValue, this);
+        		this.numpadState.bind('change:mode', this.setNumpadMode, this);
+        		this.numpadState.reset();
+        		this.setNumpadMode();
+        	}
         },
-        render_element: function() {
-            this.$element.addClass('receiptline');
-            this.$element.html(this.template_fct(this.model.toJSON()));
+    	setNumpadMode: function() {
+    		this.numpadState.set({mode: 'payment'});
+    	},
+        setValue: function(val) {
+        	this.currentPaymentLines.last().set({amount: val});
         },
     });
     var ReceiptWidget = db.web.Widget.extend({
@@ -903,60 +1001,38 @@ openerp.point_of_sale = function(db) {
             this._super(parent);
             this.model = options.model;
             this.shop = options.shop;
+            this.user = pos.get('user');
+            this.company = pos.get('company');
+            this.shop_obj = pos.get('shop');
+        },
+        start: function() {
             this.shop.bind('change:selectedOrder', this.changeSelectedOrder, this);
-            this.bindOrderLineEvents();
-            this.bindPaymentLineEvents();
-        },
-        finishOrder: function() {
-            this.shop.get('selectedOrder').destroy();
-        },
-        receiptLineList: function() {
-            return this.$element.find('#receiptlines');
-        },
-        bindOrderLineEvents: function() {
-            this.currentOrderLines = (this.shop.get('selectedOrder')).get('orderLines');
-            this.currentOrderLines.bind('add', this.addReceiptLine, this);
-            this.currentOrderLines.bind('change', this.render_element, this);
-            this.currentOrderLines.bind('remove', this.render_element, this);
-        },
-        bindPaymentLineEvents: function() {
-            this.currentPaymentLines = (this.shop.get('selectedOrder')).get('paymentLines');
-            this.currentPaymentLines.bind('all', this.updateReceiptSummary, this);
-        },
-        changeSelectedOrder: function() {
-            this.currentOrderLines.unbind();
-            this.bindOrderLineEvents();
-            this.currentPaymentLines.unbind();
-            this.bindPaymentLineEvents();
-            this.render_element();
-        },
-        addReceiptLine: function(newOrderItem) {
-            var x = new ReceiptLineWidget(null, {
-                    model: newOrderItem
-            });
-            x.appendTo(this.receiptLineList());
-            this.updateReceiptSummary();
+            this.changeSelectedOrder();
         },
         render_element: function() {
             this.$element.html(qweb_template('pos-receipt-view'));
             $('button#pos-finish-order', this.$element).click(_.bind(this.finishOrder, this));
-            this.currentOrderLines.each(_.bind( function(orderItem) {
-                var x = new ReceiptLineWidget(null, {
-                        model: orderItem
-                });
-                x.appendTo(this.receiptLineList());
-            }, this));
-            this.updateReceiptSummary();
+            $('button#print-the-ticket', this.$element).click(function(){window.print();});
         },
-        updateReceiptSummary: function() {
-            var change, currentOrder, tax, total;
-            currentOrder = this.shop.get('selectedOrder');
-            total = currentOrder.getTotal();
-            tax = currentOrder.getTax();
-            change = currentOrder.getPaidTotal() - total;
-            $('#receipt-summary-tax').html(tax.toFixed(2));
-            $('#receipt-summary-total').html(total.toFixed(2));
-            $('#receipt-summary-change').html(change.toFixed(2));
+        finishOrder: function() {
+            this.shop.get('selectedOrder').destroy();
+        },
+        changeSelectedOrder: function() {
+            if (this.currentOrderLines)
+                this.currentOrderLines.unbind();
+            this.currentOrderLines = (this.shop.get('selectedOrder')).get('orderLines');
+            this.currentOrderLines.bind('add', this.refresh, this);
+            this.currentOrderLines.bind('change', this.refresh, this);
+            this.currentOrderLines.bind('remove', this.refresh, this);
+            if (this.currentPaymentLines)
+                this.currentPaymentLines.unbind();
+            this.currentPaymentLines = (this.shop.get('selectedOrder')).get('paymentLines');
+            this.currentPaymentLines.bind('all', this.refresh, this);
+            this.refresh();
+        },
+        refresh: function() {
+            this.currentOrder = this.shop.get('selectedOrder');
+            $('.pos-receipt-container', this.$element).html(qweb_template('pos-ticket')({widget:this}));
         },
     });
     var OrderButtonWidget = db.web.Widget.extend({
@@ -1008,9 +1084,6 @@ openerp.point_of_sale = function(db) {
 
             (this.shop.get('orders')).bind('add', this.orderAdded, this);
             (this.shop.get('orders')).add(new Order);
-            this.numpadState = new NumpadState({
-                shop: this.shop
-            });
             this.productListView = new ProductListWidget(null, {
                 shop: this.shop
             });
@@ -1023,9 +1096,11 @@ openerp.point_of_sale = function(db) {
             this.paypadView.$element = $('#paypad');
             this.paypadView.render_element();
             this.paypadView.start();
+            this.numpadView = new NumpadWidget(null);
+            this.numpadView.$element = $('#numpad');
+            this.numpadView.start();
             this.orderView = new OrderWidget(null, {
                 shop: this.shop,
-                numpadState: this.numpadState
             });
             this.orderView.$element = $('#current-order-content');
             this.orderView.start();
@@ -1039,14 +1114,11 @@ openerp.point_of_sale = function(db) {
                 shop: this.shop,
             });
             this.receiptView.replace($('#receipt-screen'));
-            this.numpadView = new NumpadWidget(null, {
-                state: this.numpadState
-            });
-            this.numpadView.$element = $('#numpad');
-            this.numpadView.start();
             this.stepsView = new StepsWidget(null, {shop: this.shop});
             this.stepsView.$element = $('#steps');
             this.stepsView.start();
+            this.shop.bind('change:selectedOrder', this.changedSelectedOrder, this);
+            this.changedSelectedOrder();
         },
         createNewOrder: function() {
             var newOrder;
@@ -1065,6 +1137,24 @@ openerp.point_of_sale = function(db) {
             newOrderButton.appendTo($('#orders'));
             newOrderButton.selectOrder();
         },
+        changedSelectedOrder: function() {
+        	if (this.currentOrder) {
+        		this.currentOrder.unbind('change:step', this.changedStep);
+        	}
+        	this.currentOrder = this.shop.get('selectedOrder');
+        	this.currentOrder.bind('change:step', this.changedStep, this);
+        	this.changedStep();
+        },
+        changedStep: function() {
+        	var step = this.currentOrder.get('step');
+        	this.orderView.setNumpadState(null);
+        	this.paymentView.setNumpadState(null);
+        	if (step === 'products') {
+        		this.orderView.setNumpadState(this.numpadView.state);
+        	} else if (step === 'payment') {
+        		this.paymentView.setNumpadState(this.numpadView.state);
+        	}
+        },
     });
     var App = (function() {
         function App($element) {
@@ -1103,7 +1193,7 @@ openerp.point_of_sale = function(db) {
                 s = $(this).val().toLowerCase();
                 if (s) {
                     m = products.filter( function(p) {
-                        return p.name.toLowerCase().indexOf(s);
+                        return p.name.toLowerCase().indexOf(s) != -1;
                     });
                     $('.search-clear').fadeIn();
                 } else {
@@ -1120,29 +1210,109 @@ openerp.point_of_sale = function(db) {
         };
         return App;
     })();
+    
+    db.point_of_sale.SynchNotification = db.web.Widget.extend({
+        template: "pos-synch-notification",
+        init: function() {
+            this._super.apply(this, arguments);
+            this.nbr_pending = 0;
+        },
+        render_element: function() {
+            this._super.apply(this, arguments);
+            $('.oe_pos_synch-notification-button', this.$element).click(this.on_synch);
+        },
+        on_change_nbr_pending: function(nbr_pending) {
+            this.nbr_pending = nbr_pending;
+            this.render_element();
+        },
+        on_synch: function() {}
+    });
 
     db.web.client_actions.add('pos.ui', 'db.point_of_sale.PointOfSale');
     db.point_of_sale.PointOfSale = db.web.Widget.extend({
-        template: "PointOfSale",
-        start: function() {
-            var self = this;
-            this.$element.find("#loggedas button").click(function() {
-                self.stop();
-            });
+        init: function() {
+            this._super.apply(this, arguments);
 
             if (pos)
                 throw "It is not possible to instantiate multiple instances "+
                     "of the point of sale at the same time.";
             pos = new Pos(this.session);
+        },
+        start: function() {
+            var self = this;
+            return pos.ready.then(_.bind(function() {
+                this.render_element();
+                this.synch_notification = new db.point_of_sale.SynchNotification(this);
+                this.synch_notification.replace($('.oe_pos_synch-notification', this.$element));
+                this.synch_notification.on_synch.add(_.bind(pos.flush, pos));
+                
+                pos.bind('change:pending_operations', this.changed_pending_operations, this);
+                this.changed_pending_operations();
+                
+                this.$element.find("#loggedas button").click(function() {
+                    self.try_close();
+                });
+    
+                this.$element.find('#steps').buttonset();
 
-            this.$element.find('#steps').buttonset();
-            
-            $('.oe_toggle_secondary_menu').hide();
-            $('.oe_footer').hide();
-
-            return pos.ready.then( function() {
                 pos.app = new App(self.$element);
-            });
+                $('.oe_toggle_secondary_menu').hide();
+                $('.oe_footer').hide();
+                
+                if (pos.store.get('account.bank.statement').length === 0)
+                    return new db.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_open_statement']], ['res_id']).pipe(
+                            _.bind(function(res) {
+                        return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
+                            var action = result.result;
+                            this.do_action(action);
+                        }, this));
+                    }, this));
+            }, this));
+        },
+        render: function() {
+            return qweb_template("PointOfSale")();
+        },
+        changed_pending_operations: function () {
+            this.synch_notification.on_change_nbr_pending(pos.get('pending_operations').length);
+        },
+        try_close: function() {
+            pos.flush().then(_.bind(function() {
+                var close = _.bind(this.close, this);
+                if (pos.get('pending_operations').length > 0) {
+                    var confirm = false;
+                    $(QWeb.render('pos-close-warning')).dialog({
+                        resizable: false,
+                        height:160,
+                        modal: true,
+                        title: "Warning",
+                        buttons: {
+                            "Yes": function() {
+                                confirm = true;
+                                $( this ).dialog( "close" );
+                            },
+                            "No": function() {
+                                $( this ).dialog( "close" );
+                            }
+                        },
+                        close: function() {
+                            if (confirm)
+                                close();
+                        }
+                    });
+                } else {
+                    close();
+                }
+            }, this));
+        },
+        close: function() {
+            return new db.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_close_statement']], ['res_id']).pipe(
+                    _.bind(function(res) {
+                return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
+                    var action = result.result;
+                    action.context = _.extend(action.context || {}, {'cancel_action': {type: 'ir.actions.client', tag: 'default_home'}});
+                    this.do_action(action);
+                }, this));
+            }, this));
         },
         stop: function() {
             $('.oe_footer').show();
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 74ff2229729..c040855f4b9 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -25,7 +25,8 @@
                 </div>
             </div>
             <div id="loggedas">
-                <button>Back</button>
+                <span class="oe_pos_synch-notification"></span>
+                <button>Close</button>
             </div>
         </div>
         <div id="content">
@@ -49,15 +50,15 @@
                     <ul id="amounts">
                         <li>
                             Subtotal:
-                            <span id="subtotal">0</span> €
+                            <t t-if="currency.position == 'before'" t-esc="currency.symbol"/> <span id="subtotal">0</span> <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
                         </li>
                         <li>
                             Tax:
-                            <span id="tax">0</span> €
+                            <t t-if="currency.position == 'before'" t-esc="currency.symbol"/> <span id="tax">0</span> <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
                         </li>
                         <li>
                             Total:
-                            <span id="total">0</span> €
+                            <t t-if="currency.position == 'before'" t-esc="currency.symbol"/> <span id="total">0</span> <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
                         </li>
                     </ul>
                     <div id="paypad"></div>
@@ -65,7 +66,7 @@
                         <button class="input-button number-char">1</button>
                         <button class="input-button number-char">2</button>
                         <button class="input-button number-char">3</button>
-                        <button class="mode-button selected-mode" data-mode='quantity'>Qty</button>
+                        <button class="mode-button" data-mode='quantity'>Qty</button>
                         <br />
                         <button class="input-button number-char">4</button>
                         <button class="input-button number-char">5</button>
@@ -96,17 +97,35 @@
                     <header><h2>Payment</h2></header>
                     <div class="pos-step-container">
                         <div class="pos-payment-container">
-                            <span id="payment-due-total" class="payment-due pos-rigth-align"></span>
+                            <br />
+                            <table>
+                                <tr>
+                                    <td class="paymentline-type">Total:</td>
+                                    <td class="paymentline-amount pos-rigth-align">
+                                        <t t-if="currency.position == 'before'" t-esc="currency.symbol"/>
+                                        <span id="payment-due-total"></span>
+                                        <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
+                                    </td>
+                                </tr>
+                            </table>
                             <table id="paymentlines">
                             </table>
                             <table>
                                 <tr>
                                     <td class="paymentline-type">Paid:</td>
-                                    <td class="paymentline-amount pos-rigth-align"><span id="payment-paid-total"></span> €</td>
+                                    <td class="paymentline-amount pos-rigth-align">
+                                        <t t-if="currency.position == 'before'" t-esc="currency.symbol"/>
+                                        <span id="payment-paid-total"></span>
+                                        <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td class="paymentline-type">Change:</td>
-                                    <td class="paymentline-amount pos-rigth-align"><span id="payment-remaining"></span> €</td>
+                                    <td class="paymentline-amount pos-rigth-align">
+                                        <t t-if="currency.position == 'before'" t-esc="currency.symbol"/>
+                                        <span id="payment-remaining"></span>
+                                        <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
+                                    </td>
                                 </tr>
                             </table>
                         </div>
@@ -122,6 +141,16 @@
         </div>
     </div>
     </t>
+    <t t-name="pos-synch-notification">
+        <span>
+        <a t-if="widget.nbr_pending &gt; 0" href="javascript:void(0)" class="oe_pos_synch-notification-button">
+            <t t-esc="widget.nbr_pending"/> pending orders
+        </a>
+        </span>
+    </t>
+    <t t-name="pos-close-warning">
+        <div>There are pending operations that could not be saved into the database, are you sure you want to exit?</div>
+    </t>
     <t t-name="pos-category-template">
         <header>
             <ol class="breadcrumb">
@@ -162,8 +191,7 @@
             <div class="product-img">
                 <img t-att-src="'data:image/gif;base64,'+ img" />
                 <span class="price-tag">
-                    <t t-esc="list_price"/>
-                    €
+                    <t t-esc="format_amount(list_price)"/>
                 </span>
             </div>
             <div class="product-name">
@@ -176,8 +204,7 @@
             <t t-esc="name"/>
         </td>
         <td>
-            <t t-esc="list_price.toFixed(2)"/>
-            €
+            <t t-esc="format_amount(list_price.toFixed(2))"/>
         </td>
         <td>
             <t t-esc="discount.toFixed(2)"/>
@@ -186,8 +213,7 @@
             <t t-esc="quantity.toFixed(0)"/>
         </td>
         <td>
-            <t t-esc="(list_price * (1 - discount/100) * quantity).toFixed(2)"/>
-            €
+            <t t-esc="format_amount((list_price * (1 - discount/100) * quantity).toFixed(2))"/>
         </td>
     </t>
     <t t-name="pos-paymentline-template">
@@ -196,17 +222,7 @@
         </td>
         <td class="paymentline-amount pos-rigth-align">
             <input type="text" t-att-value="amount.toFixed(2)" />
-        </td>
-    </t>
-    <t t-name="pos-receiptline-template">
-        <td class="receiptline-quantity pos-rigth-align">
-            <t t-esc="quantity.toFixed(0)"/>
-        </td>
-        <td class="receiptline-name">
-            <t t-esc="name"/>
-        </td>
-        <td class="receiptline-amount">
-            <t t-esc="(list_price * (1 - discount/100) * quantity).toFixed(2)"/> €
+            <a href='javascript:void(0)' class='delete-payment-line'><img src="/point_of_sale/static/src/img/search_reset.gif" /></a>
         </td>
     </t>
     <t t-name="pos-payment-button-template">
@@ -224,23 +240,64 @@
             <header><h2>Receipt</h2></header>
             <div class="pos-step-container">
                 <div class="pos-receipt-container">
-                    <div class="pos-sale-ticket">
-                        OpenERP Point of Sale<br />
-                        <br />
-                        <div class="pos-rigth-align"><t t-esc="new Date().toString(Date.CultureInfo.formatPatterns.shortDate + ' ' +
-                            Date.CultureInfo.formatPatterns.longTime)"/></div>
-                        <br />
-                        <table id="receiptlines"></table>
-                        <br />
-                        <table>
-                            <tr><td>Total:</td><td class="pos-rigth-align"><span id="receipt-summary-total"></span> €</td></tr>
-                            <tr><td>Tax:</td><td class="pos-rigth-align"><span id="receipt-summary-tax"></span> €</td></tr>
-                            <tr><td>Change:</td><td class="pos-rigth-align"><span id="receipt-summary-change"></span> €</td></tr>
-                        </table>
-                    </div>
                 </div>
-                <button id="pos-finish-order">Next Order</button>
+                <div class='receipt-buttons'>
+	                <button id="print-the-ticket">
+	                    Print</button>
+	                <button id="pos-finish-order">Next Order</button>
+                </div>
             </div>
         </div>
     </t>
+    <t t-name="pos-ticket">
+        <div class="pos-sale-ticket">
+            <div class="pos-rigth-align"><t t-esc="new Date().toString(Date.CultureInfo.formatPatterns.shortDate + ' ' +
+                Date.CultureInfo.formatPatterns.longTime)"/></div>
+            <br />
+            <t t-esc="widget.company.name"/><br />
+            Phone: <t t-esc="widget.company.phone || ''"/><br />
+            User: <t t-esc="widget.user.name"/><br />
+            Shop: <t t-esc="widget.shop_obj.name"/><br />
+            <br />
+            <table>
+                <tr t-foreach="widget.currentOrderLines.toArray()" t-as="order">
+                    <td>
+                        <t t-esc="order.get('name')"/>
+                    </td>
+                    <td class="pos-rigth-align">
+                        <t t-esc="order.get('quantity').toFixed(0)"/>
+                    </td>
+                    <td class="pos-rigth-align">
+                        <t t-esc="format_amount((order.get('list_price') * (1 - order.get('discount')/100) * order.get('quantity')).toFixed(2))"/>
+                    </td>
+                </tr>
+            </table>
+            <br />
+            <table>
+                <tr><td>Tax:</td><td class="pos-rigth-align">
+                    <t t-esc="format_amount(widget.currentOrder.getTax().toFixed(2))"/>
+                    </td></tr>
+                <tr><td>Total:</td><td class="pos-rigth-align">
+                    <t t-esc="format_amount(widget.currentOrder.getTotal().toFixed(2))"/>
+                    </td></tr>
+            </table>
+            <br />
+            <table>
+                <tr t-foreach="widget.currentPaymentLines.toArray()" t-as="pline">
+                    <td>
+                        <t t-esc="pline.get('journal_id')[1]"/>
+                    </td>
+                    <td class="pos-rigth-align">
+                        <t t-esc="format_amount((pline.getAmount()).toFixed(2))"/>
+                    </td>
+                </tr>
+            </table>
+            <br />
+            <table>
+                <tr><td>Change:</td><td class="pos-rigth-align">
+                    <t t-esc="format_amount((widget.currentOrder.getPaidTotal() - widget.currentOrder.getTotal()).toFixed(2))"/>
+                    </td></tr>
+            </table>
+        </div>
+    </t>
 </templates>
\ No newline at end of file
diff --git a/addons/point_of_sale/test/point_of_sale_report.yml b/addons/point_of_sale/test/point_of_sale_report.yml
index f3ea5995b9e..c7583b1549c 100644
--- a/addons/point_of_sale/test/point_of_sale_report.yml
+++ b/addons/point_of_sale/test/point_of_sale_report.yml
@@ -35,23 +35,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt report'+format), 'wb+').write(data)
 
 -
- Create a record for the root user in pos.payment.report.user (used by the next python block).
--
-  !record {model: pos.payment.report.user, id: pos_payment_report_user_1}:
-    user_id: []
--
- Print the POS Payment Report through the wizard
--
-  !python {model: ir.ui.menu}: |
-    import time
-    ctx={}
-    ctx.update({'model': 'ir.ui.menu','active_ids': []})
-    data_dict = {'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'), 'user_id': [(6,0,[ref('base.user_root')])] }
-    from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_report_pos_payment_repport_date',wiz_data=data_dict, context=ctx, our_module='point_of_sale')
-
--
- Print the POS Details Report through the wizard
+  Print the POS Details Report through the wizard
 -
   !python {model: ir.ui.menu}: |
     import time
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 0985ae906be..cb0a6a6da9a 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -30,7 +30,6 @@ import pos_sales_user
 import pos_sales_user_today
 import pos_receipt
 import pos_payment_report_user
-import pos_payment_report_date
 import pos_payment_report
 import pos_payment
 
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index 46f710c7882..2a8037dbdc7 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -75,31 +75,21 @@ class pos_box_out(osv.osv_memory):
         res_obj = self.pool.get('res.users')
         for data in  self.read(cr, uid, ids, context=context):
             curr_company = res_obj.browse(cr, uid, uid, context=context).company_id.id
-            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context)
+            statement_ids = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context)
             monday = (datetime.today() + relativedelta(weekday=0)).strftime('%Y-%m-%d')
             sunday = (datetime.today() + relativedelta(weekday=6)).strftime('%Y-%m-%d')
             done_statmt = statement_obj.search(cr, uid, [('date', '>=', monday+' 00:00:00'), ('date', '<=', sunday+' 23:59:59'), ('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid)], context=context)
             stat_done = statement_obj.browse(cr, uid, done_statmt, context=context)
             am = 0.0
             product = product_obj.browse(cr, uid, data['product_id'], context=context)
-            acc_id = product.property_account_income
+            acc_id = product.property_account_income or product.categ_id.property_account_income_categ
             if not acc_id:
                 raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product.name))
-            if not statement_id:
+            if not statement_ids:
                 raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
-            if statement_id:
-                statement_id = statement_id[0]
-            if not statement_id:
-                statement_id = statement_obj.create(cr, uid, {
-                                    'date': time.strftime('%Y-%m-%d 00:00:00'),
-                                    'journal_id': data['journal_id'],
-                                    'company_id': curr_company,
-                                    'user_id': uid,
-                                }, context=context)
-            vals['statement_id'] = statement_id
+            vals['statement_id'] = statement_ids[0]
             vals['journal_id'] = data['journal_id']
-            if acc_id:
-                vals['account_id'] = acc_id.id
+            vals['account_id'] = acc_id.id
             amount = data['amount'] or 0.0
             if data['amount'] > 0:
                 amount = -data['amount']
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
index 92dee2f8e4c..08f51113d8d 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.py
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -25,6 +25,10 @@ from tools.translate import _
 class pos_close_statement(osv.osv_memory):
     _name = 'pos.close.statement'
     _description = 'Close Statements'
+    
+    def cancel_wizard(self, cr, uid, ids, context=None):
+        if context.get('cancel_action'):
+            return context['cancel_action']
 
     def close_statement(self, cr, uid, ids, context=None):
         """
@@ -35,6 +39,7 @@ class pos_close_statement(osv.osv_memory):
              @param context: A standard dictionary
              @return : Blank Dictionary
         """
+        context = context or {}
         mod_obj = self.pool.get('ir.model.data')
         statement_obj = self.pool.get('account.bank.statement')
         journal_obj = self.pool.get('account.journal')
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index 61c984c873e..9c11ad02e39 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -15,7 +15,9 @@
                     <group col="4" colspan="4">
                         <group col="2" colspan="2"/>
                         <button icon='gtk-stop' special="cancel"
-                            string="No" />
+                            string="No" invisible="context.get('cancel_action')"/>
+                        <button icon='gtk-stop' type="object" name="cancel_wizard"
+                            string="No" invisible="not context.get('cancel_action')"/>
                         <button name="close_statement" string="Yes"
                              type="object" icon="gtk-ok"/>
                    </group>
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index 85b43bd115d..d98d0f99eed 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -3,13 +3,13 @@
     <data>
         <!--  Point of Sale Confirm -->
         <record id="view_pos_confirm" model="ir.ui.view">
-            <field name="name">Post Journal Entries</field>
+            <field name="name">Create Sale Journal Entries</field>
             <field name="model">pos.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Post All Orders">
                 <separator string="Generate Journal Entries" colspan="4"/>
-                <label string="This wizard will generate all journal entries for orders linked to a closed cash register or statement." colspan="4" align="0.0"/>
+                <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement." colspan="4" align="0.0"/>
                 <newline/>
                 <separator colspan="4"/>
                 <group colspan="4" col="4">
@@ -25,7 +25,7 @@
         </record>
 
         <record id="action_pos_confirm" model="ir.actions.act_window">
-            <field name="name">Post Journal Entries</field>
+            <field name="name">Create Sale Entries</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.confirm</field>
             <field name="view_type">form</field>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 47c5348943b..11ca75401a4 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -75,16 +75,9 @@ class pos_open_statement(osv.osv_memory):
         form_id = form_res and form_res[1] or False
         search_id = mod_obj.get_object_reference(cr, uid, 'point_of_sale', 'view_pos_open_cash_statement_filter')
 
-        return {
-            'domain': "[('id', 'in',[ "+','.join(map(str,st_ids))+"])]",
-            'name': _('Open Cash Registers'),
-            'view_type': 'form',
-            'view_mode': 'tree, form',
-            'search_view_id': search_id and search_id[1] or False ,
-            'res_model': 'account.bank.statement',
-            'views': [(tree_id, 'tree'), (form_id, 'form')],
-            'context': {},
-            'type': 'ir.actions.act_window'
+        return  {
+            'type': 'ir.actions.client',
+            'tag': 'pos.ui',
         }
 pos_open_statement()
 
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date.py b/addons/point_of_sale/wizard/pos_payment_report_date.py
deleted file mode 100644
index f97391c7f7d..00000000000
--- a/addons/point_of_sale/wizard/pos_payment_report_date.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-from osv import osv
-from osv import fields
-
-
-class pos_payment_report_date(osv.osv_memory):
-    _name = 'pos.payment.report.date'
-    _description = 'POS Payment Report according to date'
-
-    def print_report(self, cr, uid, ids, context=None):
-        """
-             To get the date and print the report
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary
-             @return : retrun report
-        """
-        if context is None:
-            context = {}
-        datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'], context=context)
-        res = res and res[0] or {}
-        datas['form'] = res
-        if res.get('id',False):
-            datas['ids']=[res['id']]
-        return {
-            'type': 'ir.actions.report.xml',
-            'report_name': 'pos.payment.report.date',
-            'datas': datas,
-        }
-
-    _columns = {
-        'date_start': fields.date('Start Date', required=True),
-        'date_end': fields.date('End Date', required=True),
-        'user_id': fields.many2many('res.users', 'res_user_sale_date', 'user_id', 'sale_id', 'Salesman')
-    }
-    _defaults = {
-        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
-        'date_end': lambda *a: time.strftime('%Y-%m-%d'),
-    }
-
-pos_payment_report_date()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
deleted file mode 100644
index 7c74ae1d9be..00000000000
--- a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="pos_payment_report_date_form" model="ir.ui.view">
-            <field name="name">pos.payment.report.date.form</field>
-            <field name="model">pos.payment.report.date</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Sale by Date and User">
-                 <group col="4" colspan="4">
-                    <separator string="Dates" colspan="4"/>
-                    <field name="date_start"/>
-                    <field name="date_end"/>
-                    <separator string="User" colspan="4"/>
-                    <field name="user_id" nolabel="1" colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group colspan="2" col="2">
-                        <button icon='gtk-cancel' special="cancel"
-                                string="Close" />
-                        <button name="print_report" string="Print Report"
-                                colspan="1" type="object" icon="gtk-print" />
-                    </group>
-                 </group>            
-            </form>
-            </field>
-        </record>
-
-        <record id="action_report_pos_payment_repport_date" model="ir.actions.act_window">
-            <field name="name">Sales by Products</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.payment.report.date</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        </data>
-</openerp>              
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index d76917fcf45..035ee45b4df 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -45,7 +45,6 @@ module 'share'.
         'wizard/share_wizard_view.xml',
     ],
     'installable': True,
-    'certificate' : '',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/i18n/hr.po b/addons/portal/i18n/hr.po
index 737a6990153..87a79c2e7c6 100644
--- a/addons/portal/i18n/hr.po
+++ b/addons/portal/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-07-04 14:16+0000\n"
-"PO-Revision-Date: 2011-07-11 09:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-19 17:37+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:57+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
@@ -32,7 +32,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal,group_id:0
 msgid "Group"
-msgstr ""
+msgstr "Grupa"
 
 #. module: portal
 #: help:res.portal,other_group_ids:0
@@ -43,7 +43,7 @@ msgstr ""
 #: view:share.wizard:0
 #: field:share.wizard,group_ids:0
 msgid "Existing groups"
-msgstr ""
+msgstr "Postojeće grupe"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard_user
@@ -63,7 +63,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-pošta"
 
 #. module: portal
 #: view:res.portal:0
@@ -79,7 +79,7 @@ msgstr ""
 #: view:res.portal:0
 #: field:res.portal,widget_ids:0
 msgid "Widgets"
-msgstr ""
+msgstr "Widgeti"
 
 #. module: portal
 #: model:ir.module.module,description:portal.module_meta_information
@@ -108,7 +108,7 @@ msgstr ""
 #. module: portal
 #: view:res.portal.wizard:0
 msgid "Send Invitations"
-msgstr ""
+msgstr "Pošalji pozivnice"
 
 #. module: portal
 #: help:res.portal,url:0
@@ -133,7 +133,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal,parent_menu_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Nadređeni izbornik"
 
 #. module: portal
 #: view:res.portal:0
@@ -143,7 +143,7 @@ msgstr ""
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal Users"
-msgstr ""
+msgstr "Korisnici portala"
 
 #. module: portal
 #: field:res.portal,override_menu:0
@@ -153,12 +153,12 @@ msgstr ""
 #. module: portal
 #: field:res.portal,menu_action_id:0
 msgid "Menu Action"
-msgstr ""
+msgstr "Akcija izbornika"
 
 #. module: portal
 #: field:res.portal.wizard.user,name:0
 msgid "User Name"
-msgstr ""
+msgstr "Korisničko ime"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_widget
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index db83f9ae77e..c132b0dfb68 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_all,access.portal.all,model_res_portal,,1,0,0,0
-access_widget_all,access.portal.widget.all,model_res_portal_widget,,1,0,0,0
-access_manager,access.portal.manager,model_res_portal,group_portal_manager,1,1,1,1
-access_widget_manager,access.portal.widget.manager,model_res_portal_widget,group_portal_manager,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_all,access.portal.all,model_res_portal,,1,0,0,0
+access_widget_all,access.portal.widget.all,model_res_portal_widget,,1,0,0,0
+access_manager,access.portal.manager,model_res_portal,group_portal_manager,1,1,1,1
+access_widget_manager,access.portal.widget.manager,model_res_portal_widget,group_portal_manager,1,1,1,1
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 4850cb7805b..4b73db5cdcc 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record model="ir.module.category" id="module_category_portal">
+            <field name="name">Portal</field>
+            <field name="parent_id" ref="base.module_category_tools"/>
+            <field name="sequence">25</field>
+        </record>
+
         <record id="group_portal_officer" model="res.groups">
-            <field name="name">Portal / Officer</field>
+            <field name="name">Officer</field>
             <field name="comment">Portal officers can create new portal users with the portal wizard.</field>
+            <field name="category_id" ref="module_category_portal"/>
         </record>
         <record id="group_portal_manager" model="res.groups">
-            <field name="name">Portal / Manager</field>
+            <field name="name">Manager</field>
             <field name="comment">Portal managers have access to the portal definitions, and can easily configure the users, access rights and menus of portal users.</field>
+            <field name="category_id" ref="module_category_portal"/>
             <field name="implied_ids" eval="[(4, ref('group_portal_officer'))]"/>
         </record>
     </data>
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index 4af045ff6bb..e948f45ce61 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Enterprise Process',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden/Dependency',
     'description': """
 This module shows the basic processes involved in the selected modules and in the sequence they occur.
 ======================================================================================================
diff --git a/addons/process/security/ir.model.access.csv b/addons/process/security/ir.model.access.csv
index 7356880f47a..84e3b5ea0e7 100644
--- a/addons/process/security/ir.model.access.csv
+++ b/addons/process/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_process_process","process.process","model_process_process","base.group_user",1,0,0,0
-"access_process_node","process.node","model_process_node","base.group_user",1,0,0,0
-"access_process_transition","process.transition","model_process_transition","base.group_user",1,0,0,0
-"access_process_transition_action","process.transition.action","model_process_transition_action","base.group_user",1,0,0,0
-"access_process_condition","process.condition","model_process_condition","base.group_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_process_process,process.process,model_process_process,base.group_user,1,0,0,0
+access_process_node,process.node,model_process_node,base.group_user,1,0,0,0
+access_process_transition,process.transition,model_process_transition,base.group_user,1,0,0,0
+access_process_transition_action,process.transition.action,model_process_transition_action,base.group_user,1,0,0,0
+access_process_condition,process.condition,model_process_condition,base.group_user,1,0,0,0
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index 87a766a009f..d10e1874d68 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Warehouse Management",
+    "category" : "Hidden/Dependency",
     "depends" : ["base","process", "product", "stock"],
     "description": """
 This is the module for computing Procurements.
@@ -59,6 +59,7 @@ depending on the product's configuration.
         'board_mrp_procurement_view.xml',
     ],
     'demo_xml': ['stock_orderpoint.xml'],
+    'test': ['test/procurement.yml'],
     'installable': True,
     'active': False,
     'certificate': '00954248826881074509',
diff --git a/addons/procurement/i18n/hr.po b/addons/procurement/i18n/hr.po
new file mode 100644
index 00000000000..52f9ec3b968
--- /dev/null
+++ b/addons/procurement/i18n/hr.po
@@ -0,0 +1,890 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 06:23+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Traži nove artikle"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Jedinica mjere"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Metoda nabave"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:304
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "Izračunaj samo pravila minimalnih zaliha"
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Razlog"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr "Izračunaj nabave"
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Zadnja greška"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "Ne korisiti se u izračunu, samo za informaciju"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Zadnja nabava"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "na nalogu"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr ""
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:377
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr ""
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr ""
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:325
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:324
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr ""
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:353
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. Sales Orders are one typical source of "
+"Procurement Orders (but these are distinct documents). Depending on the "
+"procurement parameters and the product configuration, the procurement engine "
+"will attempt to satisfy the need by reserving products from stock, ordering "
+"products from a supplier, or passing a manufacturing order, etc. A "
+"Procurement Exception occurs when the system cannot find a way to fulfill a "
+"procurement. Some exceptions will resolve themselves automatically, but "
+"others require manual intervention (those are identified by a specific error "
+"message)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
diff --git a/addons/procurement/i18n/pt.po b/addons/procurement/i18n/pt.po
index 7fbcfb0ec74..46c8e44879b 100644
--- a/addons/procurement/i18n/pt.po
+++ b/addons/procurement/i18n/pt.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-12 02:18+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-10 13:18+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:48+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: procurement
 #: view:make.procurement:0
 msgid "Ask New Products"
-msgstr ""
+msgstr "Pedir novos produtos"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
 msgid "Schedulers"
-msgstr ""
+msgstr "Planeadores"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
 msgid "Make Procurements"
-msgstr ""
+msgstr "Elaborar aprovisionamentos"
 
 #. module: procurement
 #: help:procurement.order.compute.all,automatic:0
@@ -39,6 +39,9 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
+"Aciona um aprovisionamento automático para todos os artigos que tenham um "
+"stock virtual abaixo de zero. Não deverá utilizar esta opção, sugerimos a "
+"utilização de uma configuração 'produzir por encomenda' nos artigos."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -49,6 +52,7 @@ msgstr "Agrupar por..."
 #: help:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
+"Aprovisionamento rascunho do artigo e localização do ponto de encomenda."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:288
@@ -64,7 +68,7 @@ msgstr "Unidade de medida"
 #. module: procurement
 #: field:procurement.order,procure_method:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Método de aprovisionamento"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:304
@@ -75,7 +79,7 @@ msgstr "Não há um endereço definido para este fornecedor!"
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
 msgid "Compute Stock Minimum Rules Only"
-msgstr ""
+msgstr "Calcular apenas regras de stock mínimo."
 
 #. module: procurement
 #: field:procurement.order,company_id:0
@@ -86,23 +90,23 @@ msgstr "Empresa"
 #. module: procurement
 #: field:procurement.order,product_uos_qty:0
 msgid "UoS Quantity"
-msgstr ""
+msgstr "Quantidade UdV"
 
 #. module: procurement
 #: view:procurement.order:0
 #: field:procurement.order,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Motivo"
 
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "Compute Procurements"
-msgstr ""
+msgstr "Processar aprovisionamentos"
 
 #. module: procurement
 #: field:procurement.order,message:0
 msgid "Latest error"
-msgstr ""
+msgstr "Último erro"
 
 #. module: procurement
 #: help:mrp.property,composition:0
@@ -112,22 +116,22 @@ msgstr "Não utilizado em cálculos, apenas para informação."
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Latest procurement"
-msgstr ""
+msgstr "Último aprovisionamento"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "on order"
-msgstr ""
+msgstr "a pedido"
 
 #. module: procurement
 #: help:procurement.order,message:0
 msgid "Exception occurred while computing procurement orders."
-msgstr ""
+msgstr "Excepção ocorreu ao processar ordens de aprovisionamento"
 
 #. module: procurement
 #: help:procurement.order,state:0
@@ -141,11 +145,19 @@ msgid ""
 " It is in 'Waiting'. state when the procurement is waiting for another one "
 "to finish."
 msgstr ""
+"Quando um aprovisionamento (ordem de) é criada, o estado é 'Rascunho'.\n"
+" Se o aprovisionamento é confirmado, o estado passa a 'Confirmado'.          "
+"   \n"
+"Depois de despoletado, o estado passa a 'Em curso'.\n"
+" Se ocorre alguma escepção, o estado fica como 'Exceção'.\n"
+" Depois de resolvida a exceção, o estado passa para 'Pronto'.\n"
+" O estado 'Em espera' significa que aguarda que outro aprovisionamento "
+"termine."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules Search"
-msgstr ""
+msgstr "Pesquisa de regras de stock mínimo"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_min_qty:0
@@ -153,16 +165,19 @@ msgid ""
 "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Quando o stock virtual desce abaixo da quantidade mínima, OpenERP gera uma "
+"ordem de aprovisionamento para elevar o stock virtual até à quantidade "
+"máxima."
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
 msgid "Scheduler Parameters"
-msgstr ""
+msgstr "Parâmetros do planeador"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Movemento de stock"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -172,22 +187,22 @@ msgstr "Planeamento"
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Ready"
-msgstr ""
+msgstr "Pronto"
 
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr ""
+msgstr "Ponto de ordem automática"
 
 #. module: procurement
 #: field:mrp.property,composition:0
 msgid "Properties composition"
-msgstr ""
+msgstr "Composição da spropriedades"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmado"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -211,11 +226,13 @@ msgid ""
 "Reference of the document that created this Procurement.\n"
 "This is automatically completed by OpenERP."
 msgstr ""
+"Referência do documento que criou este aprovisionamento.\n"
+"É preenchido automaticamente pelo OpenERP."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "Ordens de aprovisionamento por processar"
 
 #. module: procurement
 #: constraint:res.company:0
@@ -238,12 +255,12 @@ msgstr "Estado"
 #: view:stock.warehouse.orderpoint:0
 #: field:stock.warehouse.orderpoint,location_id:0
 msgid "Location"
-msgstr ""
+msgstr "Localização"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Lista de entrega/receção"
 
 #. module: procurement
 #: field:make.procurement,warehouse_id:0
@@ -260,23 +277,23 @@ msgstr "Melhor preço (ainda não activado!)"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Product & Location"
-msgstr ""
+msgstr "Produto e localização"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute
 msgid "Compute Procurement"
-msgstr ""
+msgstr "Calcular aprovisionamento"
 
 #. module: procurement
 #: model:ir.module.module,shortdesc:procurement.module_meta_information
 #: field:stock.move,procurements:0
 msgid "Procurements"
-msgstr ""
+msgstr "Aprovisionamentos"
 
 #. module: procurement
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range Days"
-msgstr ""
+msgstr "Dias de alcance do planeador"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
@@ -288,6 +305,12 @@ msgid ""
 "operations to fullfil the need: purchase order proposition, manufacturing "
 "order, etc."
 msgstr ""
+"Uma ordem de aprovisionamento é usada para registar a necessidade de um "
+"artigo num local específico. As ordens de aprovisionamento em regra criadas "
+"automaticamente a partir das ordens de venda, de uma regra logistica 'Pull' "
+"(puxa) ou de uma regra de stock mínimo. Quando a ordem de aprovisionamento é "
+"confirmada, cria automaticamente as operações necessárias para satisfazer a "
+"necessidade: ordens de compra e/ou ordens de produção, etc."
 
 #. module: procurement
 #: field:make.procurement,date_planned:0
@@ -309,7 +332,7 @@ msgstr "Quantidade"
 #: code:addons/procurement/procurement.py:377
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
-msgstr ""
+msgstr "Sem stock suficiente, nem regra de stock minimo definida."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -330,7 +353,7 @@ msgstr "Configuração"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,qty_multiple:0
 msgid "Qty Multiple"
-msgstr ""
+msgstr "Multiplo de quantidade"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -338,11 +361,13 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
+"Se regista um aprovisionamento manualmente, provavelmente quer usar o método "
+"produzir para ordens."
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement
 msgid "Automatic Procurements"
-msgstr ""
+msgstr "Aprovisionamentos automáticos"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
@@ -354,17 +379,17 @@ msgstr "Quantidade máxima"
 #: model:process.process,name:procurement.process_process_procurementprocess0
 #: view:procurement.order:0
 msgid "Procurement"
-msgstr ""
+msgstr "Aprovisionamento"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action
 msgid "Procurement Orders"
-msgstr ""
+msgstr "Ordens de aprovisionamento"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "To Fix"
-msgstr ""
+msgstr "Por corrigir"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -374,7 +399,7 @@ msgstr "Exceções"
 #. module: procurement
 #: model:process.node,note:procurement.process_node_serviceonorder0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Atribuição desde ordem de produção ou de compra"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property
@@ -385,17 +410,17 @@ msgstr "Propriedade"
 #: model:ir.actions.act_window,name:procurement.act_make_procurement
 #: view:make.procurement:0
 msgid "Procurement Request"
-msgstr ""
+msgstr "Requisição de aprovisionamento"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid "Compute Stock"
-msgstr ""
+msgstr "Calcular stock"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Late"
-msgstr ""
+msgstr "Tardio"
 
 #. module: procurement
 #: model:process.process,name:procurement.process_process_serviceproductprocess0
@@ -409,17 +434,22 @@ msgid ""
 "    This is the module for computing Procurements.\n"
 "    "
 msgstr ""
+"\n"
+"    Este é o modulo para processamento de aprovisionamentos\n"
+"    "
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
-msgstr ""
+msgstr "Ordens de aprovisionamento relacionadas"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
+"O assistente verifica todas as regras de stock mínimo e gera as ordens de "
+"aprovisionamento"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -443,6 +473,8 @@ msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
 "than 1!"
 msgstr ""
+"Verifique a quantidade nas ordens de aprovisionamento, deve ser maior que "
+"zero!"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,active:0
@@ -450,6 +482,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
+"Se o campo 'ativo' for falso, perite ocultar o ponto de encomenda, sem o "
+"remover."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -462,11 +496,13 @@ msgstr ""
 #: help:procurement.orderpoint.compute,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
 msgstr ""
+"Se o stock de um artigo é inferior a 0, vai comportar-se como um ponto de "
+"encomenda."
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Lines"
-msgstr ""
+msgstr "Linhas de aprovisionamento"
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
@@ -483,7 +519,7 @@ msgstr ""
 #: view:procurement.order:0
 #: field:procurement.order,note:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -493,7 +529,7 @@ msgstr "Rascunho"
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "This wizard will schedule procurements."
-msgstr ""
+msgstr "O assistente vai programar os aprovisionamentos."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -508,17 +544,17 @@ msgstr "Normal"
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Está a tentar associar a um lote, que não é do mesmo artigo."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: procurement
 #: model:process.node,name:procurement.process_node_procureproducts0
 msgid "Procure Products"
-msgstr ""
+msgstr "Artigos a aprovisionar"
 
 #. module: procurement
 #: field:procurement.order,date_planned:0
@@ -539,12 +575,12 @@ msgstr ""
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr ""
+msgstr "Ponto de encomenda automático"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "Regra de inventário mínimo"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -559,7 +595,7 @@ msgstr "Informação extra"
 #. module: procurement
 #: help:procurement.order,name:0
 msgid "Procurement name."
-msgstr ""
+msgstr "Nome do aprovisionamento"
 
 #. module: procurement
 #: constraint:stock.move:0
@@ -569,12 +605,12 @@ msgstr "Tem de associar um lote de produção a este produto"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Reason"
-msgstr ""
+msgstr "Motivo do aprovisionamento"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
 msgid "Qty Multiple must be greater than zero."
-msgstr ""
+msgstr "O multiplo da quantidade deve ser maior que zero."
 
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
@@ -590,13 +626,13 @@ msgstr ""
 #: code:addons/procurement/procurement.py:372
 #, python-format
 msgid "Procurement '%s' is in exception: not enough stock."
-msgstr ""
+msgstr "O aprovisionamento '%s' está em exceção: stock insuficiente."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:138
 #, python-format
 msgid "Cannot delete Procurement Order(s) which are in %s State!"
-msgstr ""
+msgstr "Não pode eliminar uma ordem de aprovisionamento no estado '%s'!"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:324
@@ -609,7 +645,7 @@ msgstr "Insuficiência de dados!"
 #: field:mrp.property,group_id:0
 #: field:mrp.property.group,name:0
 msgid "Property Group"
-msgstr ""
+msgstr "Grupo da propriedade"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -619,32 +655,33 @@ msgstr "Diversos"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Locations"
-msgstr ""
+msgstr "Localizações"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "from stock"
-msgstr ""
+msgstr "de stock"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "General Information"
-msgstr ""
+msgstr "Informação genérica"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Run Procurement"
-msgstr ""
+msgstr "Executar o aprovisionamento"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Concluído"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
 msgstr ""
+"A quantidade do aprovisionamento será arredondada para este múltiplo."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -659,7 +696,7 @@ msgstr "Cancelar"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr ""
+msgstr "Modo de reordenação"
 
 #. module: procurement
 #: field:procurement.order,origin:0
@@ -674,7 +711,7 @@ msgstr "Não urgente"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
 msgid "Compute all schedulers"
-msgstr ""
+msgstr "Executar todos os planeadores"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -684,7 +721,7 @@ msgstr "Atual"
 #. module: procurement
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Aprovisionamentos em exceção"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -697,7 +734,7 @@ msgstr "Detalhes"
 #: model:ir.actions.act_window,name:procurement.procurement_exceptions
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
 msgid "Procurement Exceptions"
-msgstr ""
+msgstr "Exceções de aprovisionamento"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
@@ -707,12 +744,12 @@ msgstr ""
 #: model:ir.ui.menu,name:procurement.menu_stock_order_points
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
-msgstr ""
+msgstr "Regras de stock mínimo"
 
 #. module: procurement
 #: field:procurement.order,close_move:0
 msgid "Close Move at end"
-msgstr ""
+msgstr "Fechar movimento no fim"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -746,7 +783,7 @@ msgstr "mínimo"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Rules"
-msgstr ""
+msgstr "Regras de quantidade"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -756,17 +793,17 @@ msgstr "Em execução"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "UdM do artigo"
 
 #. module: procurement
 #: model:process.node,name:procurement.process_node_serviceonorder0
 msgid "Make to Order"
-msgstr ""
+msgstr "Produzir por encomenda"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -800,11 +837,13 @@ msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
 msgstr ""
+"Este assistente vai planear o aprovisionamento para este artigo. Este "
+"aprovisionamento pode gerar uma tarefa, uma ordem de produção ou de compra."
 
 #. module: procurement
 #: view:res.company:0
 msgid "MRP & Logistics Scheduler"
-msgstr ""
+msgstr "Planeador de produção e logistica"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -820,20 +859,20 @@ msgstr "máximo"
 #. module: procurement
 #: field:procurement.order,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "UdV do artigo"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:353
 #, python-format
 msgid "from stock: products assigned."
-msgstr ""
+msgstr "de stock: produtos atribuidos."
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_compute_schedulers
 #: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
 #: view:procurement.order.compute.all:0
 msgid "Compute Schedulers"
-msgstr ""
+msgstr "Executar planeadores"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_exceptions
@@ -853,12 +892,12 @@ msgstr ""
 #. module: procurement
 #: field:procurement.order,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "UdM do artigo"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Search Procurement"
-msgstr ""
+msgstr "Pesquisar aprovisionamento"
 
 #. module: procurement
 #: help:res.company,schedule_range:0
@@ -876,15 +915,15 @@ msgstr "Muito urgente"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Ponto de encomenda automático"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Details"
-msgstr ""
+msgstr "Detalhes do aprovisionamento"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:180
 #, python-format
 msgid "SCHEDULER"
-msgstr ""
+msgstr "PLANEADOR"
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 9556b1aa081..91461f794cc 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -63,7 +63,6 @@ mrp_property()
 
 class StockMove(osv.osv):
     _inherit = 'stock.move'
-
     _columns= {
         'procurements': fields.one2many('procurement.order', 'move_id', 'Procurements'),
     }
@@ -154,11 +153,11 @@ class procurement_order(osv.osv):
             return {'value': v}
         return {}
 
-    def check_product(self, cr, uid, ids):
+    def check_product(self, cr, uid, ids, context=None):
         """ Checks product type.
         @return: True or False
         """
-        return all(procurement.product_id.type in ('product', 'consu') for procurement in self.browse(cr, uid, ids))
+        return all(proc.product_id.type in ('product', 'consu') for proc in self.browse(cr, uid, ids, context=context))
 
     def check_move_cancel(self, cr, uid, ids, context=None):
         """ Checks if move is cancelled or not.
@@ -174,9 +173,9 @@ class procurement_order(osv.osv):
         """ Checks if move is done or not.
         @return: True or False.
         """
-        if not context:
-            context = {}
-        return all(not procurement.move_id or procurement.move_id.state == 'done' for procurement in self.browse(cr, uid, ids, context=context))
+        return all(proc.product_id.type == 'service' or (proc.move_id and proc.move_id.state == 'done') \
+                    for proc in self.browse(cr, uid, ids, context=context))
+
     #
     # This method may be overrided by objects that override procurement.order
     # for computing their own purpose
@@ -258,26 +257,25 @@ class procurement_order(osv.osv):
 
     def check_produce(self, cr, uid, ids, context=None):
         """ Checks product type.
-        @return: True or Product Id.
+        @return: True or False
         """
-        res = True
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         for procurement in self.browse(cr, uid, ids, context=context):
-            if procurement.product_id.product_tmpl_id.supply_method <> 'produce':
-                partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id])
-                if partner_list:
-                    partner = partner_list and partner_list[0] and partner_list[0][1] and partner_list[0][1].name or False
-                    if user.company_id and user.company_id.partner_id:
-                        if partner.id == user.company_id.partner_id.id:
-                            return True
+            product = procurement.product_id
+            #TOFIX: if product type is 'service' but supply_method is 'buy'.
+            if product.supply_method <> 'produce':
+                supplier = product.seller_id
+                if supplier and user.company_id and user.company_id.partner_id:
+                    if supplier.id == user.company_id.partner_id.id:
+                        continue
                 return False
-            if procurement.product_id.product_tmpl_id.type=='service':
-                res = res and self.check_produce_service(cr, uid, procurement, context)
+            if product.type=='service':
+                res = self.check_produce_service(cr, uid, procurement, context)
             else:
-                res = res and self.check_produce_product(cr, uid, procurement, context)
+                res = self.check_produce_product(cr, uid, procurement, context)
             if not res:
                 return False
-        return res
+        return True
 
     def check_buy(self, cr, uid, ids):
         """ Checks product type.
@@ -483,7 +481,7 @@ class StockPicking(osv.osv):
                 if move.state == 'done' and move.procurements:
                     for procurement in move.procurements:
                         wf_service.trg_validate(user, 'procurement.order',
-                                procurement.id, 'button_check', cursor)
+                            procurement.id, 'button_check', cursor)
         return res
 
 StockPicking()
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index 23b0a08af78..53b6608fa6f 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -50,12 +50,14 @@
             <field name="wkf_id" ref="wkf_procurement"/>
             <field name="name">produce_check</field>
         </record>
+        <!-- act_produce_service should be move in project_mrp module. -->
         <record id="act_produce_service" model="workflow.activity">
             <field name="wkf_id" ref="wkf_procurement"/>
             <field name="name">produce_service</field>
             <field name="kind">function</field>
             <field name="action">action_produce_assign_service()</field>
         </record>
+
         <record id="act_make_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_procurement"/>
             <field name="name">ready</field>
@@ -163,18 +165,28 @@
             <field name="act_to" ref="act_produce_check"/>
             <field name="condition">check_produce()</field>
         </record>
-        <record id="trans_product_check_produce_service" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
-            <field name="act_to" ref="act_produce_service"/>
-            <field name="condition">not check_product()</field>
-        </record>
+        
         <record id="trans_make_to_stock_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_make_to_stock"/>
+            <field name="act_from" ref="act_make_to_stock"/> <!-- TOFIX: If product is service product and procure method is 'make_to_stock', procurement is closed without generated service -->
             <field name="act_to" ref="act_make_done"/>
             <field name="condition">True</field>
             <field name="trigger_model" eval="False"/>
             <field name="trigger_expr_id" eval="False"/>
         </record>
+        <!-- TOFIX: Without installing 'mrp' module,  If product is produce(mto), procurement never close (Its gone in idle) so sale order never close and also invoice never created if post paid invoice. solution of this issue is below, just add one transition from act_produce_check to act_make_done -->
+        <!--
+        <record id="trans_produce_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_to" ref="procurement.act_make_done"/>
+            <field name="condition">check_product()</field>
+        </record> -->
+
+        <!-- TOFIX: service related transition should be move into project_mrp module. -->
+        <record id="trans_product_check_produce_service" model="workflow.transition">
+            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_to" ref="act_produce_service"/>
+            <field name="condition">not check_product()</field>
+        </record>
         <record id="trans_produce_service_cancel" model="workflow.transition">
             <field name="act_from" ref="act_produce_service"/>
             <field name="act_to" ref="act_cancel"/>
@@ -184,6 +196,7 @@
             <field name="act_from" ref="act_produce_service"/>
             <field name="act_to" ref="act_make_done"/>
         </record>
+
         <record id="trans_make_done_done" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
diff --git a/addons/procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
index a09115daecf..0d5f22895e4 100644
--- a/addons/procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
@@ -1,10 +1,9 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_procurement","procurement.order","model_procurement_order","base.group_user",1,0,0,0
-"access_procurement_stock_manager","procurement.order stock.manager","model_procurement_order","stock.group_stock_manager",1,1,1,1
-"access_procurement_stock_user","procurement.order stock.user","model_procurement_order","stock.group_stock_user",1,1,1,1
-"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_user",1,0,0,0
-"access_stock_warehouse_orderpoint_system","stock.warehouse.orderpoint system","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
-"access_mrp_property_group","mrp.property.group","model_mrp_property_group","stock.group_stock_manager",1,1,1,1
-"access_mrp_property","mrp.property","model_mrp_property","stock.group_stock_manager",1,1,1,1
-"access_mrp_property_group","mrp.property.group","model_mrp_property_group","base.group_user",1,0,0,0
-"access_mrp_property","mrp.property","model_mrp_property","base.group_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_procurement,procurement.order,model_procurement_order,base.group_user,1,0,0,0
+access_procurement_stock_user,procurement.order stock.user,model_procurement_order,stock.group_stock_user,1,1,1,1
+access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,model_stock_warehouse_orderpoint,stock.group_stock_user,1,0,0,0
+access_stock_warehouse_orderpoint_system,stock.warehouse.orderpoint system,model_stock_warehouse_orderpoint,stock.group_stock_manager,1,1,1,1
+access_mrp_property_group,mrp.property.group,model_mrp_property_group,stock.group_stock_manager,1,1,1,1
+access_mrp_property,mrp.property,model_mrp_property,stock.group_stock_manager,1,1,1,1
+access_mrp_property_group,mrp.property.group,model_mrp_property_group,base.group_user,1,0,0,0
+access_mrp_property,mrp.property,model_mrp_property,base.group_user,1,0,0,0
diff --git a/addons/procurement/test/procurement.yml b/addons/procurement/test/procurement.yml
new file mode 100644
index 00000000000..f769715e572
--- /dev/null
+++ b/addons/procurement/test/procurement.yml
@@ -0,0 +1,89 @@
+-
+  For test the procurement process, First I have to apply a minimum stock rule on product
+-
+  I create minimum stock rule for product.
+-
+  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
+    company_id: base.main_company
+    location_id: stock.stock_location_stock
+    logic: max
+    name: OP/00008
+    product_id: product.product_product_cpu2
+    product_max_qty: 15.0
+    product_min_qty: 5.0
+    product_uom: product.product_uom_kgm
+    qty_multiple: 1
+    warehouse_id: stock.warehouse0
+-
+  Check product quantity and update it, if needed for apply a minimum stock rule.
+-
+  !python {model: product.product}: |
+    product = self.browse(cr, uid, ref('product.product_product_cpu2'))
+    if product.virtual_available < 5.0:
+        change_qty = self.pool.get('stock.change.product.qty')
+        id = change_qty.create(cr, uid, {'location_id' : ref('stock.stock_location_stock'), 'new_quantity': 4, 'product_id': product.id})
+        change_qty.change_product_qty(cr, uid, [id], {'active_model':'product.product', 'active_id': product.id, 'active_ids':[product.id]})
+    assert product.qty_available == 4,"Product quantity is not updated."
+    assert product.virtual_available < 5.0,'Virtual stock have more quantities.'
+-
+  I run the scheduler.
+-
+  !python {model: procurement.order}: |
+    self.run_scheduler(cr, uid)
+-
+  I check that procurement order is based on minimum stock rule.
+-
+  !python {model: procurement.order}: |
+    proc_ids = self.search(cr, uid, [('product_id','=', ref('product.product_product_cpu2'))])
+    assert proc_ids, 'No Procurement created.'
+    proc_order = self.browse(cr, uid, proc_ids)[0]
+    assert proc_order.product_qty == 11.0,"Procurement product quantity is not corresponded."
+-
+  I check product quantity.
+-
+  !python {model: product.product}: |
+    product = self.browse(cr, uid, ref('product.product_product_cpu2'))
+    assert product.virtual_available == 15.0,"After run the scheduler product's virtual stock is not updated."
+-
+  For test the Procurement Request wizard, Again I have to update product quantity.
+-
+  !python {model: product.product}: |
+    mk_procure = self.pool.get('make.procurement')
+    procur_order = self.pool.get('procurement.order')
+    product = self.browse(cr, uid, ref('product.product_product_cpu2'))
+
+    context.update({'active_model': 'product.product','active_id':ref('product.product_product_cpu2')})
+    values = {'warehouse_id': ref('base.main_company'), 'uom_id': ref('product.product_uom_unit'), 'qty': 5}
+    id = mk_procure.create(cr, uid, values, context)
+    procurement = mk_procure.make_procurement(cr, uid, [id], context)
+    assert product.virtual_available == 20.0, 'Virtual stock should be updated'
+
+    proc_id = procurement.get('res_id')
+    for procurement in procur_order.browse(cr, uid, [proc_id]):
+        if procurement.state == 'confirmed':
+            assert procurement.state == 'confirmed',"Procurement state should be 'Confirmed'."
+            assert procurement.product_id.id == ref('product.product_product_cpu2'),"Product is not correspond."
+            assert procurement.product_qty == 5,"Product Quantity is not correspond."
+            assert procurement.product_uom.id == ref('product.product_uom_unit'),"Product's UOM is not correspond."
+    context.update({'proc': proc_id})
+-
+  I run the scheduler.
+-
+  !python {model: procurement.order}: |
+    self.run_scheduler(cr, uid)
+-
+  I check the current state of procurement.
+-
+  !python {model: procurement.order}: |
+    proc_id = context.get('proc')
+    proc = self.browse(cr, uid, [proc_id])[0]
+    assert proc.state == 'ready' or 'exception',"Procurement should be in Ready or Exception state"
+#-
+#  I compute minimum stock.
+#  [Note.  Commented out because it spawns a thread that may query the db after tests have been reverted.]
+#-
+#  !python {model: procurement.orderpoint.compute}: |
+#    proc_id = context.get('proc')
+#    context.update({'active_model': 'procurement.order', 'active_id': proc_id})
+#    id = self.create(cr, uid, {'automatic': True}, context)
+#    self.procure_calculation(cr, uid, [id], context)
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index 1c4bd145d6d..33a6361d03b 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-15 06:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-10 12:01+0000\n"
+"Last-Translator: António Anacleto (www.biztek.cv) "
+"<antonio.anacleto@biztek.cv>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:19+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -1748,7 +1749,7 @@ msgstr "Produtos por Categoria"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Categorias de Produtos"
 
 #. module: product
@@ -1862,7 +1863,7 @@ msgstr ""
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
 msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "Este produto está configurado com exemplo de fluxos puxe/empurre"
 
 #. module: product
 #: field:product.packaging,length:0
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 73151e8853f..3ddfe1e6900 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -166,7 +166,6 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="product_pricelist_view_search" />
             <field name="context">{"default_type":"sale", "search_default_type":"sale"}</field>
-            <field name="domain">[('type','=','sale')]</field>
             <field name="help">A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80.</field>
         </record>
         <record id="product_pricelist_action_for_purchase" model="ir.actions.act_window">
@@ -177,7 +176,6 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="product_pricelist_view_search" />
             <field name="context">{"default_type":"purchase", "search_default_type":"purchase"}</field>
-            <field name="domain">[('type','=','purchase')]</field>
             <field name="help">A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80.</field>
         </record>
         <menuitem
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 3aebec13715..99347667f80 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -442,6 +442,16 @@
             <field name="type">product</field>
                 <field name="categ_id" ref="product_category_shelves0"/>
         </record>
+        <record id="product_product_span100" model="product.product">
+            <field name="default_code">SPAN100</field>
+            <field name="supply_method">produce</field>
+            <field eval="'make_to_order'" name="procure_method"/>
+            <field name="uom_id" ref="product_uom_unit"/>
+            <field name="uom_po_id" ref="product_uom_unit"/>
+            <field name="name">Shelf Panel</field>
+            <field name="type">product</field>
+            <field name="categ_id" ref="product_category_shelves0"/>
+        </record>
         <record id="product_product_woodmm0" model="product.product">
             <field name="default_code">WOOD002</field>
             <field name="supply_method">buy</field>
@@ -455,6 +465,19 @@
             <field name="categ_id" ref="product_category_rawmaterial0"/>
         </record>
 
+        <record id="product_product_woodmm10" model="product.product">
+            <field name="default_code">WOOD010</field>
+            <field name="supply_method">buy</field>
+            <field name="standard_price">7.0</field>
+            <field name="uom_id" ref="product_uom_meter"/>
+            <field name="uom_po_id" ref="product_uom_meter"/>
+            <field name="name">Wood 10mm</field>
+            <field eval="2" name="seller_delay"/>
+            <field eval="7.0" name="sale_delay"/>
+            <field name="type">product</field>
+            <field name="categ_id" ref="product_category_rawmaterial0"/>
+        </record>
+
         <record id="product_product_kitchendesignproject0" model="product.product">
             <field name="default_code">PROJ</field>
             <field name="supply_method">produce</field>
@@ -509,7 +532,7 @@
 
         <record id="product_product_rearpanelarm0" model="product.product">
             <field name="default_code">RPAN100</field>
-            <field name="supply_method">buy</field>
+            <field name="supply_method">produce</field>
             <field name="standard_price">10.0</field>
             <field eval="0" name="sale_ok"/>
             <field name="uom_id" ref="product_uom_unit"/>
@@ -548,7 +571,7 @@
 
         <record id="product_product_shelf0" model="product.product">
             <field name="default_code">RCK100</field>
-            <field name="supply_method">buy</field>
+            <field name="supply_method">produce</field>
             <field name="standard_price">5.0</field>
             <field eval="0" name="sale_ok"/>
             <field name="uom_id" ref="product_uom_unit"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6d9483f81ab..38b9d2d0ed1 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -56,7 +56,7 @@
                     <field name="virtual_available"/>
                     <field name="lst_price"/>
                     <field name="price" invisible="not context.get('pricelist',False)"/>
-                    <field name="standard_price"/>
+                    <field name="standard_price" groups="base.group_extended"/>
                     <field name="state" groups="base.group_extended"/>
                     <field name="company_id" groups="base.group_multi_company" invisible="1"/>
                 </tree>
@@ -100,9 +100,10 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Base Prices" colspan="2"/>
-                                <field groups="base.group_extended" name="cost_method"/>
-                                <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                 <field name="list_price"/>
+                                <field groups="base.group_extended" name="cost_method"/>
+                                <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"
+                                    groups="base.group_extended"/>
                                 <newline/>
                                 <field name="price_margin" groups="product.group_product_variant"/>
                                 <field name="price_extra" groups="product.group_product_variant"/>
@@ -637,8 +638,9 @@
 
                             <group colspan="2" col="2">
                                 <separator string="Base Prices" colspan="2"/>
-                                <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                 <field name="list_price"/>
+                                <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"
+                                    groups="base.group_extended"/>
                                 <field groups="base.group_extended" name="cost_method"/>
                             </group>
 
diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index 72c51639849..b5cd20854d9 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -1,19 +1,19 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_uom_categ_user","product.uom.categ.user","model_product_uom_categ","base.group_user",1,0,0,0
-"access_product_uom_user","product.uom.user","model_product_uom","base.group_user",1,0,0,0
-"access_product_ul_user","product.ul.user","model_product_ul","base.group_user",1,0,0,0
-"access_product_category_user","product.category.user","model_product_category","base.group_user",1,0,0,0
-"access_product_template_user","product.template.user","model_product_template","base.group_user",1,0,0,0
-"access_product_packaging_user","product.packaging.user","model_product_packaging","base.group_user",1,0,0,0
-"access_product_supplierinfo_user","product.supplierinfo.user","model_product_supplierinfo","base.group_user",1,0,0,0
-"access_pricelist_partnerinfo_user","pricelist.partnerinfo.user","model_pricelist_partnerinfo","base.group_user",1,0,0,0
-"access_product_price_type_user","product.price.type.user","model_product_price_type","base.group_user",1,0,0,0
-"access_product_pricelist_type_user","product.pricelist.type.user","model_product_pricelist_type","base.group_user",1,0,0,0
-"access_product_pricelist_user","product.pricelist.user","model_product_pricelist","base.group_user",1,0,0,0
-"access_product_pricelist_version_user","product.pricelist.version.user","model_product_pricelist_version","base.group_user",1,0,0,0
-"access_product_pricelist_item_user","product.pricelist.item.user","model_product_pricelist_item","base.group_user",1,0,0,0
-"access_product_pricelist_type_partner_manager","product.pricelist.type partner manager","model_product_pricelist_type","base.group_partner_manager",1,0,0,0
-"access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0
-"access_product_product_employee","product.product employee","model_product_product","base.group_user",1,0,0,0
-"access_product_template_sale_manager","product.template salemanager","model_product_template","base.group_sale_manager",1,1,1,1
-"access_product_product_sale_manager","product.product salemanager","model_product_product","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_product_uom_categ_user,product.uom.categ.user,model_product_uom_categ,base.group_user,1,0,0,0
+access_product_uom_user,product.uom.user,model_product_uom,base.group_user,1,0,0,0
+access_product_ul_user,product.ul.user,model_product_ul,base.group_user,1,0,0,0
+access_product_category_user,product.category.user,model_product_category,base.group_user,1,0,0,0
+access_product_template_user,product.template.user,model_product_template,base.group_user,1,0,0,0
+access_product_packaging_user,product.packaging.user,model_product_packaging,base.group_user,1,0,0,0
+access_product_supplierinfo_user,product.supplierinfo.user,model_product_supplierinfo,base.group_user,1,0,0,0
+access_pricelist_partnerinfo_user,pricelist.partnerinfo.user,model_pricelist_partnerinfo,base.group_user,1,0,0,0
+access_product_price_type_user,product.price.type.user,model_product_price_type,base.group_user,1,0,0,0
+access_product_pricelist_type_user,product.pricelist.type.user,model_product_pricelist_type,base.group_user,1,0,0,0
+access_product_pricelist_user,product.pricelist.user,model_product_pricelist,base.group_user,1,0,0,0
+access_product_pricelist_version_user,product.pricelist.version.user,model_product_pricelist_version,base.group_user,1,0,0,0
+access_product_pricelist_item_user,product.pricelist.item.user,model_product_pricelist_item,base.group_user,1,0,0,0
+access_product_pricelist_type_partner_manager,product.pricelist.type partner manager,model_product_pricelist_type,base.group_partner_manager,1,0,0,0
+access_product_pricelist_partner_manager,product.pricelist partner manager,model_product_pricelist,base.group_partner_manager,1,0,0,0
+access_product_product_employee,product.product employee,model_product_product,base.group_user,1,0,0,0
+access_product_template_sale_manager,product.template salemanager,model_product_template,base.group_sale_manager,1,1,1,1
+access_product_product_sale_manager,product.product salemanager,model_product_product,base.group_sale_manager,1,1,1,1
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index d9f14a13225..5c993b9cd61 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -3,14 +3,8 @@
 <data noupdate="1">
 
     <record id="group_uos" context="{'noadmin':True}" model="res.groups">
-        <field name="name">Useability / Product UoS View</field>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
+        <field name="name">Product UoS View</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record id="product_comp_rule" model="ir.rule">
@@ -21,7 +15,8 @@
     </record>
 
     <record id="group_product_variant" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Useability / Product Variant</field>
+        <field name="name">Product Variant</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record model="ir.rule" id="product_pricelist_comp_rule">
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index 3b60b21979c..b2b2592b338 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -18,7 +18,7 @@
 #
 ##############################################################################
 {
-    "name" : "Products Attributes & Manufacturers",
+    "name" : "Products Manufacturers",
     "version" : "1.0",
     "author" : "OpenERP SA",
     'category': 'Purchase Management',
diff --git a/addons/product_manufacturer/security/ir.model.access.csv b/addons/product_manufacturer/security/ir.model.access.csv
index b06d5d3ea96..aab8e0748fe 100644
--- a/addons/product_manufacturer/security/ir.model.access.csv
+++ b/addons/product_manufacturer/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_manufacturer_attribute","product.manufacturer.attribute","model_product_manufacturer_attribute",base.group_user,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_product_manufacturer_attribute,product.manufacturer.attribute,model_product_manufacturer_attribute,base.group_user,1,1,1,1
diff --git a/addons/product_margin/security/ir.model.access.csv b/addons/product_margin/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/product_margin/security/ir.model.access.csv
+++ b/addons/product_margin/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index c49565f8e29..5e240a5ac0b 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -18,7 +18,7 @@
 #
 ##############################################################################
 {
-    "name": "Visible Discounts on SO",
+    "name": "Prices Visible Discounts",
     "version": "1.0",
     "author": "OpenERP SA",
     'category': 'Sales Management',
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index 3036b038d3f..18403d646f7 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden/Dependency",
     'complexity': "easy",
     "description": """
 Installer for extra Hidden like lunch, survey, idea, share, etc.
diff --git a/addons/profile_tools/i18n/hr.po b/addons/profile_tools/i18n/hr.po
new file mode 100644
index 00000000000..eaaed3f8e40
--- /dev/null
+++ b/addons/profile_tools/i18n/hr.po
@@ -0,0 +1,153 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 10:10+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: profile_tools
+#: help:misc_tools.installer,idea:0
+msgid "Promote ideas of the employees, votes and discussion on best ideas."
+msgstr ""
+"Promoviranje ideja zaposlenika, glasovanje i rasprava o najboljim idejama."
+
+#. module: profile_tools
+#: help:misc_tools.installer,share:0
+msgid ""
+"Allows you to give restricted access to your OpenERP documents to external "
+"users, such as customers, suppliers, or accountants. You can share any "
+"OpenERP Menu such as your project tasks, support requests, invoices, etc."
+msgstr ""
+"Dopušta vam davanje ograničenog pristupa vašim OpenERP dokumentima vanjskim "
+"korisnicima, poput kupaca, dobavljača ili računovođe. Možete podjeliti bilo "
+"koji OpenERP izbornik poput zadatka projekta, zahtejvi za podrškom, računi, "
+"itd."
+
+#. module: profile_tools
+#: help:misc_tools.installer,lunch:0
+msgid "A simple module to help you to manage Lunch orders."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr "Ponavljajući dokumenti"
+
+#. module: profile_tools
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
+msgstr "misc_tools.installer"
+
+#. module: profile_tools
+#: model:ir.module.module,description:profile_tools.module_meta_information
+msgid ""
+"Installs tools for lunch,survey,subscription and audittrail\n"
+"    module\n"
+"    "
+msgstr ""
+"Instaliraj alate za lansiranje, upitnike, pretplatu i audittrail modul\n"
+"    "
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid ""
+"Extra Tools are applications that can help you improve your organization "
+"although they are not key for company management."
+msgstr ""
+"Dodatni alati su aplikacije koje vam mogu pomoći u poboljšanju organizacije "
+"iako nisu ključni za upravljanje društvom."
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure"
+msgstr "Podešavanje"
+
+#. module: profile_tools
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr "Omogućuje organiziranje istraživanja"
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr "Razni alati"
+
+#. module: profile_tools
+#: help:misc_tools.installer,pad:0
+msgid ""
+"This module creates a tighter integration between a Pad instance of your "
+"choosing and your OpenERP Web Client by letting you easily link pads to "
+"OpenERP objects via OpenERP attachments."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools Configuration"
+msgstr "Podešavanje dodatnih alata"
+
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr "Kutija za ideje"
+
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr "Pomaže u generiranju automatskih ponavljajućih dokumenata"
+
+#. module: profile_tools
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr "Podešavanje alata"
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Collaborative Note Pads"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,survey:0
+msgid "Survey"
+msgstr "Upitnik"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
+
+#. module: profile_tools
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: profile_tools
+#: field:misc_tools.installer,share:0
+msgid "Web Share"
+msgstr "Djeljenje na webu"
diff --git a/addons/profile_tools/security/ir.model.access.csv b/addons/profile_tools/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/profile_tools/security/ir.model.access.csv
+++ b/addons/profile_tools/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/profile_tools/static/src/img/icon.png b/addons/profile_tools/static/src/img/icon.png
new file mode 100644
index 00000000000..d6ba0866777
Binary files /dev/null and b/addons/profile_tools/static/src/img/icon.png differ
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index e23ce653702..1b25c9d15cc 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -62,8 +62,9 @@ Dashboard for project members that includes:
         'project_demo.xml',
     ],
     'test':[
-        'test/test_project.yml',
-        'test/test_project_delegation.yml',
+        'test/project_demo.yml',
+        'test/project_process.yml',
+        'test/task_process.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index cdd8894aabe..88424be85fa 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -87,7 +87,6 @@
                             <action name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks"/>
                         </column>
                         <column>
-                            <action name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours"/>
                             <action name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
                         </column>
                     </board>
diff --git a/addons/project/project.py b/addons/project/project.py
index 5c234cf5e26..02fdcf411e2 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -114,12 +114,6 @@ class project(osv.osv):
             if task.project_id: result[task.project_id.id] = True
         return result.keys()
 
-    def _get_project_work(self, cr, uid, ids, context=None):
-        result = {}
-        for work in self.pool.get('project.task.work').browse(cr, uid, ids, context=context):
-            if work.task_id and work.task_id.project_id: result[work.task_id.project_id.id] = True
-        return result.keys()
-
     def unlink(self, cr, uid, ids, *args, **kwargs):
         for proj in self.browse(cr, uid, ids):
             if proj.tasks:
@@ -360,7 +354,7 @@ def Project():
     working_days = %s
     resource = %s
 """       % (
-            project.id, 
+            project.id,
             project.date_start, working_days,
             '|'.join(['User_'+str(x) for x in puids])
         )
@@ -879,14 +873,24 @@ class task(osv.osv):
         self.write(cr, uid, ids, {'state': 'draft'}, context=context)
         return True
 
+
+    def _delegate_task_attachments(self, cr, uid, task_id, delegated_task_id, context=None):
+        attachment = self.pool.get('ir.attachment')
+        attachment_ids = attachment.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', task_id)], context=context)
+        new_attachment_ids = []
+        for attachment_id in attachment_ids:
+            new_attachment_ids.append(attachment.copy(cr, uid, attachment_id, default={'res_id': delegated_task_id}, context=context))
+        return new_attachment_ids
+        
+
     def do_delegate(self, cr, uid, ids, delegate_data={}, context=None):
         """
         Delegate Task to another users.
         """
         assert delegate_data['user_id'], _("Delegated User should be specified")
-        delegrated_tasks = {}
+        delegated_tasks = {}
         for task in self.browse(cr, uid, ids, context=context):
-            delegrated_task_id = self.copy(cr, uid, task.id, {
+            delegated_task_id = self.copy(cr, uid, task.id, {
                 'name': delegate_data['name'],
                 'project_id': delegate_data['project_id'] and delegate_data['project_id'][0] or False,
                 'user_id': delegate_data['user_id'] and delegate_data['user_id'][0] or False,
@@ -897,6 +901,7 @@ class task(osv.osv):
                 'child_ids': [],
                 'work_ids': []
             }, context=context)
+            self._delegate_task_attachments(cr, uid, task.id, delegated_task_id, context=context)
             newname = delegate_data['prefix'] or ''
             task.write({
                 'remaining_hours': delegate_data['planned_hours_me'],
@@ -910,8 +915,8 @@ class task(osv.osv):
             
             message = _("The task '%s' has been delegated to %s.") % (delegate_data['name'], delegate_data['user_id'][1])
             self.log(cr, uid, task.id, message)
-            delegrated_tasks[task.id] = delegrated_task_id
-        return delegrated_tasks
+            delegated_tasks[task.id] = delegated_task_id
+        return delegated_tasks
 
     def do_pending(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'pending'}, context=context)
@@ -920,21 +925,24 @@ class task(osv.osv):
             self.log(cr, uid, id, message)
         return True
 
-    def set_remaining_time_1(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 1.0}, context=context)
+    def set_remaining_time(self, cr, uid, ids, remaining_time=1.0, context=None):
+        for task in self.browse(cr, uid, ids, context=context):
+            if (task.state=='draft') or (task.planned_hours==0.0):
+                self.write(cr, uid, [task.id], {'planned_hours': remaining_time}, context=context)
+        self.write(cr, uid, ids, {'remaining_hours': remaining_time}, context=context)
         return True
 
+    def set_remaining_time_1(self, cr, uid, ids, context=None):
+        return self.set_remaining_time(cr, uid, ids, 1.0, context)
+
     def set_remaining_time_2(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 2.0}, context=context)
-        return True
+        return self.set_remaining_time(cr, uid, ids, 2.0, context)
 
     def set_remaining_time_5(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 5.0}, context=context)
-        return True
+        return self.set_remaining_time(cr, uid, ids, 5.0, context)
 
     def set_remaining_time_10(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 10.0}, context=context)
-        return True
+        return self.set_remaining_time(cr, uid, ids, 10.0, context)
 
     def set_kanban_state_blocked(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context)
@@ -979,6 +987,7 @@ class task(osv.osv):
             self.pool.get('project.task.history').create(cr, uid, {
                 'task_id': task.id,
                 'remaining_hours': task.remaining_hours,
+                'planned_hours': task.planned_hours,
                 'kanban_state': task.kanban_state,
                 'type_id': task.type_id.id,
                 'state': task.state,
@@ -1096,7 +1105,7 @@ class account_analytic_account(osv.osv):
         if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
             vals['child_ids'] = []
         return super(account_analytic_account, self).create(cr, uid, vals, context=context)
-    
+
     def unlink(self, cr, uid, ids, *args, **kwargs):
         project_obj = self.pool.get('project.project')
         analytic_ids = project_obj.search(cr, uid, [('analytic_account_id','in',ids)])
@@ -1158,7 +1167,8 @@ class project_task_history(osv.osv):
         'end_date': fields.function(_get_date, string='End Date', type="date", store={
             'project.task.history': (_get_related_date, None, 20)
         }),
-        'remaining_hours': fields.float('Remaining Hours', digits=(16,2)),
+        'remaining_hours': fields.float('Remaining Time', digits=(16,2)),
+        'planned_hours': fields.float('Planned Time', digits=(16,2)),
         'user_id': fields.many2one('res.users', 'Responsible'),
     }
     _defaults = {
@@ -1186,7 +1196,7 @@ class project_task_history_cumulative(osv.osv):
                     id as history_id,
                     date+generate_series(0, CAST((coalesce(end_date,DATE 'tomorrow')::date - date)AS integer)-1) as date,
                     task_id, type_id, user_id, kanban_state, state,
-                    remaining_hours
+                    remaining_hours, planned_hours
                 FROM
                     project_task_history
             ) as history
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index a3bfe9be673..b7b59911fa4 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
+        <!-- Requests Links -->
+        <record id="req_link_project" model="res.request.link">
+            <field name="name">Project</field>
+            <field name="object">project.project</field>
+        </record>
+
+        <record id="req_link_task" model="res.request.link">
+            <field name="name">Project task</field>
+            <field name="object">project.task</field>
+        </record>
+
         <!-- Resource: project.project -->
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c8fe92f4194..22fc175246e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -378,6 +378,7 @@
                                                         type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
                                                     ><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
                                                 ></t>
+                                                <a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
                                             </span>
                                         </div>
                                         <div class="oe_kanban_clear"/>
@@ -488,11 +489,6 @@
                         <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-                        <filter name="edit"
-                            string="Edit" context="{'set_editable':True,'seq_visible': True}"
-                            icon="gtk-execute"
-                            groups="base.group_extended"/>
-                        <separator orientation="vertical"/>
                         <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index aff90aea94e..89667992f0a 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -25,6 +25,18 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Project Tasks" type="bar">
+                    <field name="date"/>
+                    <field name="planned_hours" operator="+"/>
+                    <field name="type_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+        <record id="view_task_history_burndown_graph" model="ir.ui.view">
+            <field name="name">project.task.history.burndown.graph</field>
+            <field name="model">project.task.history.burndown</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Burndown Chart of Tasks" type="bar">
                     <field name="date"/>
                     <field name="remaining_hours" operator="+"/>
                     <field name="type_id" group="True"/>
@@ -32,12 +44,13 @@
             </field>
         </record>
 
+
         <record id="view_task_history_search" model="ir.ui.view">
             <field name="name">project.task.history.cumulative.search</field>
             <field name="model">project.task.history.cumulative</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-               <search string="Task's Cumulative Flow">
+               <search string="Task's Analysis">
                     <group>
                         <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
@@ -69,13 +82,28 @@
             <field name="res_model">project.task.history.cumulative</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_task_history_graph"/>
             <field eval="False" name="filter"/>
-            <field name="context">{"search_default_open":1, "search_default_this_month": 1}</field>
+            <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>
         </record>
         <menuitem action="action_view_task_history_cumulative"
             id="menu_action_view_task_history_cumulative"
             parent="project_report_task" />
 
 
+        <record id="action_view_task_history_burndown" model="ir.actions.act_window">
+            <field name="name">Burndown Chart</field>
+            <field name="res_model">project.task.history.cumulative</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_task_history_burndown_graph"/>
+            <field eval="False" name="filter"/>
+            <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>
+        </record>
+        <menuitem action="action_view_task_history_burndown"
+            id="menu_action_view_task_history_burndown"
+            parent="project_report_task" />
+
+
     </data>
 </openerp>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index bf828d6b231..5af8706108f 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -150,7 +150,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_task_project_user_search"/>
-            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_year':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
@@ -269,28 +269,5 @@
          </field>
     </record>
 
-    <record id="action_project_vs_planned_total_hours_graph" model="ir.actions.act_window">
-
-        <field name="name">Projects: Planned Vs Total hours</field>
-        <field name="res_model">project.vs.hours</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="context">{}</field>
-        <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
-        <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
-    </record>
-
-    <record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_project_vs_planned_total_hours_tree"/>
-            <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
-    </record>
-    <record id="open_view_project_vs_planned_total_hours_graph" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
-            <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
-    </record>
     </data>
 </openerp>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 955a6ef0c97..633c5164484 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,26 +1,18 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
-"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
-"access_project_project","project.project","model_project_project","project.group_project_user",1,1,1,1
-"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,1,1,1
-"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,1,1,1
-"access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
-"access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
-"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
-"access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
-"access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
-"access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,1,1,1
-"access_project_vs_hours","project.vs.hours","model_project_vs_hours","project.group_project_user",1,1,1,1
-"access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1
-"access_partner_task user","base.res.partner user","base.model_res_partner","project.group_project_user",1,0,0,0
-"access_partner_task manager","base.res.partner manager","base.model_res_partner","project.group_project_manager",1,0,0,0
-"access_partner_address_task user","base.res.partner.address user","base.model_res_partner_address","project.group_project_user",1,0,0,0
-"access_partner_address_task manager","base.res.partner.address manager","base.model_res_partner_address","project.group_project_manager",1,0,0,0
-"access_task_on_partner","project.task on partners","model_project_task","base.group_user",1,0,0,0
-"access_project_on_partner","project.project on partners","model_project_project","base.group_user",1,0,0,0
-"access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
-"access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
-"access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
-"access_account_analytic_line_project","account.analytic.line project","analytic.model_account_analytic_line","project.group_project_manager",1,1,1,1
-"access_project_task_history","project.task.history project","project.model_project_task_history","project.group_project_user",1,1,1,0
-"access_project_task_history_cumulative","project.task.history project","project.model_project_task_history_cumulative","project.group_project_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_project,project.project,model_project_project,project.group_project_user,1,1,1,1
+access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,1,1,1
+access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1
+access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1
+access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1
+access_report_project_task_user,report.project.task.user,model_report_project_task_user,project.group_project_manager,1,1,1,1
+access_project_vs_hours,project.vs.hours,model_project_vs_hours,project.group_project_user,1,1,1,1
+access_task_by_days,task.by.days,model_task_by_days,project.group_project_user,1,1,1,1
+access_partner_task user,base.res.partner user,base.model_res_partner,project.group_project_user,1,0,0,0
+access_partner_address_task user,base.res.partner.address user,base.model_res_partner_address,project.group_project_user,1,0,0,0
+access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0
+access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0
+access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,0,0,0
+access_project_project_sale_user,project.project salesman,model_project_project,base.group_sale_salesman,1,0,0,0
+access_account_analytic_line_project,account.analytic.line project,analytic.model_account_analytic_line,project.group_project_manager,1,1,1,1
+access_project_task_history,project.task.history project,project.model_project_task_history,project.group_project_user,1,1,1,0
+access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 62f74f51d1b..f1e3a6e9b74 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -3,18 +3,16 @@
 <data noupdate="1">
 
     <record id="group_project_user" model="res.groups">
-        <field name="name">Project / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_project_management"/>
     </record>
 
     <record id="group_project_manager" model="res.groups">
-        <field name="name">Project / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_project_management"/>
         <field name="implied_ids" eval="[(4, ref('group_project_user'))]"/>
     </record>
 
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
     <record model="ir.ui.menu" id="menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
diff --git a/addons/project/static/src/img/icon.png b/addons/project/static/src/img/icon.png
new file mode 100644
index 00000000000..8dc1bc78fa4
Binary files /dev/null and b/addons/project/static/src/img/icon.png differ
diff --git a/addons/project/test/project_demo.yml b/addons/project/test/project_demo.yml
new file mode 100644
index 00000000000..3bcae52e238
--- /dev/null
+++ b/addons/project/test/project_demo.yml
@@ -0,0 +1,12 @@
+-
+  !record {model: project.project, id: project_integrate_openerp, view: False}:
+    partner_id: base.res_partner_agrolait
+-
+  !record {model: project.task, id: project_task_1, view: False}:
+    remaining_hours: 10.00
+-
+  !record {model: project.task, id: project_task_1, view: False}:
+    planned_hours: 10.00
+-
+  !record {model: project.task, id: project_task_1, view: False}:
+    project_id: project_integrate_openerp
\ No newline at end of file
diff --git a/addons/project/test/project_process.yml b/addons/project/test/project_process.yml
new file mode 100644
index 00000000000..3c51c464b1f
--- /dev/null
+++ b/addons/project/test/project_process.yml
@@ -0,0 +1,70 @@
+-
+  In order to Test Process of Project Management,
+-
+  I create duplicate template.
+-
+  !python {model: project.project}: |
+     new_template = self.duplicate_template(cr, uid, [ref("project_integrate_openerp")])
+     assert new_template, "duplicate template is not created"
+     template = self.browse(cr, uid, new_template['res_id'], context=context)
+     assert template.state == 'open', "Duplicate template must be in open state."
+-
+  I convert template into real Project.
+-
+  !python {model: project.project}: |
+     self.reset_project(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check project details after convert from template.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be active}:
+    - state == "open"
+-
+  I put project in pending.
+-
+  !python {model: project.project}: |
+    self.set_pending(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check state after put in pending.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be in pending state}:
+    - state == "pending"
+-
+  I re-open the project.
+-
+  !python {model: project.project}: |
+      self.set_open(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check state after reopen.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be open.}:
+    - state == "open"
+-
+  I close the project.
+-
+  !python {model: project.project}: |
+    self.set_done(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check state after closed.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be close.}:
+    - state == "close"
+-
+  I set project into template.
+-
+  !python {model: project.project}: |
+    self.set_template(cr, uid, [ref("project_integrate_openerp")])
+-
+  I schedule tasks of project.
+-
+  !python {model: project.project}: |
+    self.schedule_tasks(cr, uid, [ref("project_integrate_openerp")], context=context)
+-
+  I copy the tasks of project.
+-
+  !python {model: project.project}: |
+    self.template_copy(cr, uid, ref("project_integrate_openerp"))
+-
+  I cancel Project.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_project_9")])
\ No newline at end of file
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
new file mode 100644
index 00000000000..73250de2963
--- /dev/null
+++ b/addons/project/test/task_process.yml
@@ -0,0 +1,76 @@
+-
+  I put task in pending due to specification is not clear.
+-
+  !python {model: project.task}: |
+    self.do_pending(cr, uid, [ref("project_task_1")])
+    context.update({"active_id": ref("project_task_1")})
+-
+  I check state  of task after put in pending.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task should be in pending state}:
+    - state == "pending"
+-
+  !record {model: project.task.delegate, id: delegate_id}:
+    user_id: res_users_analyst
+    planned_hours: 12.0
+    planned_hours_me: 2.0
+-
+  Now I delegate task to team member.
+-
+  !python {model: project.task.delegate}: |
+    self.delegate(cr, uid, [ref("delegate_id")], {"active_id": ref("project_task_1")})
+-
+  I check delegated task details.
+-
+  !python {model: project.task}: |
+    task = self.browse(cr, uid, ref("project_task_1"), context=context)
+    assert task.planned_hours == 2.0, "Planning hours is not correct after delegated."
+    assert task.state == "pending", "Task should be in Pending after delegated."
+-
+  I re-open the task.
+-
+  !python {model: project.task}: |
+    self.do_reopen(cr, uid, [ref("project_task_1")])
+-
+  I check reopened task details.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task should be open.}:
+    - state == "open"
+-
+  I change the stage of task to next stage.
+-
+  !python {model: project.task}: |
+    self.next_type(cr, uid, [ref("project_task_1")])
+-
+  !record {model: project.task.reevaluate, id: reevaluate_id}:
+    remaining_hours : 120
+-
+  I reevaluate task with remaining hours.
+-
+  !python {model: project.task.reevaluate}: |
+    self.compute_hours(cr, uid, [ref("reevaluate_id")], {"active_id": ref("project_task_1")})
+-
+  I check remaining hours after reevaluated task.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}:
+    - remaining_hours == 120.0
+-
+  I close the task.
+-
+  !python {model: project.task}: |
+    self.action_close(cr, uid, [ref("project_task_1")])
+-
+  I check state after closed.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task is in open state}:
+    - state == "done"
+-
+  I change the stage of task to previous stage.
+-
+  !python {model: project.task}: |
+    self.prev_type(cr, uid, [ref("project_task_1")])
+-
+  I cancel Task.
+-
+  !python {model: project.task}: |
+    self.do_cancel(cr, uid, [ref("project_task_2")])
\ No newline at end of file
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
deleted file mode 100644
index f79c2a34224..00000000000
--- a/addons/project/test/test_project.yml
+++ /dev/null
@@ -1,296 +0,0 @@
--
-  Test project template feature
--
-  Create project 'OpenERP Training Programme'
--
-  !record {model: project.project, id: project_project_openerptrainingprogramme0}:
-    company_id: base.main_company
-    name: OpenERP Training Programme
--
-  Create task 'Technical Training' for this project
--
-  !record {model: project.task, id: project_task_technicaltraining0}:
-    date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    name: Technical Training
-    planned_hours: 30.0
-    project_id: project_project_openerptrainingprogramme0
-    remaining_hours: 30.0
-    state: draft
--
-  Create task 'Functional Training' for this project
--
-  !record {model: project.task, id: project_task_functionaltraining0}:
-    date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    name: Functional Training
-    planned_hours: 30.0
-    project_id: project_project_openerptrainingprogramme0
-    remaining_hours: 30.0
-    state: draft
--
-  Set project as project template
--
-  !python {model: project.project}: |
-    self.set_template(cr, uid, [ref("project_project_openerptrainingprogramme0")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_id": ref("project.menu_open_view_project_all"), })
--
-  Check if project in template state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in template state}:
-       - state == "template"
--
-  Create new project based on this template
--
-  !python {model: project.project}: |
-     new_prj = self.duplicate_template(cr, uid, [ref("project_project_openerptrainingprogramme0")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_id": ref("project.menu_open_view_project_all"), })
-     if not new_prj:
-         raise Exception( "New project based on template not created")
-     new_id = new_prj['res_id']
-     new_prj = self.read(cr, uid, [new_id], ['name', 'state'])[0]
-     state = new_prj['state']
-     name = new_prj['name']
-     assert state == 'open', "Project in %s state. Project created from template project must be in open state"%state
--
-  Reset project template to normal project
--
-  !python {model: project.project}: |
-    self.reset_project(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids":
-      [ref("project.menu_open_view_project_all")], "tz": False, "active_model":
-      "ir.ui.menu", "project_id": False, "active_id": ref("project.menu_open_view_project_all"),
-      })
--
-  Check if project in open state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in open state}:
-       - state == "open"
--
-  Test for different project-states
--
-  Keep project pending
--
-  !python {model: project.project}: |
-    self.set_pending(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids":
-      [ref("project.menu_open_view_project_all")], "tz": False, "active_model":
-      "ir.ui.menu", "project_id": False, "active_id": ref("project.menu_open_view_project_all"),
-      })
--
-  Check if project in pending state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in pending state}:
-       - state == "pending"
--
-  Cancel the project
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids":
-      [ref("project.menu_open_view_project_all")], "tz": False, "active_model":
-      "ir.ui.menu", "project_id": False, "active_id": ref("project.menu_open_view_project_all"),
-      })
--
-  Check if project in cancel state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in cancel state}:
-       - state == "cancelled"
--
-  Re-open the project
--
-  !python {model: project.project}: |
-    self.set_open(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_model": "ir.ui.menu", "project_id": False, "active_id":
-      ref("project.menu_open_view_project_all"), })
--
-  Check if project in open state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in open state}:
-       - state == "open"
--
-  Test for task work allocation
--
-  As i cancelled my project before, i check if the task 'Technical Training' is in cancelled state
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Task is in cancelled state}:
-       - state == "cancelled"
--
-  Now in order to reactivate the task 'Technical Training', i click on the "Reactivate" button and fill the remaining hour field
--
-  !record {model: project.task.reevaluate, id: project_task_technicaltraining_remainingwiz0}:
-    remaining_hours: 30.0
-- |
-  I click the apply button
--
-  !python {model: project.task.reevaluate}: |
-      self.compute_hours(cr, uid, [ref('project_task_technicaltraining_remainingwiz0')], {'active_id': ref("project_task_technicaltraining0"),'button_reactivate': True})
-- |
-  Check if task 'Technical Training' in  open state and for other initial values
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Project is in open state}:
-       - state == "open"
-       - planned_hours == 30
-       - remaining_hours == 30
-       - delay_hours == 0.0
-       - effective_hours == 0.0
--
-  Make a work task entry 'Training on OpenERP modules, models and classes' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on OpenERP modules, models and classes
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, effective_hours must be equal to 10
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After work task of 10 hours effective_hours must be equal to 10}:
-       - remaining_hours == 20
-       - effective_hours == 10.0
--
-  Make a work task entry 'Training on OpenERP xml views' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on OpenERP xml views
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, effective_hours must be equal to 20
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After one more work task of 10 hours effective_hours must be equal to 20}:
-       - remaining_hours == 10
-       - effective_hours == 20.0
--
-  Make a work task entry 'Training on workflows' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on workflows
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, effective_hours must be equal to 30
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After one more work task of 10 hours effective_hours must be equal to 30}:
-       - remaining_hours == 0
-       - effective_hours == 30.0
--
-  Set remaining hours of 10 hours for reevaluating the task
--
-  !record {model: project.task.reevaluate, id: config_compute_remaining_0}:
-    remaining_hours: 10.0
--
-  Reevaluate the task
--
-  !python {model: project.task.reevaluate}: |
-    self.compute_hours(cr, uid, [ref("config_compute_remaining_0")], {"lang": "en_US",
-      "project_id": False, "tz": False, "active_model": "project.task", "search_default_project_id":
-      False, "search_default_user_id": 1, "search_default_current": 1, "active_ids":
-      [ref("project_task_technicaltraining0")], "active_id": ref("project_task_technicaltraining0"), })
-
--
-   Check for effective hours and remaining hours, remaining_hours must be 10 while planned_hours remains 30
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After reevaluating the task with 10 hours remaining_hours must be 10 while planned_hours remains 30}:
-       - planned_hours == 30
-       - remaining_hours == 10.0
-       - effective_hours == 30.0
--
-  Make a work task entry 'Training on reports and wizards' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on reports and wizards
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After one more work task of 10 hours effective_hours must be equal to 40 while planned_hours remains 30}:
-       - planned_hours == 30
-       - remaining_hours == 0
-       - effective_hours == 40.0
--
-  Close the task
--
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_technicaltraining0")], {'mail_send': False})
--
-  Check if task in done state
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Task is in done state}:
-       - state == "done"
-
-
--
-  Test for task reactivation
--
-  Reactivate task
--
-  !record {model: project.task.reevaluate, id: config_compute_remaining_1}:
-    remaining_hours: 10.0
--
-  Reevaluate the task with 10 hours remaining
--
-  !python {model: project.task.reevaluate}: |
-    self.compute_hours(cr, uid, [ref("config_compute_remaining_1")], {"lang": "en_US",
-      "project_id": False, "tz": False, "button_reactivate": True, "active_model":
-      "project.task", "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "active_ids": [ref("project_task_technicaltraining0")], "active_id": ref("project_task_technicaltraining0"),
-      })
--
-   Check for effective hours and remaining hours, remaining_hours must be 10 while planned_hours remains 30
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After reevaluating the task with 10 hours remaining_hours must be 10 while planned_hours remains 30}:
-       - planned_hours == 30
-       - remaining_hours == 10.0
-       - effective_hours == 40.0
--
-  Make a work task entry 'Training on yml' of 5 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 5.0
-        name: Training on yml
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, remaining_hours must be 5, effective_hours must be 45
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After work task of 5 hours effective_hours must be equal to 45 and remaining_hours is 5}:
-       - planned_hours == 30
-       - remaining_hours == 5.0
-       - effective_hours == 45.0
--
-  Close the task
--
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_technicaltraining0")], {'mail_send': False})
--
-  Check if task in done state
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error}:
-       - state == "done"
--
-   Check for effective hours and remaining hours
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After closing the task planned_hours must remain 30 effective_hours must be 45 and remaining hours must be 0}:
-       - planned_hours == 30
-       - remaining_hours == 0.0
-       - effective_hours == 45.0
--
-  Close project 'OpenERP Training Programme'
--
-  !python {model: project.project}: |
-    self.set_done(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_model": "ir.ui.menu", "project_id": False, "active_id":
-      ref("project.menu_open_view_project_all"), })
--
-  Check if project in close state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: "Project must be in closed state"}:
-       - state == "close"
-
diff --git a/addons/project/test/test_project_delegation.yml b/addons/project/test/test_project_delegation.yml
deleted file mode 100644
index 02bc9afaae8..00000000000
--- a/addons/project/test/test_project_delegation.yml
+++ /dev/null
@@ -1,230 +0,0 @@
--
-  This scenario tests the delegation process. Closing all the delegated tasks(task delegation at multiple levels) transits the parent task from pending to open state.  
-- 
-  Creating a project OpenERP Documentation
-- 
-  !record {model: project.project, id: project_project_openerpdocumentation0}:
-    company_id: base.main_company
-    name: OpenERP Documentation    
-    
-- 
-  Creating a task 'Develop book for Technical and Functional reference'
-- 
-  !record {model: project.task, id: project_task_documentation_book}:
-    name: Develop book for Technical and Functional reference
-    planned_hours: 20.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 20.0
-    state: draft
-    
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_documentation_book")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), }) 
-
-- 
-  Creating a task 'Publish the References'
-- 
-  !record {model: project.task, id: project_task_publish_book}:
-    name: Publish the References
-    planned_hours: 10.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 10.0
-    state: draft
-    
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_publish_book")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), }) 
-
--
-  Test the delegate wizard 
-- 
-  Creating a delegate task 'Publish the References' of 15 hours, renaming parent task to 'CHECK Publish the References' of 1 hour
-- 
-  !record {model: project.task.delegate, id: project_task_publish_book_delegate}:
-    name: Publish the References
-    new_task_description: aaa
-    planned_hours: 15.0
-    planned_hours_me: 1.0
-    prefix: 'CHECK: Publish the References'
-    state: pending
-    user_id: base.user_demo
-    
-- 
-  Validating the delegate task
-- 
-  !python {model: project.task.delegate}: |
-    self.delegate(cr, uid, [ref("project_task_publish_book_delegate")],
-      {"lang": "en_US", "active_model": "project.task", "tz": False, "record_id":
-      4, "active_ids": [ref("project_task_publish_book")], "active_id": ref("project_task_publish_book"),
-      })
-
--
-  Check if parent task 'CHECK Publish the References' is in pending state
-- 
-  !assert {model: project.task, id: project_task_publish_book, severity: error, string: "Task must be in pending state after delegation"}:
-       - state == "pending"      
-- 
-  Creating a delegate task 'Prepare a book that gives functional overview of OpenERP' 
-- 
-  !record {model: project.task, id: project_task_delegate_openerp_tutorial}:
-    name: Prepare a book that gives functional overview of OpenERP
-    planned_hours: 30.0
-    project_id: project.project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
-    
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_openerp_tutorial")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })
-          
-- 
-  Creating a delegate task 'Prepare a technical reference for creating your modules'
-- 
-  !record {model: project.task, id: project_task_delegate_developer_book}:
-    name: Prepare a technical reference for creating your modules
-    planned_hours: 30.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
- 
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_developer_book")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })
-
-- 
-  Delegate task 'Develop book for Technical and Functional reference' to these tasks and make it pending
-- 
-  !record {model: project.task, id: project_task_documentation_book}:
-    child_ids:
-      - project.project_task_delegate_openerp_tutorial
-      - project.project_task_delegate_developer_book
-    planned_hours: 20.0
-    state: pending
-
-- 
-  Creating a delegate task 'Prepare documentation for Module Development'
-- 
-  !record {model: project.task, id: project_task_delegate_module_develop}:
-    name: Prepare documentation for Module Development
-    planned_hours: 30.0
-    project_id: project.project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
-    
-
-- 
-  Creating a delegate 'Prepare documentation for Business Process Development'
-- 
-  !record {model: project.task, id: project_task_delegate_business_process_develop}:
-    name: Prepare documentation for Business Process Development
-    planned_hours: 30.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
-
-- 
-  Delegate task 'Prepare a technical reference for creating your modules' to these tasks and make it pending
-- 
-  !record {model: project.task, id: project_task_delegate_developer_book}:
-    child_ids:
-      - project.project_task_delegate_module_develop
-      - project.project_task_delegate_business_process_develop
-    planned_hours: 20.0
-    state: pending
-
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_module_develop")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })
-      
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_business_process_develop")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })      
-
-- 
-  Check if 'Prepare a technical reference for creating your modules' in pending state
-- 
-  !assert {model: project.task, id: project_task_delegate_developer_book, severity: error, string: Task must be in pending state}:
-       - state == "pending"
-                 
-- 
-  Close the child task 'Prepare documentation for Module Development'
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_module_develop")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Close the child task 'Prepare documentation for Business Process Development'
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_business_process_develop")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Parent task 'Prepare a technical reference for creating your modules' task must now be in open state
-- 
-  !assert {model: project.task, id: project_task_delegate_developer_book, severity: error, string: Task is in done state}:
-       - state == "open"
-       
-      
-- 
-  Check if task 'Develop book for Technical and Functional reference' in pending state
-- 
-  !assert {model: project.task, id: project_task_documentation_book, severity: error, string: Task is in pending state}:
-       - state == "pending"
-                 
-- 
-  Close the child task 'Prepare a technical reference for creating your modules'
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_developer_book")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Close the child task 'Prepare a book that gives functional overview of OpenERP' 
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_openerp_tutorial")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Parent task 'Develop book for Technical and Functional reference' must be now in open state 
-- 
-  !assert {model: project.task, id: project_task_documentation_book, severity: error, string: Task is in done state}:
-       - state == "open"                  
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index efadc3f124b..544165dc02b 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -63,25 +63,25 @@ class project_task_delegate(osv.osv_memory):
         task_name =tools.ustr(task.name)
 
         if 'project_id' in fields:
-            res.update({'project_id': task.project_id and task.project_id.id})
+            res['project_id'] = int(task.project_id.id) if task.project_id else False
 
         if 'name' in fields:
             if task_name.startswith(_('CHECK: ')):
                 newname = tools.ustr(task_name).replace(_('CHECK: '), '')
             else:
                 newname = tools.ustr(task_name or '')
-            res.update({'name': newname})
+            res['name'] = newname
         if 'planned_hours' in fields:
-            res.update({'planned_hours': task.remaining_hours or 0.0})
+            res['planned_hours'] = task.remaining_hours or 0.0
         if 'prefix' in fields:
             if task_name.startswith(_('CHECK: ')):
                 newname = tools.ustr(task_name).replace(_('CHECK: '), '')
             else:
                 newname = tools.ustr(task_name or '')
             prefix = _('CHECK: %s') % newname
-            res.update({'prefix': prefix})
+            res['prefix'] = prefix
         if 'new_task_description' in fields:
-            res.update({'new_task_description': task.description})
+            res['new_task_description'] = task.description
         return res
 
 
diff --git a/addons/project_caldav/i18n/hr.po b/addons/project_caldav/i18n/hr.po
new file mode 100644
index 00000000000..ddd7ab55739
--- /dev/null
+++ b/addons/project_caldav/i18n/hr.po
@@ -0,0 +1,576 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 17:39+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: project_caldav
+#: help:project.task,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,we:0
+msgid "Wed"
+msgstr "Sri"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Monthly"
+msgstr "Mjesečno"
+
+#. module: project_caldav
+#: help:project.task,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Ponavljajući sastanak"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Sunday"
+msgstr "Nedjelja"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fourth"
+msgstr "Četvrti"
+
+#. module: project_caldav
+#: field:project.task,show_as:0
+msgid "Show as"
+msgstr "Prikaži kao"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees details"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,day:0
+#: selection:project.task,select1:0
+msgid "Date of month"
+msgstr "Dan u mjesecu"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Public"
+msgstr "Javni"
+
+#. module: project_caldav
+#: field:project.task,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "March"
+msgstr "Ožujak"
+
+#. module: project_caldav
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Friday"
+msgstr "Petak"
+
+#. module: project_caldav
+#: field:project.task,allday:0
+msgid "All Day"
+msgstr "Cijeli dan"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Free"
+msgstr "Slobodno"
+
+#. module: project_caldav
+#: field:project.task,mo:0
+msgid "Mon"
+msgstr "Pon"
+
+#. module: project_caldav
+#: model:ir.model,name:project_caldav.model_project_task
+msgid "Task"
+msgstr "Zadatak"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Last"
+msgstr "Posljednji"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Days"
+msgstr "Dana"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,organizer:0
+#: field:project.task,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,location:0
+msgid "Location"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Mail TO"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Hours"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,end_type:0
+msgid "Forever"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,count:0
+msgid "Repeat"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "First"
+msgstr ""
+
+#. module: project_caldav
+#: code:addons/project_caldav/project_caldav.py:67
+#, python-format
+msgid "Tasks"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: project_caldav
+#: model:ir.module.module,shortdesc:project_caldav.module_meta_information
+msgid "CalDAV for task management"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,edit_all:0
+msgid "Edit All"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "From"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Reminder"
+msgstr ""
+
+#. module: project_caldav
+#: model:ir.module.module,description:project_caldav.module_meta_information
+msgid " Synchronize between Project task and Caldav Vtodo."
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees Detail"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Months"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Repeat Times"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "To"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,freq:0
+msgid "Frequency"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "of"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Busy"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+#: field:project.task,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Other"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Details"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Years"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assign Task"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Rule"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,alarm_id:0
+#: field:project.task,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "The"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Private"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,end_type:0
+msgid "Way to end reccurency"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,date:0
+#: field:project.task,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index 0d566be4619..c88892eae11 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -57,20 +57,6 @@
                 </field>
             </field>
         </record>
-        
-        <record id="view_project_caldav_task_form2" model="ir.ui.view">
-            <field name="name">project.task.caldav.form2</field>
-            <field name="model">project.task</field>
-            <field name="inherit_id" ref="project.view_task_form2" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="progress" position="after">
-                    <!--     Recurrency of task not well implemented for now, remove the option-->     
-                     <field name="recurrency" invisible="1"/>
-                     <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"/>                    
-                </field>
-            </field>
-        </record>
 
         <record id="view_project_caldav_task_form3" model="ir.ui.view">
             <field name="name">project.task.caldav.form3</field>
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index 61ed601829f..7dae4706b70 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -57,7 +57,7 @@ performing those tasks.
     ],
     'demo_xml': ['project_gtd_demo.xml'],
     'test':[
-        'test/gtd_test.yml'
+         'test/task_timebox.yml'
     ],
     'installable': True,
     'application': True,
diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv
index 8e85047c51c..d85ac8a5d0c 100644
--- a/addons/project_gtd/security/ir.model.access.csv
+++ b/addons/project_gtd/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_gtd_context_user","project.gtd.context project user","model_project_gtd_context","project.group_project_user",1,0,0,0
-"access_project_gtd_timebox_user","project.gtd.timebox project user","model_project_gtd_timebox","project.group_project_user",1,0,0,0
-"access_project_gtd_context_manager","project.gtd.context project manager","model_project_gtd_context","project.group_project_manager",1,1,1,1
-"access_project_gtd_timebox_manager","project.gtd.timebox project manager","model_project_gtd_timebox","project.group_project_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_gtd_context_user,project.gtd.context project user,model_project_gtd_context,project.group_project_user,1,0,0,0
+access_project_gtd_timebox_user,project.gtd.timebox project user,model_project_gtd_timebox,project.group_project_user,1,0,0,0
+access_project_gtd_context_manager,project.gtd.context project manager,model_project_gtd_context,project.group_project_manager,1,1,1,1
+access_project_gtd_timebox_manager,project.gtd.timebox project manager,model_project_gtd_timebox,project.group_project_manager,1,1,1,1
diff --git a/addons/project_gtd/static/src/img/icon.png b/addons/project_gtd/static/src/img/icon.png
new file mode 100644
index 00000000000..2f888a90a60
Binary files /dev/null and b/addons/project_gtd/static/src/img/icon.png differ
diff --git a/addons/project_gtd/test/gtd_test.yml b/addons/project_gtd/test/gtd_test.yml
deleted file mode 100644
index 0583bc7e8e0..00000000000
--- a/addons/project_gtd/test/gtd_test.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-- 
-  Create a task 'Develop time management module' with weekly timebox
-- 
-  !record {model: project.task, id: project_task_developtimemanagementmodule0}:
-    name: Develop time management module
-    planned_hours: 15.0
-    project_id: project.project_project_22
-    remaining_hours: 15.0
-    state: draft
-    timebox_id: project_gtd.timebox_weekly
-    
-    
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_developtimemanagementmodule0")], {"lang":
-      "en_US", "project_id": False, "tz": False, "active_model": "ir.ui.menu",
-      "department_id": False, "section_id": False, "search_default_project_id":
-      False, "search_default_user_id": 1, "search_default_current": 1, "active_ids":
-      [ref("project.menu_action_view_task")], "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Create time box for next week
-- 
-  !record {model: project.gtd.timebox, id: project_gtd_timebox_nextweek0}:
-    name: Next Week
-    sequence: 0.0
-    
-- 
-  Create time box for tomorrow
-- 
-  !record {model: project.gtd.timebox, id: project_gtd_timebox_tomorrow1}:
-    name: Tomorrow
-    sequence: 0.0
-    
-- 
-  Planify the task from weekly timebox to tomorrow timebox
-- 
-  !record {model: project.timebox.fill.plan, id: project_timebox_fill_plan_0}:
-    task_ids:
-      - project_task_developtimemanagementmodule0
-    timebox_id: project_gtd.timebox_weekly
-    timebox_to_id: project_gtd_timebox_tomorrow1
-    
-    
-- 
-  Set the task to tomorrow timebox
-- 
-  !python {model: project.timebox.fill.plan}: |
-    self.process(cr, uid, [ref("project_timebox_fill_plan_0")], {"lang": "en_US",
-      "project_id": False, "tz": False, "active_model": "project.gtd.timebox",
-      "department_id": False, "section_id": False, "record_id": 1, "active_ids":
-      [ref("project_gtd.timebox_daily")], "active_id": ref("project_gtd.timebox_daily"),
-      })
-
--
-   Check if task set to tomorrow timebox
--
-   !assert {model: project.task, id: project_task_developtimemanagementmodule0, string: Task set to tomorrow timebox}:
-      - timebox_id.id == ref("project_gtd_timebox_tomorrow1")
-      
--
-   Empty Timebox for tomorrow
--
-   !python {model: project.timebox.empty}: |
-      self._empty(cr, uid,  {"lang": "en_US",
-      "project_id": False, "tz": False, "active_model": "project.gtd.timebox",
-      "department_id": False, "section_id": False, "record_id": 1, "active_ids":
-      [ref("project_gtd_timebox_tomorrow1")], "active_id": ref("project_gtd_timebox_tomorrow1"),
-      })
-           
--
-   Check task 'Develop time management module' is no more in tomorrow timebox
--
-   !assert {model: project.task, id: project_task_developtimemanagementmodule0, string: Task is not in tomorrow timebox}: 
-      - timebox_id.id != ref("project_gtd_timebox_tomorrow1")
diff --git a/addons/project_gtd/test/task_timebox.yml b/addons/project_gtd/test/task_timebox.yml
new file mode 100644
index 00000000000..8efa7219b21
--- /dev/null
+++ b/addons/project_gtd/test/task_timebox.yml
@@ -0,0 +1,45 @@
+-
+  In order to test the process of Timebox in Project Management module,
+  I set my task from Daily to Weekly Timebox through Plannify Timebox
+-
+  !record {model: project.timebox.fill.plan, id: plan_id}:
+    task_ids: [project.project_task_10]
+    timebox_id: timebox_daily
+    timebox_to_id: timebox_weekly
+-
+  I set the task from Daily Timebox to Weekly Timebox
+-
+  !python {model: project.timebox.fill.plan}: |
+    self.process(cr, uid, [ref("plan_id")])
+-
+  I check task is set to Weekly Timebox
+-
+  !assert {model: project.task, id: project.project_task_10, string: Task should be set to weekly timebox}:
+     - timebox_id.id == ref("timebox_weekly")
+-
+  I Empty the Weekly Timebox
+-
+  !python {model: project.timebox.empty}: |
+      self._empty(cr, uid,  {"active_model": "project.gtd.timebox",
+      "active_ids":[ref("timebox_weekly")],
+      "active_id": ref("timebox_weekly"),
+      })
+-
+  I check task 'Develop Module in Sale Management' is no more in Weekly Timebox
+-
+  !assert {model: project.task, id: project.project_task_10 , string: Task is not in Weekly Timebox }:
+     - timebox_id.id != ref("timebox_weekly")
+-
+  I set Previous Timebox on task
+-
+  !python {model: project.task}: |
+     previous_timebox = self.prev_timebox(cr, uid, [ref("project.project_task_10")],
+     {'active_ids': [ref("project_gtd.menu_open_gtd_timebox_tree")],})
+     assert previous_timebox == True, "I set Previous Timebox on task"
+-
+  I set Next Timebox on task
+-
+  !python {model: project.task}: |
+      next_timebox = self.next_timebox(cr, uid, [ref("project.project_task_10")],
+      {'active_ids': [ref("project_gtd.menu_open_gtd_timebox_tree")],})
+      assert next_timebox == True, "I set Next Timebox on task"
\ No newline at end of file
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 215e4971bf2..012f9b5e799 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -54,8 +54,10 @@ and decide on their status as they evolve.
      ],
     'demo_xml': ['project_issue_demo.xml'],
     'test': [
-      'test/convert_issue_to_task.yml',
-      'test/test_project_issue_states.yml'
+      'test/subscribe_issue.yml',
+      'test/issue_process.yml',
+      'test/cancel_issue.yml',
+      'test/issue_demo.yml'
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 216f01eba9f..4553276057f 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -56,14 +56,14 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board">
-                    <board style="1-1">
+                <form string="Issues Dashboard">
+                    <board style="2-1">
                         <column>
                             <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
                             <action name="%(action_view_pending_project_issue_tree)d" string="Pending Issues"/>
                         </column>
                         <column>
-	                        <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
+                            <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
                             <action name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
                         </column>
                     </board>
@@ -80,7 +80,7 @@
             <field name="view_id" ref="board_project_issue_form"/>
         </record>
         <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.next_id_86"
-         	icon="terp-graph"
+             icon="terp-graph"
             action="open_board_project_issue"/>
 
     <!-- For Project Dashboard -->
@@ -147,12 +147,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.board_project_form"/>
             <field name="arch" type="xml">
-            	<xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
-						<action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
-            	</xpath>
-            	<xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
-						<action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
-            	</xpath>
+                <xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
+                        <action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
+                </xpath>
+                <xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
+                        <action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/project_issue/i18n/hr.po b/addons/project_issue/i18n/hr.po
new file mode 100644
index 00000000000..0b778e24777
--- /dev/null
+++ b/addons/project_issue/i18n/hr.po
@@ -0,0 +1,958 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-19 17:35+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
+"X-Generator: Launchpad (build 14538)\n"
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr ""
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr "Otvoren"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr "Datum otvaranja"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "Ožujak"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "Progres (%)"
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr "Emailovi promatrača"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Close Working hours"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr "Dana za otvaranje"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Date Closed"
+msgstr "Datum zatvaranja"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr "Dan"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,task_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr "Zadatak"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0
+#: field:project.issue,project_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
+msgid "My Open Project issues"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,partner_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:473
+#, python-format
+msgid " (copy)"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Previous"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Convert To Task"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Next"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,priority:0
+#: view:project.issue.report:0
+#: field:project.issue.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,version_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,version_id:0
+msgid "Version"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.module.module,shortdesc:project_issue.module_meta_information
+msgid "Issue Management in Project Management"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Pending Issues"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Open Working Hours"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,canal_id:0
+#: field:project.issue.report,canal_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,create_date:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.open_board_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
+msgid "Project Issue Dashboard"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,type_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History Information"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
+#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
+msgid "Project issues"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "My Open Project Issue"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,canal_id:0
+msgid ""
+"The channels represent the different communication modes available with the "
+"customer. With each commercial opportunity, you can indicate the canall "
+"which is this opportunity source."
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:283
+#, python-format
+msgid "Tasks"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,assigned_to:0
+msgid "This is the current user to whom the related task have been assigned"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:362
+#: view:project.issue:0
+#, python-format
+msgid "Escalate"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.module.module,description:project_issue.module_meta_information
+msgid ""
+"\n"
+"        This module provide Issues/Bugs Management in Project\n"
+"    "
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,categ_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+#: selection:project.issue.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Status"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Current Issues"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Global CC"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,active:0
+#: field:project.issue.version,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Bugs"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By State"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,date:0
+msgid "Date"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,type_id:0
+msgid "Resolution"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,assigned_to:0
+#: view:project.issue.report:0
+#: field:project.issue.report,assigned_to:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_issue
+#: field:project.project,reply_to:0
+msgid "Reply-To Email Address"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Attachments"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Form"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,state:0
+#: view:project.issue.report:0
+#: field:project.issue.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Close"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+msgid "Issues"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
+#: model:ir.model,name:project_issue.model_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,user_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Current"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, customer complaints, and material breakdowns are "
+"collected here. You can define the stages assigned when solving the project "
+"issue (analysis, development, done). With the mailgateway module, issues can "
+"be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Details"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reply"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,name:0
+msgid "Issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+msgid "Issue Analysis"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Sale Team    "
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,partner_name:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:61
+#, python-format
+msgid "Issue '%s' has been opened."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr ""
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:76
+#, python-format
+msgid "Issue '%s' has been closed."
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:377
+#, python-format
+msgid "No Title"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Open Issues by Creation Date"
+msgstr ""
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 22cc02b8645..9d61e9fe850 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -314,7 +314,8 @@ class project_issue(crm.crm_case, osv.osv):
                 'description':bug.description,
                 'date_deadline': bug.date,
                 'project_id': bug.project_id.id,
-                'priority': bug.priority,
+                # priority must be in ['0','1','2','3','4'], while bug.priority is in ['1','2','3','4','5']
+                'priority': str(int(bug.priority) - 1),
                 'user_id': bug.user_id.id,
                 'planned_hours': 0.0,
             })
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index f5c39be7713..4708a6fdcd6 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -1,12 +1,11 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
-"access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
-"access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
-"access_crm_case_categ_id","crm.case.categ","crm.model_crm_case_categ","project.group_project_manager",1,1,1,1
-"access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
-"access_project_issue_version_project_user","project_issue_version user","model_project_issue_version","project.group_project_user",1,0,0,0
-"access_mail_message_project_manager","mail.message.manager","mail.model_mail_message","project.group_project_manager",1,1,1,1
-"access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
-"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0
-"access_mail_message_issue_project_user","mail.message.user","mail.model_mail_message","project.group_project_user",1,1,1,0
-"access_crm_case_section","crm.case.section","crm.model_crm_case_section","project.group_project_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_issue_user,project.issue,model_project_issue,project.group_project_user,1,1,1,1
+access_project_issue_report_all,project.issue.report,model_project_issue_report,project.group_project_manager,1,1,1,1
+access_crm_case_categ_id,crm.case.categ,crm.model_crm_case_categ,project.group_project_manager,1,1,1,1
+access_project_issue_version_project,project_issue_version manager,model_project_issue_version,project.group_project_manager,1,1,1,1
+access_project_issue_version_project_user,project_issue_version user,model_project_issue_version,project.group_project_user,1,0,0,0
+access_mail_message_project_manager,mail.message.manager,mail.model_mail_message,project.group_project_manager,1,1,1,1
+access_resource_calendar_project_manager,resource.calendar.project.manager,resource.model_resource_calendar,project.group_project_manager,1,1,1,1
+access_project_issue_report_user,project.issue.report user,model_project_issue_report,project.group_project_user,1,0,0,0
+access_mail_message_issue_project_user,mail.message.user,mail.model_mail_message,project.group_project_user,1,1,1,0
+access_crm_case_section,crm.case.section,crm.model_crm_case_section,project.group_project_user,1,0,0,0
diff --git a/addons/project_issue/static/src/img/icon.png b/addons/project_issue/static/src/img/icon.png
new file mode 100644
index 00000000000..20723a81a57
Binary files /dev/null and b/addons/project_issue/static/src/img/icon.png differ
diff --git a/addons/project_issue/test/cancel_issue.yml b/addons/project_issue/test/cancel_issue.yml
new file mode 100644
index 00000000000..ff05d923ed0
--- /dev/null
+++ b/addons/project_issue/test/cancel_issue.yml
@@ -0,0 +1,60 @@
+-
+  In order to test process of issue tracking in OpenERP, I cancel the unqualified Issue.
+-
+  !python {model: project.issue}: |
+    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+-
+  I check the issue is in cancel state.
+-
+  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
+    - state == 'cancel' 
+-
+  I re-open the Issue.
+-
+  !python {model: project.issue}: |
+    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+-
+  I check the state of issue after open it. 
+-
+  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in open state}:
+    - state == 'open' 
+-
+  I put the issue in pending state.
+-
+  !python {model: project.issue}: |
+    self.case_pending(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+- 
+  I check the state of issue after put it in pending state.
+-  
+  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}:
+    - state == 'pending'
+-
+  I cancel the issue is in pending state.
+-
+  !python {model: project.issue}: |
+    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+-
+  I check the issue is in cancel state.
+-
+  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
+    - state == 'cancel'
+-
+  I close Issue.
+-
+  !python {model: project.issue}: |
+    self.case_close(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+-  
+  I check state of Issue after close.
+- 
+  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in done state}:
+    - state == 'done'
+-
+  I cancel the issue is in done state.
+-
+  !python {model: project.issue}: |
+    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+-
+  I check the issue is in cancel state.
+-
+  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
+    - state == 'cancel'
\ No newline at end of file
diff --git a/addons/project_issue/test/convert_issue_to_task.yml b/addons/project_issue/test/convert_issue_to_task.yml
deleted file mode 100644
index 13ddef69251..00000000000
--- a/addons/project_issue/test/convert_issue_to_task.yml
+++ /dev/null
@@ -1,32 +0,0 @@
--
-   Create an issue  
--
-   !record {model: project.issue, id: project_issue_onchangeevent0}:
-    categ_id: project_issue.bug_categ
-    name: on_change event does not pass context to the method
-    project_id: project.project_project_22
-    working_hours_close: 0.0
-    working_hours_open: 0.0
-
--
-   Check there is no task attached to issue
--
-   !assert {model: project.issue, id: project_issue_onchangeevent0, string: There must not be any task attached to issue}:
-     - task_id.id == False
-
--
-   Convert issue to task
--
-   !python {model: project.issue}: |
-    self.convert_issue_task(cr, uid, [ref("project_issue_onchangeevent0")],
-      {"lang": "en_US", "project_id": False, "tz": False, "active_model": "ir.ui.menu",
-      "department_id": False, "section_id": False, "search_default_project_id":
-      False, "search_default_my_bugs": 1, "search_default_user_id": 1, "search_default_current_bugs":
-      1, "active_ids": [ref("project_issue.menu_project_issue_track")], "active_id":
-      ref("project_issue.menu_project_issue_track"), })
-     
--
-   Check there is a task attached to issue
--
-   !assert {model: project.issue, id: project_issue_onchangeevent0, string: After creating a task for the issue there must be a task attached to it}:
-     - task_id.id != False
diff --git a/addons/project_issue/test/issue.eml b/addons/project_issue/test/issue.eml
new file mode 100644
index 00000000000..32659bbd7da
--- /dev/null
+++ b/addons/project_issue/test/issue.eml
@@ -0,0 +1,45 @@
+Return-Path: <Robert_Adersen@yahoo.com>
+X-Original-To: abc@mycompany.com
+Delivered-To: abc@mycompany.com
+Received: by mail1.mycompany.com (Postfix, from userid 10002)
+	id 3955EBFACA; Tue, 29 Nov 2011 08:14:47 +0100 (CET)
+X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail1.mycompany.com
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
+	RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1
+Received: from nm39-vm6.bullet.mail.ne1.yahoo.com (nm39-vm6.bullet.mail.ne1.yahoo.com [98.138.229.166])
+	by mail1.mycompany.com (Postfix) with SMTP id 0D074BF53A
+	for <abc@mycompany.com>; Tue, 29 Nov 2011 08:14:44 +0100 (CET)
+Received: from [98.138.90.54] by nm39.bullet.mail.ne1.yahoo.com with NNFMP; 29 Nov 2011 07:13:26 -0000
+Received: from [98.138.84.39] by tm7.bullet.mail.ne1.yahoo.com with NNFMP; 29 Nov 2011 07:13:26 -0000
+Received: from [127.0.0.1] by smtp107.mail.ne1.yahoo.com with NNFMP; 29 Nov 2011 07:13:26 -0000
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.in; s=s1024; t=1322550806; bh=LFefFqrky41IufKZHP8a86obZoBPxyX1aafgWNcrw7U=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:Content-Transfer-Encoding; b=NB8bd6b4Uk3/3fKhdzbcqFEZGPpKyotLeE0xh8H08rcFEahMFfY5uXgsYZsUFvTLCKfTyQWh/oPTVxHeUTGY/Y5MzAnndghX6S0mzlFtmW2dwLMqdWxQLZwU7EhbyYF9PCHicsmtlUVyo7Ou5ePSviqC0SOyCJJVWwzWlv5W9Zg=
+X-Yahoo-Newman-Id: 152218.10448.bm@smtp107.mail.ne1.yahoo.com
+X-Yahoo-Newman-Property: ymail-3
+X-YMail-OSG: i4zQqJUVM1mab8kxoCTmgMwxw9th.MdiJzmc4Ffbno7QGkl
+ acotmc0pGoiw_GrhwReSA6uNIveeAUi9WA6NniWAElxbUzGIQplTBHjRhdqF
+ d_rLG1Yn71DYxllLCZC8xoRzumVHw.kue0ymrl4D0VO.lEeyXbbYoz.TpAvu
+ ZASBwSV_mESEUu96bb1esfOjI_2MhibMNmt.2egkOG6LS3AcDkVWXJb.VpQe
+ yZieJ5djjUx9uu4HModjROSUWHKm3Qd5ZwvG.3s1JvHNNvPC3Mo6x.DXi_rj
+ d70J2pruXhJ9ZnbNooZiSHkrhaugWV.kquq6475ZxKP6Tu7G8iUgZUkHWCf.
+ aEdBFl2.4RanSkMohEfbNtwpXUQ0eDDOOPatHFB27JSP0jw--
+X-Yahoo-SMTP: oNtzSBqswBAqJIGYOgyGesyleENrhUEtEgBkQ053
+Received: from [192.168.1.30] (Robert_Adersen@180.211.100.2 with plain)
+        by smtp107.mail.ne1.yahoo.com with SMTP; 28 Nov 2011 23:13:25 -0800 PST
+Message-ID: <4ED48611.6070605@yahoo.in>
+Date: Tue, 29 Nov 2011 12:43:21 +0530
+From: Robert Adersen <Robert_Adersen@yahoo.com>
+User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110424 Thunderbird/3.1.10
+MIME-Version: 1.0
+To: abc@mycompany.com
+Subject: Error in the account module
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+Content-Transfer-Encoding: 7bit
+
+Hello Sir,
+
+I am using the openerp v6.1 and i have problem in hr module, so try to 
+check it and solve my problem.
+
+thanks
+Robert Adersen
diff --git a/addons/project_issue/test/issue_demo.yml b/addons/project_issue/test/issue_demo.yml
new file mode 100644
index 00000000000..1ad26e6db73
--- /dev/null
+++ b/addons/project_issue/test/issue_demo.yml
@@ -0,0 +1,8 @@
+-
+  !record {model: project.issue, id: project_task_1, view: False}:
+   task_id: 'project.project_task_17'
+   name: 'Error in account module'
+-
+  !record {model: project.issue, id: project01, view: False}:
+   project_id: 'project.project_project_9'
+   name: 'OpenERP Integration'
diff --git a/addons/project_issue/test/issue_process.yml b/addons/project_issue/test/issue_process.yml
new file mode 100644
index 00000000000..d5900bb1b4f
--- /dev/null
+++ b/addons/project_issue/test/issue_process.yml
@@ -0,0 +1,57 @@
+-
+  In order to test process of issue tracking in OpenERP, I Open the Issue.
+-
+  !python {model: project.issue}: |
+    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+- 
+  I check state of Issue after opened it.
+- 
+  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in open state}:
+    - state == 'open'       
+- 
+  Now I put Issue in pending due to need more information.
+- 
+  !python {model: project.issue}: |
+    self.case_pending(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+- 
+  I check state after put in pending.
+-  
+  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}:
+    - state == 'pending'
+-
+  I send mail to get more details.
+-
+  !python {model: mail.compose.message }: |
+    ctx = context.copy()
+    ctx.update({'active_model': 'project.issue', 'active_id': ref("crm_case_buginaccountsmodule0"), 'active_ids': [ref("crm_case_buginaccountsmodule0")]})
+    vals = self.default_get(cr, uid , [], context=ctx)
+    try:
+        new_id = self.create(cr, uid, {'email_from': 'support@mycompany.com','email_to': 'Robert_Adersen@yahoo.com', 'subject': 'Regarding error in account module we nees more details'})
+        self.send_mail(cr, uid, [new_id], context=ctx)
+    except Exception, e:
+        pass  
+-
+  After getting sufficient details, I re-open Issue from pending state.
+-
+  !python {model: project.issue}: |
+    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+-
+  I check state of Issue after re-opened.
+-
+  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in open state}:
+    - state == 'open'   
+-
+  I create Task for Issue.
+-
+  !python {model: project.issue}: |
+    self.convert_issue_task(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+-
+  I close Issue after resolving it
+-
+  !python {model: project.issue}: |
+    self.case_close(cr, uid, [ref("crm_case_buginaccountsmodule0")])
+-  
+  I Check state of Issue after closed.
+- 
+  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in done state}:
+    - state == 'done'
diff --git a/addons/project_issue/test/subscribe_issue.yml b/addons/project_issue/test/subscribe_issue.yml
new file mode 100644
index 00000000000..4ba472b41ed
--- /dev/null
+++ b/addons/project_issue/test/subscribe_issue.yml
@@ -0,0 +1,17 @@
+-
+  In Order to test process of  Issue in OpenERP, Custmer send the issue by email.
+-
+  !python {model: mail.thread}: |
+    import addons
+    request_file = open(addons.get_module_resource('project_issue','test', 'issue.eml'),'rb')
+    request_message = request_file.read()
+    self.message_process(cr, uid, 'project.issue', request_message)
+-
+  After getting the mail, I check details of new issue of that customer.
+- 
+  !python {model: project.issue}: |
+    issue_ids = self.search(cr, uid, [('email_from', '=', 'Robert Adersen <Robert_Adersen@yahoo.com>')])
+    assert issue_ids and len(issue_ids), "issue is not created after getting request"
+    issue = self.browse(cr, uid, issue_ids[0], context=context)
+    assert not issue.partner_id, "Customer should be a new"
+    assert issue.name == "Error in the account module", "Subject does not match"
\ No newline at end of file
diff --git a/addons/project_issue/test/test_project_issue_states.yml b/addons/project_issue/test/test_project_issue_states.yml
deleted file mode 100644
index ee48c9a9df0..00000000000
--- a/addons/project_issue/test/test_project_issue_states.yml
+++ /dev/null
@@ -1,112 +0,0 @@
--
-   Create an issue
--
-   !record {model: project.issue, id: project_issue_stockmovedates0}:
-    categ_id: project_issue.bug_categ
-    name: Stock Move dates
-    project_id: project.project_project_22
-    working_hours_close: 0.0
-    working_hours_open: 0.0
-- 
-  Check if issue in 'draft' state
--
-  !assert {model: project.issue, id: project_issue_stockmovedates0, severity: error, string: Issue is in draft state}:
-    - state == 'draft'
-        
-- 
-  Open the issue
-- 
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("project_issue_stockmovedates0")], {"lang":
-      "en_US", "active_ids": [ref("project_issue.menu_project_issue_track")], "tz":
-      False, "active_model": "ir.ui.menu", "search_default_project_id": False, "search_default_my_bugs":
-      1, "search_default_user_id": 1, "search_default_current_bugs": 1, "project_id":
-      False, "active_id": ref("project_issue.menu_project_issue_track"), })
-- 
-  Check if issue in 'open' state
--
-  !assert {model: project.issue, id: project_issue_stockmovedates0, severity: error, string: Issue is in open state}:
-    - state == 'open'
-
-- 
-  Keep issue pending
-- 
-  !python {model: project.issue}: |
-    self.case_pending(cr, uid, [ref("project_issue_stockmovedates0")],
-      {"lang": "en_US", "active_ids": [ref("project_issue.menu_project_issue_track")],
-      "tz": False, "active_model": "ir.ui.menu", "search_default_project_id":
-      False, "search_default_my_bugs": 1, "search_default_user_id": 1, "search_default_current_bugs":
-      1, "project_id": False, "active_id": ref("project_issue.menu_project_issue_track"),
-      })
-- 
-  Check if issue in 'pending' state
--
-  !assert {model: project.issue, id: project_issue_stockmovedates0, severity: error, string: Issue is in pending state}:
-    - state == 'pending'
-    
-    
-- 
-  Open the issue
-- 
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("project_issue_stockmovedates0")], {"lang":
-      "en_US", "active_ids": [ref("project_issue.menu_project_issue_track")], "tz":
-      False, "active_model": "ir.ui.menu", "search_default_project_id": False, "search_default_my_bugs":
-      1, "search_default_user_id": 1, "search_default_current_bugs": 1, "project_id":
-      False, "active_id": ref("project_issue.menu_project_issue_track"), })
-- 
-  Check if issue in 'open' state
--
-  !assert {model: project.issue, id: project_issue_stockmovedates0, severity: error, string: Issue is in open state}:
-    - state == 'open'
-      
-
-- 
-  Cancel the issue
-- 
-  !python {model: project.issue}: |
-    self.case_cancel(cr, uid, [ref("project_issue_stockmovedates0")],
-      {"lang": "en_US", "active_ids": [ref("project_issue.menu_project_issue_track")],
-      "tz": False, "active_model": "ir.ui.menu", "search_default_project_id":
-      False, "search_default_my_bugs": 1, "search_default_user_id": 1, "search_default_current_bugs":
-      1, "project_id": False, "active_id": ref("project_issue.menu_project_issue_track"),
-      })
-- 
-  Check if issue in 'cancel' state
--
-  !assert {model: project.issue, id: project_issue_stockmovedates0, severity: error, string: Issue is in cancel state}:
-    - state == 'cancel'
-
-    
-- 
-  Reset the issue 
-- 
-  !python {model: project.issue}: |
-    self.case_reset(cr, uid, [ref("project_issue_stockmovedates0")],
-      {"lang": "en_US", "active_ids": [ref("project_issue.menu_project_issue_track")],
-      "tz": False, "active_model": "ir.ui.menu", "search_default_project_id":
-      False, "search_default_my_bugs": 1, "search_default_user_id": 1, "search_default_current_bugs":
-      1, "project_id": False, "active_id": ref("project_issue.menu_project_issue_track"),
-      })
-- 
-  Check if issue in 'draft' state
--
-  !assert {model: project.issue, id: project_issue_stockmovedates0, severity: error, string: Issue is in draft state}:
-    - state == 'draft'
-
-
-- 
-  Close the issue
-- 
-  !python {model: project.issue}: |
-    self.case_close(cr, uid, [ref("project_issue_stockmovedates0")],
-      {"lang": "en_US", "active_ids": [ref("project_issue.menu_project_issue_track")],
-      "tz": False, "active_model": "ir.ui.menu", "search_default_project_id":
-      False, "search_default_my_bugs": 1, "search_default_user_id": 1, "search_default_current_bugs":
-      1, "project_id": False, "active_id": ref("project_issue.menu_project_issue_track"),
-      })
-- 
-  Check if issue in 'done' state
--
-  !assert {model: project.issue, id: project_issue_stockmovedates0, severity: error, string: Issue is in done state}:
-    - state == 'done'
diff --git a/addons/project_issue_sheet/i18n/hr.po b/addons/project_issue_sheet/i18n/hr.po
new file mode 100644
index 00000000000..a300e7ec625
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/hr.po
@@ -0,0 +1,77 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 09:54+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,description:project_issue_sheet.module_meta_information
+msgid ""
+"\n"
+"                    This module adds the Timesheet support for the "
+"Issues/Bugs Management in Project\n"
+"                "
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Analitičke stavke"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Stavka kontrolne kartice"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr "Kontrolna kartica"
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analitički konto"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "Datum kreiranja"
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "Kontrolne kartice"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,shortdesc:project_issue_sheet.module_meta_information
+msgid "Add the Timesheet support for Issue Management in Project Management"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr ""
diff --git a/addons/project_issue_sheet/security/ir.model.access.csv b/addons/project_issue_sheet/security/ir.model.access.csv
index 0e6c92c038b..a524f4cf05f 100644
--- a/addons/project_issue_sheet/security/ir.model.access.csv
+++ b/addons/project_issue_sheet/security/ir.model.access.csv
@@ -1,15 +1,15 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_sheet_sheet_project_user","hr_timesheet_sheet.sheet user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_user",1,1,1,0
-"access_hr_analytic_timesheet_project_user","hr_analytic_timesheet user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
-"access_hr_analytic_timesheet_project_manager","hr_analytic_timesheet manager","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_manager",1,0,0,0
-"access_hr_timesheet_sheet_sheet_project_manager","hr_timesheet_sheet.sheet manager","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_manager",1,0,0,0
-"access_hr_analytic_timesheet_project_manager","account.analytic.line.timesheet.project.manager","account.model_account_analytic_line","project.group_project_manager",1,1,1,1
-"access_account_analytic_journal_project_manager","account.analytic.journal.project.manager","account.model_account_analytic_journal","project.group_project_manager",1,1,1,1
-"access_account_fiscalyear_project_manager","account.fiscalyear.project.manager","account.model_account_fiscalyear","project.group_project_manager",1,1,1,1
-"access_hr_timesheet_invoice_factor_project_manager","hr_timesheet_invoice.factor.project.manager","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_manager",1,1,1,1
-"access_account_invoice_project_manager","account.invoice.project.manager","account.model_account_invoice","project.group_project_manager",1,1,1,1
-"access_analytic_account_line_project_user","analytic_account_line_timesheet user","analytic.model_account_analytic_line","project.group_project_user",1,1,1,0
-"access_account_analytic_journal_project_user","account.analytic.journal.project.user","account.model_account_analytic_journal","project.group_project_user",1,1,1,0
-"access_account_fiscalyear_project_user","account.fiscalyear.project.user","account.model_account_fiscalyear","project.group_project_user",1,1,1,0
-"access_hr_timesheet_invoice_factor_project_user","hr_timesheet_invoice.factor.project.user","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_user",1,1,1,0
-"access_account_invoice_project_user","account.invoice.project.user","account.model_account_invoice","project.group_project_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_hr_timesheet_sheet_sheet_project_user,hr_timesheet_sheet.sheet user,hr_timesheet_sheet.model_hr_timesheet_sheet_sheet,project.group_project_user,1,1,1,0
+access_hr_analytic_timesheet_project_user,hr_analytic_timesheet user,hr_timesheet_sheet.model_hr_analytic_timesheet,project.group_project_user,1,1,1,0
+access_hr_analytic_timesheet_project_manager,hr_analytic_timesheet manager,hr_timesheet_sheet.model_hr_analytic_timesheet,project.group_project_manager,1,0,0,0
+access_hr_timesheet_sheet_sheet_project_manager,hr_timesheet_sheet.sheet manager,hr_timesheet_sheet.model_hr_timesheet_sheet_sheet,project.group_project_manager,1,0,0,0
+access_hr_analytic_timesheet_project_manager,account.analytic.line.timesheet.project.manager,account.model_account_analytic_line,project.group_project_manager,1,1,1,1
+access_account_analytic_journal_project_manager,account.analytic.journal.project.manager,account.model_account_analytic_journal,project.group_project_manager,1,1,1,1
+access_account_fiscalyear_project_manager,account.fiscalyear.project.manager,account.model_account_fiscalyear,project.group_project_manager,1,1,1,1
+access_hr_timesheet_invoice_factor_project_manager,hr_timesheet_invoice.factor.project.manager,hr_timesheet_invoice.model_hr_timesheet_invoice_factor,project.group_project_manager,1,1,1,1
+access_account_invoice_project_manager,account.invoice.project.manager,account.model_account_invoice,project.group_project_manager,1,1,1,1
+access_analytic_account_line_project_user,analytic_account_line_timesheet user,analytic.model_account_analytic_line,project.group_project_user,1,1,1,0
+access_account_analytic_journal_project_user,account.analytic.journal.project.user,account.model_account_analytic_journal,project.group_project_user,1,1,1,0
+access_account_fiscalyear_project_user,account.fiscalyear.project.user,account.model_account_fiscalyear,project.group_project_user,1,1,1,0
+access_hr_timesheet_invoice_factor_project_user,hr_timesheet_invoice.factor.project.user,hr_timesheet_invoice.model_hr_timesheet_invoice_factor,project.group_project_user,1,1,1,0
+access_account_invoice_project_user,account.invoice.project.user,account.model_account_invoice,project.group_project_user,1,1,1,0
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index fffed6128ac..7d33a431f2a 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -43,14 +43,8 @@ Features
     "init_xml": [],
     "demo_xml": ["project_long_term_demo.xml"],
     "test": [
-          'test/test_schedule_phases_case1.yml',
-          'test/schedule_project_phases.yml',
-          'test/schedule_project_tasks.yml',
-          'test/test_schedule_phases_case2.yml',
-          'test/project_schedule_consecutive_day.yml',
-          'test/project_schedule_without_wroking_hour.yml',
-          'test/phase_constraint.yml',
-          'test/test_schedule_tasks_case1.yml',
+          'test/phase_process.yml',
+          'test/task_process.yml',
     ],
     "update_xml": [
         "security/ir.model.access.csv",
@@ -60,7 +54,6 @@ Features
         "wizard/project_compute_tasks_view.xml",
     ],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate': '001227470751077315069',
 }
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
new file mode 100644
index 00000000000..434470646c2
--- /dev/null
+++ b/addons/project_long_term/i18n/hr.po
@@ -0,0 +1,625 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 09:44+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: project_long_term
+#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
+msgid "Long Term Project Management"
+msgstr "Upravljanje dugotrajnim projektima"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of Phases"
+msgstr "Izračunaj planiranje faza"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Sljedeće faze"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Zadaci projekta"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Faze"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: view:project.resource.allocation:0
+msgid "Resources Allocation"
+msgstr "Alokacija resursa"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying settings"
+msgstr "Postavke prikaza"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Zakaži"
+
+#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid ""
+"\n"
+"\n"
+"        Long Term Project management module that tracks planning, "
+"scheduling, resources allocation.\n"
+"        Mainly used with Big project management.\n"
+"            - Project Phases will be maintained by Manager of the project\n"
+"            - Compute Phase Scheduling: Compute start date and end date of "
+"the phases which are in draft,open and pending state of the project given.\n"
+"                                        If no project given then all the "
+"draft,open and pending state phases will be taken\n"
+"            - Compute Task Scheduling: This works same as the scheduler "
+"button on project.phase. It takes the project as argument and computes all "
+"the open,draft and pending tasks\n"
+"            - Schedule Tasks: All the tasks which are in draft,pending and "
+"open state are scheduled with taking the phase's start date\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"        Modul upravljanja dugotrajnim projektima prati planiranje, "
+"zakazivanje i alokaciju resursa.\n"
+"        Uglavnom se koristi s Upravljanjem velikim projektima.\n"
+"            - Faze projekta će održavati voditelj projekta\n"
+"            - Izračunaj zakaizivanje faza: Uzračunaj početni datum i završni "
+"datum faza koje su u statusu nacrt,otvoreno i na čekanju za odabrani "
+"projekt.\n"
+"                                        Ako nijeda projekt nije odabran tada "
+"će se uzeti sve faze u statusu nacrt, otvoreno i na čekanju \n"
+"            - Izračunaj zakazivanje zadatka: RAdi na isti način kao i gumb "
+"za zakazivanje na fazama projekta. Uzima projekt kao argument i računa sve "
+"zadatke u statusu nacrt, otvoreno i na čekanju.\n"
+"            - Zakaži zadatke: Svi azdaci u statusu nacrt, otvoreno i na "
+"čekanju se zakazuju uzimajući početni datum faze.\n"
+"\n"
+"    "
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+msgid "Resource Allocations"
+msgstr "Alokacije resursa"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:128
+#, python-format
+msgid "Day"
+msgstr "Dan"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Zadatak"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Izračunaj pojedinačni projekt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Prijašnje faze"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "JM (Jedinica mjere) je mjerna jedinica za trajanje"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr " Planer računa prema datumu početka i trajanju."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,project_id:0
+#: view:project.task:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Error!"
+msgstr "Greška!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Završni datum"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Planning"
+msgstr "Planiranje"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Krajnji rok"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+msgid "Compute Phase Scheduling"
+msgstr "Izračunaj zakazivanje faze"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:190
+#, python-format
+msgid " (copy)"
+msgstr " (kopija)"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,useability:0
+msgid "Availability"
+msgstr "Raspoloživost"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "I_zračunaj"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of phases for all or specified project"
+msgstr "Izračunaj zakazivanje faza za sve ili pojedini projekt"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "JM trajanja"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+msgid "Compute Task Scheduling"
+msgstr "Izračunaj zakazivanje zadataka"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Minimalni početni datum"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_resource_allocation
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Project Resource Allocation"
+msgstr "Alokacija resursa projekta"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task"
+msgstr "Izračunaj zakazivanje zadatka"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_resource
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+#: view:project.resource.allocation:0
+msgid "Resources"
+msgstr "Resursi"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"\t           "
+msgstr ""
+"Za zakazivanje faza svih ili pojedinog projekta. Nakon toga otvara Gantt "
+"pogled.\n"
+"\t           "
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Početni datum"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Vezani zadaci"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Dates"
+msgstr "Datumi"
+
+#. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid ""
+"Availability of this resource for this project phase in percentage (=50%)"
+msgstr "Raspoloživost tog resursa za tu fazu projekta u postotku (=50%)"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "prisili početak faze nakon ovog datuma"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Zadaci projekta"
+
+#. module: project_long_term
+#: field:project.phase,resource_ids:0
+msgid "Project Resources"
+msgstr "Resursi projekta"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "_Ok"
+msgstr "_U redu"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Schedule and Display info"
+msgstr "Zakaži i prikaži info"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"Računa planer prema datumu projekta ili završnom datumu prethodne faze"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "Početni datum faze mora biti manje od završnog datuma faze."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_schedule_tasks
+msgid "project.schedule.tasks"
+msgstr "project.schedule.tasks"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your resources allocation, describe different tasks and link your "
+"phase to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"human resources, convert your phases into a series of tasks when you start "
+"working on the project."
+msgstr ""
+"Projekt je moguće podjeliti u različite faze. Za svaku fazu, možete "
+"definriati alokaciju resursa, opisati različite zadatke i povezati vašu fazu "
+"sa prethodnom i sljedećom fazom, dodati datumska ograničenja za automatsko "
+"zakazivanje. Koristite dugotrajno planiranje za vaše raspoložive ljudske "
+"resurse, pretvorite vaš faze u seriju zadataka nakon početka rada na "
+"projektu."
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.resource.allocation,date_start:0
+msgid "Start Date"
+msgstr "Početni datum"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Resource Allocation"
+msgstr "Alokacija resursa"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "prisili završetak faze prije ovog datuma"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Na čekanju"
+
+#. module: project_long_term
+#: field:project.resource.allocation,name:0
+msgid "unknown"
+msgstr "nepoznato"
+
+#. module: project_long_term
+#: field:project.resource.allocation,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Task Detail"
+msgstr "Pojedinosti o zadataku"
+
+#. module: project_long_term
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "Raspored radnih sati za prilagođavanje izvještaja Gantt dijagramom"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Izračun zadatka projekta"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Ograničenja"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Daje redoslijed sekvence prilikom prikaza popisa faza."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Faze projekta"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Izvršeno"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "U tijeku"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Preostali sati"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,responsible_id:0
+msgid "Responsible"
+msgstr "Odgovoran"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr "Radno vrijeme"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Current"
+msgstr "Trenutni"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Početna faza"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Please Specify Project to be schedule"
+msgstr "Molim navedite projekt za zakazivanje"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,total_hours:0
+msgid "Total Hours"
+msgstr "Ukupni sati"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "Task Scheduling completed successfully."
+msgstr "Zakazivanje zdataka uspješno završeno"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task for specified project."
+msgstr "Izračunaj zakazivanje zadataka za odabrani projekt"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Phase"
+msgstr "Faza"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"Ako je faza kreirana u statusu 'Nacrt'.\n"
+" AKo je faza započela, status se mijenja u 'U tijeku'.\n"
+" Ako je potreban pregled faza je u statusu 'Na čekanju'.                     "
+"             \n"
+" Ako je faza završila, status je postavljen na 'Završeno'."
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.resource.allocation,date_end:0
+msgid "End Date"
+msgstr "Završni Datum"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,resource_id:0
+msgid "Resource"
+msgstr "Resurs"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Pojedinosti zadatka"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Period"
+msgstr "Razdoblje rada"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_resource_resource
+msgid "Resource Detail"
+msgstr "Pojedinosti resursa"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Zakazivanje"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: field:project.resource.allocation,phase_id:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+msgid "Project Phase"
+msgstr "Faza projekta"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Izračun faza projekta"
+
+#. module: project_long_term
+#: field:project.schedule.tasks,msg:0
+msgid "Message"
+msgstr "Poruka"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "Petlje u fazama nisu dozvoljene"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All Projects"
+msgstr "Izračunaj sve projekte"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Odsustva resursa"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
+#: view:project.phase:0
+#: view:project.schedule.tasks:0
+msgid "Schedule Tasks"
+msgstr "Zakaži zadatke"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Predefinirano u danima"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Trajanje"
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 4ab1722336e..d402f16991a 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -73,11 +73,6 @@ class project_phase(osv.osv):
                  return False
          return True
 
-    def _get_default_uom_id(self, cr, uid):
-       model_data_obj = self.pool.get('ir.model.data')
-       model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
-       return model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
-
     def _compute_progress(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         if not ids:
@@ -179,7 +174,7 @@ class project_phase(osv.osv):
                 'months': 'm', 'month':'month', 'm':'m',
                 'weeks': 'w', 'week': 'w', 'w':'w',
                 'hours': 'H', 'hour': 'H', 'h':'H',
-            }.get(phase.product_uom.name.lower(), "h")
+            }.get(phase.product_uom.name.lower(), "H")
             duration = str(phase.duration) + duration_uom
             result += '''
     def Phase_%s():
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index fe3f8c8e510..4cd6d5cdec4 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -5,6 +5,10 @@
         This Demo data file Human Resources, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
         -->
 
+        <record id="project.project_integrate_openerp" model="project.project">
+            <field name="resource_calendar_id" ref="resource.timesheet_group1"/>
+        </record>
+
         <!-- Project Phases -->
 
         <record id="project_phase_1" model="project.phase">
@@ -13,6 +17,7 @@
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="1" name="sequence"/>
             <field name="duration">30</field>
+            <field name="constraint_date_start" eval="time.strftime('%Y-%m-01 10:00:00')"></field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
@@ -37,9 +42,9 @@
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
         <function model="project.phase" name="set_open" eval="[ref('project_phase_3')]"/>
-        
+
         <record id="project_phase_4" model="project.phase">
-            <field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
+            <field eval="[(6, 0, [ref('project_phase_3')])]" name="previous_phase_ids"/>
             <field name="name">Development and Integration</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="4" name="sequence"/>
@@ -60,7 +65,7 @@
             <field eval="[(6, 0, [ref('project_phase_5')])]" name="previous_phase_ids"/>
             <field name="name">Deployement and Training</field>
             <field name="product_uom" ref="product.uom_day"/>
-            <field eval="5" name="sequence"/>
+            <field eval="6" name="sequence"/>
             <field name="duration">10</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 4382d27834e..6ca496f691d 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -1,9 +1,9 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_phase","project.phase","model_project_phase","project.group_project_user",1,1,1,0
-"access_project_user_allocation","project.user.allocation","model_project_user_allocation","project.group_project_user",1,0,0,0
-"access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,1,1,1
-"access_project_user_allocation_manager","project.user.allocation manager","model_project_user_allocation","project.group_project_manager",1,1,1,1
-"access_resource_resource_user","user.user user","resource.model_resource_resource","project.group_project_user",1,0,0,0
-"access_resource_calendar_leaves_user","user.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
-"access_resource_resource_manager","user.user manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
-"access_project_user_allocation_manager","project.user.allocation.manager","model_project_user_allocation","project.group_project_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_phase,project.phase,model_project_phase,project.group_project_user,1,1,1,0
+access_project_user_allocation,project.user.allocation,model_project_user_allocation,project.group_project_user,1,0,0,0
+access_project_phase_manager,project.phase manager,model_project_phase,project.group_project_manager,1,1,1,1
+access_project_user_allocation_manager,project.user.allocation manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
+access_resource_resource_user,user.user user,resource.model_resource_resource,project.group_project_user,1,0,0,0
+access_resource_calendar_leaves_user,user.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
+access_resource_resource_manager,user.user manager,resource.model_resource_resource,project.group_project_manager,1,1,1,1
+access_project_user_allocation_manager,project.user.allocation.manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
diff --git a/addons/project_long_term/test/phase_constraint.yml b/addons/project_long_term/test/phase_constraint.yml
deleted file mode 100644
index f4fa09e6e38..00000000000
--- a/addons/project_long_term/test/phase_constraint.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-- 
-  Given that I have a project 'Test Phases'.
-- 
-  !record {model: project.project, id: project_project_developyamlproject0}:
-    name: "Develop Yaml Project Module"
-    date_start: !eval time.strftime('%Y-%m-%d')
-    resource_calendar_id: resource.timesheet_group1
-    members:
-      - base.user_admin
-- 
-  And I create three human ressources to work on this project, an analyst.
-- 
-  !record {model: resource.resource, id: resource_resource_analyst1}:
-    calendar_id: resource.timesheet_group1
-    name: Analyst
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: base.user_admin
-- 
-  I define a developer HR.
-- 
-  !record {model: resource.resource, id: resource_resource_develop0}:
-    calendar_id: resource.timesheet_group1
-    name: Developer
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: base.user_admin
-- 
-  I define a tester HR.
-- 
-  !record {model: resource.resource, id: resource_resource_tester1}:
-    calendar_id: resource.timesheet_group1
-    name: tester
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: base.user_admin
-- 
-  Then I create three phases for my projects; Analysis, Development, Testing.
-- 
-  The first phase is 'Analysis' and has a duration of 6 days.
-- 
-  !record {model: project.phase, id: project_phase_analysisflowforyaml0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 6.0
-    name: "Analysis"
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject0
-    state: draft
-
-- 
-  I update the constrain and the analysis phase to not start before 4 days.
-- 
-   !python {model : project.phase }: |
-      pass
-      import datetime
-      from dateutil.relativedelta import *
-      start = datetime.date.today() + relativedelta(days=4)
-      self.write(cr,uid, [(ref("project_phase_analysisflowforyaml0"))], {'constraint_date_start': start})
-- 
-  The second phase is 'Development' and depend on the 'Analysis', with a duration of 6 days.
-- 
-  !record {model: project.phase, id: project_phase_developyaml0}:
-    duration: 6.0
-    name: Development
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject0
-    previous_phase_ids:
-      - project_phase_analysisflowforyaml0
-
-- 
-  I update the Constrain Date Start adn Date End for phase Develop yaml
-- 
-   !python {model : project.phase }: |
-      pass 
-      import datetime
-      #from dateutil.relativedelta import *
-      #start = datetime.date.today() - relativedelta(days=5)    
-      #end = datetime.date.today() + relativedelta(days=10)
-      #self.write(cr,uid, [(ref("project_phase_developyaml0"))], {'constraint_date_start': start, 'constraint_date_end':end})
--
-  The third phase is 'Testing' and depend on the 'Develop' phase, with a duration of 6 days.
-- 
-  !record {model: project.phase, id: project_phase_testyaml0}:
-    duration: 6.0
-    name: Testing
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject0
-    previous_phase_ids:
-      - project_phase_developyaml0
-- 
-  Then I launch the scheduler to compute starting and ending phases on all phases of this project.
-- 
-  !record {model: project.compute.phases, id: project_compute_phases_0}:
-    project_id: project_project_developyamlproject0
-    target_project: one
-- 
-  !python {model: project.project}: |
-    self.schedule_phases(cr, uid, [ref("project_project_developyamlproject0")])
--
-  After scheduling, I check the starting date and ending date on the phases are correct.
--
-  !python {model: project.phase}: |
-     import datetime
-     from dateutil.relativedelta import *
-     minstart = (datetime.date.today() + relativedelta(days=4)).strftime('%Y-%m-%d')
-     minend = (datetime.date.today() + relativedelta(days=11)).strftime('%Y-%m-%d')
-
-     phase1=self.browse(cr, uid, ref('project_phase_analysisflowforyaml0'))
-     assert phase1.date_start>=minstart, 'Error, the Analysis phase '+phase1.date_start+' should start after '+str(minstart)
-     assert phase1.date_end>=minend, 'Error, the Analysis phase should end after '+str(minend)
-
-     phase2=self.browse(cr, uid, ref('project_phase_developyaml0'))
-     assert phase2.date_start>=phase1.date_end, 'Error, the phase Development should start after the end of the Analysis phase'
-
-     phase3=self.browse(cr, uid, ref('project_phase_testyaml0'))
-     assert phase3.date_start>=phase2.date_end, 'Error, the phase Testing should start after the end of the Development phase'
-     assert phase3.date_start<phase3.date_end, 'Error, the phase Testing should start before ending'
-
diff --git a/addons/project_long_term/test/phase_process.yml b/addons/project_long_term/test/phase_process.yml
new file mode 100644
index 00000000000..725c5b2a97d
--- /dev/null
+++ b/addons/project_long_term/test/phase_process.yml
@@ -0,0 +1,79 @@
+-
+  In order to test process of Phases,
+-
+  I create a record to schedule the phase of project.
+-
+  !record {model: project.compute.phases, id: project_compute_phases01}:
+    target_project: 'one'
+    project_id: project.project_integrate_openerp
+-
+  I schedule the phases.
+-
+  !python {model: project.compute.phases}: |
+    self.check_selection(cr, uid, [ref("project_compute_phases01")])
+-
+  I check the starting date and ending date on the phases after scheduling.
+-
+  !python {model: project.project}: |
+     project = self.browse(cr, uid, ref("project.project_integrate_openerp"), context=context)
+     def _convert(date):
+        import time
+        return time.strptime(date, '%Y-%m-%d %H:%M:%S')
+     def _check(phase, _convert, _check): #TOFIX: why need to pass function ?
+        for next_phase in phase.next_phase_ids:
+            assert _convert(next_phase.date_start) >= _convert(phase.date_end), "Phase does not start in proper date."
+            _check(next_phase, _convert, _check)
+        return True
+     
+     for phase in project.phase_ids:
+        
+        assert phase.date_start, "Start date should be computed."
+        assert phase.date_end, "End date should be computed." 
+        if not phase.previous_phase_ids and phase.constraint_date_start:
+            assert  _convert(phase.date_start) >= _convert(phase.constraint_date_start), "Phase does not start in proper date."
+            _check(phase, _convert, _check)
+-
+  I open phase.
+-
+  !python {model: project.phase}: |
+    self.set_open(cr, uid, [ref("project_phase_1")])
+-
+  I check state of phase after opened.
+-
+  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in open state}:
+    - state == "open"
+-
+  I put phase in pending state.
+-
+  !python {model: project.phase}: |
+    self.set_pending(cr, uid, [ref("project_phase_1")])
+-
+  I check state of phase after put in pending.
+-
+  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in pending state}:
+    - state == "pending"
+-
+  I make Phase in cancel state.
+-
+  !python {model: project.phase}: |
+    self.set_cancel(cr, uid, [ref("project_phase_1")])
+-
+  I check state of phase after cancelled.
+-
+  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in cancel state}:
+    - state == "cancelled"
+-
+  I put again in draft phase.
+-
+  !python {model: project.phase}: |
+    self.set_draft(cr, uid, [ref("project_phase_1")])
+-
+  I close phase.
+-
+  !python {model: project.phase}: |
+    self.set_done(cr, uid, [ref("project_phase_1")])
+-
+  I check state of phase after closed.
+-
+  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in done state}:
+    - state == "done"
diff --git a/addons/project_long_term/test/project_schedule_consecutive_day.yml b/addons/project_long_term/test/project_schedule_consecutive_day.yml
deleted file mode 100644
index cffe06a9ff9..00000000000
--- a/addons/project_long_term/test/project_schedule_consecutive_day.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-- 
-  Create a project 'Develop yaml Project Module'.
-- 
-  !record {model: project.project, id: project_project_developyamlproject_2}:
-    name: "Develop Yaml Project Module"
-    date_start: !eval time.strftime('%Y-%m-%d')
-    members:
-      - base.user_admin
-
-- 
-  I have set Working Time from Monday to  Friday from 9am to 17pm.
-- 
-  !record {model: resource.calendar, id: resource_calendar_hoursweekstest_P2}:
-    name: "from Monday to  Friday, from 9am to 17pm"
-
-- 
-  I have set Day1 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_hoursweekstest_P2day1}:
-    name: "Day1"
-    hour_from : 09.00
-    hour_to : 17.00
-    dayofweek : "0"
-    calendar_id : resource_calendar_hoursweekstest_P2
-
-- 
-  I have set Day2 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: rresource_calendar_hoursweekstest_P2day2}:
-    name: "Day2"
-    hour_from : 09.00
-    hour_to : 17.00
-    dayofweek : "1"
-    calendar_id : resource_calendar_hoursweekstest_P2
-    
-- 
-  I have set Day3 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_hoursweekstest_P2day3}:
-    name: "Day3"
-    hour_from : 09.00
-    hour_to : 17.00
-    dayofweek : "2"    
-    calendar_id : resource_calendar_hoursweekstest_P2
-
-- 
-  I have set Day4 Working Time for Monday to  Friday from 9am to 17pm working hour
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_hoursweekstest_P2day4}:
-    name: "Day4"
-    hour_from: 09.00
-    hour_to: 17.00
-    dayofweek: "3"
-    calendar_id: resource_calendar_hoursweekstest_P2
-
-- 
-  I have set Day5 Working Time for Monday to  Friday from 9am to 17pm working hour
--
-  !record {model: resource.calendar.attendance, id: resource_calendar_hoursweekstest_P2day5}:
-    name: "Day5"
-    hour_from: 09.00
-    hour_to: 17.00
-    dayofweek: "4"
-    calendar_id: resource_calendar_hoursweekstest_P2
-
-- 
-  Now Set working period to  Project 'Develop yaml Project Module'
-- 
-  !python {model: project.project}: |  
-    self.write(cr, uid, [ref("project_project_developyamlproject_2")], {'resource_calendar_id': ref("resource_calendar_hoursweekstest_P2")})
-
-- 
-  Create 3 a project phase.
-  First 'Analysis Flow for Yaml'Project Phase
-- 
-  !record {model: project.phase, id:  project_project_developyamlproject_2_Phase1}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 5.0
-    name: "Analysis Flow for Yaml"
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    state: draft
-    
-- 
-  Create project phase 'Develop yaml'
-- 
-  !record {model: project.phase, id:  project_project_developyamlproject_2_Phase2}:
-    duration: 5.0
-    name: Develop Yaml
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    previous_phase_ids:
-      -  project_project_developyamlproject_2_Phase1
-       
-- 
-  Create project phase 'Test Yaml'
-- 
-  !record {model: project.phase, id:  project_project_developyamlproject_2_Phase3}:
-    duration: 5.0
-    name: Testing Yaml
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    previous_phase_ids:
-      -  project_project_developyamlproject_2_Phase2    
-    
-- 
-  Compute Schedule of phases For One project 
-- 
-  !record {model: project.compute.phases, id: project_compute_phases_0}:
-    project_id: project_project_developyamlproject_2
-    target_project: one
-- 
-  Schedule project phases using Compute Phase Scheduling
-- 
-  !python {model: project.project}: |
-    self.schedule_phases(cr, uid, [ref("project_project_developyamlproject_2")])
-      
--
-  After  scheduling, Check that  phases scheduled, check that either of phase's start_date, end_date not null.
--
-  !python {model: project.project}: |
-     proj=self.browse(cr, uid, [ref("project_project_developyamlproject_2")])[0]
-     for phase in proj.phase_ids:
-        if (not phase.date_start) or (not phase.date_end):
-           raise AssertionError("Phases not scheduled")
-
-
diff --git a/addons/project_long_term/test/project_schedule_without_wroking_hour.yml b/addons/project_long_term/test/project_schedule_without_wroking_hour.yml
deleted file mode 100644
index 4fe7687425b..00000000000
--- a/addons/project_long_term/test/project_schedule_without_wroking_hour.yml
+++ /dev/null
@@ -1,76 +0,0 @@
--
-  Create a project 'Develop yaml Implementation Module'.
--
-  !record {model: project.project, id: project_project_developyamlproject_2}:
-    name: "Develop Yaml Project Module"
-    date_start: !eval time.strftime('%Y-%m-%d')
-
-- 
-  Create 4 Project phase.
-  First Project Phase 'Analysis Flow for Yaml'
-- 
-  !record {model: project.phase, id: project_project_developyamlproject_2_phase_1}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 6.0
-    product_uom: product.uom_day
-    name: "Analysis Flow for Yaml"
-    project_id: project_project_developyamlproject_2
-    state: draft
-    
-- 
-  Create project phase 'Develop yaml'
-- 
-  !record {model: project.phase, id: project_project_developyamlproject_2_phase_2}:
-    duration: 6.0
-    name: "Develop yaml"
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    previous_phase_ids:
-      - project_project_developyamlproject_2_phase_1
-    state: draft
-- 
-  Create project phase 'Test Yaml'
-- 
-  !record {model: project.phase, id: project_project_developyamlproject_2_phase_3}:
-    duration: 6.0
-    name: Testing Yaml
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    previous_phase_ids:
-      - project_project_developyamlproject_2_phase_2    
-    state: draft
-
-- 
-  Create project phase 'Implement Yaml'
-- 
-  !record {model: project.phase, id: project_project_developyamlproject_2_phase_4}:
-    duration: 6.0
-    name: Testing Yaml
-    product_uom: product.uom_day
-    project_id: project_project_developyamlproject_2
-    previous_phase_ids:
-      - project_project_developyamlproject_2_phase_3    
-    state: draft
-- 
-  Compute Schedule of phases For One project 
-- 
-  !record {model: project.compute.phases, id: project_compute_phases_0}:
-    project_id: project_project_developyamlproject_2
-    target_project: one
-    
-- 
-  Schedule project phases using Compute Phase Scheduling
-- 
-  !python {model: project.project}: |
-    self.schedule_phases(cr, uid, [ref("project_project_developyamlproject_2")])
-      
--
-  After  scheduling, Check that  phases scheduled, check that either of phase's start_date, end_date not null.
--
-  !python {model: project.project}: |
-     proj=self.browse(cr, uid, [ref("project_project_developyamlproject_2")])[0]
-     for phase in proj.phase_ids:
-        if (not phase.date_start) or (not phase.date_end):
-           raise AssertionError("Phases not scheduled")      
-      
-
diff --git a/addons/project_long_term/test/schedule_project_phases.yml b/addons/project_long_term/test/schedule_project_phases.yml
deleted file mode 100644
index 550787fe867..00000000000
--- a/addons/project_long_term/test/schedule_project_phases.yml
+++ /dev/null
@@ -1,180 +0,0 @@
--
-  Create a project 'World Bank's Project'
--
-  !record {model: project.project, id: project_project_worldbanksproject0}:
-    name: "World Bank's Project"
-    priority: 4
-    members:
-      - project.res_users_analyst
-      - project.res_users_project_manager
-      - project.res_users_technical_leader
-      - project.res_users_developer
-      - project.res_users_designer
-      - project.res_users_tester
-
--
-  Create a project phase 'Defining Client's Basic Idea of Project'
--
-  !record {model: project.phase, id: project_phase_definingclientsbasicideaofproject0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 15.0
-    name: "Defining Client's Basic Idea of Project"
-    product_uom: product.uom_day
-    project_id: project_project_worldbanksproject0
-
--
-  Create project phase 'Establishing Project Feasibility'
--
-  !record {model: project.phase, id: project_phase_establishingprojectfeasibility0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 30.0
-    name: Establishing Project Feasibility
-    product_uom: product.uom_day
-    project_id: project_project_worldbanksproject0
--
-  Create the phase task 'Develop GUI for Server Configuration'
--
-  !record {model: project.task, id: project_task_t0}:
-    name: Develop GUI for Server Configuration
-    planned_hours: 20.0
-    state: draft
-    phase_id:  project_phase_definingclientsbasicideaofproject0
-    project_id: project_project_worldbanksproject0
-
--
-  Create the phase task 'Develop GUI for Modules Configuration'
--
-  !record {model: project.task, id: project_task_t1}:
-    name: Develop GUI for Modules Configuration
-    planned_hours: 25.0
-    remaining_hours: 25.0
-    state: draft
-    phase_id:  project_phase_definingclientsbasicideaofproject0
-    project_id: project_project_worldbanksproject0
-
--
-  Create project phase 'Preparation of Engineering Designs'
--
-  !record {model: project.phase, id: project_phase_preparationofengineeringdesigns0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 100.0
-    name: Preparation of Engineering Designs
-    product_uom: product.uom_hour
-    project_id: project_project_worldbanksproject0
-
--
-  Create the phase task 'Develop GUI for Client Configuration'
--
-  !record {model: project.task, id: project_task_t2}:
-    name: Develop GUI for Server Configuration
-    planned_hours: 20.0
-    remaining_hours: 20.0
-    state: draft
-    phase_id:  project_phase_preparationofengineeringdesigns0
-    project_id: project_project_worldbanksproject0
-
--
-  Create the phase task 'Develop GUI for Client Module Configuration'
--
-  !record {model: project.task, id: project_task_t3}:
-    name: Develop GUI for Modules Configuration
-    planned_hours: 25.0
-    remaining_hours: 25.0
-    state: draft
-    phase_id:  project_phase_preparationofengineeringdesigns0
-    project_id: project_project_worldbanksproject0
-
-
--
-  Create project phase 'Procurement of Works and Goods'
--
-  !record {model: project.phase, id: project_phase_procurementofworksandgoods0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 24.0
-    name: Procurement of Works and Goods
-    product_uom: product.uom_hour
-    project_id: project_project_worldbanksproject0
-
--
-  Create project phase 'Project Construction'
--
-  !record {model: project.phase, id: project_phase_projectconstruction0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 4320.0
-    name: Project Construction
-    product_uom: product.uom_hour
-    project_id: project_project_worldbanksproject0
-
-
--
-  Create project phase 'Project Completion'
--
-  !record {model: project.phase, id: project_phase_projectcompletion0}:
-    date_start: !eval time.strftime('%Y-%m-%d')
-    duration: 240.0
-    name: Project Completion
-    product_uom: product.uom_hour
-    project_id: project_project_worldbanksproject0
-
--
-  Set previous phase for phase 'Establishing Project Feasibility'
--
-  !record {model: project.phase, id: project_phase_establishingprojectfeasibility0}:
-    previous_phase_ids:
-      - project_phase_definingclientsbasicideaofproject0
-
-
--
-  Set previous phase for phase 'Preparation of Engineering Designs'
--
-  !record {model: project.phase, id: project_phase_preparationofengineeringdesigns0}:
-    previous_phase_ids:
-      - project_phase_establishingprojectfeasibility0
-
--
-  Set previous phase for phase 'Procurement of Works and Goods'
--
-  !record {model: project.phase, id: project_phase_procurementofworksandgoods0}:
-    previous_phase_ids:
-      - project_phase_preparationofengineeringdesigns0
-
--
-  Set previous phase for phase 'Project Construction'
--
-  !record {model: project.phase, id: project_phase_projectconstruction0}:
-    previous_phase_ids:
-      - project_phase_procurementofworksandgoods0
-
-
--
-  Set previous phase for phase 'Project Completion'
--
-  !record {model: project.phase, id: project_phase_projectcompletion0}:
-    previous_phase_ids:
-      - project_phase_projectconstruction0
-
-
--
-  Get the project to schedule phases
--
-  !record {model: project.compute.phases, id: project_compute_phases_0}:
-    project_id: project_project_worldbanksproject0
-    target_project: one
-
-
--
-  Schedule project phases
--
-  !python {model: project.project}: |
-    self.schedule_phases(cr, uid, ref("project_project_worldbanksproject0"))
-
--
-  Check if phases scheduled, check that either of phase's start_date, end_date and user_id is not null
--
-  !python {model: project.project}: |
-     prj=self.browse(cr, uid, [ref("project_project_worldbanksproject0")])[0]
-     for phase in prj.phase_ids:
-        if (not phase.date_start) or (not phase.date_end):
-            raise AssertionError("Tasks not scheduled")
-
-
diff --git a/addons/project_long_term/test/schedule_project_tasks.yml b/addons/project_long_term/test/schedule_project_tasks.yml
deleted file mode 100644
index 17db7ef8038..00000000000
--- a/addons/project_long_term/test/schedule_project_tasks.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-- 
-  Create project 'Develop a thunderbird-openerp synchronization plugin'
-- 
-  !record {model: project.project, id: project_project_project1}:
-    name: Develop a thunderbird-openerp synchronization plugin
-    members:
-      - project.res_users_project_manager
-      - project.res_users_technical_leader
-      - project.res_users_developer
-      - project.res_users_designer
-      - project.res_users_tester
-      - project.res_users_analyst
-      - project.res_users_finacial_manager
-
-- 
-  Create phase 'Develop GUI' in thunderbird
-- 
-  !record {model: project.phase, id: project_phase_phase1}:
-    date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    duration: 200.0
-    name: Develop GUI in thunderbird
-    product_uom: product.uom_day
-    project_id: project_project_project1
-    state: draft
-- 
-  Create the phase task 'Develop GUI for Server Configuration'
-- 
-  !record {model: project.task, id: project_task_t10}:
-    name: Develop GUI for Server Configuration
-    planned_hours: 20.0
-    remaining_hours: 20.0
-    state: draft
-    phase_id: project_phase_phase1
-    project_id: project_project_project1
-    user_id: project.res_users_developer
-    
-- 
-  Create the phase task 'Develop GUI for Modules Configuration'
-- 
-  !record {model: project.task, id: project_task_t11}:
-    name: Develop GUI for Modules Configuration
-    planned_hours: 25.0
-    remaining_hours: 25.0
-    state: draft
-    phase_id: project_phase_phase1
-    project_id: project_project_project1
-    user_id: project.res_users_developer
-- 
-  Create the phase task 'Develop GUI for OpenERP Synchronisation'
-- 
-  !record {model: project.task, id: project_task_t12}:
-    name: Develop GUI for OpenERP Synchronisation
-    planned_hours: 30.0
-    remaining_hours: 30.0
-    state: draft
-    phase_id: project_phase_phase1
-    project_id: project_project_project1
-    user_id: project.res_users_developer
-- 
-  Create the phase task 'Design required GUI/Menus'
-- 
-  !record {model: project.task, id: project_task_13}:
-    name: Design required GUI/Menus
-    planned_hours: 25.0
-    remaining_hours: 25.0
-    state: draft
-    phase_id: project_phase_phase1
-    project_id: project_project_project1
-    user_id: project.res_users_designer
-
-- 
-  Schedule tasks
-- 
-  !python {model: project.project}: |
-        self.schedule_tasks(cr, uid, ref("project_project_project1"))
-
--
-  Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
--
-  !python {model: project.project}: |
-    prj = self.browse(cr, uid, [ref("project_project_project1")])[0]
-    for task in prj.tasks:
-        if task.state in ('done','cancelled'):
-            continue
-        if (not task.user_id) or (not task.date_start) or (not task.date_end):
-            raise AssertionError("Project tasks not scheduled!")
diff --git a/addons/project_long_term/test/task_process.yml b/addons/project_long_term/test/task_process.yml
new file mode 100644
index 00000000000..64ecef73476
--- /dev/null
+++ b/addons/project_long_term/test/task_process.yml
@@ -0,0 +1,19 @@
+-
+  I create a record to compute the tasks of project.
+-
+  !record {model: project.compute.tasks, id: project_compute_tasks0}:
+    project_id: project.project_integrate_openerp
+-
+  I compute and shedule the tasks.
+-
+  !python {model: project.compute.tasks}: |
+    self.compute_date(cr, uid, [ref("project_compute_tasks0")])
+-
+  Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
+-
+  !python {model: project.project}: |
+    prj = self.browse(cr, uid, [ref("project.project_integrate_openerp")])[0]
+    for task in prj.tasks:
+        if task.state in ('done','cancelled'):
+            continue
+        assert task.user_id and task.date_start and task.date_end, "Project tasks not scheduled"
diff --git a/addons/project_long_term/test/test_schedule_phases_case1.yml b/addons/project_long_term/test/test_schedule_phases_case1.yml
deleted file mode 100644
index 8b9ff5f3705..00000000000
--- a/addons/project_long_term/test/test_schedule_phases_case1.yml
+++ /dev/null
@@ -1,76 +0,0 @@
--
-  In order to test scheduling of project phases, I create two different phases and
-  test it with two different dates for scheduling.
--
-  I create a project Development and Testing.
-- 
-  !record {model: project.project, id: project_project_project_case1}:
-    name: "Development and Testing"
-    date_start: !eval time.strftime('%Y-%m-%d')
-    balance: 0.0
-    credit: 0.0
-    currency_id: base.EUR
-    debit: 0.0
-    effective_hours: 0.0
-    members:
-      - base.user_admin
-
-    planned_hours: 0.0
-    progress_rate: 0.0
-    quantity: 0.0
-    quantity_max: 0.0
-    state: open
-    type_ids:
-      - project.project_tt_specification
-      - project.project_tt_development
-      - project.project_tt_testing
-      - project.project_tt_merge
-- 
-  I create first phase of the project.
-- 
-  !record {model: project.phase, id: project_phase_firstphase0_case1}:
-    duration: 2.0
-    name: First Phase
-    product_uom: product.uom_day
-    project_id: project_project_project_case1
-    state: draft
-- 
-  I create second phase of the project.
-- 
-  !record {model: project.phase, id: project_phase_secondphase0_case2}:
-    duration: 3.0
-    name: Second Phase
-    previous_phase_ids:
-      - project_phase_firstphase0_case1
-    product_uom: product.uom_day
-    project_id: project_project_project_case1
-    state: draft
--
-  Now I create a record to compute the phase of project.
--
-  !record {model: project.compute.phases, id: project_compute_phases0}:
-    target_project: 'one'
-    project_id: project_project_project_case1
--
-  I schedule the phases.
--
-  !python {model: project.compute.phases}: |
-    self.check_selection(cr, uid, [ref("project_compute_phases0")])
--
-  I check the starting and ending dates of both phases.
--
-  !python {model: project.phase}: |
-    import datetime
-    from dateutil.relativedelta import *
-    start = (datetime.date.today()).strftime('%Y-%m-%d')
-    end = (datetime.date.today() + relativedelta(days=1)).strftime('%Y-%m-%d 17:00:00')
-    first_phase = self.browse(cr, uid, ref('project_phase_firstphase0_case1'))
-    assert (first_phase.date_start[:10] >= start),'Start dates are wrong: %s < %s !' % (first_phase.date_start[:10], start)
-    assert (first_phase.date_end >= end),'End dates are wrong: %s <%s!' % (first_phase.date_end, end)
-
-    second_phase = self.browse(cr, uid, ref('project_phase_secondphase0_case2'))
-    start = first_phase.date_end
-    end = (datetime.date.today() + relativedelta(days=4)).strftime('%Y-%m-%d')
-    assert second_phase.date_start >= start, 'Dates are wrong on second phase: %s < %s!' % (second_phase.date_start, start)
-    assert second_phase.date_end >= end, 'Dates are wrong on second phase %s < %s!' % (second_phase.date_end, end)
-
diff --git a/addons/project_long_term/test/test_schedule_phases_case2.yml b/addons/project_long_term/test/test_schedule_phases_case2.yml
deleted file mode 100644
index 35173a897a3..00000000000
--- a/addons/project_long_term/test/test_schedule_phases_case2.yml
+++ /dev/null
@@ -1,193 +0,0 @@
--
-  In order to test scheduling of project phases, I create two different 
-  working periods and resources. And schedule the phases.
-- 
-  I create first working period 'Working Time A'.
-- 
-  !record {model: resource.calendar, id: resource_calendar_workingtimea0}:
-    attendance_ids:
-      - dayofweek: '0'
-        hour_from: 10.0
-        hour_to: 16.0
-        name: Monday
-      - dayofweek: '1'
-        hour_from: 10.0
-        hour_to: 16.0
-        name: Tuesday
-      - dayofweek: '2'
-        hour_from: 10.0
-        hour_to: 16.0
-        name: Wednesday
-      - dayofweek: '3'
-        hour_from: 10.0
-        hour_to: 16.0
-        name: Thursday
-    name: Working Time A
-
-- 
-  Creating a resource.calendar.attendance record
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_attendance_monday0}:
-    calendar_id: resource_calendar_workingtimea0
-    dayofweek: '0'
-    hour_from: 10.0
-    hour_to: 16.0
-    name: Monday
-- 
-  Creating a resource.calendar.attendance record
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_attendance_tuesday0}:
-    calendar_id: resource_calendar_workingtimea0
-    dayofweek: '1'
-    hour_from: 10.0
-    hour_to: 16.0
-    name: Tuesday
-- 
-  Creating a resource.calendar.attendance record
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_attendance_wednesday0}:
-    calendar_id: resource_calendar_workingtimea0
-    dayofweek: '2'
-    hour_from: 10.0
-    hour_to: 16.0
-    name: Wednesday
-- 
-  Creating a resource.calendar.attendance record
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_attendance_thursday0}:
-    calendar_id: resource_calendar_workingtimea0
-    dayofweek: '3'
-    hour_from: 10.0
-    hour_to: 16.0
-    name: Thursday
-- 
-  I create second working period 'Working Time B'.
-- 
-  !record {model: resource.calendar, id: resource_calendar_workingtimeb0}:
-    attendance_ids:
-      - dayofweek: '4'
-        hour_from: 9.0
-        hour_to: 18.0
-        name: Friday
-    name: Working Time B
-- 
-  Creating a resource.calendar.attendance record
-- 
-  !record {model: resource.calendar.attendance, id: resource_calendar_attendance_friday0}:
-    calendar_id: resource_calendar_workingtimeb0
-    dayofweek: '4'
-    hour_from: 9.0
-    hour_to: 18.0
-    name: Friday
-- 
-  I create first resource say 'Resource X' without assigning working period.
-- 
-  !record {model: resource.resource, id: resource_resource_resourcex0}:
-    name: Resource X
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: base.user_admin
-- 
-  I create first resource say 'Resource Y' with working period 'Working Time B'.
-- 
-  !record {model: resource.resource, id: resource_resource_resourcey0}:
-    calendar_id: resource_calendar_workingtimeb0
-    name: Resource Y
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: base.user_admin
-- 
-  I create a project 'Development and Testing' and assign working period 'Working Time A'.
-- 
-  !record {model: project.project, id: project_project_project0}:
-    balance: 0.0
-    credit: 0.0
-    currency_id: base.EUR
-    debit: 0.0
-    effective_hours: 0.0
-    members:
-      - base.user_admin
-    name: Development and Testing
-    planned_hours: 20.0
-    progress_rate: 0.0
-    quantity: 0.0
-    quantity_max: 0.0
-    resource_calendar_id: resource_calendar_workingtimea0
-    state: open
-    tasks:
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task 1
-        planned_hours: 10.0
-        remaining_hours: 10.0
-        state: draft
-        total_hours: 10.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task 2
-        planned_hours: 10.0
-        remaining_hours: 10.0
-        state: draft
-        total_hours: 10.0
-    total_hours: 10.0
-    members:
-      - project.res_users_analyst
-      - project.res_users_project_manager
-      - project.res_users_technical_leader
-      - project.res_users_developer
-      - project.res_users_designer
-      - project.res_users_tester
-    type_ids:
-      - project.project_tt_specification
-      - project.project_tt_development
-      - project.project_tt_testing
-      - project.project_tt_merge
-     
-- 
-  I create a phase 'Initial Phase' for project 'Development and Testing'.
-- 
-  !record {model: project.phase, id: project_phase_phase0}:
-    date_start: '2011-01-03 08:00:00'
-    duration: 0.0
-    name: Initial Phase
-    product_uom: product.uom_day
-    project_id: project_project_project0
-    state: draft
-- 
-  I create first task 'Developing module' and assign 10h.
-- 
-  !record {model: project.task, id: project_task_task0}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Developing module
-    planned_hours: 10.0
-    project_id: project_project_project0
-    remaining_hours: 10.0
-    state: draft
-    total_hours: 10.0
-    phase_id: project_phase_phase0
-- 
-  I create first task 'Testing module' and assign 10h.
-- 
-  !record {model: project.task, id: project_task_task1}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Testing module
-    planned_hours: 10.0
-    project_id: project_project_project0
-    remaining_hours: 10.0
-    state: draft
-    total_hours: 10.0
-    phase_id: project_phase_phase0
--
-  Now I create a record to compute the phase of project.
--
-  !record {model: project.compute.phases, id: project_compute_phases0}:
-    target_project: 'one'
-    project_id: project_project_project0
--
-  I schedule the phases.
--
-  !python {model: project.compute.phases}: |
-    self.check_selection(cr, uid, [ref("project_compute_phases0")])
-
diff --git a/addons/project_long_term/test/test_schedule_tasks_case1.yml b/addons/project_long_term/test/test_schedule_tasks_case1.yml
deleted file mode 100644
index 3bb0ea87c43..00000000000
--- a/addons/project_long_term/test/test_schedule_tasks_case1.yml
+++ /dev/null
@@ -1,246 +0,0 @@
--
-  In order to test scheduling of tasks, I create four tasks with different sequences and schedule them.
-- 
-  I create first user.
-- 
-  !record {model: res.users, id: res_users_user0}:
-    company_id: base.main_company
-    context_lang: en_US
-    groups_id:
-      - base.group_partner_manager
-      - base.group_user
-    login: user1
-    name: User 1
-    password: user1
-- 
-  I create second user.
-- 
-  !record {model: res.users, id: res_users_user1}:
-    company_id: base.main_company
-    context_lang: en_US
-    groups_id:
-      - base.group_partner_manager
-      - base.group_user
-    login: user2
-    name: User 2
-    password: user2    
-- 
-  I create a Project.
-- 
-  !record {model: project.project, id: project_project_projecta0}:
-    balance: 0.0
-    credit: 0.0
-    currency_id: base.EUR
-    debit: 0.0
-    effective_hours: 0.0
-    name: Project A
-    members:
-      - res_users_user0
-      - res_users_user1
-    phase_ids:
-      - date_start: '2011-01-06 08:00:00'
-        duration: 2.0
-        name: Phase A
-        product_uom: product.uom_day
-        state: draft
-        task_ids:
-          - delay_hours: 0.0
-            effective_hours: 0.0
-            name: Task D
-            planned_hours: 5.0
-            remaining_hours: 5.0
-            state: draft
-            total_hours: 5.0
-          - delay_hours: 0.0
-            effective_hours: 0.0
-            name: Task C
-            planned_hours: 5.0
-            remaining_hours: 5.0
-            sequence: 11
-            state: draft
-            total_hours: 5.0
-          - delay_hours: 0.0
-            effective_hours: 0.0
-            name: Task B
-            planned_hours: 5.0
-            remaining_hours: 5.0
-            sequence: 13
-            state: draft
-            total_hours: 5.0
-          - delay_hours: 0.0
-            effective_hours: 0.0
-            name: Task A
-            planned_hours: 5.0
-            remaining_hours: 5.0
-            sequence: 14
-            state: draft
-            total_hours: 5.0
-    planned_hours: 20.0
-    progress_rate: 0.0
-    quantity: 0.0
-    quantity_max: 0.0
-    state: open
-    tasks:
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task D
-        planned_hours: 5.0
-        remaining_hours: 5.0
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task C
-        planned_hours: 5.0
-        remaining_hours: 5.0
-        sequence: 11
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task B
-        planned_hours: 5.0
-        remaining_hours: 5.0
-        sequence: 13
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task A
-        planned_hours: 5.0
-        remaining_hours: 5.0
-        sequence: 14
-        state: draft
-        total_hours: 5.0
-    total_hours: 15.0
-- 
-  I create first task with highest sequence.
-- 
-  !record {model: project.task, id: project_task_taska0}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Task A
-    planned_hours: 5.0
-    project_id: project_project_projecta0
-    remaining_hours: 5.0
-    sequence: 14
-    state: draft
-    total_hours: 5.0
-- 
-  I create second task.
-- 
-  !record {model: project.task, id: project_task_taskb0}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Task B
-    planned_hours: 5.0
-    project_id: project_project_projecta0
-    remaining_hours: 5.0
-    sequence: 13
-    state: draft
-    total_hours: 5.0
-- 
-  I create third task.
-- 
-  !record {model: project.task, id: project_task_taskc0}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Task C
-    planned_hours: 5.0
-    project_id: project_project_projecta0
-    remaining_hours: 5.0
-    sequence: 11
-    state: draft
-    total_hours: 5.0
--
-  I create fourth task with lowest sequence.
-- 
-  !record {model: project.task, id: project_task_taskd0}:
-    delay_hours: 0.0
-    effective_hours: 0.0
-    name: Task D
-    planned_hours: 5.0
-    project_id: project_project_projecta0
-    remaining_hours: 5.0
-    state: draft
-    total_hours: 5.0
-- 
-  Now I create a resource for first user.
-- 
-  !record {model: resource.resource, id: resource_resource_user0}:
-    name: User 1
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: res_users_user0
-- 
-  I create a resource for second user.
-- 
-  !record {model: resource.resource, id: resource_resource_user1}:
-    name: User 2
-    resource_type: user
-    time_efficiency: 1.0
-    user_id: res_users_user1
-- 
-  Now I create one phase for the project.
-- 
-  !record {model: project.phase, id: project_phase_phasea0}:
-    date_start: '2011-01-06 08:00:00'
-    duration: 2.0
-    name: Phase A
-    product_uom: product.uom_day
-    project_id: project_project_projecta0
-    state: draft
-    task_ids:
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task D
-        planned_hours: 5.0
-        project_id: project_project_projecta0
-        remaining_hours: 5.0
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task C
-        planned_hours: 5.0
-        project_id: project_project_projecta0
-        remaining_hours: 5.0
-        sequence: 11
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task B
-        planned_hours: 5.0
-        project_id: project_project_projecta0
-        remaining_hours: 5.0
-        sequence: 13
-        state: draft
-        total_hours: 5.0
-      - delay_hours: 0.0
-        effective_hours: 0.0
-        name: Task A
-        planned_hours: 5.0
-        project_id: project_project_projecta0
-        remaining_hours: 5.0
-        sequence: 14
-        state: draft
-        total_hours: 5.0
--
-  Now I create a record to schedule the tasks of project.
--
-  !record {model: project.compute.tasks, id: project_compute_tasks0}:
-    project_id: project_project_projecta0
--
-  I schedule the tasks.
--
-  !python {model: project.compute.tasks}: |
-    self.compute_date(cr, uid, [ref("project_compute_tasks0")])
--
-  I check that whether the tasks now allocated to respected resources or not.
--
-  !python {model: project.task}: |
-    task_ids = self.search(cr, uid, [('project_id','=',ref('project_project_projecta0'))])
-    for task in self.browse(cr, uid, task_ids):
-      if (not task.date_start) or (not task.date_end):
-        raise AssertionError("Tasks are not scheduled.")
diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
index 7f55c580fb8..233bb0e79a6 100644
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name": "Tasks Mail Integration",
+    "name": "Tasks-Mail Integration",
     "version": "1.1",
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
diff --git a/addons/project_mailgate/i18n/hr.po b/addons/project_mailgate/i18n/hr.po
new file mode 100644
index 00000000000..cb4276b9d7f
--- /dev/null
+++ b/addons/project_mailgate/i18n/hr.po
@@ -0,0 +1,107 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 08:56+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History Information"
+msgstr "Informacije o povjesti"
+
+#. module: project_mailgate
+#: model:ir.model,name:project_mailgate.model_project_task
+msgid "Task"
+msgstr "Zadatak"
+
+#. module: project_mailgate
+#: model:ir.module.module,description:project_mailgate.module_meta_information
+msgid ""
+"This module is an interface that synchronises mails with OpenERP Project "
+"Task.\n"
+"\n"
+"It allows creating tasks as soon as a new mail arrives in our configured "
+"mail server.\n"
+"Moreover, it keeps track of all further communications and task states.\n"
+"    "
+msgstr ""
+"Ovaj modul je sučelje za sinhronizaciju poruka sa OpenERP projektnim "
+"zadacima.\n"
+"\n"
+"Omogućava kreiranje zadataka čim stigne novi e-mail na naš konfigurirani "
+"mail poslužitelj.\n"
+"Štoviše, čuva zapise o svim kasnijim komunikacijama i statusima zadataka.\n"
+"    "
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Attachments"
+msgstr "Privici"
+
+#. module: project_mailgate
+#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
+msgid "Project MailGateWay"
+msgstr "MailGateWay projekta"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:123
+#, python-format
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Details"
+msgstr "Pojedinosti"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:149
+#, python-format
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:143
+#, python-format
+msgid "Done"
+msgstr "Izvršeno"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:129
+#, python-format
+msgid "Open"
+msgstr "Otvoreno"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:135
+#, python-format
+msgid "Pending"
+msgstr "Na čekanju"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History"
+msgstr "Povijest"
diff --git a/addons/project_mailgate/security/ir.model.access.csv b/addons/project_mailgate/security/ir.model.access.csv
index cf9a08b958d..6c495169161 100644
--- a/addons/project_mailgate/security/ir.model.access.csv
+++ b/addons/project_mailgate/security/ir.model.access.csv
@@ -1,3 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mail_message_project_manager","project.mail.message.manager","mail.model_mail_message","project.group_project_manager",1,1,1,0
-"access_mail_message_project_user","project.mail.message.user","mail.model_mail_message","project.group_project_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mail_message_project_user,project.mail.message.user,mail.model_mail_message,project.group_project_user,1,1,1,0
diff --git a/addons/project_messages/i18n/hr.po b/addons/project_messages/i18n/hr.po
new file mode 100644
index 00000000000..d12926319b0
--- /dev/null
+++ b/addons/project_messages/i18n/hr.po
@@ -0,0 +1,144 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 08:50+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Za"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr "project.messages"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "Od"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+msgid "Communication Messages"
+msgstr "Komunikacijske poruke"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "Datum kreiranja"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "Danas"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr ""
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.act_project_messages
+#: model:ir.actions.act_window,name:project_messages.action_view_project_editable_messages_tree
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_messages
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid ""
+"An in-project messaging system allows for an efficient and trackable "
+"communication between project members. The messages are stored in the system "
+"and can be used for post analysis."
+msgstr ""
+"Sustav poruka unutar projekta omogućava efikasnu i slijedivu komunikaciju "
+"između članova projekta. Poruke se čuvaju u sustavu i mogu se koristiti za "
+"kasniju analizu."
+
+#. module: project_messages
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid ""
+"\n"
+"    This module provides the functionality to send messages within a "
+"project.\n"
+"    A user can send messages individually to other user. He can even "
+"broadcast\n"
+"    it to all the users.\n"
+"    "
+msgstr ""
+"\n"
+"    Modul omogućava funkcionalnost slanja poruka unutar projekta.\n"
+"    Korisnik može slati pojedinačne poruke drugom korisniku. Može čak i "
+"obavjestiti\n"
+"    sve korisnike.\n"
+"    "
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "Poruka za"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr "Poruka"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "Poruka od"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Project Messages"
+msgstr "Poruke projekta"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
+
+#. module: project_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr "Interni sustav poruka projekta"
diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
index 5756a7456bb..1792f1ea840 100644
--- a/addons/project_messages/security/ir.model.access.csv
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -1,4 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_messages","project.messages","model_project_messages","project.group_project_user",1,1,1,1
-"access_project_messages_manager","project.messages manager","model_project_messages","project.group_project_manager",1,1,1,1
-"access_project_message_project_user","project.project.user","model_project_project","project.group_project_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_messages,project.messages,model_project_messages,project.group_project_user,1,1,1,1
+access_project_message_project_user,project.project.user,model_project_project,project.group_project_user,1,0,0,0
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index e5722b92da9..c36b3229a81 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -54,7 +54,7 @@ task is completed.
     'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
     'init_xml': [],
     'update_xml': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml', 'project_mrp_view.xml'],
-    'demo_xml': [],
+    'demo_xml': ['project_mrp_demo.xml'],
     'test': ['test/project_task_procurement.yml'],
     'installable': True,
     'active': False,
diff --git a/addons/project_mrp/i18n/hr.po b/addons/project_mrp/i18n/hr.po
index a5bf98634cf..4b4f2016620 100644
--- a/addons/project_mrp/i18n/hr.po
+++ b/addons/project_mrp/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-03 09:34+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 00:12+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:23+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: project_mrp
@@ -25,7 +25,7 @@ msgstr "Za svaki proizvod, pri vrsti usluge i pri narudžbi"
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_procuretask0
 msgid "Procurement Task"
-msgstr ""
+msgstr "Procurement Task"
 
 #. module: project_mrp
 #: model:ir.module.module,shortdesc:project_mrp.module_meta_information
@@ -45,28 +45,28 @@ msgstr "Ako je tip proizvoda 'usluga' tada kreira zadatak"
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Greška! Rekurzivni zadaci."
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: project_mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Neispravan barkod!"
 
 #. module: project_mrp
 #: field:product.product,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_procurement_order
 #: field:project.task,procurement_id:0
 msgid "Procurement"
-msgstr "Nabava"
+msgstr "Procurement"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
@@ -74,7 +74,7 @@ msgstr "Nabava"
 #: model:process.node,name:project_mrp.process_node_procuretasktask0
 #: field:procurement.order,task_id:0
 msgid "Task"
-msgstr "Zadatak"
+msgstr "Task"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
@@ -84,12 +84,12 @@ msgstr "Stvara se zadatak kako bi se pružila usluga"
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
 msgid "Order Task"
-msgstr "Zadatak narudžbe"
+msgstr "Zadatak naloga"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_saleordertask0
 msgid "Sale Order Task"
-msgstr "Zadatak Prodajne Narudžbe"
+msgstr "Zadatak prodajnog naloga"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -125,12 +125,12 @@ msgstr ""
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
 msgid "If procurement method is Make to order and supply method is produce"
-msgstr ""
+msgstr "If procurement method is Make to order and supply method is produce"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
 msgid "In case you sell services on sale order"
-msgstr "U slučaju da prodajete usluge prema narudžbi prodaje"
+msgstr "U slučaju kada prodajete usluge na prodajnim nalozima"
 
 #~ msgid "Procure Task"
 #~ msgstr "Zadatak nabave"
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index 3bbb0658b11..a3cde855b6c 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -31,10 +31,10 @@ class project_task(osv.osv):
     }
 
     def _validate_subflows(self, cr, uid, ids):
+        wf_service = netsvc.LocalService("workflow")
         for task in self.browse(cr, uid, ids):
             if task.procurement_id:
-                wf_service = netsvc.LocalService("workflow")
-                wf_service.trg_validate(uid, 'procurement.order', task.procurement_id.id, 'subflow.done', cr)
+                wf_service.trg_write(uid, 'procurement.order', task.procurement_id.id, cr)
 
     def do_close(self, cr, uid, ids, *args, **kwargs):
         res = super(project_task, self).do_close(cr, uid, ids, *args, **kwargs)
diff --git a/addons/project_mrp/project_mrp_demo.xml b/addons/project_mrp/project_mrp_demo.xml
new file mode 100644
index 00000000000..fcc0b27d31f
--- /dev/null
+++ b/addons/project_mrp/project_mrp_demo.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+    
+        <!--Resource: sale.order.line for services type product-->
+        
+        <record id="line_services" model="sale.order.line">
+            <field name="order_id" ref="sale.order7"/>
+            <field name="name">Advance</field>
+            <field name="product_id" ref="sale.advance_product_0"/>
+            <field name="product_uom" ref="product.uom_day"/>
+            <field name="price_unit">150.0</field>
+            <field name="product_uom_qty">5.0</field>
+            <field name="type">make_to_order</field>
+        </record>
+        
+    </data>
+</openerp>        
diff --git a/addons/project_mrp/project_mrp_workflow.xml b/addons/project_mrp/project_mrp_workflow.xml
index 751634816e3..18962cde0ee 100644
--- a/addons/project_mrp/project_mrp_workflow.xml
+++ b/addons/project_mrp/project_mrp_workflow.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <record model="workflow.transition" id="procurement.trans_produce_service_make_done">
-            <field name="act_from" ref="procurement.act_produce_service"/>
-            <field name="act_to" ref="procurement.act_make_done"/>
-            <field name="signal">subflow.done</field>
+        <record id="trans_make_done_done2" model="workflow.transition">
+            <field name="act_from" ref="procurement.act_make_done"/>
+            <field name="act_to" ref="procurement.act_done"/>
+            <field name="condition">action_check_finished()</field>
+            <field name="trigger_model">project.task</field>
+            <field name="trigger_expr_id">task_id and [task_id.id] or []</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 2c9732478fb..7d3045aede0 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -29,29 +29,46 @@ class procurement_order(osv.osv):
         'sale_line_id': fields.many2one('sale.order.line', 'Sale order line')
     }
 
-    def check_produce_service(self, cr, uid, procurement, context=None):
+    def action_check_finished(self, cr, uid, ids):
+        res = super(procurement_order, self).action_check_finished(cr, uid, ids)
+        return res and self.check_task_done(cr, uid, ids)
+    
+    def check_task_done(self, cr, uid, ids, context=None):
+        """ Checks if task is done or not.
+        @return: True or False.
+        """
+        return all(proc.product_id.type != 'service' or (proc.task_id and proc.task_id.state in ('done', 'cancelled')) \
+                    for proc in self.browse(cr, uid, ids, context=context))
+
+    def check_produce_service(self, cr, uid, procurement, context=None):    
         return True
 
-    def action_produce_assign_service(self, cr, uid, ids, context=None):
-        project_obj = self.pool.get('project.project')
-        uom_obj = self.pool.get('product.uom')
-        default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
-        for procurement in self.browse(cr, uid, ids, context=context):
-            project_id = False
-            if procurement.product_id.project_id:
-                project_id = procurement.product_id.project_id.id
-            elif procurement.sale_line_id:
-                account_id = procurement.sale_line_id.order_id.project_id.id
-                if account_id:
-                    project_ids = project_obj.search(cr, uid, [('analytic_account_id', '=', account_id)])
-                    project_id = project_ids and project_ids[0] or False
-            if procurement.product_uom.id != default_uom:
-                planned_hours = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, default_uom)
-            else:
-                planned_hours = procurement.product_qty
+    def _convert_qty_company_hours(self, cr, uid, procurement, context=None):
+        product_uom = self.pool.get('product.uom')
+        company_time_uom_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
+        if procurement.product_uom.id != company_time_uom_id:
+            planned_hours = product_uom._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, company_time_uom_id)
+        else:
+            planned_hours = procurement.product_qty
+        return planned_hours
 
-            self.write(cr, uid, [procurement.id], {'state': 'running'})
-            task_id = self.pool.get('project.task').create(cr, uid, {
+    def _get_project(self, cr, uid, procurement, context=None):
+        project_project = self.pool.get('project.project')
+        project = procurement.product_id.project_id
+        if not project and procurement.sale_line_id:
+            # find the project corresponding to the analytic account of the sale order
+            account = procurement.sale_line_id.order_id.project_id
+            project_ids = project_project.search(cr, uid, [('analytic_account_id', '=', account.id)])
+            projects = project_project.browse(cr, uid, project_ids, context=context)
+            project = projects and projects[0] or False
+        return project
+
+    def action_produce_assign_service(self, cr, uid, ids, context=None):
+        project_task = self.pool.get('project.task')
+        for procurement in self.browse(cr, uid, ids, context=context):
+            project = self._get_project(cr, uid, procurement, context=context)
+            planned_hours = self._convert_qty_company_hours(cr, uid, procurement, context=context)
+            task_id = project_task.create(cr, uid, {
                 'name': '%s:%s' % (procurement.origin or '', procurement.product_id.name),
                 'date_deadline': procurement.date_planned,
                 'planned_hours':planned_hours,
@@ -60,12 +77,10 @@ class procurement_order(osv.osv):
                 'notes': procurement.note,
                 'procurement_id': procurement.id,
                 'description': procurement.note,
-                'date_deadline': procurement.date_planned,
-                'project_id':  project_id,
-                'state': 'draft',
+                'project_id':  project and project.id or False,
                 'company_id': procurement.company_id.id,
             },context=context)
-            self.write(cr, uid, [procurement.id],{'task_id':task_id})
+            self.write(cr, uid, [procurement.id], {'task_id': task_id, 'state': 'running'}, context=context)
         return task_id
 
 procurement_order()
diff --git a/addons/project_mrp/security/ir.model.access.csv b/addons/project_mrp/security/ir.model.access.csv
index 7c6e2a7a30c..8bc4d4ba1b5 100644
--- a/addons/project_mrp/security/ir.model.access.csv
+++ b/addons/project_mrp/security/ir.model.access.csv
@@ -1,3 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_procurement_project_user","procurement.order project_user","model_procurement_order","project.group_project_user",1,1,1,1
-"access_procurement_project_manager","procurement.order project_manager","model_procurement_order","project.group_project_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_procurement_project_user,procurement.order project_user,model_procurement_order,project.group_project_user,1,1,1,1
diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/project_mrp/test/project_task_procurement.yml
index b2cc6a68363..b72527e61a5 100644
--- a/addons/project_mrp/test/project_task_procurement.yml
+++ b/addons/project_mrp/test/project_task_procurement.yml
@@ -1,83 +1,48 @@
-- |
-  In order to test project_mrp module with OpenERP I create a sale order
-  with product type 'service' so when procurement runs one task is created for
-  the project associated with my sale order.
 -
-  I create record for a service type product.
+  In order to test process to generate task automatic from procurement, I confirm sale order to sale service product.
 -
-  !record {model: product.product, id: product_product_partnerstraining0, view: False}:
-    categ_id: product.product_category_7
-    cost_method: standard
-    mes_type: fixed
-    name: Partners Training
-    procure_method: make_to_order
-    supply_method: produce
-    type: service
-    uom_id: product.uom_day
-    uom_po_id: product.uom_day
-    warranty: 0.0
-- |
-  I create a sale order for product Partners Training which has type 'Service',
-  and select the appropriate Analytic Account matching my project.
-- 
-  !record {model: sale.order, id: sale_order_so0}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: TESTSO006
-    order_policy: manual
-    partner_id: base.res_partner_asus
-    partner_invoice_id: base.res_partner_address_tang
-    partner_order_id: base.res_partner_address_tang
-    partner_shipping_id: base.res_partner_address_tang
-    order_line:
-      - state: draft
-        delay: 7.0
-        name: Partners Training
-        price_unit: 1.0
-        product_id: product_product_partnerstraining0
-        product_uom: product.uom_day
-        product_uom_qty: 5.0
-        type: make_to_order
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
-    user_id: base.user_demo
-
-- I select the Analytic Account for my project on the sale order 
-- 
-  !python {model: sale.order}: |
-    acc_id = self.pool.get('project.project').browse(cr, uid,
-        ref('project.project_integrate_openerp')).analytic_account_id.id
-    self.write(cr, uid, ref('sale_order_so0'), {'project_id': acc_id})
+  !workflow {model: sale.order, action: order_confirm, ref: sale.order7}
 -
-  I confirm this sale order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
--
-  I check the procurements.
+  I run the scheduler.
 -
   !python {model: procurement.order}: |
-    orderline_obj = self.pool.get('sale.order.line')
-    line_ids = orderline_obj.search(cr, uid, [('order_id','=', ref('sale_order_so0'))])
-    orders = orderline_obj.browse(cr, uid, line_ids)
-    proc_ids = map(lambda x: x.procurement_id.id, orders)
-    assert proc_ids, 'No Procurements!'
+    self.run_scheduler(cr, uid)
 -
-  The scheduler runs.
+  Now I check that task details after run procurement
 -
-  !function {model: procurement.order, name: run_scheduler}:
-    - model: procurement.order
-      search: "[]"
+  !python {model: procurement.order}: |
+    from datetime import datetime
+    procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
+    assert procurement_ids, "Procurement is not generated for Service Order Line."
+    procurement = self.browse(cr, uid, procurement_ids[0], context=context)
+    assert procurement.state != 'done' , "Procurement should not be closed."
+    task = procurement.task_id
+    assert task, "Task is not generated."
+    # check whether task project either is the product's project, or corresponds to the analytic account of sale order
+    project = task.project_id
+    if procurement.product_id.project_id:
+        assert project == procurement.product_id.project_id, "Project does not correspond."
+    elif procurement.sale_line_id:
+        account = procurement.sale_line_id.order_id.project_id
+        assert (not project and not account) or project.analytic_account_id == account, "Project does not correspond."
+    planned_hours = self._convert_qty_company_hours(cr, uid, procurement, context=context)
+    assert task.planned_hours == planned_hours, 'Planned Hours do not correspond.'
+    assert datetime.strptime(task.date_deadline, '%Y-%m-%d') == datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S'), 'Deadline does not correspond.'
+    if procurement.product_id.product_manager:
+        assert task.user_id.id == procurement.product_id.product_manager.id, 'Allocated Person does not correspond with Service Product Manager.'
+    assert task.description == procurement.note, "Task description does not correspond."
 -
-  Now I check that one task is created for my sale order, in the desired project
+  I close that task.
 -
   !python {model: project.task}: |
-    order_obj = self.pool.get('sale.order')
-    order = order_obj.browse(cr, uid, ref('sale_order_so0'))
-    # planned_hours == 40 because default company project UOM is hours, and
-    # product was sold as 5.0 days.
-    task_id = self.search(cr, uid, [('name', '=', order.name+":Partners Training"),
-                                    ('project_id','=', ref('project.project_integrate_openerp')),
-                                    ('planned_hours','=', 40.0),
-                                    ('state','=','draft')])
-    assert task_id, 'Expected Task not found!'
\ No newline at end of file
+    task_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
+    assert task_ids, "Task is not generated for Service Order Line."
+    self.do_close(cr, uid, task_ids, context=context)
+-
+  I check procurement of Service Order Line after closed task.
+-
+  !python {model: procurement.order}: |
+    procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
+    assert procurement_ids, "Procurement is not generated for Service Order Line."
+    procurement = self.browse(cr, uid, procurement_ids[0], context=context)
+    assert procurement.state == 'done' , "Procurement should be closed."
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index 23d900d86ff..5540b6eb773 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -21,10 +21,10 @@
 
 
 {
-    'name': 'Planning Management Module',
+    'name': 'Resources Planing',
     'version': '1.0',
     "category": "Project Management",
-    'complexity': "easy",
+    'complexity': "expert",
     'description': """Keep track of your planning
 This module helps you to manage your plannings.
 ===============================================
diff --git a/addons/project_planning/i18n/hr.po b/addons/project_planning/i18n/hr.po
index ca01b101337..adeb2db41c2 100644
--- a/addons/project_planning/i18n/hr.po
+++ b/addons/project_planning/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-12 09:28+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:55+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -31,39 +31,41 @@ msgid ""
 "This value is given by the sum of work remaining to do on the task for this "
 "planning, expressed in days."
 msgstr ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
 
 #. module: project_planning
 #: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
 #: model:ir.ui.menu,name:project_planning.menu_board_planning
 #: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
-msgstr "Statistike Planiranja"
+msgstr "Statistike planiranja"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning.line:0
 msgid "Planning Line"
-msgstr "Linija Planiranja"
+msgstr "Linija planiranja"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Unallocated Time"
-msgstr ""
+msgstr "Ukupno slobodno vrijeme"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
-msgstr "Ime Planiranja"
+msgstr "Naziv planiranja"
 
 #. module: project_planning
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Greška! Rekurzivni zadaci."
 
 #. module: project_planning
 #: view:board.board:0
 msgid "My Project's planning"
-msgstr ""
+msgstr "My Project's planning"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,timesheet:0
@@ -71,12 +73,12 @@ msgstr ""
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.user,timesheet:0
 msgid "Timesheet"
-msgstr "Raspored"
+msgstr "Evidencija rada"
 
 #. module: project_planning
 #: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Planning Management Module"
-msgstr ""
+msgstr "Planning Management Module"
 
 #. module: project_planning
 #: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
@@ -85,93 +87,97 @@ msgid ""
 "material), OpenERP allows you to encode and then automatically compute tasks "
 "and phases scheduling, track resource allocation and availability."
 msgstr ""
+"With its global system to schedule all resources of a company (people and "
+"material), OpenERP allows you to encode and then automatically compute tasks "
+"and phases scheduling, track resource allocation and availability."
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Total planned tasks"
-msgstr ""
+msgstr "Ukupno planiranih zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Task"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 #: view:report_account_analytic.planning.line:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: project_planning
 #: field:account.analytic.account,planning_ids:0
 #: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
 #: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
 msgid "Plannings"
-msgstr ""
+msgstr "Plannings"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Start Task"
-msgstr ""
+msgstr "Započni zadatak"
 
 #. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 #: view:report_account_analytic.planning.line:0
 msgid "Total Planned (in Days)"
-msgstr ""
+msgstr "Total Planned (in Days)"
 
 #. module: project_planning
 #: constraint:report_account_analytic.planning:0
 msgid ""
 "Invalid planning ! Planning dates can't overlap for the same responsible. "
 msgstr ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
 
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_account:0
 msgid "Planning By Account"
-msgstr ""
+msgstr "Planiranje računa"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Current Plannings"
-msgstr ""
+msgstr "Current Plannings"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "Analitički konto"
+msgstr "Konto analitike"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Vrati u nacrt"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatni podaci"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "To :"
-msgstr ""
+msgstr "Do :"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,timesheet:0
@@ -180,34 +186,36 @@ msgid ""
 "This value is given by the sum of all work encoded in the timesheet(s) "
 "between the 'Date From' and 'Date To' of the planning."
 msgstr ""
+"Ova vrijednost daje zbroj svih radova, kodirano u timesheet/u, raspon  'Od "
+"datuma' i 'Do datuma' rasporeda/planiranja."
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Error! You can not create recursive analytic accounts."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,plan_open:0
 #: field:report_account_analytic.planning.user,plan_open:0
 msgid "Time Allocation without Tasks"
-msgstr ""
+msgstr "Time Allocation without Tasks"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 msgid "Planning Lines"
-msgstr ""
+msgstr "Linije Planiranja"
 
 #. module: project_planning
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,account_id:0
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
-msgstr "Analitički Konto"
+msgstr "Analitički konto"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_open:0
@@ -215,27 +223,29 @@ msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to FALSE, expressed in days."
 msgstr ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Razno"
 
 #. module: project_planning
 #: help:res.company,planning_time_mode_id:0
 msgid "This will set the unit of measure used in plannings."
-msgstr ""
+msgstr "This will set the unit of measure used in plannings."
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "HR Planning"
-msgstr "Planiranje Ljudskih resursa"
+msgstr "Planiranje ljudskih resursa"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,tasks:0
 #: field:report_account_analytic.planning.user,tasks:0
 msgid "Remaining Tasks"
-msgstr ""
+msgstr "Preostali zadaci"
 
 #. module: project_planning
 #: view:account.analytic.account:0
@@ -259,12 +269,12 @@ msgstr "Ukupno planirano"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time Encoding"
-msgstr ""
+msgstr "Time Encoding"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,free:0
 msgid "Unallocated Time"
-msgstr ""
+msgstr "Unallocated Time"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_open:0
@@ -272,11 +282,13 @@ msgid ""
 "This value is given by the sum of time allocation without task(s) linked, "
 "expressed in days."
 msgstr ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegiraj"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,free:0
@@ -284,6 +296,8 @@ msgid ""
 "Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
 "without Tasks + Holiday Leaves)"
 msgstr ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
 
 #. module: project_planning
 #: help:report_account_analytic.planning,business_days:0
@@ -291,6 +305,8 @@ msgid ""
 "Set here the number of working days within this planning for one person full "
 "time"
 msgstr ""
+"Set here the number of working days within this planning for one person full "
+"time"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -300,39 +316,39 @@ msgstr "["
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "From :"
-msgstr ""
+msgstr "From :"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_user_ids:0
 msgid "Planning By User"
-msgstr ""
+msgstr "Planning By User"
 
 #. module: project_planning
 #: model:ir.actions.act_window,name:project_planning.act_task_of_lines
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
-msgstr "Zadaci"
+msgstr "Tasks"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning By Account (in Days)"
-msgstr ""
+msgstr "Planning By Account (in Days)"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Time without tasks"
-msgstr ""
+msgstr "Vrijeme bez zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
-msgstr "Datum početka"
+msgstr "Početni datum"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,total_free:0
 msgid "Total Free"
-msgstr ""
+msgstr "Uk. slobodno"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_tasks:0
@@ -340,16 +356,18 @@ msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to TRUE expressed in days."
 msgstr ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
 
 #. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
-msgstr "Analiza Planiranja"
+msgstr "Analiza planiranja"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
-msgstr "Količina JM"
+msgstr "Kol. u JM"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
@@ -360,7 +378,7 @@ msgstr "Bilješka"
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
@@ -371,12 +389,12 @@ msgstr "Planiranje po Kontu"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Pending"
-msgstr ""
+msgstr "Na čekanju"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned Days"
-msgstr ""
+msgstr "Planirani dani"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,state:0
@@ -389,6 +407,8 @@ msgid ""
 "This value is given by the total of validated leaves into the 'Date From' "
 "and 'Date To' of the planning."
 msgstr ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
@@ -401,7 +421,7 @@ msgstr "Korisnik"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Remaining Tasks"
-msgstr ""
+msgstr "Total Remaining Tasks"
 
 #. module: project_planning
 #: model:ir.module.module,description:project_planning.module_meta_information
@@ -426,17 +446,17 @@ msgstr ""
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Organizacije"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_in_base_uom:0
 msgid "Quantity in base uom"
-msgstr ""
+msgstr "Količina u osnovnoj JM"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,plan_tasks:0
 msgid "Time Planned on Tasks"
-msgstr ""
+msgstr "Vrijeme za planirane zadatke"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
@@ -446,61 +466,61 @@ msgstr "Količina"
 #. module: project_planning
 #: field:report_account_analytic.planning,code:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
-msgstr "Linija Planiranja"
+msgstr "Linija planiranja"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning By User (in Days)"
-msgstr ""
+msgstr "Planning By User (in Days)"
 
 #. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
-msgstr "Statistike Planiranja"
+msgstr "Statistike planiranja"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
-msgstr "Otvori"
+msgstr "Otvoreno"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
 #: view:report_account_analytic.planning:0
 msgid "Planning by User"
-msgstr ""
+msgstr "Planning by User"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,business_days:0
 msgid "Business Days"
-msgstr ""
+msgstr "Radni dani"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Ponovno Aktiviraj"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
@@ -510,52 +530,52 @@ msgstr "Odgovoran"
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
-msgstr "Stat Planiranja"
+msgstr "Stat planiranja"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,plan_tasks:0
 msgid "Time Allocation of Tasks"
-msgstr ""
+msgstr "Time Allocation of Tasks"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Summary by user"
-msgstr "Sižetak prema Korisniku"
+msgstr "Sažetak prema Korisniku"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation without Tasks"
-msgstr ""
+msgstr "Total Time Allocation without Tasks"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,holiday:0
 msgid "Leaves"
-msgstr ""
+msgstr "Dopusti"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation of Tasks"
-msgstr ""
+msgstr "Ukupno vrijeme alociranih zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
-msgstr "Datum završetka"
+msgstr "Završni Datum"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Remaining tasks"
-msgstr ""
+msgstr "Remaining tasks"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Summary by project"
-msgstr "Sižetak po Projektu"
+msgstr "Sažetak po Projektu"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Responsible :"
-msgstr ""
+msgstr "Responsible :"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -565,17 +585,17 @@ msgstr "]"
 #. module: project_planning
 #: field:res.company,planning_time_mode_id:0
 msgid "Planning Time Unit"
-msgstr ""
+msgstr "Vremenska jedinica planiranja"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,task_ids:0
 msgid "Planning Tasks"
-msgstr ""
+msgstr "Planiranje zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
-msgstr "Upravitelj"
+msgstr "Voditelj"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_tasks:0
@@ -583,3 +603,5 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
+"Vrijednost dobivena zbrojem alociranih vremenskih zadataka iskazanih u "
+"danima."
diff --git a/addons/project_planning/security/ir.model.access.csv b/addons/project_planning/security/ir.model.access.csv
index d5cb64be83d..0c3a57cf173 100644
--- a/addons/project_planning/security/ir.model.access.csv
+++ b/addons/project_planning/security/ir.model.access.csv
@@ -1,11 +1,11 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_account_analytic_planning_project_manager","report_account_analytic.planning manager","model_report_account_analytic_planning","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning_line_project_manager","report_account_analytic.planning.line manager","model_report_account_analytic_planning_line","project.group_project_manager",1,0,0,0
-"access_report_account_analytic_planning_stat_project_manager","report_account_analytic.planning.stat manager","model_report_account_analytic_planning_stat","project.group_project_manager",1,0,0,0
-"access_report_account_analytic_planning_stat_project_user","report_account_analytic.planning.stat user","model_report_account_analytic_planning_stat","project.group_project_user",1,1,1,0
-"access_account_analytic_account_project_manager","account.analytic.account project manager","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning__project_user","report_account_analytic.planning user","model_report_account_analytic_planning_user","project.group_project_user",1,1,1,0
-"access_report_account_analytic_planning_account_project_manager","report_account_analytic.planning.account","model_report_account_analytic_planning_account","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning_line_project_user","report_account_analytic.planning.line user","model_report_account_analytic_planning_line","project.group_project_user",1,1,1,0
-"access_report_account_analytic_planning_account_project_user","report_account_analytic.planning.account user","model_report_account_analytic_planning_account","project.group_project_user",1,1,1,0
-"access_report_account_analytic_planning__project_manager","report_account_analytic.planning.manager","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_report_account_analytic_planning_project_manager,report_account_analytic.planning manager,model_report_account_analytic_planning,project.group_project_manager,1,1,1,1
+access_report_account_analytic_planning_line_project_manager,report_account_analytic.planning.line manager,model_report_account_analytic_planning_line,project.group_project_manager,1,0,0,0
+access_report_account_analytic_planning_stat_project_manager,report_account_analytic.planning.stat manager,model_report_account_analytic_planning_stat,project.group_project_manager,1,0,0,0
+access_report_account_analytic_planning_stat_project_user,report_account_analytic.planning.stat user,model_report_account_analytic_planning_stat,project.group_project_user,1,1,1,0
+access_account_analytic_account_project_manager,account.analytic.account project manager,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1
+access_report_account_analytic_planning__project_user,report_account_analytic.planning user,model_report_account_analytic_planning_user,project.group_project_user,1,1,1,0
+access_report_account_analytic_planning_account_project_manager,report_account_analytic.planning.account,model_report_account_analytic_planning_account,project.group_project_manager,1,1,1,1
+access_report_account_analytic_planning_line_project_user,report_account_analytic.planning.line user,model_report_account_analytic_planning_line,project.group_project_user,1,1,1,0
+access_report_account_analytic_planning_account_project_user,report_account_analytic.planning.account user,model_report_account_analytic_planning_account,project.group_project_user,1,1,1,0
+access_report_account_analytic_planning__project_manager,report_account_analytic.planning.manager,model_report_account_analytic_planning_user,project.group_project_manager,1,1,1,1
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index 5ca01a3a0e1..90a4ef2eafa 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -23,6 +23,7 @@
     'name': 'Project Retro-planning',
     'version': '0.1',
     'category': 'Project Management',
+    'complexity': "expert",
     'description': """
 Changes dates according to change in project End Date.
 ======================================================
diff --git a/addons/project_retro_planning/i18n/hr.po b/addons/project_retro_planning/i18n/hr.po
index 872dde535d7..a1eb983f064 100644
--- a/addons/project_retro_planning/i18n/hr.po
+++ b/addons/project_retro_planning/i18n/hr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-02 14:48+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 08:13+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_retro_planning
 #: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
@@ -35,13 +35,17 @@ msgid ""
 "          then the deadline date and start date for all the tasks will "
 "change accordingly  "
 msgstr ""
+"\n"
+"        - Ako se promjenio datum završetka projekta\n"
+"          tada će se promjeniti i kranji rok i datum početka za sve zadatke  "
 
 #. module: project_retro_planning
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
 
 #. module: project_retro_planning
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index d4aa99196b0..52804e2a4ba 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Methodology: SCRUM',
     'version': '1.0',
     'category': 'Project Management',
-    'complexity': "easy",
+    'complexity': "normal",
     'description': """
 This module implements all concepts defined by the scrum project management methodology for IT companies.
 =========================================================================================================
diff --git a/addons/project_scrum/i18n/hr.po b/addons/project_scrum/i18n/hr.po
index 9a987317ebb..4b8f473050c 100644
--- a/addons/project_scrum/i18n/hr.po
+++ b/addons/project_scrum/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-12-08 17:01+0000\n"
+"PO-Revision-Date: 2011-12-09 14:20+0000\n"
 "Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-09 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-12-10 04:56+0000\n"
 "X-Generator: Launchpad (build 14450)\n"
 
 #. module: project_scrum
@@ -34,7 +34,7 @@ msgstr "Naziv skupa"
 #. module: project_scrum
 #: model:process.transition,note:project_scrum.process_transition_backlogtask0
 msgid "From backlog create task."
-msgstr ""
+msgstr "Kreiraj zadatak iz backloga"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -68,12 +68,35 @@ msgid ""
 "    * http://controlchaos.com\n"
 "    "
 msgstr ""
+"\n"
+"    Ovaj modul implemetira sve koncepte definirane u SRUM metodologiji\n"
+"    za upravljanje projektima u IT kompanijama:\n"
+"    * Projekti sa susretima (sprintovima), vlasnik produkta, scrum master\n"
+"    * Sprintovi sa pregledima, dnevnim sastancima, povratnim informacijama\n"
+"    * Backlog produkta\n"
+"    * Backlog sprinta\n"
+"\n"
+"    Dodaje neke koncepte modulu Upravljanja projektima:  \n"
+"    * Srednjoročni i dugoročni putokaz\n"
+"    * Korisnički/Funkcionalni zahtjevi naspram tehničkih\n"
+"\n"
+"    Također kreira i novi sustav izvještavanja:\n"
+"    * Burn-down chart - grafikon preostalog posla\n"
+"\n"
+"    Scrum projekti i zadaci nasljeđuju iz pravih projekata i zadataka,\n"
+"    tako da je moguće nastaviti raditi na normalnim zadacima koji ukljućuju "
+"\n"
+"    i zadatke iz Scrum projekata.\n"
+"   \n"
+"    Više informacija o metodologiji:\n"
+"    * http://controlchaos.com\n"
+"    "
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "What did you do since the last meeting?"
-msgstr ""
+msgstr "Što ste radili od zadnjeg sastanka?"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
@@ -83,46 +106,51 @@ msgid ""
 "which the team implements a list of product backlogs. The sprint review is "
 "organized when the team presents its work to the customer and product owner."
 msgstr ""
+"Scrum agilna metodologija se koristi u projektima razvoja softvera. U ovoj "
+"metodologiji sprint je kratki period vremena (npr. 1 mjesec) u kojem tim "
+"implementira listu backlogova (preostalih poslova) produkta. Pregled sprinta "
+"se organizira kad tim prezetira svoj rad klijentu i vlasniku produkta."
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: project_scrum
 #: model:process.node,note:project_scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
-msgstr ""
+msgstr "Kreiraj zadatak iz preostalih zadataka"
 
 #. module: project_scrum
 #: model:ir.module.module,shortdesc:project_scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
-msgstr ""
+msgstr "Scrum, agilna metoda razvoja"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Napredak"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,user_id:0
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,scrum_master_id:0
 msgid "Scrum Master"
-msgstr ""
+msgstr "Scrum Master"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:83
 #, python-format
 msgid "The sprint '%s' has been opened."
-msgstr ""
+msgstr "Sprint '%s' je otvoren."
 
 #. module: project_scrum
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -133,50 +161,50 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Retrospective"
-msgstr ""
+msgstr "Pogled unazad"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Send Email"
-msgstr ""
+msgstr "Pošalji e-mail"
 
 #. module: project_scrum
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj
 msgid "View project's backlog"
-msgstr ""
+msgstr "Pogledaj preostale zadatke projekta"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi kao nacrt"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
 msgid "Merge Product Backlogs"
-msgstr ""
+msgstr "Spoji preostale zadatke produkta"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_merge
 #: view:project.scrum.backlog.merge:0
 msgid "Merge Backlogs"
-msgstr ""
+msgstr "Spoji preostale zadatke"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:53
 #, python-format
 msgid "Scrum Meeting : %s"
-msgstr ""
+msgstr "Scrum sastanak: %s"
 
 #. module: project_scrum
 #: view:project.task:0
 msgid "Backlog"
-msgstr ""
+msgstr "Preostali zadaci"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_email
@@ -186,27 +214,27 @@ msgstr ""
 #. module: project_scrum
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,name:0
 msgid "Sprint Name"
-msgstr ""
+msgstr "Ime sprinta"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Zadatak"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Ok"
-msgstr ""
+msgstr "U redu"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Spent hours"
-msgstr ""
+msgstr "Utrošeni sati"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_meeting_form
@@ -215,30 +243,37 @@ msgid ""
 "this methodology, a daily meeting is organized by the scrum master with his "
 "team in order to detect the difficulties the team faced/will face."
 msgstr ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face.\r\n"
+"Scrum agilna metodologija se koristi u projektima razvoja softvera. U ovoj "
+"metodologiji, Scrum master organizira dnevne sastanke sa svojim timom kako "
+"bi otkrio poteškoće s kojima se tim susreo ili će se susresti."
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:316
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
+"Molim upišite e-mail adresu vlasnika produkta definiranog  na sprintu."
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:327
 #, python-format
 msgid "Scrum Meeting of %s"
-msgstr ""
+msgstr "Srum sastanak %s"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
 #, python-format
 msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
+msgstr "Preostali zadatak produkta '%s' je pretvoren u zadatak %d."
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
 #, python-format
 msgid "Product Backlog '%s' is assigned sprint:%s"
-msgstr ""
+msgstr "Preostali zadatak produkta '%s' je dodjeljen sprintu: %s"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
@@ -248,7 +283,7 @@ msgstr ""
 #: field:project.task,product_backlog_id:0
 #, python-format
 msgid "Product Backlog"
-msgstr ""
+msgstr "Preostali zadaci produkta"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_project
@@ -259,12 +294,12 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Start Task"
-msgstr ""
+msgstr "Započni zadatak"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:90
@@ -272,7 +307,7 @@ msgstr ""
 #: code:addons/project_scrum/wizard/project_scrum_email.py:96
 #, python-format
 msgid "None"
-msgstr ""
+msgstr "Ništa"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -282,44 +317,44 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Sprint Info"
-msgstr ""
+msgstr "Sprint info"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,date_stop:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Završni datum"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Links"
-msgstr ""
+msgstr "Poveznice"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Izračunato kao zbroj izvršenog rada na zadatku"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:91
 #, python-format
 msgid "Task for Today"
-msgstr ""
+msgstr "Zadaci za danas"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,state_open:0
 msgid "Open Backlog"
-msgstr ""
+msgstr "Otvori popis preostalih zadatka"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Total Spent Hours"
-msgstr ""
+msgstr "Ukupno utrošeno sati"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:94
@@ -330,14 +365,14 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Planning"
-msgstr ""
+msgstr "Planiranje"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
 #: view:project.scrum.backlog.create.task:0
 #: view:project.scrum.email:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Otkaži"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,scrum_master_id:0
@@ -349,12 +384,12 @@ msgstr ""
 #: field:project.scrum.product.backlog,expected_hours:0
 #: field:project.scrum.sprint,expected_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Planirani sati"
 
 #. module: project_scrum
 #: field:project.scrum.email,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Predmet"
 
 #. module: project_scrum
 #: view:board.board:0
@@ -364,28 +399,28 @@ msgstr ""
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Sprints"
-msgstr ""
+msgstr "Sprintevi"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:314
 #, python-format
 msgid "Email notification could not be sent to the product owner %s"
-msgstr ""
+msgstr "Obavjest e-mailom nije mogla biti poslana vlasniku produkta %s"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,convert_to_task:0
 msgid "Convert To Task"
-msgstr ""
+msgstr "Pretvori u zadatak"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Are you sure you want to merge these Backlogs?"
-msgstr ""
+msgstr "Jeste li sigurni da želite spojiti ove preostale zadatke"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.create.task,user_id:0
 msgid "Responsible user who can work on task"
-msgstr ""
+msgstr "Odgovorni korisnik koji može raditi na zadataku"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -393,17 +428,17 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
 msgid "View sprint Tasks"
-msgstr ""
+msgstr "Pogledaj zadatke sprinta"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,meeting_ids:0
 msgid "Daily Scrum"
-msgstr ""
+msgstr "Dnevni Scrum"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.create.task:0
@@ -415,7 +450,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
 #: view:project.scrum.product.backlog:0
 msgid "Product Backlogs"
-msgstr ""
+msgstr "Preostali zadaci produkta"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:301
@@ -424,78 +459,78 @@ msgstr ""
 #: code:addons/project_scrum/project_scrum.py:316
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Greška !"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Are there anything blocking you?"
-msgstr ""
+msgstr "Da li vas nešto blokira?"
 
 #. module: project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_scrum
 msgid "Scrum"
-msgstr ""
+msgstr "Scrum"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_today:0
 msgid "Tasks for today"
-msgstr ""
+msgstr "Današnji zadaci"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:88
 #: field:project.scrum.meeting,question_yesterday:0
 #, python-format
 msgid "Tasks since yesterday"
-msgstr ""
+msgstr "Zadaci od jučer"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Upozorenje"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
 msgid "Assign sprint to backlogs"
-msgstr ""
+msgstr "Dodjeli sprintove preostali zadacima"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,expected_hours:0
 msgid "Estimated time to do the task."
-msgstr ""
+msgstr "Procjenjeno potrebno vrijeme za dovršetak zadatka."
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,task_hours:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Sati zadatka"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Dates"
-msgstr ""
+msgstr "Datumi"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Send to Scrum Master"
-msgstr ""
+msgstr "Pošalji Scrum masteru"
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Poništeno"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj2
 msgid "View project's tasks"
-msgstr ""
+msgstr "Pogledaj zadatke projekta"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:56
@@ -504,43 +539,45 @@ msgid ""
 "Hello  , \n"
 "I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
 msgstr ""
+"Pozdrav,\n"
+"Šaljem vam Scrum sastanak. %s sprinta '%s' projekta '%s'"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
-msgstr ""
+msgstr "Dnevno"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,backlog_ids:0
 msgid "Sprint Backlog"
-msgstr ""
+msgstr "Preostali zadaci sprinta"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegiraj"
 
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Moja ploča"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Postpone Backlog"
-msgstr ""
+msgstr "Odgodi preostale zadatke"
 
 #. module: project_scrum
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
 #: view:project.task:0
 msgid "Task Progress"
-msgstr ""
+msgstr "Napredak zadatka"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,date:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "Datum sastanka"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
@@ -549,112 +586,116 @@ msgstr ""
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Tasks"
-msgstr ""
+msgstr "Zadaci"
 
 #. module: project_scrum
 #: field:project.scrum.email,product_owner_email:0
 msgid "Product Owner Email"
-msgstr ""
+msgstr "E-mail vlasnika produkta"
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 msgid "_Send"
-msgstr ""
+msgstr "_Pošalji"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,sprint_id:0
 msgid "Select Sprint to assign backlog."
-msgstr ""
+msgstr "Odaberite sprint za dodjelu preostalih zadataka"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,progress:0
 #: help:project.scrum.sprint,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Izračunato kao: Utrošeno vrijeme/Ukupno vrijeme"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_blocks:0
 msgid "Blocks encountered"
-msgstr ""
+msgstr "Pronađene blokade"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,state_open:0
 msgid "Change the state of product backlogs to open if its in draft state"
 msgstr ""
+"Promjeni status preostalih zahtjeva produkta radi otvaranja ako je u statusu "
+"nacrta."
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 #: field:project.scrum.email,message:0
 msgid "Message"
-msgstr ""
+msgstr "Obavijest"
 
 #. module: project_scrum
 #: field:project.scrum.email,scrum_master_email:0
 msgid "Scrum Master Email"
-msgstr ""
+msgstr "E-mail Scrum mastera"
 
 #. module: project_scrum
 #: help:project.project,product_owner_id:0
 #: help:project.scrum.sprint,product_owner_id:0
 msgid "The person who is responsible for the product"
-msgstr ""
+msgstr "Osoba koja je odgovorna za produkt"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Scrum Sprint"
-msgstr ""
+msgstr "Scrum sprint"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Product owner"
-msgstr ""
+msgstr "Vlasnik produkta"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Review"
-msgstr ""
+msgstr "Provjera"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,retrospective:0
 msgid "Sprint Retrospective"
-msgstr ""
+msgstr "Sprint pogled unazad"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,note:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: project_scrum
 #: help:project.task,product_backlog_id:0
 msgid ""
 "Related product backlog that contains this task. Used in SCRUM methodology"
 msgstr ""
+"Povezani preostali zadaci produkta koji sadrže zadatak. Korišteni u SCRUM "
+"metodologiji."
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "What do you plan to do till the next meeting?"
-msgstr ""
+msgstr "Što planirate raditi do sljedećeg sastanka?"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
 #: view:postpone.wizard:0
 #: view:project.scrum.product.backlog:0
 msgid "Postpone"
-msgstr ""
+msgstr "Odgodi"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -662,87 +703,88 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: selection:project.scrum.sprint,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Na čekanju"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Optional Info"
-msgstr ""
+msgstr "Dodatne informacije"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
 msgid "Create Tasks from Product Backlogs"
-msgstr ""
+msgstr "Kreiraj zadatke iz preostalih zadataka produkta"
 
 #. module: project_scrum
 #: help:project.project,sprint_size:0
 msgid "Number of days allocated for sprint"
-msgstr ""
+msgstr "Broj dana dodjeljnih sprintu"
 
 #. module: project_scrum
 #: field:project.project,product_owner_id:0
 #: field:project.scrum.sprint,product_owner_id:0
 msgid "Product Owner"
-msgstr ""
+msgstr "Vlasnik produkta"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,sequence:0
 msgid "Gives the sequence order when displaying a list of product backlog."
 msgstr ""
+"Daje poredak sekvence prilikom prikaza liste preostalih zadataka produkta."
 
 #. module: project_scrum
 #: model:process.node,name:project_scrum.process_node_productbacklog0
 #: view:project.scrum.product.backlog:0
 msgid "Product backlog"
-msgstr ""
+msgstr "Preostali zadaci produkta"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_product_backlog
 msgid "Backlogs"
-msgstr ""
+msgstr "Preostali zadaci"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:326
 #, python-format
 msgid "Thank you"
-msgstr ""
+msgstr "Hvala"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,convert_to_task:0
 msgid "Create Task for Product Backlog"
-msgstr ""
+msgstr "Kreiraj zadatke za preostale zadatke produkta"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_meeting_form
 #: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
 msgid "Scrum Meetings"
-msgstr ""
+msgstr "Scrum sastanci"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,expected_hours:0
 msgid "Estimated total time to do the Backlog"
-msgstr ""
+msgstr "Procjenjeno ukupno vrijeme za izvršenje preostalih zadataka"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
-msgstr ""
+msgstr "Odaberi projekt za novu listu preostalih zadataka produkta"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Merge"
-msgstr ""
+msgstr "Spoji"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
-msgstr ""
+msgstr "Pogledaj preostale zadatke sprinta"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_backlog:0
@@ -754,7 +796,7 @@ msgstr ""
 #: view:project.scrum.backlog.create.task:0
 #: view:project.scrum.product.backlog:0
 msgid "Convert to Task"
-msgstr ""
+msgstr "Pretvori u zadatak"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,project_id:0
@@ -762,49 +804,51 @@ msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
 msgstr ""
+"Ako imate (?) u imenu projekta, znači da nema analitičkog konta vezanog uz "
+"projekt."
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Send to Product Owner"
-msgstr ""
+msgstr "Pošalji vlasniku produkta"
 
 #. module: project_scrum
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
 #: view:project.scrum.product.backlog:0
 msgid "Backlog Progress"
-msgstr ""
+msgstr "Napredak preostalih zadataka"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:301
 #, python-format
 msgid "Email notification could not be sent to the scrum master %s"
-msgstr ""
+msgstr "E-mail obavjest nije mogla biti poslana Scrum masteru %s"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: selection:project.scrum.product.backlog,state:0
 #: selection:project.scrum.sprint,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 #: view:project.scrum.product.backlog:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -812,33 +856,33 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: selection:project.scrum.sprint,state:0
 msgid "Open"
-msgstr ""
+msgstr "_"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 #: field:project.scrum.sprint,effective_hours:0
 msgid "Effective hours"
-msgstr ""
+msgstr "Efektivni sati"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Preostali sati"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,name:0
 msgid "Feature"
-msgstr ""
+msgstr "Značajka"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -846,17 +890,17 @@ msgstr ""
 #: view:project.scrum.sprint:0
 #: view:project.task:0
 msgid "Current"
-msgstr ""
+msgstr "Trenutno"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "My Backlogs"
-msgstr ""
+msgstr "Moji presotali zadaci"
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 msgid "Send Email for Scrum Meeting Details"
-msgstr ""
+msgstr "Pošalji e-mail za detalje Scrum sastanka"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
@@ -866,17 +910,22 @@ msgid ""
 "can be planified in a development sprint and may be split into several "
 "tasks. The product backlog is managed by the product owner of the project."
 msgstr ""
+"Scrum agilna metodologija se koristi u procesu razvoja softvera. Preostali "
+"zadaci produkta je lista značajki za implementaciju. Preostali zadaci "
+"produkta planiraju se u razvojnom sprintu (skupu) i mogu biti razdvojeni na "
+"više zadataka. Listom preostalih zadaka produkta upravlja vlasnik produkta "
+"na projektu."
 
 #. module: project_scrum
 #: model:process.transition,name:project_scrum.process_transition_backlogtask0
 msgid "Backlog Task"
-msgstr ""
+msgstr "Zadatak liste preostalih zadataka"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Planned hours"
-msgstr ""
+msgstr "Planirani sati"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_project_scrum_email
@@ -885,38 +934,38 @@ msgstr ""
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Scrum Meeting"
-msgstr ""
+msgstr "Scrum sastanak"
 
 #. module: project_scrum
 #: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart
 #: view:project.scrum.sprint:0
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Burndown chart - prikaz preostalog posla"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Daily Meetings"
-msgstr ""
+msgstr "Dnevni sastanci"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Expected hours"
-msgstr ""
+msgstr "Očekivani sati"
 
 #. module: project_scrum
 #: field:project.project,sprint_size:0
 msgid "Sprint Days"
-msgstr ""
+msgstr "Dani sprinta"
 
 #. module: project_scrum
 #: help:project.scrum.email,product_owner_email:0
 msgid "Email Id of Product Owner"
-msgstr ""
+msgstr "ID e-maila vlasnika produkta"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,progress:0
 msgid "Progress (0-100)"
-msgstr ""
+msgstr "Napredak (0-100)"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:324
@@ -926,6 +975,9 @@ msgid ""
 " \n"
 "I am sending you Daily Meeting Details of date %s for the Sprint %s\n"
 msgstr ""
+"Pozdrav %s,\n"
+"\n"
+"šaljem vam detalje dnevnog sastanka datuma %s, za sprint %s\n"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:325
@@ -940,6 +992,14 @@ msgid ""
 "*Blocks encountered:\n"
 "_______________________ %s"
 msgstr ""
+"\n"
+"*Zadaci od jučer:\n"
+"_______________________%s\n"
+"*Zadaci za danas:\n"
+"_______________________ %s\n"
+"\n"
+"*Pronađene blokade:\n"
+"_______________________ %s"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,active:0
@@ -947,31 +1007,33 @@ msgid ""
 "If Active field is set to true, it will allow you to hide the product "
 "backlog without removing it."
 msgstr ""
+"Ako je aktivno polje postavljeno na DA, omogućit će vam skrivanje liste "
+"preostalih zadataka produkta bez uklanjanja."
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,task_hours:0
 msgid "Estimated time of the total hours of the tasks"
-msgstr ""
+msgstr "Procjenjeno  vrijeme ukupnih sati zadataka"
 
 #. module: project_scrum
 #: view:project.project:0
 msgid "Scrum Data"
-msgstr ""
+msgstr "Scrum podaci"
 
 #. module: project_scrum
 #: field:project.project,scrum:0
 msgid "Is a Scrum Project"
-msgstr ""
+msgstr "je Scrum projekt"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Edit"
-msgstr ""
+msgstr "Uredi"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,tasks_id:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "Detalji zadatka"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_postpone_wizard
@@ -981,7 +1043,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Total Planned Hours"
-msgstr ""
+msgstr "Ukupno planirani sati"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
@@ -989,83 +1051,87 @@ msgid ""
 "This wizard merge backlogs and create one new backlog with draft state (Old "
 "backlogs Will be deleted). And it also merge old tasks from backlogs"
 msgstr ""
+"Ovaj asistent spaja liste preostalih zadataka i kreira jednu novu listu u "
+"statusu Nacrt (stare liste preostalih zadataka će biti izbrisane). Također "
+"spaja stare zadatke iz liste preostalih zadataka."
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:303
 #, python-format
 msgid "Please provide email address for scrum master defined on sprint."
-msgstr ""
+msgstr "Molim upišite e-mail adresu scrum mastera definiranog na sprintu."
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Select the project for merged backlogs"
-msgstr ""
+msgstr "Odaberite projekt za spojene liste preostalih zadataka"
 
 #. module: project_scrum
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
 msgid "My Sprint"
-msgstr ""
+msgstr "Moj sprint"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,effective_hours:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Utrošeni sati"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,effective_hours:0
 msgid "Computed using the sum of the time spent on every related tasks"
 msgstr ""
+"Izračunato korištenjem sume utrošenog vremena svakog povezanog zadatka"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.open_board_project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_deshboard_scurm
 msgid "Scrum Dashboard"
-msgstr ""
+msgstr "Scrum nadzorna ploča"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_sprint
 msgid "Project Scrum Sprint"
-msgstr ""
+msgstr "Scrum sprint projekta"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Feature Description"
-msgstr ""
+msgstr "Opis značajki"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
 #, python-format
 msgid "Please select any Project."
-msgstr ""
+msgstr "Molim odaberite neki projekt"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:97
 #, python-format
 msgid "Thank you,"
-msgstr ""
+msgstr "Hvala"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:90
 #, python-format
 msgid "The sprint '%s' has been closed."
-msgstr ""
+msgstr "Sprint %s je zatvoren"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint
 #: view:project.scrum.backlog.assign.sprint:0
 msgid "Assign Sprint"
-msgstr ""
+msgstr "Dodjeli sprint"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.create.task,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Dodjeljen"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Are you sure to postpone Backlog ?"
-msgstr ""
+msgstr "Jeste li sigurni da želite odgoditi listu preostalih zadataka"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,sprint_id:0
@@ -1076,15 +1142,15 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,sprint_id:0
 msgid "Sprint"
-msgstr ""
+msgstr "Sprint"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
 #, python-format
 msgid "Please select at least two product Backlogs"
-msgstr ""
+msgstr "Molim odaberite bar dvije liste preostalih zadataka produkta"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,review:0
 msgid "Sprint Review"
-msgstr ""
+msgstr "Pregled sprinta"
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 260eadd4a61..85eba636b90 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -254,6 +254,7 @@ class project_scrum_task(osv.osv):
             for task in line.tasks_id:
                 result[task.id] = True
         return result.keys()
+
     _columns = {
         'product_backlog_id': fields.many2one('project.scrum.product.backlog', 'Product Backlog',help="Related product backlog that contains this task. Used in SCRUM methodology"),
         'sprint_id': fields.related('product_backlog_id','sprint_id', type='many2one', relation='project.scrum.sprint', string='Sprint',
@@ -262,12 +263,7 @@ class project_scrum_task(osv.osv):
                 'project.scrum.product.backlog': (_get_task, ['sprint_id'], 10)
             }),
     }
-    #dead code
-    def onchange_backlog_id(self, cr, uid, backlog_id=False):
-        if not backlog_id:
-            return {}
-        project_id = self.pool.get('project.scrum.product.backlog').browse(cr, uid, backlog_id).project_id.id
-        return {'value': {'project_id': project_id}}
+
 project_scrum_task()
 
 class project_scrum_meeting(osv.osv):
@@ -292,45 +288,6 @@ class project_scrum_meeting(osv.osv):
     _defaults = {
         'date' : lambda *a: time.strftime('%Y-%m-%d'),
     }
-    # dead code
-    def button_send_to_master(self, cr, uid, ids, context=None):
-        meeting_id = self.browse(cr, uid, ids, context=context)[0]
-        if meeting_id and meeting_id.sprint_id.scrum_master_id.user_email:
-            res = self.email_send(cr, uid, ids, meeting_id.sprint_id.scrum_master_id.user_email)
-            if not res:
-                raise osv.except_osv(_('Error !'), _('Email notification could not be sent to the scrum master %s') % meeting_id.sprint_id.scrum_master_id.name)
-        else:
-            raise osv.except_osv(_('Error !'), _('Please provide email address for scrum master defined on sprint.'))
-        return True
-
-    #dead code
-    def button_send_product_owner(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        context.update({'button_send_product_owner': True})
-        meeting_id = self.browse(cr, uid, ids, context=context)[0]
-        if meeting_id.sprint_id.product_owner_id.user_email:
-            res = self.email_send(cr,uid,ids,meeting_id.sprint_id.product_owner_id.user_email)
-            if not res:
-                raise osv.except_osv(_('Error !'), _('Email notification could not be sent to the product owner %s') % meeting_id.sprint_id.product_owner_id.name)
-        else:
-            raise osv.except_osv(_('Error !'), _('Please provide email address for product owner defined on sprint.'))
-        return True
-
-    #dead code
-    def email_send(self, cr, uid, ids, email, context=None):
-        mail_message_obj = self.pool.get('mail.message')
-        meeting_id = self.browse(cr, uid, ids, context=context)[0]
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        user_email = user.user_email or tools.config.get('email_from', False)
-        body = _("Hello %s,\n \nI am sending you Daily Meeting Details of date %s for the Sprint %s\n") %(meeting_id.sprint_id.scrum_master_id.name, meeting_id.date, meeting_id.sprint_id.name)
-        body += _('\n* Tasks since yesterday:\n_______________________\n%s\n\n* Task for Today:\n_______________________ \n%s\n\n* Blocks encountered:\n_______________________ \n\n%s') %(meeting_id.question_yesterday,meeting_id.question_today, meeting_id.question_blocks or _('No Blocks'))
-        body += _("\n\nThank you,\n%s") % user.name
-        sub_name = meeting_id.name or _('Scrum Meeting of %s') % meeting_id.date
-        flag = mail_message_obj.schedule_with_attach(cr, uid, user_email , [email], sub_name, body, model='project.scrum.meeting', res_id=meeting_id.id, context=context)
-        if not flag:
-            return False
-        return True
 
 project_scrum_meeting()
 
diff --git a/addons/project_scrum/security/ir.model.access.csv b/addons/project_scrum/security/ir.model.access.csv
index 88e8c506e14..910c3a57296 100644
--- a/addons/project_scrum/security/ir.model.access.csv
+++ b/addons/project_scrum/security/ir.model.access.csv
@@ -1,9 +1,9 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_scrum_sprint","project_scrum.sprint","model_project_scrum_sprint","project.group_project_user",1,1,1,0
-"access_scrum_product_backlog","project_scrum.product.backlog","model_project_scrum_product_backlog","project.group_project_user",1,1,1,0
-"access_scrum_meeting","project_scrum.meeting","model_project_scrum_meeting","project.group_project_user",1,1,1,0
-"access_scrum_meeting_manager","project_scrum.meeting.manager","model_project_scrum_meeting","project.group_project_manager",1,1,1,1
-"access_scrum_sprint_manager","project_scrum.sprint.manager","model_project_scrum_sprint","project.group_project_manager",1,1,1,1
-"access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,1,1,1
-"access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
-"access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_scrum_sprint,project_scrum.sprint,model_project_scrum_sprint,project.group_project_user,1,1,1,0
+access_scrum_product_backlog,project_scrum.product.backlog,model_project_scrum_product_backlog,project.group_project_user,1,1,1,0
+access_scrum_meeting,project_scrum.meeting,model_project_scrum_meeting,project.group_project_user,1,1,1,0
+access_scrum_meeting_manager,project_scrum.meeting.manager,model_project_scrum_meeting,project.group_project_manager,1,1,1,1
+access_scrum_sprint_manager,project_scrum.sprint.manager,model_project_scrum_sprint,project.group_project_manager,1,1,1,1
+access_scrum_product_backlog_manager,project_scrum.product.backlog manager,model_project_scrum_product_backlog,project.group_project_manager,1,1,1,1
+access_product_uom_project_manager,product.uom project manager,product.model_product_uom,project.group_project_manager,1,1,1,1
+access_product_uom_project_user,product.uom project user,product.model_product_uom,project.group_project_user,1,0,0,0
diff --git a/addons/project_timesheet/i18n/hr.po b/addons/project_timesheet/i18n/hr.po
index 55b351af97b..ed2d228c401 100644
--- a/addons/project_timesheet/i18n/hr.po
+++ b/addons/project_timesheet/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2009-12-22 12:22+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 11:28+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:29+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: project_timesheet
@@ -34,12 +34,12 @@ msgstr ""
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr ""
+msgstr "Zadatak ev. rada"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Prijava / Odjava po Projektu"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -49,17 +49,17 @@ msgstr "ID povezanog vremenskog tijeka"
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Project Task Work"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: project_timesheet
 #: constraint:res.partner:0
@@ -69,28 +69,28 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic account/project"
-msgstr ""
+msgstr "Analitički konto/projekt"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Sati zadatka"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Error! project start-date must be lower then project end-date."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -100,7 +100,7 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:220
@@ -111,32 +111,32 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Račun zadatka"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "Rad zadatka"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Greška! Rekurzivni zadaci."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:220
@@ -147,43 +147,43 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Task"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Fakturiraj radove"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Pogreška! Ne možete dodijeliti eskalacije na isti projekt!"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Dovršite evidenciju rada."
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -193,7 +193,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Kupac"
 
 #. module: project_timesheet
 #: model:ir.module.module,description:project_timesheet.module_meta_information
@@ -210,47 +210,47 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Fakturiranje zadataka"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Sati evidencije rada"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr ""
+msgstr "Task encoding"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Task summary is comes into the timesheet line"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Fakturiraj"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "Zadaci po korisniku"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:48
@@ -263,22 +263,22 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Podaci računa"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Encode how much time u spent on your task"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -288,7 +288,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Ev. rada/sati zadatka po mjesecima"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:43
@@ -302,43 +302,43 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "Work on task"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mjesec-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Nakon izvršenja zadatka kreiraj račun."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Automatsko kreiranje računa iz stavki prodajnog naloga"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
@@ -348,7 +348,7 @@ msgstr "Vremenski plan projekta"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "Fakturiraj rad na zadatku"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:59
@@ -364,12 +364,12 @@ msgstr ""
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Sati zadatka po mjesecima"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
 msgid "Fill Timesheet"
-msgstr ""
+msgstr "Popuni ev. rada"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -377,3 +377,6 @@ msgid ""
 "This lists show you every task work you can invoice to the customer. Select "
 "the lines in order to generate the invoices automatically."
 msgstr ""
+
+#~ msgid "My Timesheet"
+#~ msgstr "Moje evidencija rada"
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index 4888811df2f..85ccf63e19f 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_timesheet_task_user_manager","report.timesheet.task.user.manager","model_report_timesheet_task_user","project.group_project_manager",1,1,1,1
-"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
-"access_hr_timesheet_sheet_sheet_user","hr.timesheet.sheet.sheet.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_report_timesheet_task_user_manager,report.timesheet.task.user.manager,model_report_timesheet_task_user,project.group_project_manager,1,1,1,1
+access_hr_analytic_timesheet_user,hr.analytic.timesheet.user,hr_timesheet_sheet.model_hr_analytic_timesheet,project.group_project_user,1,1,1,0
+access_hr_timesheet_sheet_sheet_user,hr.timesheet.sheet.sheet.user,hr_timesheet_sheet.model_hr_timesheet_sheet_sheet,project.group_project_user,1,1,1,0
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 010b0369edf..373c7b51fc2 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -67,6 +67,7 @@ Dashboard for purchase management that includes:
         'test/process/run_scheduler.yml',
         'test/process/merge_order.yml',
         'test/process/edi_purchase_order.yml',
+        'test/process/invoice_on_poline.yml',
         'test/ui/print_report.yml',
         'test/ui/duplicate_order.yml',
         'test/ui/delete_order.yml',
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 04a9b47abe3..0bb34e3713b 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -13,7 +13,8 @@
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','=','draft')]</field>
+            <field name="domain">[('state','=','draft')]</field>
+            <field name="context">{'quotation_only': True}</field>
         </record>
         <record id="purchase_waiting" model="ir.actions.act_window">
             <field name="name">Purchase Order Waiting Approval</field>
@@ -24,7 +25,7 @@
             <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]</field>
         </record>
 
-		<record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
+        <record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
             <field name="name">purchase.order.monthly.categ.tree</field>
             <field name="model">purchase.report</field>
             <field name="type">tree</field>
@@ -47,7 +48,7 @@
                 </tree>
             </field>
         </record>
-    	<record model="ir.ui.view" id="view_purchase_order_monthly_categ_graph">
+        <record model="ir.ui.view" id="view_purchase_order_monthly_categ_graph">
             <field name="name">purchase.order.monthly.categ.graph</field>
             <field name="model">purchase.report</field>
             <field name="type">graph</field>
@@ -59,92 +60,41 @@
                 </graph>
             </field>
         </record>
-	    <record id="action_purchase_order_monthly_categ_graph" model="ir.actions.act_window">
-	        <field name="name">Monthly Purchase by Category</field>
-	        <field name="res_model">purchase.report</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-		<field name="context">{'group_by':['month','category_id'],'group_by_no_leaf':1}</field>
-	        <field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field>
-	    </record>
-	    <record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view">
+        <record id="action_purchase_order_monthly_categ_graph" model="ir.actions.act_window">
+            <field name="name">Monthly Purchase by Category</field>
+            <field name="res_model">purchase.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="context">{'group_by':['month','category_id'],'group_by_no_leaf':1}</field>
+            <field name="domain">[('state','in',('approved','except_picking','except_invoice','done'))]</field>
+            <field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field>
+        </record>
+        <record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_purchase_order_monthly_categ_tree"/>
             <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
-	    </record>
-	    <record id="open_view_purchase_order_monthly_categ_graph" model="ir.actions.act_window.view">
-	            <field eval="1" name="sequence"/>
-	            <field name="view_mode">graph</field>
-	            <field name="view_id" ref="view_purchase_order_monthly_categ_graph"/>
-	            <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
-	    </record>
+        </record>
+        <record id="open_view_purchase_order_monthly_categ_graph" model="ir.actions.act_window.view">
+                <field eval="1" name="sequence"/>
+                <field name="view_mode">graph</field>
+                <field name="view_id" ref="view_purchase_order_monthly_categ_graph"/>
+                <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
+        </record>
 
-        <record model="ir.ui.view" id="view_negotiation_by_supplier_tree">
-            <field name="name">negotiation.by.supplier.tree</field>
-            <field name="model">purchase.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Negotiation by Supplier">
-                    <field name="partner_id"/>
-                    <field name="negociation"/>
-                </tree>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="view_negotiation_by_supplier_graph">
-            <field name="name">negotiation.by.supplier.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Negotiation by Supplier" type="bar">
-                    <field name="partner_id"/>
-                    <field name="negociation"/>
-                </graph>
-            </field>
-        </record>
-		<record id="action_negotiation_by_supplier" model="ir.actions.act_window">
-	        <field name="name">Negotiation by Supplier</field>
-	        <field name="res_model">purchase.report</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-		<field name="context">{'group_by':['partner_id'],'group_by_no_leaf':1}</field>
-	        <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
-	    </record>
-	    <record id="open_view_negotiation_by_supplier_tree" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_negotiation_by_supplier_tree"/>
-            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
-	    </record>
-	    <record id="open_view_negotiation_by_supplier_graph" model="ir.actions.act_window.view">
-	            <field eval="1" name="sequence"/>
-	            <field name="view_mode">graph</field>
-	            <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
-	            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
-	    </record>
 
         <record id="board_purchase_form" model="ir.ui.view">
             <field name="name">board.purchase.form</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board">
-                    <board style="1-1">
+                <form string="Purchase Dashboard">
+                    <board style="2-1">
                         <column>
-                        <!--
-                            <action name="%(purchase.action_current_purchases)d" string="Current purchases"/>
-                            <action name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month"/>
-                        -->
-                        	<action name="%(purchase_draft)d" string="Request for Quotations"/>
+                            <action name="%(purchase_draft)d" string="Request for Quotations"/>
                         </column>
                         <column>
-                        	<action name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"/>
-                        <!--
-                            <action name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier"/>
-                            <action name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state"/>
-                            <action name="%(purchase.action_qty_per_product)d" string="Total Quantity per product"/>
-                        -->
-
+                            <action name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchases by Category"/>
                         </column>
                     </board>
                 </form>
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index b1d2cf956ae..601e427eda4 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-12-12 11:24+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -22,6 +22,8 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:292
@@ -53,7 +55,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr "Datum izrade dokumenta"
+msgstr "Datum  kreiranja ovog dokumenta"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -67,6 +69,12 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"Zahtjev za ponudom možete kreirati i prije nego što je nalog za nabavu "
+"potvrđen.\n"
+"Ovdje će se naći i zahtjevi za ponudom koje program automatski kreira "
+"temeljem postavke logističkih pravila (minimalne količine, JIT, ...). "
+"Zahtjev za ponudom možete pretvoriti u Nalog za nabavu. Postave na nalogu za "
+"nabavu kontroliraju kreiranje ulaznog računa temeljem naloga ili primki."
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -81,13 +89,13 @@ msgstr "Nefakturirano"
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr "Adresa odredišta"
+msgstr "Adresa isporuke"
 
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.report,validator:0
 msgid "Validated By"
-msgstr ""
+msgstr "Potvrđeno od strane"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -96,12 +104,12 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,partner_id:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavljač"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices ?"
-msgstr ""
+msgstr "Želite li kreirati ulazni račun?"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -110,6 +118,9 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Nalozi za nabavu po brojevima, dobavljačima, proizvodima, .... \n"
+"Za svaki nalog nabave možete pratiti primljene proizvode i kontrolirati "
+"izradu ulaznih računa."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -132,7 +143,7 @@ msgstr ""
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "From a Pick list"
-msgstr ""
+msgstr "Sa popisa odabira"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:660
@@ -145,12 +156,12 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr ""
+msgstr "Odaberite otvoreni prodajni nalog"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -158,35 +169,35 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,company_id:0
 msgid "Company"
-msgstr "Tvrtka"
+msgstr "Organizacija"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
 #: view:purchase.report:0
 msgid "Monthly Purchase by Category"
-msgstr ""
+msgstr "Mjesečne nabave po grupama"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
-msgstr "Postavi kao nacrt"
+msgstr "Postavi na nacrt"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Iznimka računa"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr ""
+msgstr "Uobičajeni cjenik nabave"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_current_purchases
 msgid "Current purchases"
-msgstr ""
+msgstr "Aktualne nabave"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -195,6 +206,9 @@ msgid ""
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
 msgstr ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -202,11 +216,13 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
+"Za ovog partnera ovdje možete navesti specifičan cjenik za nabavu ako se ne "
+"primjenjuje uobičajeni cjenik."
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -214,6 +230,8 @@ msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
 msgstr ""
+"Cjenik određuje valutu za ovu narudžbu. Ujedno računa i cijenu dobavljača za "
+"odabrane proizvode/količine."
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
@@ -229,7 +247,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr ""
+msgstr "Odobri nabavu"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
@@ -237,27 +255,27 @@ msgstr ""
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Odobreno"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr ""
+msgstr "Referentna JM"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Origin"
-msgstr ""
+msgstr "Izvor"
 
 #. module: purchase
 #: field:purchase.report,product_uom:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Referentna JM"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
 msgid "Purchases"
-msgstr ""
+msgstr "Nabava"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -265,7 +283,7 @@ msgstr ""
 #: view:purchase.order.line:0
 #: field:purchase.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:660
@@ -278,7 +296,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -286,7 +304,7 @@ msgstr ""
 #: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Porezi"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -297,19 +315,19 @@ msgstr ""
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Nalog za nabavu"
 
 #. module: purchase
 #: field:purchase.order,name:0
 #: view:purchase.order.line:0
 #: field:purchase.order.line,order_id:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Broj naloga"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Net Total :"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -320,7 +338,7 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
 msgid "Products"
-msgstr ""
+msgstr "Proizvodi"
 
 #. module: purchase
 #: field:purchase.installer,progress:0
@@ -333,13 +351,15 @@ msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
+"Primka generira ulazni račun. Ovisno o kontroli računa na Nalogu nabave, "
+"račun se kreira na temelju primljenih ili naručenih količina."
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:315
@@ -350,40 +370,40 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Convert to Purchase Order"
-msgstr ""
+msgstr "U nalog za nabavu"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0
 #: field:purchase.report,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Pricelist"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Shipping Exception"
 
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Stavke računa"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Incoming Products"
-msgstr ""
+msgstr "Ulaz proizvoda"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Proizvodi za isporuku"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Manually Corrected"
-msgstr ""
+msgstr "Ručno ispravljeno"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -393,7 +413,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr ""
+msgstr "Vezna oznaka"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:244
@@ -404,18 +424,18 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "Ime kontakta na odredištu"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Skladišni prijenosi"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:344
@@ -426,13 +446,13 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Konto analitike"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# linija"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:696
@@ -455,22 +475,22 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Price"
-msgstr ""
+msgstr "Net Cijena"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Order Line"
-msgstr ""
+msgstr "Stavka naloga"
 
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "Označava da je izvršen prijem proizvoda"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:721
@@ -482,18 +502,18 @@ msgstr ""
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 #: selection:purchase.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Prosječna cijena"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
@@ -505,22 +525,22 @@ msgstr "Potvrdi"
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr ""
+msgstr "Kontrola računa"
 
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr ""
+msgstr "Oznaka dobavljača"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "Iznos poreza"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -529,6 +549,8 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"Primka može kreirati ulazni račun. Ovisno o kontroli računa na Nalogu "
+"nabave, račun se izrađuje na temelju primljenih ili naručenih količina."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -537,7 +559,7 @@ msgstr ""
 #: field:purchase.order.line,state:0
 #: view:purchase.report:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -545,32 +567,34 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Tel.:"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking
 #: field:purchase.order,picking_ids:0
 msgid "Picking List"
-msgstr ""
+msgstr "Skladišni dokument"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Print"
-msgstr ""
+msgstr "Ispis"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr ""
+msgstr "Spoji naloge za nabavu"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Order Lines"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:662
@@ -581,29 +605,29 @@ msgstr ""
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Fax:"
-msgstr ""
+msgstr "Fax:"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Total Price"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Iznos bez poreza"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
 msgid "Pricelists"
-msgstr ""
+msgstr "Cjenici"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
-msgstr ""
+msgstr "Address Contact Name"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -619,7 +643,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Kreirani računi za nalog nabave"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:292
@@ -633,17 +657,17 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Opći podaci"
 
 #. module: purchase
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Moja ploča"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "Potvrda naloga za nabavu br."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -652,6 +676,9 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -665,6 +692,9 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Prema polju \"Kontrola računa\" račun će se generirati automatski ako je "
+"\"Kontrola računa\" postavljena na \"Iz primki\" .Račun se može i ručno "
+"upisati ako je \"Kontrola računa\" postavljena na \"Ručno\"."
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -674,12 +704,12 @@ msgstr ""
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
 msgid "Create invoice"
-msgstr ""
+msgstr "Kreiraj račun"
 
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
 msgid "Reservation Destination"
-msgstr ""
+msgstr "Reservation Destination"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:244
@@ -692,40 +722,40 @@ msgstr ""
 #: selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Postava"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
 #: view:purchase.report:0
 msgid "Purchase by supplier"
-msgstr ""
+msgstr "Nabave po dobavljaču"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total amount"
-msgstr ""
+msgstr "Ukupni iznos"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Receptions"
-msgstr ""
+msgstr "Primke"
 
 #. module: purchase
 #: field:purchase.order,validator:0
 #: view:purchase.report:0
 msgid "Validated by"
-msgstr ""
+msgstr "Potvrdio"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -735,12 +765,16 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"Ovdje kontrolirate ulazne račune koje očekujete od dobavljača. OpenERP "
+"automatski kreira nacrte ulaznih računa iz naloga za nabavu i/ili primki. "
+"Kada primite originalni ulazni račun od dobavljača usporedite ga s nacrtom i "
+"potvrdite ga."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr ""
+msgstr "ZZP (RFQ)"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -781,22 +815,22 @@ msgstr ""
 #: field:purchase.order.line,date_order:0
 #: field:purchase.report,date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum naloga"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Incoming products to control"
-msgstr ""
+msgstr "Proizvodi koji dolaze na ulaznu kontrolu"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approbation"
-msgstr ""
+msgstr "Approbation"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Purchase Orders Statistics"
-msgstr ""
+msgstr "Statistika naloga za nabavu"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -811,7 +845,7 @@ msgstr ""
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
 #: model:process.node,name:purchase.process_node_invoicecontrol0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Nacrt računa"
 
 #. module: purchase
 #: help:purchase.installer,purchase_analytic_plans:0
@@ -824,11 +858,13 @@ msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
 msgstr ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: purchase
 #: field:purchase.installer,purchase_requisition:0
@@ -838,101 +874,101 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr ""
+msgstr "Kategorije jedinica mjere"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "Dana za isporuku"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
 msgid "Receive Products"
-msgstr ""
+msgstr "Prihvat proizvoda"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Procurement"
 
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Računi"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr ""
+msgstr "Potvrđeni nalozi nabave u račun"
 
 #. module: purchase
 #: field:purchase.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr ""
+msgstr "Ukupan broj redaka naloga korisnika po mjesecu."
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: purchase
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "Waiting Supplier Ack"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "Nalozi za nabavu koje čekaju potvrdu"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "Uk. osnovica"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
 msgid "Received"
-msgstr ""
+msgstr "Received"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "List of ordered products."
-msgstr ""
+msgstr "List of ordered products."
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr ""
+msgstr "Ovo je popis primki nastalih ovom nabavom"
 
 #. module: purchase
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
 msgid "Purchase Management"
-msgstr ""
+msgstr "Upravljanje nabavom"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Potrebna revizija knjigovođe."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
@@ -949,25 +985,25 @@ msgstr ""
 #. module: purchase
 #: report:purchase.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Taxes :"
 
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0
 #: field:purchase.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturirano"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Grupa"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "State of the Purchase Order."
-msgstr ""
+msgstr "Stanje naloga za nabavu"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -977,19 +1013,19 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Stanje naloga"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+msgstr "Kreiraj račune"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 #: view:purchase.order.line:0
 #: field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "Stavka naloga nabave"
 
 #. module: purchase
 #: constraint:res.partner:0
@@ -999,28 +1035,28 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
-msgstr ""
+msgstr "Calendar View"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr ""
+msgstr "Spajanje naloga za nabavu"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Regards,"
-msgstr ""
+msgstr "Regards,"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
-msgstr ""
+msgstr "Negotiation by Supplier"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Svojstva nabave"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1029,21 +1065,23 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"Nalog za nabavu kreira ulazni račun u trenutku potvrde. Račun nastaje "
+"temeljem naloga ili primki ovisno o \"Kontrola računa\" na nalogu."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Osnovica"
 
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "Označava da je račun plaćen"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Outgoing products to invoice"
-msgstr ""
+msgstr "Nefakturirani izlaz"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -1054,37 +1092,37 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_qty_per_product
 #: view:purchase.report:0
 msgid "Qty. per product"
-msgstr ""
+msgstr "Kol. po proizvodu"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Pokušavate pridružiti lot koji nije iz istog proizvoda"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr ""
+msgstr "Datum kreiranja ovog dokumenta."
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Prodaja i nabava"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr ""
+msgstr "Nalozi za nabavu"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Manual Invoices"
-msgstr ""
+msgstr "Ručni računi"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:318
@@ -1096,12 +1134,12 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Prošireni filtri..."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:362
@@ -1125,22 +1163,22 @@ msgstr ""
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Pick list generated"
-msgstr ""
+msgstr "Pick list generated"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Exception"
-msgstr ""
+msgstr "Exception"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Compute"
-msgstr ""
+msgstr "Izračunaj"
 
 #. module: purchase
 #: model:ir.module.module,description:purchase.module_meta_information
@@ -1168,38 +1206,38 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Organizacije"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Purchase Order"
-msgstr ""
+msgstr "Otkaži nalog za nabavu"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "A pick list is generated to track the incoming products."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Kokpit"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "Products Value"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
@@ -1210,34 +1248,34 @@ msgstr ""
 #: view:purchase.order:0
 #: view:purchase.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Ponude"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
 #: view:purchase.report:0
 msgid "Purchase order per month"
-msgstr ""
+msgstr "Nalozi nabave po mjesecima"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "History"
-msgstr ""
+msgstr "Povijest"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
 msgid "Products by Category"
-msgstr ""
+msgstr "Proizvodi po kategorijama"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "Dana do potvrde"
 
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr ""
+msgstr "Izvorni dokument koji je generirao ovaj zahtjev za nabavu."
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1249,33 +1287,40 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
+"Stanje naloga za nabavu ili zahtjeva za ponudom. Ponuda je nalog za nabavu u "
+"stanju 'Nacrt'. Nalog zatim treba uskladiti s ponudom dobavljača i "
+"potvrditi. Potvrda naloga je prihvaćanje ponude dobavljača, odnosno slanje "
+"narudžbenice dobavljaču. Nakon toga dobavljač potvrđuje narudžbenicu i nalog "
+"prelazi u stanje 'Odobren'. Kad je nalog za nabavu plaćen i zaprimljen, "
+"stanje postaje 'Izvršen'. Ako se dogodi otkazivanje tijekom izrade računa "
+"ili kod zaprimanja robe stanje postaje 'Iznimka'."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Podzbroj"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_rfq
 #: model:ir.ui.menu,name:purchase.menu_purchase_rfq
 msgid "Requests for Quotation"
-msgstr ""
+msgstr "Zahtjevi za ponudom"
 
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "Datum potvrde naloga za nabavu (narudžbenice)."
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "Waiting"
 
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
-msgstr ""
+msgstr "Verzija uobičajenog cjenika nabave"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -1292,23 +1337,23 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Fiskalna pozicija"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr ""
+msgstr "Zahtjev za ponudom br."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1323,12 +1368,12 @@ msgstr "Odustani"
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 msgid "Purchase Order Lines"
-msgstr ""
+msgstr "Stavke naloga za nabavu"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "Dobavljač odobrava narudžbenicu."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1336,86 +1381,86 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
 #: view:purchase.report:0
 msgid "Purchase Orders"
-msgstr ""
+msgstr "Nalozi za nabavu"
 
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Izvorni dokument"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Merge orders"
-msgstr ""
+msgstr "Spoji naloge"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "Kreiraj račun iz stavki naloga za nabavu"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Primke"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
-msgstr ""
+msgstr "Ukupno naloga po korisniku i mjesecu"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Request for Quotation"
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Tél. :"
-msgstr ""
+msgstr "Tél. :"
 
 #. module: purchase
 #: field:purchase.order,create_uid:0
 #: view:purchase.report:0
 #: field:purchase.report,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Our Order Reference"
-msgstr ""
+msgstr "Naša oznaka naloga"
 
 #. module: purchase
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr ""
+msgstr "Traži naloge za nabavu"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Skladište"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Request for Quotations."
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
-msgstr ""
+msgstr "Datum Zah."
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
 #: field:purchase.report,date_approve:0
 msgid "Date Approved"
-msgstr ""
+msgstr "Datum odobrenja"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:417
@@ -1427,17 +1472,17 @@ msgstr ""
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoicing"
-msgstr ""
+msgstr "Dostava i fakturiranje"
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planirani datum"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
@@ -1447,41 +1492,41 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirmation"
-msgstr ""
+msgstr "Confirmation"
 
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,name:0
 #: report:purchase.quotation:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "Ovo je vodeće/rezervno vrijeme za svaki nabavni nalog."
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr ""
+msgstr "Expected Delivery address:"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
 #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
 msgid "Receptions Analysis"
-msgstr ""
+msgstr "Analiza primki"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "Iznos osnovice."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1490,44 +1535,47 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"Access your supplier records and maintain a good relationship with your "
+"suppliers. You can track all your interactions with them through the History "
+"tab: emails, orders, meetings, etc."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr ""
+msgstr "Dostava"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_draft
 msgid "Request for Quotations"
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "JM proizvoda"
 
 #. module: purchase
 #: report:purchase.order:0
 #: report:purchase.quotation:0
 msgid "Qty"
-msgstr ""
+msgstr "Kol."
 
 #. module: purchase
 #: field:purchase.order,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresa"
 
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
-msgstr ""
+msgstr "Reservation"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "Uk. količina i iznos po mjesecima"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:409
@@ -1541,27 +1589,29 @@ msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
 msgid "Purchase Analysis"
-msgstr ""
+msgstr "Analiza nabave"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Your Order Reference"
-msgstr ""
+msgstr "Referenca naloga"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1569,18 +1619,18 @@ msgstr ""
 #: report:purchase.quotation:0
 #: field:purchase.report,expected_date:0
 msgid "Expected Date"
-msgstr ""
+msgstr "Očekivani datum"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
 #: view:purchase.report:0
 msgid "Total price by product by state"
-msgstr ""
+msgstr "Ukupna cijena po proizvodu po stanju"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "TVA:"
-msgstr ""
+msgstr "TVA:"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1591,22 +1641,22 @@ msgstr ""
 #. module: purchase
 #: report:purchase.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Shipping address :"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
-msgstr ""
+msgstr "Kontrola nabave"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1623,43 +1673,53 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Pravila: \n"
+" \n"
+" Nalozi za nabavu će biti spojeni samo ako su: \n"
+" * u stanju 'Nacrt' \n"
+" * pripadaju istom dobavljaču \n"
+" * imaju iste sladišne lokacije i cjenike nabave \n"
+" \n"
+" Linije se spajaju samo ako su identične u svemu osim količine i jedinice "
+"mjere: \n"
+" "
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "Uobičajena nabavna cijena"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr ""
+msgstr "Purchase Pricelist"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr ""
+msgstr "Kontrola računa"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr ""
+msgstr "Odobri"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "Za odobriti"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: purchase
 #: help:purchase.order.line,state:0
@@ -1672,6 +1732,13 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:424
@@ -1682,54 +1749,54 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Verzije cjenika"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "Adrese"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
-msgstr ""
+msgstr "Are you sure you want to merge these orders ?"
 
 #. module: purchase
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 #: view:purchase.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr ""
+msgstr "Iz naloga za nabavu"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "TVA :"
-msgstr ""
+msgstr "TVA :"
 
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "Ukupan iznos"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr ""
+msgstr "Vodeće vrijeme nabave"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -1738,17 +1805,20 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Ako je 'Fakturiranje' na nalogu postavljeno na 'Temeljem naloga', račun će "
+"se automatski generirati. Račun može izraditi i knjigovođa upisom računa i "
+"stavki kada je 'Fakturiranje' postavljeno na 'Ručno'."
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase"
-msgstr ""
+msgstr "Nabava"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_partner
 #: field:purchase.order.line,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:662
@@ -1771,18 +1841,18 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Skladišni prijenosi"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "Jedinice mjere"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Orders"
-msgstr ""
+msgstr "Orders"
 
 #. module: purchase
 #: help:purchase.order,name:0
@@ -1790,9 +1860,11 @@ msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
 msgstr ""
+"jedinstveni broj naloga za prodaju, automatski postavljen u trenutku "
+"kreiranja"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.open_board_purchase
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
-msgstr ""
+msgstr "Kokpit nabave"
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 0dc015834a0..b61f0d340d2 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -35,14 +35,6 @@ from osv.orm import browse_record, browse_null
 #
 class purchase_order(osv.osv):
 
-    def _calc_amount(self, cr, uid, ids, prop, unknow_none, unknow_dict):
-        res = {}
-        for order in self.browse(cr, uid, ids):
-            res[order.id] = 0
-            for oline in order.order_line:
-                res[order.id] += oline.price_unit * oline.product_qty
-        return res
-
     def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         cur_obj=self.pool.get('res.currency')
@@ -300,25 +292,6 @@ class purchase_order(osv.osv):
         for id in ids:
             self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
         return True
-    # Dead code:
-    def wkf_warn_buyer(self, cr, uid, ids):
-        self.write(cr, uid, ids, {'state' : 'wait', 'validator' : uid})
-        request = pooler.get_pool(cr.dbname).get('res.request')
-        for po in self.browse(cr, uid, ids):
-            managers = []
-            for oline in po.order_line:
-                manager = oline.product_id.product_manager
-                if manager and not (manager.id in managers):
-                    managers.append(manager.id)
-            for manager_id in managers:
-                request.create(cr, uid,{
-                       'name' : _("Purchase amount over the limit"),
-                       'act_from' : uid,
-                       'act_to' : manager_id,
-                       'body': _('Somebody has just confirmed a purchase with an amount over the defined limit'),
-                       'ref_partner_id': po.partner_id.id,
-                       'ref_doc1': 'purchase.order,%d' % (po.id,),
-                })
 
     def _prepare_inv_line(self, cr, uid, account_id, order_line, context=None):
         """Collects require data from purchase order line that is used to create invoice line 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 90acbf4ecfd..b61a33ed73b 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -315,11 +315,10 @@
                     <field name="date_order" />
                     <field name="partner_id"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field name="location_id"/>
-                    <field name="minimum_planned_date"/>
+                    <field name="minimum_planned_date" invisible="context.get('quotation_only', False)"/>
                     <field name="origin"/>
-                    <field name="invoiced_rate" widget="progressbar"/>
-                    <field name="shipped_rate" widget="progressbar"/>
+                    <field name="invoiced_rate" widget="progressbar" invisible="context.get('quotation_only', False)"/>
+                    <field name="shipped_rate" widget="progressbar" invisible="context.get('quotation_only', False)"/>
                     <field name="amount_untaxed" sum="Total Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
                     <field name="state"/>
diff --git a/addons/purchase/report/order.py b/addons/purchase/report/order.py
index 6c99d6381f4..c253467f12a 100644
--- a/addons/purchase/report/order.py
+++ b/addons/purchase/report/order.py
@@ -27,55 +27,7 @@ import pooler
 class order(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(order, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update({
-            'time': time,
-            'get_line_tax': self._get_line_tax,
-            'get_tax': self._get_tax,
-            'get_product_code': self._get_product_code,
-        })
-    def _get_line_tax(self, line_obj):
-        self.cr.execute("SELECT tax_id FROM purchase_order_taxe WHERE order_line_id=%s", (line_obj.id))
-        res = self.cr.fetchall() or None
-        if not res:
-            return ""
-        if isinstance(res, list):
-            tax_ids = [t[0] for t in res]
-        else:
-            tax_ids = res[0]
-        res = [tax.name for tax in pooler.get_pool(self.cr.dbname).get('account.tax').browse(self.cr, self.uid, tax_ids)]
-        return ",\n ".join(res)
-    
-    def _get_tax(self, order_obj):
-        self.cr.execute("SELECT DISTINCT tax_id FROM purchase_order_taxe, purchase_order_line, purchase_order \
-            WHERE (purchase_order_line.order_id=purchase_order.id) AND (purchase_order.id=%s)", (order_obj.id))
-        res = self.cr.fetchall() or None
-        if not res:
-            return []
-        if isinstance(res, list):
-            tax_ids = [t[0] for t in res]
-        else:
-            tax_ids = res[0]
-        tax_obj = pooler.get_pool(self.cr.dbname).get('account.tax')
-        res = []
-        for tax in tax_obj.browse(self.cr, self.uid, tax_ids):
-            self.cr.execute("SELECT DISTINCT order_line_id FROM purchase_order_line, purchase_order_taxe \
-                WHERE (purchase_order_taxe.tax_id=%s) AND (purchase_order_line.order_id=%s)", (tax.id, order_obj.id))
-            lines = self.cr.fetchall() or None
-            if lines:
-                if isinstance(lines, list):
-                    line_ids = [l[0] for l in lines]
-                else:
-                    line_ids = lines[0]
-                base = 0
-                for line in pooler.get_pool(self.cr.dbname).get('purchase.order.line').browse(self.cr, self.uid, line_ids):
-                    base += line.price_subtotal
-                res.append({'code':tax.name,
-                    'base':base,
-                    'amount':base*tax.amount})
-        return res
-    def _get_product_code(self, product_id, partner_id):
-        product_obj=pooler.get_pool(self.cr.dbname).get('product.product')
-        return product_obj._product_code(self.cr, self.uid, [product_id], name=None, arg=None, context={'partner_id': partner_id})[product_id]
+        self.localcontext.update({'time': time})
 
 report_sxw.report_sxw('report.purchase.order','purchase.order','addons/purchase/report/order.rml',parser=order)
 
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 68323bc9146..095f17090da 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -99,7 +99,7 @@
                     <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
- 					<separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
                     <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
@@ -187,98 +187,5 @@
     </record>
     <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="base.next_id_73" sequence="8"/>
 
-    <record model="ir.ui.view" id="view_purchase_by_supplier_graph">
-            <field name="name">purchase.by.supplier.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Purchase by supplier" type="bar">
-                    <field name="partner_id"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-	<record id="action_purchase_by_supplier" model="ir.actions.act_window">
-        <field name="name">Purchase by supplier</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('state','=','done'),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
-        <field name="context">{'group_by_no_leaf':1,'group_by':['partner_id']}</field>
-        <field name="view_id" ref="view_purchase_by_supplier_graph"/>
-    </record>
-
-    <record model="ir.ui.view" id="view_total_price_by_product_by_state_graph">
-            <field name="name">total.price.by.product.by.state.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Total price by product by state" type="pie">
-                    <field name="product_id"/>
-                    <field name="price_total" operator="+"/>
-
-                </graph>
-            </field>
-        </record>
-	<record id="action_total_price_by_product_by_state" model="ir.actions.act_window">
-        <field name="name">Total price by product by state</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,graph</field>
-        <field name="context">{'group_by_no_leaf':1,'group_by':['product_id','state']}</field>
-        <field name="view_id" ref="view_total_price_by_product_by_state_graph"/>
-    </record>
-
-    <record model="ir.ui.view" id="view_qty_per_product_graph">
-            <field name="name">qty.per.product.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Qty. per product" type="bar">
-                    <field name="product_id"/>
-                    <field name="quantity" operator="+"/>
-                </graph>
-            </field>
-        </record>
-	<record id="action_qty_per_product" model="ir.actions.act_window">
-        <field name="name">Qty. per product</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('state','=','done')]</field>
-        <field name="context">{'group_by_no_leaf':1,'group_by':['product_id']}</field>
-        <field name="view_id" ref="view_qty_per_product_graph"/>
-    </record>
-
-   	   <record model="ir.ui.view" id="view_po_per_month_tree">
-            <field name="name">qty.per.product.tree</field>
-            <field name="model">purchase.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Purchase order per month" >
-                    <field name="month"/>
-                    <field name="product_id" invisible="1"/>
-                    <field name="nbr" operator="+"/>
-                </tree>
-            </field>
-        </record>
-	<record id="action_po_per_month_tree" model="ir.actions.act_window">
-        <field name="name">Purchase order per month</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('date','&gt;',time.strftime('%Y-01-01 00:00:00')),('date','&lt;',time.strftime('%Y-12-31 23:59:59')),('state','=','done')]</field>
-		<field name="context">{'group_by_no_leaf':1,'group_by':['month','product_id']}</field>
-		<field name="view_id" ref="view_po_per_month_tree"/>
-    </record>
-
-  <record id="action_current_purchases" model="ir.actions.act_window">
-        <field name="name">Current purchases</field>
-        <field name="res_model">purchase.order</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','in',('draft','confirmed'))]</field>
-        <field name="view_id" ref="purchase.purchase_order_tree"/>
-      </record>
     </data>
 </openerp>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index c9ad36840fa..efee0adc589 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -1,67 +1,67 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_purchase_order","purchase.order","model_purchase_order","group_purchase_user",1,1,1,1
-"access_purchase_order_manager","purchase.order","model_purchase_order","group_purchase_manager",1,1,1,1
-"access_purchase_order_line","purchase.order.line user","model_purchase_order_line","group_purchase_user",1,1,1,1
-"access_purchase_order_line_manager","purchase.order.line manager","model_purchase_order_line","group_purchase_manager",1,0,0,0
-"access_stock_location_purchase_user","stock.location","stock.model_stock_location","group_purchase_user",1,0,0,0
-"access_stock_warehouse_purchase_user","stock.warehouse","stock.model_stock_warehouse","group_purchase_user",1,0,0,0
-"access_stock_picking_purchase_user","stock.picking","stock.model_stock_picking","group_purchase_user",1,1,1,1
-"access_stock_move_purchase_user","stock.move","stock.model_stock_move","group_purchase_user",1,1,1,1
-"access_purchase_order_stock_worker","purchase.order","model_purchase_order","stock.group_stock_user",1,0,0,0
-"access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,0,0
-"access_account_tax_purchase_user","account.tax","account.model_account_tax","group_purchase_user",1,0,0,0
-"access_report_purchase_order","purchase.report","model_purchase_report","group_purchase_manager",1,0,0,0
-"access_report_purchase_order_user","purchase.report user","model_purchase_report","group_purchase_user",1,0,0,0
-"access_purchase_order_line_manager","purchase.order.line","model_purchase_order_line","group_purchase_manager",1,1,1,1
-"access_stock_location_purchase_user_manager","stock.location","stock.model_stock_location","group_purchase_manager",1,0,0,0
-"access_stock_warehouse_purchase_user_manager","stock.warehouse","stock.model_stock_warehouse","group_purchase_manager",1,0,0,0
-"access_stock_picking_purchase_user_manager","stock.picking","stock.model_stock_picking","group_purchase_manager",1,1,1,1
-"access_stock_move_purchase_user_manager","stock.move","stock.model_stock_move","group_purchase_manager",1,1,1,1
-"access_account_tax_purchase_user_manager","account.tax","account.model_account_tax","group_purchase_manager",1,0,0,0
-"access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,0,0,0
-"access_product_product_purchase_manager","product.product.purchase.manager","product.model_product_product","group_purchase_manager",1,0,0,0
-"access_product_template_purchase_user","product.template purchase_user","product.model_product_template","group_purchase_user",1,0,0,0
-"access_product_template_purchase_manager","product.template purchase_manager","product.model_product_template","group_purchase_manager",1,0,0,0
-"access_account_invoice_purchase","account_invoice purchase","account.model_account_invoice","group_purchase_user",1,1,1,1
-"access_account_invoice_line_purchase","account_invoice.line purchase","account.model_account_invoice_line","group_purchase_user",1,1,1,1
-"access_account_invoice_purchase_manager","account_invoice purchase manager","account.model_account_invoice","group_purchase_manager",1,0,0,0
-"access_account_invoice_line_purchase_manager","account_invoice.line purchase manager","account.model_account_invoice_line","group_purchase_manager",1,0,0,0
-"access_account_invoice_tax_purchase","account_invoice.tax purchase","account.model_account_invoice_tax","group_purchase_user",1,1,1,1
-"access_account_fiscal_position_purchase_user","account.fiscal.position purchase","account.model_account_fiscal_position","group_purchase_user",1,0,0,0
-"access_account_sequence_fiscalyear_purchase_user","account.sequence.fiscalyear purchase","account.model_account_sequence_fiscalyear","group_purchase_user",1,1,1,1
-"access_res_partner_purchase_user","res.partner purchase","base.model_res_partner","group_purchase_user",1,0,0,0
-"access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
-"access_account_journal_period","account.journal.period","account.model_account_journal_period","group_purchase_user",1,1,1,0
-"access_account_journal","account.journal","account.model_account_journal","group_purchase_user",1,0,0,0
-"access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,0,0,0
-"access_account_period","account.period","account.model_account_period","group_purchase_user",1,0,0,0
-"access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","group_purchase_user",1,0,0,0
-"access_account_move","account.move","account.model_account_move","group_purchase_user",1,0,0,0
-"access_account_move_line","account.move.line","account.model_account_move_line","group_purchase_user",1,0,0,0
-"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","group_purchase_user",1,0,0,0
-"access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","group_purchase_user",1,0,0,0
-"access_report_stock_move","report.stock.move.manager","stock.model_report_stock_move","group_purchase_manager",1,0,0,0
-"access_report_stock_move_user","report.stock.move.user","stock.model_report_stock_move","group_purchase_user",1,0,0,0
-"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,1,1,0
-"access_stock_production_lot_revision","stock.production.lot.revision","stock.model_stock_production_lot_revision","group_purchase_user",1,1,1,0
-"access_res_partner_purchase_manager","res.partner.purchase.manager","base.model_res_partner","group_purchase_manager",1,1,1,0
-"access_product_uom_categ_purchase_manager","product.uom.categ purchase_manager","product.model_product_uom_categ","purchase.group_purchase_manager",1,1,1,1
-"access_product_uom_purchase_manager","product.uom purchase_manager","product.model_product_uom","purchase.group_purchase_manager",1,1,1,1
-"access_product_ul_purchase_manager","product.ul purchase_manager","product.model_product_ul","purchase.group_purchase_manager",1,1,1,1
-"access_product_category_purchase_manager","product.category purchase_manager","product.model_product_category","purchase.group_purchase_manager",1,1,1,1
-"access_product_template_purchase_manager","product.template purchase_manager","product.model_product_template","purchase.group_purchase_manager",1,1,1,1
-"access_product_product_purchase_manager","product.product purchase_manager","product.model_product_product","purchase.group_purchase_manager",1,1,1,1
-"access_product_packaging_purchase_manager","product.packaging purchase_manager","product.model_product_packaging","purchase.group_purchase_manager",1,1,1,1
-"access_product_supplierinfo_purchase_manager","product.supplierinfo purchase_manager","product.model_product_supplierinfo","purchase.group_purchase_manager",1,1,1,1
-"access_pricelist_partnerinfo_purchase_manager","pricelist.partnerinfo purchase_manager","product.model_pricelist_partnerinfo","purchase.group_purchase_manager",1,1,1,1
-"access_product_price_type_purchase_manager","product.price.type purchase_manager","product.model_product_price_type","purchase.group_purchase_manager",1,1,1,1
-"access_product_pricelist_type_purchase_manager","product.pricelist.type purchase_manager","product.model_product_pricelist_type","purchase.group_purchase_manager",1,1,1,1
-"access_product_pricelist_purchase_manager","product.pricelist purchase_manager","product.model_product_pricelist","purchase.group_purchase_manager",1,1,1,1
-"access_ir_property_group_purchase_manager","ir_property group_purchase_manager","base.model_ir_property","purchase.group_purchase_manager",1,1,1,1
-"access_product_group_res_partner_purchase_manager","res_partner group_purchase_manager","base.model_res_partner","purchase.group_purchase_manager",1,1,1,0
-"access_product_pricelist_version_purchase_manager","product.pricelist.version purchase_manager","product.model_product_pricelist_version","purchase.group_purchase_manager",1,1,1,1
-"access_product_pricelist_item_purchase_manager","product.pricelist.item purchase_manager","product.model_product_pricelist_item","purchase.group_purchase_manager",1,1,1,1
-"access_account_account_purchase_manager","account.account purchase manager","account.model_account_account","purchase.group_purchase_manager",1,0,0,0
-"access_account_journal_purchase_manager","account.journal purchase manager","account.model_account_journal","purchase.group_purchase_manager",1,0,0,0
-"access_stock_tracking_purchase_user","stock.tracking purchase.user","stock.model_stock_tracking","purchase.group_purchase_user",1,1,1,0
-"access_stock_location_purchase_manager","stock.location purchase manager","stock.model_stock_location","purchase.group_purchase_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_purchase_order,purchase.order,model_purchase_order,group_purchase_user,1,1,1,1
+access_purchase_order_manager,purchase.order,model_purchase_order,group_purchase_manager,1,1,1,1
+access_purchase_order_line,purchase.order.line user,model_purchase_order_line,group_purchase_user,1,1,1,1
+access_purchase_order_line_manager,purchase.order.line manager,model_purchase_order_line,group_purchase_manager,1,0,0,0
+access_stock_location_purchase_user,stock.location,stock.model_stock_location,group_purchase_user,1,0,0,0
+access_stock_warehouse_purchase_user,stock.warehouse,stock.model_stock_warehouse,group_purchase_user,1,0,0,0
+access_stock_picking_purchase_user,stock.picking,stock.model_stock_picking,group_purchase_user,1,1,1,1
+access_stock_move_purchase_user,stock.move,stock.model_stock_move,group_purchase_user,1,1,1,1
+access_purchase_order_stock_worker,purchase.order,model_purchase_order,stock.group_stock_user,1,0,0,0
+access_purchase_order_line_stock_worker,purchase.order.line,model_purchase_order_line,stock.group_stock_user,1,0,0,0
+access_account_tax_purchase_user,account.tax,account.model_account_tax,group_purchase_user,1,0,0,0
+access_report_purchase_order,purchase.report,model_purchase_report,group_purchase_manager,1,0,0,0
+access_report_purchase_order_user,purchase.report user,model_purchase_report,group_purchase_user,1,0,0,0
+access_purchase_order_line_manager,purchase.order.line,model_purchase_order_line,group_purchase_manager,1,1,1,1
+access_stock_location_purchase_user_manager,stock.location,stock.model_stock_location,group_purchase_manager,1,0,0,0
+access_stock_warehouse_purchase_user_manager,stock.warehouse,stock.model_stock_warehouse,group_purchase_manager,1,0,0,0
+access_stock_picking_purchase_user_manager,stock.picking,stock.model_stock_picking,group_purchase_manager,1,1,1,1
+access_stock_move_purchase_user_manager,stock.move,stock.model_stock_move,group_purchase_manager,1,1,1,1
+access_account_tax_purchase_user_manager,account.tax,account.model_account_tax,group_purchase_manager,1,0,0,0
+access_product_product_purchase_user,product.product.purchase.user,product.model_product_product,group_purchase_user,1,0,0,0
+access_product_product_purchase_manager,product.product.purchase.manager,product.model_product_product,group_purchase_manager,1,0,0,0
+access_product_template_purchase_user,product.template purchase_user,product.model_product_template,group_purchase_user,1,0,0,0
+access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,group_purchase_manager,1,0,0,0
+access_account_invoice_purchase,account_invoice purchase,account.model_account_invoice,group_purchase_user,1,1,1,1
+access_account_invoice_line_purchase,account_invoice.line purchase,account.model_account_invoice_line,group_purchase_user,1,1,1,1
+access_account_invoice_purchase_manager,account_invoice purchase manager,account.model_account_invoice,group_purchase_manager,1,0,0,0
+access_account_invoice_line_purchase_manager,account_invoice.line purchase manager,account.model_account_invoice_line,group_purchase_manager,1,0,0,0
+access_account_invoice_tax_purchase,account_invoice.tax purchase,account.model_account_invoice_tax,group_purchase_user,1,1,1,1
+access_account_fiscal_position_purchase_user,account.fiscal.position purchase,account.model_account_fiscal_position,group_purchase_user,1,0,0,0
+access_account_sequence_fiscalyear_purchase_user,account.sequence.fiscalyear purchase,account.model_account_sequence_fiscalyear,group_purchase_user,1,1,1,1
+access_res_partner_purchase_user,res.partner purchase,base.model_res_partner,group_purchase_user,1,0,0,0
+access_res_partner_address_purchase_user,res.partner.address purchase,base.model_res_partner_address,group_purchase_user,1,0,0,0
+access_account_journal_period,account.journal.period,account.model_account_journal_period,group_purchase_user,1,1,1,0
+access_account_journal,account.journal,account.model_account_journal,group_purchase_user,1,0,0,0
+access_account_journal_manager,account.journal,account.model_account_journal,group_purchase_manager,1,0,0,0
+access_account_period,account.period,account.model_account_period,group_purchase_user,1,0,0,0
+access_account_fiscalyear,account.fiscalyear,account.model_account_fiscalyear,group_purchase_user,1,0,0,0
+access_account_move,account.move,account.model_account_move,group_purchase_user,1,0,0,0
+access_account_move_line,account.move.line,account.model_account_move_line,group_purchase_user,1,0,0,0
+access_account_analytic_line,account.analytic.line,account.model_account_analytic_line,group_purchase_user,1,0,0,0
+access_account_move_reconcile,account.move.reconcile,account.model_account_move_reconcile,group_purchase_user,1,0,0,0
+access_report_stock_move,report.stock.move.manager,stock.model_report_stock_move,group_purchase_manager,1,0,0,0
+access_report_stock_move_user,report.stock.move.user,stock.model_report_stock_move,group_purchase_user,1,0,0,0
+access_stock_production_lot_user,stock.production.lot user,stock.model_stock_production_lot,group_purchase_user,1,1,1,0
+access_stock_production_lot_revision,stock.production.lot.revision,stock.model_stock_production_lot_revision,group_purchase_user,1,1,1,0
+access_res_partner_purchase_manager,res.partner.purchase.manager,base.model_res_partner,group_purchase_manager,1,1,1,0
+access_product_uom_categ_purchase_manager,product.uom.categ purchase_manager,product.model_product_uom_categ,purchase.group_purchase_manager,1,1,1,1
+access_product_uom_purchase_manager,product.uom purchase_manager,product.model_product_uom,purchase.group_purchase_manager,1,1,1,1
+access_product_ul_purchase_manager,product.ul purchase_manager,product.model_product_ul,purchase.group_purchase_manager,1,1,1,1
+access_product_category_purchase_manager,product.category purchase_manager,product.model_product_category,purchase.group_purchase_manager,1,1,1,1
+access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,purchase.group_purchase_manager,1,1,1,1
+access_product_product_purchase_manager,product.product purchase_manager,product.model_product_product,purchase.group_purchase_manager,1,1,1,1
+access_product_packaging_purchase_manager,product.packaging purchase_manager,product.model_product_packaging,purchase.group_purchase_manager,1,1,1,1
+access_product_supplierinfo_purchase_manager,product.supplierinfo purchase_manager,product.model_product_supplierinfo,purchase.group_purchase_manager,1,1,1,1
+access_pricelist_partnerinfo_purchase_manager,pricelist.partnerinfo purchase_manager,product.model_pricelist_partnerinfo,purchase.group_purchase_manager,1,1,1,1
+access_product_price_type_purchase_manager,product.price.type purchase_manager,product.model_product_price_type,purchase.group_purchase_manager,1,1,1,1
+access_product_pricelist_type_purchase_manager,product.pricelist.type purchase_manager,product.model_product_pricelist_type,purchase.group_purchase_manager,1,1,1,1
+access_product_pricelist_purchase_manager,product.pricelist purchase_manager,product.model_product_pricelist,purchase.group_purchase_manager,1,1,1,1
+access_ir_property_group_purchase_manager,ir_property group_purchase_manager,base.model_ir_property,purchase.group_purchase_manager,1,1,1,1
+access_product_group_res_partner_purchase_manager,res_partner group_purchase_manager,base.model_res_partner,purchase.group_purchase_manager,1,1,1,0
+access_product_pricelist_version_purchase_manager,product.pricelist.version purchase_manager,product.model_product_pricelist_version,purchase.group_purchase_manager,1,1,1,1
+access_product_pricelist_item_purchase_manager,product.pricelist.item purchase_manager,product.model_product_pricelist_item,purchase.group_purchase_manager,1,1,1,1
+access_account_account_purchase_manager,account.account purchase manager,account.model_account_account,purchase.group_purchase_manager,1,0,0,0
+access_account_journal_purchase_manager,account.journal purchase manager,account.model_account_journal,purchase.group_purchase_manager,1,0,0,0
+access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_stock_tracking,purchase.group_purchase_user,1,1,1,0
+access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index a67c675b089..4a8ac571703 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="1">
 
     <record id="group_purchase_user" model="res.groups">
-        <field name="name">Purchases / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_purchase_management"/>
     </record>
     <record id="group_purchase_manager" model="res.groups">
-        <field name="name">Purchases / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_purchase_management"/>
         <field name="implied_ids" eval="[(4, ref('group_purchase_user'))]"/>
     </record>
 
diff --git a/addons/purchase/static/src/img/icon.png b/addons/purchase/static/src/img/icon.png
new file mode 100644
index 00000000000..fda2d52a710
Binary files /dev/null and b/addons/purchase/static/src/img/icon.png differ
diff --git a/addons/purchase/test/process/invoice_on_poline.yml b/addons/purchase/test/process/invoice_on_poline.yml
new file mode 100644
index 00000000000..c2ad07aab95
--- /dev/null
+++ b/addons/purchase/test/process/invoice_on_poline.yml
@@ -0,0 +1,27 @@
+-
+   I confirm purchase order which has invoicing control method "Based on Purchase Order Lines".
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: order_purchase6}
+-
+  In order to test create invoice for purchase order line.
+-
+  !python {model: purchase.order}: |
+    invoice_line_obj = self.pool.get('purchase.order.line_invoice')
+    purchase_order = self.browse(cr, uid, ref("order_purchase6"))
+    context.update({'active_model': 'purchase.order', 'active_ids': [ref("order_purchase6")]})
+    for purchase_line in purchase_order.order_line:
+        invoice_line_obj.makeInvoices(cr, uid, purchase_line.id, context=context)
+-
+  I check the invoice of order.
+-
+   !python {model: purchase.order}: |
+     purchase_order = self.browse(cr, uid, ref("order_purchase6"))
+     for purchase_line in purchase_order.order_line:
+       assert len(purchase_order.invoice_ids) == 1, "Invoice should be generated."
+-
+  I set the default invoicing control method "Based on Purchase Order Lines".
+-
+  !python {model: purchase.config.wizard}: |
+    new_id = self.create(cr ,uid, {'default_method': 'manual'})
+    self.execute(cr, uid, [new_id])
+
diff --git a/addons/purchase_analytic_plans/i18n/hr.po b/addons/purchase_analytic_plans/i18n/hr.po
index f03e787479e..f6ef8e51123 100644
--- a/addons/purchase_analytic_plans/i18n/hr.po
+++ b/addons/purchase_analytic_plans/i18n/hr.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-08-03 09:36+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 08:01+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "Stavka nabavnog naloga"
 
 #. module: purchase_analytic_plans
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Oznaka naloga mora biti jedinstvena"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
@@ -34,12 +34,12 @@ msgstr "Analitička raspodjela"
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "Nalog za nabavu"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
 msgid "Purchase Analytic Distribution Management"
-msgstr "Upravljanje analitičkom raspodjelom kupnji"
+msgstr "Upravljanje analitičkom raspodjelom u nabavi"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
@@ -48,6 +48,10 @@ msgid ""
 "    The base module to manage analytic distribution and purchase orders.\n"
 "    "
 msgstr ""
+"\n"
+"    Osnovni modul za upravljanje analitičkom raspodjelom i nabavnim "
+"nalozima.\n"
+"    "
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za Arhitekturu Prikaza!"
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index eda89e81aa8..b8c0225fd2f 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -41,7 +41,10 @@ that exceeds minimum amount set by configuration wizard.
         'purchase_double_validation_installer.xml',
         'board_purchase_view.xml'
     ],
-    'test': ['test/purchase_double_validation_test.yml'],
+    'test': [
+        'test/purchase_double_validation_demo.yml',
+        'test/purchase_double_validation_test.yml'
+    ],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/purchase_double_validation/i18n/hr.po b/addons/purchase_double_validation/i18n/hr.po
new file mode 100644
index 00000000000..42309561093
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/hr.po
@@ -0,0 +1,88 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 07:16+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr "Konfiguracija nabavne aplikacije"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr ""
+"Definiraj minimalni iznos nakon nakon kojeg je potrebno potvrditi nabavu."
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: purchase_double_validation
+#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information
+msgid "purchase_double_validation"
+msgstr "purchase_double_validation"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: purchase_double_validation
+#: model:ir.module.module,description:purchase_double_validation.module_meta_information
+msgid ""
+"\n"
+"\tThis module modifies the purchase workflow in order to validate purchases "
+"that exceeds minimum amount set by configuration wizard\n"
+"    "
+msgstr ""
+"\n"
+"\tOvaj modul mijenja dijagram tijeka nabave kako bi potvrdio nabave koje "
+"prelaze minimalni iznos postavljen u asistentu za konfiguraciju\n"
+"    "
+
+#. module: purchase_double_validation
+#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
+#: view:purchase.double.validation.installer:0
+msgid "Configure Limit Amount for Purchase"
+msgstr "Konfiguriraj granični iznos za nabavu"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr "Maksimalni iznos nakon kojeg je obavezna potvrda nabave."
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr "purchase.double.validation.installer"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr "Maksimalni iznos nabave"
diff --git a/addons/purchase_double_validation/test/purchase_double_validation_demo.yml b/addons/purchase_double_validation/test/purchase_double_validation_demo.yml
new file mode 100644
index 00000000000..a3143de5ee7
--- /dev/null
+++ b/addons/purchase_double_validation/test/purchase_double_validation_demo.yml
@@ -0,0 +1,13 @@
+-
+  !record {model: purchase.order, id: order_purchase11}:
+    partner_id: base.res_partner_desertic_hispafuentes
+    order_line:
+      - product_id: product.product_product_pc4
+        product_qty: 10
+-
+  !record {model: purchase.order, id: order_purchase12}:
+    partner_id: base.res_partner_vickingdirect0
+    order_line:
+      - product_id: product.product_product_hdd2
+        product_qty: 10
+
diff --git a/addons/purchase_double_validation/test/purchase_double_validation_test.yml b/addons/purchase_double_validation/test/purchase_double_validation_test.yml
index ecc8d08a493..0d37b22abcf 100755
--- a/addons/purchase_double_validation/test/purchase_double_validation_test.yml
+++ b/addons/purchase_double_validation/test/purchase_double_validation_test.yml
@@ -1,117 +1,36 @@
 -
-  I Create new limit amount from  Configure Limit Amount for Purchase wizard.
-- 
+  I set new limit amount from  Configure Limit Amount for Purchase .
+-
   !record {model: purchase.double.validation.installer, id: purchase_double_validation_installer_1}:
     limit_amount: 3000
-- 
-  Then I set the Limit Amount
-- 
+-
   !python {model: purchase.double.validation.installer}: |
     self.execute(cr, uid, [ref("purchase_double_validation_installer_1")])
 -
-  In order to test the purchase double validation flow,I start by creating a new product 'MOB1'
+  In order to test the flow, I confirmed the purchase order.
 -
- !record {model: product.product, id: product_product_mob1}:
-    categ_id: 'product.product_category_3'
-    cost_method: standard
-    mes_type: fixed
-    name: MOB1
-    price_margin: 2.0
-    procure_method: make_to_stock
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
-    seller_delay: '1'
-    standard_price: 2000.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
+  !workflow {model: purchase.order, action: purchase_confirm, ref: order_purchase11}
 -
-  In order to test the purchase double validation flow,I create a new record where "invoice_method" is From Order.
+  I check that the order which was initially in the draft state has transmit to confirm state for double validation it should not an Approve state.
 -
-  Test for purchase double validation in which Total > = Limit Amount.
-- 
-  I create purchase order for MOB1 for 3 quantity.
-- 
-  !record {model: purchase.order, id: purchase_order_po11}:
-    company_id: base.main_company
-    date_order: '2011-01-1'
-    invoice_method: order
-    location_id: stock.stock_location_stock
-    order_line:
-      - date_planned: '2011-01-11'
-        name: MOB1
-        price_unit: 2000.0
-        product_id: 'product_product_mob1'
-        product_qty: 3.0
-        product_uom: product.product_uom_unit
-        state: draft
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
-    pricelist_id: purchase.list0
-- 
-  Initially purchase order is in the draft state.
+  !assert {model: purchase.order, id: order_purchase11, severity: error, string: Purchase Order should not be in Approved state.}:
+    - state != 'approved'
 -
-  !assert {model: purchase.order, id: purchase_order_po11}:
-    - state == 'draft'  
+  I Approved the purchase order.
 -
-  I confirm the purchase order for MOB1.
+  !workflow {model: purchase.order, action: purchase_approve, ref: order_purchase11}
 -
-  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po11}
--  
-  I check that the order which was initially in the draft state has transmit to confirm state for double validation.
--
-  !assert {model: purchase.order, id: purchase_order_po11}:
-    - state == 'confirmed'
--
-  I Approved purchase order by Supplier for MOB1.
--
-  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po11}
--  
   I check that the order which was initially in the confirmed state has transmit to approved state.
 -
-  !assert {model: purchase.order, id: purchase_order_po11}:
-    - state == 'approved' 
+  !assert {model: purchase.order, id: order_purchase11, severity: error, string: Purchase Order should be in Approved state.}:
+    - state == 'approved'
 -
-  Test for purchase double validation in which Total < Limit Amount.
-- 
-  I create purchase order for MOB1 for 1 quantity.
-- 
-  !record {model: purchase.order, id: purchase_order_po12}:
-    company_id: base.main_company
-    date_order: '2011-01-02'
-    invoice_method: order
-    location_id: stock.stock_location_stock
-    order_line:
-      - date_planned: '2011-01-12'
-        name: MOB1
-        price_unit: 2000.0
-        product_id: 'product_product_mob1'
-        product_qty: 1.0
-        product_uom: product.product_uom_unit
-        state: draft
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
-    pricelist_id: purchase.list0
-- 
-  Initially purchase order is in the draft state.
+  I confirmed the purchase order of amount of less than Limit amount.
 -
-  !assert {model: purchase.order, id: purchase_order_po12}:
-    - state == 'draft'  
+  !workflow {model: purchase.order, action: purchase_confirm, ref: order_purchase12}
 -
-  I confirm the purchase order for MOB1.
+  I check that the order is in approved state.
 -
-  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po12}
--  
-  I check that the order which was initially in the draft state has transmit to approved state.
--
-  !assert {model: purchase.order, id: purchase_order_po12}:
+  !assert {model: purchase.order, id: order_purchase12, severity: error, string: Purchase Order should be in Approved state.}:
     - state == 'approved'
 
-
-   
\ No newline at end of file
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index d1ec2b1c260..a926b3bfb3a 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -18,11 +18,11 @@
 #
 ##############################################################################
 {
-    "name" : "Purchase Requisition",
+    "name" : "Purchase Requisitions",
     "version" : "0.1",
     "author" : "OpenERP SA",
     "category" : "Purchase Management",
-    'complexity': "easy",
+    'complexity': "normal",
     "images" : ['images/purchase_requisitions.jpeg'],
     "website" : "http://www.openerp.com",
     "description": """
@@ -43,8 +43,10 @@ This new object will regroup and will allow you to easily keep track and order a
                     "security/ir.model.access.csv","purchase_requisition_sequence.xml"
     ],
     "active": False,
-    "test":['test/purchase_requisition_report.yml',
-            'test/purchase_requisition_test.yml',
+    "test":[
+            'test/purchase_requisition_demo.yml',
+            'test/purchase_requisition.yml',
+            'test/cancel_purchase_requisition.yml',
             ],
     "installable": True,
     "certificate" : "001023264099823179629",
diff --git a/addons/purchase_requisition/i18n/hr.po b/addons/purchase_requisition/i18n/hr.po
new file mode 100644
index 00000000000..ef664e8d8cd
--- /dev/null
+++ b/addons/purchase_requisition/i18n/hr.po
@@ -0,0 +1,436 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-11 22:15+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-12 05:17+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr "U tijeku"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "No Product in Tender"
+msgstr "Nema artikla u tenderu"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm"
+msgstr "Potvrdi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Odgovoran"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr "Dobavljač"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Vrsta zahtjeva"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detalji artikla"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Datum zahtjeva"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
+#: model:ir.actions.report.xml,name:purchase_requisition.report_purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: field:product.product,purchase_requisition:0
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition.line,requisition_id:0
+#: view:purchase.requisition.partner:0
+msgid "Purchase Requisition"
+msgstr "Zahtjev za nabavom"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Stavka zahtjeva za nabavom"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Artikl"
+
+#. module: purchase_requisition
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Oznaka naloga mora biti jedinstvena"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: purchase_requisition
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box so that requisitions generates purchase requisitions instead "
+"of directly requests for quotations."
+msgstr ""
+"Označi ovu kučicu kako bi zahtjev generirao zahtjev za nabavom umjesto "
+"direktno upit."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr "Upit"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr "Višestruki zahtjevi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Odobrio dobavljač"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Vrati u nacrt"
+
+#. module: purchase_requisition
+#: model:ir.module.module,description:purchase_requisition.module_meta_information
+msgid ""
+"\n"
+"    This module allows you to manage your Purchase Requisition.\n"
+"    When a purchase order is created, you now have the opportunity to save "
+"the related requisition.\n"
+"    This new object will regroup and will allow you to easily keep track and "
+"order all your purchase orders.\n"
+msgstr ""
+"\n"
+"    Ovaj modul omogućuje upravljanje zahtjevima u nabavi.\n"
+"    Kad se kreira nabavni nalog, imate priliku snimiti povezani zahtjev.\n"
+"    Novi objekt će se pregrupirati i mogućiti vam lako praćenje i "
+"naručivanje svih vaših nabavnih naloga.\n"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr "Adresa"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Oznaka narudžbe"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Početni datum"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid ""
+"A purchase requisition is the step before a request for quotation. In a "
+"purchase requisition (or purchase tender), you can record the products you "
+"need to buy and trigger the creation of RfQs to suppliers. After the "
+"negotiation, once you have reviewed all the supplier's offers, you can "
+"validate some and cancel others."
+msgstr ""
+"Zahtjev u nabavi je korak prije upita. U zahtjevu za nabavom (ili nabavnom "
+"tenderu), možete zabilježiti sve artikle\r\n"
+"koje morate kupiti i pokrenuti kreiranje upita dobavljačima. Nakon pregovora "
+"nakon što se razmotrili sve ponude dobavljača možete potvrditi neke, a "
+"odustati od drugih."
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Zahtjevi u nabavi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Završni datum"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Oznaka zahtjeva"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Artikli za nabavu"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Konačan rok zahtjeva"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "Pretraži zahtjeve u nabavi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Datum narudžbe"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Zahtjev u nabavi (ekskluzivni):  Prilikom potvrde nabavnog naloga , "
+"poništava preostale nabavne naloge.\n"
+"Zahtjevi u nabavi(Višestruki):  Omogućuje više nabavnih naloga. Prilikom "
+"potvrde nabavnog naloga ne poništava preostale naloge."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Poništi nabavni nalog"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Nalog za nabavu"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "Error!"
+msgstr "Greška!"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr "JM proizvoda"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "Artikli"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Datum naloga"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "["
+msgstr "["
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Partner za zahtjev u nabavi"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr "]"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Detalji upita"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Nabava za zahtjev"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Nalozi u nabavi"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Vezna oznaka"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Nabava"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "Zadnji zahtjev"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Upiti"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Zahtjev u nabavi (ekskluzivan)"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Kreiraj upit"
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Greška: neispravan EAN kod"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr "Izvršeno"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Potvrdi nabavni nalog"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: purchase_requisition
+#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
+msgid "Purchase - Purchase Requisition"
+msgstr "Nabava - Zahtjevi u nabavi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "Nedodjeljen"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Zahtjev"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Nalozi u nabavi"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+"Već imate jedan %s nabavni nalog za tog partnera. Morate poništiti ovaj "
+"nabavni nalog kako bi kreirali novi upit."
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index d619e3a82f5..cc0956b8755 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -19,7 +19,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 import time
 import netsvc
 
@@ -83,6 +84,89 @@ class purchase_requisition(osv.osv):
         self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
         return True
 
+    def _planned_date(self, requisition, delay=0.0):
+        company = requisition.company_id
+        date_planned = False
+        if requisition.date_start:
+            date_planned = datetime.strptime(requisition.date_start, '%Y-%m-%d %H:%M:%S') - relativedelta(days=company.po_lead)
+        else:
+            date_planned = datetime.today() - relativedelta(days=company.po_lead)
+        if delay:
+            date_planned -= relativedelta(days=delay)
+        return date_planned and date_planned.strftime('%Y-%m-%d %H:%M:%S') or False
+
+    def _seller_details(self, cr, uid, requisition_line, supplier, context=None):
+        product_uom = self.pool.get('product.uom')
+        pricelist = self.pool.get('product.pricelist')
+        supplier_info = self.pool.get("product.supplierinfo")
+        product = requisition_line.product_id
+        default_uom_po_id = product.uom_po_id.id
+        qty = product_uom._compute_qty(cr, uid, requisition_line.product_uom_id.id, requisition_line.product_qty, default_uom_po_id)
+        seller_delay = 0.0
+        seller_price = False
+        seller_qty = False
+        for product_supplier in product.seller_ids:
+            if supplier.id ==  product_supplier.name and qty >= product_supplier.qty:
+                seller_delay = product_supplier.delay
+                seller_qty = product_supplier.qty
+        supplier_pricelist = supplier.property_product_pricelist_purchase or False
+        seller_price = pricelist.price_get(cr, uid, [supplier_pricelist.id], product.id, qty, False, {'uom': default_uom_po_id})[supplier_pricelist.id]
+        if seller_qty:
+            qty = max(qty,seller_qty)
+        date_planned = self._planned_date(requisition_line.requisition_id, seller_delay)
+        return seller_price, qty, default_uom_po_id, date_planned
+
+    def make_purchase_order(self, cr, uid, ids, partner_id, context=None):
+        """
+        Create New RFQ for Supplier
+        """
+        if context is None:
+            context = {}
+        assert partner_id, 'Supplier should be specified'
+        purchase_order = self.pool.get('purchase.order')
+        purchase_order_line = self.pool.get('purchase.order.line')
+        res_partner = self.pool.get('res.partner')
+        fiscal_position = self.pool.get('account.fiscal.position')
+        supplier = res_partner.browse(cr, uid, partner_id, context=context)
+        delivery_address_id = res_partner.address_get(cr, uid, [supplier.id], ['delivery'])['delivery']
+        supplier_pricelist = supplier.property_product_pricelist_purchase or False
+        res = {}
+        for requisition in self.browse(cr, uid, ids, context=context):
+            if supplier.id in filter(lambda x: x, [rfq.state <> 'cancel' and rfq.partner_id.id or None for rfq in requisition.purchase_ids]):
+                 raise osv.except_osv(_('Warning'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % supp_record.state)
+            location_id = requisition.warehouse_id.lot_input_id.id
+            purchase_id = purchase_order.create(cr, uid, {
+                        'origin': requisition.name,
+                        'partner_id': supplier.id,
+                        'partner_address_id': delivery_address_id,
+                        'pricelist_id': supplier_pricelist.id,
+                        'location_id': location_id,
+                        'company_id': requisition.company_id.id,
+                        'fiscal_position': supplier.property_account_position and supplier.property_account_position.id or False,
+                        'requisition_id':requisition.id,
+                        'notes':requisition.description,
+                        'warehouse_id':requisition.warehouse_id.id ,
+            })
+            res[requisition.id] = purchase_id
+            for line in requisition.line_ids:
+                product = line.product_id
+                seller_price, qty, default_uom_po_id, date_planned = self._seller_details(cr, uid, line, supplier, context=context)
+                taxes_ids = product.supplier_taxes_id
+                taxes = fiscal_position.map_tax(cr, uid, supplier.property_account_position, taxes_ids)
+                purchase_order_line.create(cr, uid, {
+                    'order_id': purchase_id,
+                    'name': product.partner_ref,
+                    'product_qty': qty,
+                    'product_id': product.id,
+                    'product_uom': default_uom_po_id,
+                    'price_unit': seller_price,
+                    'date_planned': date_planned,
+                    'notes': product.description_purchase,
+                    'taxes_id': [(6, 0, taxes)],
+                }, context=context)
+                
+        return res
+
 purchase_requisition()
 
 class purchase_requisition_line(osv.osv):
@@ -96,7 +180,7 @@ class purchase_requisition_line(osv.osv):
         'product_uom_id': fields.many2one('product.uom', 'Product UoM'),
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'company_id': fields.related('requisition_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
     }
 
     def onchange_product_id(self, cr, uid, ids, product_id,product_uom_id, context=None):
@@ -133,7 +217,7 @@ class purchase_order(osv.osv):
                             proc_obj.write(cr, uid, proc_ids, {'purchase_id': po.id})
                         wf_service = netsvc.LocalService("workflow")
                         wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
-                    self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'done','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
+                    po.requisition_id.tender_done(context=context)
         return res
 
 purchase_order()
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index deb25fe9e14..910fc22bc63 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -6,24 +6,65 @@
             <field eval="[(4, ref('group_purchase_requisition_user'))]" name="groups_id"/>
         </record>
 
+        <record id="product.product_product_hdd3" model="product.product">
+            <field name="purchase_requisition" eval="True"/>
+        </record>
+
     <!--Resource: purchase.requisition-->
 
-		<record id="order_purchase_requisition1" model="purchase.requisition">
+		<record id="requisition1" model="purchase.requisition">
             <field name="user_id" model="res.users"/>
-            <field name="exclusive">multiple</field>
+            <field name="exclusive">exclusive</field>
             <field name="date_start" eval="time.strftime('%Y/%m/%d %H:%M:%S')"/>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
 		</record>
 
-        <!--Resource: purchase.requisition.line-->
-
-        <record id="line_purchase_requisition1" model="purchase.requisition.line">
-            <field name="requisition_id" ref="order_purchase_requisition1"/>
-            <field name="product_id" ref="product.product_product_pc3"/>
-            <field name="product_uom_id" model="product.uom" search="[]"/>
+        <record id="requisition_line1" model="purchase.requisition.line">
+            <field name="name">[HDD3] HDD Seagate 7200.8 160GB</field>
+            <field name="requisition_id" ref="requisition1"/>
+            <field name="product_id" ref="product.product_product_hdd3"/>
+            <field name="product_uom_id" ref="product.product_uom_unit"/>
             <field name="product_qty">5</field>
         </record>
 
+        <!--Resource: purchase.order-->
+
+        <record id="rfq1" model="purchase.order">
+            <field name="location_id" ref="stock.stock_location_stock"/>
+            <field name="pricelist_id" ref="purchase.list0"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="partner_address_id" ref="base.res_partner_address_7"/>
+            <field name="requisition_id" ref="requisition1"/>
+        </record>
+
+        <record id="rfq1_line" model="purchase.order.line">
+            <field name="order_id" ref="rfq1"/>
+            <field name="name">[HDD3] HDD Seagate 7200.8 160GB</field>
+            <field name="date_planned" eval="time.strftime('%Y/%m/10')"/>
+            <field name="product_id" ref="product.product_product_hdd3"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">60</field>
+            <field name="product_qty">5</field>
+        </record>
+               
+        <record id="rfq2" model="purchase.order">
+            <field name="location_id" ref="stock.stock_location_stock"/>
+            <field name="pricelist_id" ref="purchase.list0"/>
+            <field name="partner_id" ref="base.res_partner_vickingdirect0"/>
+            <field name="partner_address_id" ref="base.res_partner_address_brussels0"/>
+            <field name="requisition_id" ref="requisition1"/>
+        </record>
+
+        <record id="rfq2_line" model="purchase.order.line">
+            <field name="order_id" ref="rfq2"/>
+            <field name="name">[HDD3] HDD Seagate 7200.8 160GB</field>
+            <field name="date_planned" eval="time.strftime('%Y/%m/15')"/>
+            <field name="product_id" ref="product.product_product_hdd3"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">50</field>
+            <field name="product_qty">3</field>
+        </record>        
+
 
     </data>
 </openerp>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index e0f09f6f7d6..bd47d093df0 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -174,7 +174,6 @@
     <menuitem
         id="menu_purchase_requisition_pro_mgt"
         sequence="0"
-        groups="base.group_extended"
         parent="purchase.menu_procurement_management"
         action="action_purchase_requisition"/>
 
diff --git a/addons/purchase_requisition/security/ir.model.access.csv b/addons/purchase_requisition/security/ir.model.access.csv
index ec8c031f88b..4c6b8d8cdde 100644
--- a/addons/purchase_requisition/security/ir.model.access.csv
+++ b/addons/purchase_requisition/security/ir.model.access.csv
@@ -1,7 +1,7 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_purchase_requisition","purchase.requisition","model_purchase_requisition","purchase.group_purchase_user",1,1,1,1
-"access_purchase_requisition_line_purchase_user","purchase.requisition.line","model_purchase_requisition_line","purchase.group_purchase_user",1,1,1,1
-"access_purchase_requisition_manager","purchase.requisition manager","model_purchase_requisition","purchase.group_purchase_manager",1,0,0,0
-"access_purchase_requisition_line_manager","purchase.requisition.line manager","model_purchase_requisition_line","purchase.group_purchase_manager",1,0,0,0
-"access_purchase_requisition_stock_manager","purchase.requisition","model_purchase_requisition","stock.group_stock_manager",1,0,1,0
-"access_purchase_requisition_line_stock_manager","purchase.requisition.line","model_purchase_requisition_line","stock.group_stock_manager",1,0,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_purchase_requisition,purchase.requisition,model_purchase_requisition,purchase.group_purchase_user,1,1,1,1
+access_purchase_requisition_line_purchase_user,purchase.requisition.line,model_purchase_requisition_line,purchase.group_purchase_user,1,1,1,1
+access_purchase_requisition_manager,purchase.requisition manager,model_purchase_requisition,purchase.group_purchase_manager,1,0,0,0
+access_purchase_requisition_line_manager,purchase.requisition.line manager,model_purchase_requisition_line,purchase.group_purchase_manager,1,0,0,0
+access_purchase_requisition_stock_manager,purchase.requisition,model_purchase_requisition,stock.group_stock_manager,1,0,1,0
+access_purchase_requisition_line_stock_manager,purchase.requisition.line,model_purchase_requisition_line,stock.group_stock_manager,1,0,1,0
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index af8a1330e2d..71c54b973e3 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -2,12 +2,20 @@
 <openerp>
 <data noupdate="1">
 
+    <record model="ir.module.category" id="module_category_purchase_requisition">
+        <field name="name">Purchase Requisition</field>
+        <field name="parent_id" ref="base.module_category_purchase_management"/>
+        <field name="sequence">9</field>
+    </record>
+
     <record id="group_purchase_requisition_user" model="res.groups">
-        <field name="name">Purchase Requisition / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="module_category_purchase_requisition"/>
     </record>
 
     <record id="group_purchase_requisition_manager" model="res.groups">
-        <field name="name">Purchase Requisition / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="module_category_purchase_requisition"/>
         <field name="implied_ids" eval="[(4, ref('group_purchase_requisition_user'))]"/>
     </record>
     
diff --git a/addons/purchase_requisition/test/cancel_purchase_requisition.yml b/addons/purchase_requisition/test/cancel_purchase_requisition.yml
new file mode 100644
index 00000000000..389c328a5cf
--- /dev/null
+++ b/addons/purchase_requisition/test/cancel_purchase_requisition.yml
@@ -0,0 +1,26 @@
+-
+  I cancel requisition.
+-
+  !python {model: purchase.requisition}: |
+    self.tender_cancel(cr, uid, [ref("requisition1")])
+-
+  I check requisition after cancelled.
+-
+  !assert {model: purchase.requisition, id: requisition1}:
+    - state == 'cancel'
+-
+  I reset requisition as "New".
+-
+  !python {model: purchase.requisition}: |
+    self.tender_reset(cr, uid, [ref('requisition1')])
+-
+  I duplicate requisition.
+-
+  !python {model: purchase.requisition}: |
+    self.copy(cr, uid, ref('requisition1'))
+-
+  I delete requisition.
+-
+  !python {model: purchase.order}: |
+    self.unlink(cr, uid, [ref("requisition1")])
+
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index fb5fa774fc3..a2e5b743965 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -1,189 +1,90 @@
-
 -
-  In order to test the purchase requisition module, I will do a sale order -> purchase_requisition ->
-  purchase flow and I will buy the required products at two different suppliers.
+  I create the procurement order and run that procurement.
 -
-  I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
-  with the generation of purchase requisitions.
+  !python {model: make.procurement}: |
+    context.update({'active_model':'product.product', 'active_ids': [ref('product.product_product_hdd3')], 'active_id': ref('product.product_product_hdd3')})
 -
-  !record {model: product.product, id: product_product_laptopacer0}:
-    categ_id: product.product_category_3
-    cost_method: standard
-    mes_type: fixed
-    name: Laptop ACER
-    procure_method: make_to_order
-    purchase_requisition: 1
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_asus
-        qty: 5.0
-        min_qty: 1.0
-    supply_method: buy
-    type: product
+  !record {model: make.procurement, id: procurement_product_hdd3}:
+    product_id: product.product_product_hdd3
+    qty: 15
     uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
-    list_price: 100.0
+    warehouse_id: stock.stock_warehouse_shop0
 -
-  Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001.
+  !python {model: make.procurement}: |
+    self.make_procurement(cr, uid, [ref('procurement_product_hdd3')], context)
 -
-  !record {model: sale.order, id: sale_order_testtender0}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: TEST/TENDER/0001
-    order_line:
-      - name: Laptop ACER
-        price_unit: 100.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 5.0
-        state: draft
-        delay: 7.0
-        product_id: product_product_laptopacer0
-        product_uos_qty: 5.0
-        th_weight: 0.0
-        type: make_to_order
-    order_policy: manual
-    partner_id: base.res_partner_agrolait
-    partner_invoice_id: base.res_partner_address_8
-    partner_order_id: base.res_partner_address_8
-    partner_shipping_id: base.res_partner_address_8
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
+  I run the scheduler.
 -
-  I confirm the sale order.
+  !python {model: procurement.order}: |
+    self.run_scheduler(cr, uid)
 -
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0}
+  I check requisition details which created after run procurement.
 -
-  I launch the scheduler to compute all procurements, and specify all requisitions orders.
+  !python {model: procurement.order}: |
+    procurement_ids = self.search(cr, uid, [('requisition_id','!=', False)])
+    for procurement in self.browse(cr, uid, procurement_ids, context=context):
+        requisition = procurement.requisition_id
+        assert requisition.date_end == procurement.date_planned, "End date is not correspond."
+        assert len(requisition.line_ids) == 1, "Requisition Lines should be one."
+        line = requisition.line_ids[0]
+        assert line.product_id.id == procurement.product_id.id, "Product is not correspond."
+        assert line.product_uom_id.id == procurement.product_uom.id, "UOM is not correspond."
+        assert line.product_qty == procurement.product_qty, "Quantity is not correspond."
 -
-  !python {model: procurement.order.compute.all}: |
-    proc_obj = self.pool.get('procurement.order')
-    proc_obj._procure_confirm(cr,uid)
+  I open another requisition.
 -
-  On the purchase requisition, I create a new purchase order for the supplier 'DistriPC' by clicking on
-  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC .
--
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
--
-  I create a new purchase order.
+  !python {model: purchase.requisition}: |
+    self.tender_in_progress(cr, uid, [ref("requisition1")], context=context)
+- 
+  Supplier send one RFQ so I create requisition request of that supplier.
 -
   !python {model: purchase.requisition.partner}: |
-    req_obj = self.pool.get('purchase.requisition')
-    ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER')])
-    self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang":
-      'en_US', "active_model": "purchase.requisition", "tz": False, "record_id":
-      1, "active_ids": ids, "active_id": ids[0], })
-
+    context.update({"active_model": "purchase.requisition","active_ids": [ref("requisition1")],"active_id": ref("requisition1")})
+- 
+  !record {model: purchase.requisition.partner, id: requisition_partner_0}:
+    partner_id: base.res_partner_desertic_hispafuentes
+- 
+  !python {model: purchase.requisition.partner}: |
+    self.create_order(cr, uid, [ref("requisition_partner_0")], context=context)
 -
- I check that I have two purchase orders on the purchase requisition.
--
- !python {model: purchase.order}: |
-    from tools.translate import _
-    order_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
-    ids=len(order_ids)
-    assert(ids == 2), _('Purchase Order not Created')
-
--
- I set the purchase requisition as 'Not Exclusive'.
--
- !python {model: purchase.requisition}: |
-    ids =self.search(cr, uid, [('origin','=','Laptop ACER')])
-    self.write(cr,uid,ids[0],{'exclusive': 'multiple' })
--
-  I change the quantities so that the purchase order for DistriPC includes 3 pieces and the
-  purchase order for Asustek includes 2 pieces.
+  I check that the RFQ details which created for supplier.
 -
   !python {model: purchase.order}: |
-    line_obj=self.pool.get('purchase.order.line')
-    partner_obj=self.pool.get('res.partner')
-    requistion_obj=self.pool.get('purchase.requisition')
-    requistion_ids =requistion_obj.search(cr, uid, [('origin','=','Laptop ACER')])
-    partner_id1=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0]
-    partner_id2=partner_obj.search(cr,uid,[('name','=','Distrib PC')])[0]
-    purchase_id1= self.search(cr, uid, [('partner_id','=',partner_id1),('requisition_id','in',requistion_ids)])
-    purchase_id2= self.search(cr, uid, [('partner_id','=',partner_id2),('requisition_id','in',requistion_ids)])
-    order_line1=self.browse(cr, uid, purchase_id1, context)[0].order_line[0].id
-    order_line2=self.browse(cr, uid, purchase_id2, context)[0].order_line[0].id
-    line_obj.write(cr, uid, order_line1, {'product_qty':2})
-    line_obj.write(cr, uid, order_line2, {'product_qty':3})
+    purchase_requisition = self.pool.get("purchase.requisition")
+    purchase_ids = self.search(cr, uid, [('requisition_id','=',ref("requisition1"))])
+    assert purchase_ids, "RFQ is not created."
+    rfq = self.browse(cr, uid, purchase_ids[0], context=context)
+    requisition = rfq.requisition_id
+    supplier = rfq.partner_id
+    assert supplier.id == ref('base.res_partner_desertic_hispafuentes'), "RFQ Partner is not correspond."
+    assert len(rfq.order_line) == len(requisition.line_ids), "Lines are not correspond."
+    for rfq_line in rfq.order_line:
+        for line in requisition.line_ids:
+            if rfq_line.product_id.id == line.product_id.id:
+                seller_price, qty, default_uom_po_id, date_planned = purchase_requisition._seller_details(cr, uid, line, supplier, context=context)
+                assert rfq_line.product_qty == qty, "Quantity is not correspond."
+                assert rfq_line.product_uom.id == default_uom_po_id, "UOM is not correspond."
+                assert rfq_line.price_unit == seller_price, "Unit Price is not correspond."   
 -
-  I confirm and validate both purchase orders.
+  I confirmed RFQ which has best price.
 -
   !python {model: purchase.order}: |
-   order_ids= self.search(cr, uid, [])
-   import netsvc
-   wf_service = netsvc.LocalService("workflow")
-   for id in order_ids:
-      wf_service.trg_validate(uid, 'purchase.order',id,'purchase_confirm', cr)
-      wf_service.trg_validate(uid, 'purchase.order',id,'purchase_approve', cr)
--
-  I check that the delivery order of the customer is in state 'Waiting Goods'.
--
-  !python {model: stock.picking }: |
-    from tools.translate import _
-    picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
-    if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      assert (pick.state =='confirmed'),_('Picking  is  not in confirm state.')
-      assert (pick.move_lines[0].state == 'waiting'), _('Stock Move is  not Waiting state.')
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    purchase = self.browse(cr, uid, ref('rfq2'), context=context)
+    wf_service.trg_validate(uid, 'purchase.order', purchase.id, 'purchase_confirm', cr)
 
 -
-  I receive the order of the supplier Asustek from the Incoming Products menu.
+  I check status of requisition after confirmed best RFQ.
 -
-  !python {model: stock.picking }: |
-   import time
-   partner_obj=self.pool.get('res.partner')
-   order_obj=self.pool.get('purchase.order')
-   partner_id=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0]
-   picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')])
-   if picking_id:
-     pick=self.browse(cr,uid,picking_id[0])
-     move =pick.move_lines[0]
-     partial_datas = {
-              'partner_id': pick.address_id.partner_id.id,
-              'address_id': pick.address_id.id,
-              'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-     partial_datas['move%s'%(move.id)]= {
-       'product_id': move.product_id.id,
-       'product_qty': move.product_qty,
-       'product_uom': move.product_uom.id,
-      }
-     self.do_partial(cr, uid, picking_id,partial_datas)
+  !python {model: purchase.requisition}: |
+    requisition = self.browse(cr, uid, ref('requisition1'), context=context)
+    requisition.state == 'done', "Requisition should be closed."
 -
- I receive the order of the supplier DistriPC from the Incoming Shipments menu.
--
-  !python {model: stock.picking }: |
-   import time
-   partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
-   picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      move =pick.move_lines[0]
-      partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
-            'delivery_date' : time.strftime('%Y-%m-%d'),
-           }
-      partial_datas['move%s'%(move.id)]= {
-          'product_id': move.product_id.id,
-          'product_qty': move.product_qty,
-          'product_uom': move.product_uom.id,
-      }
-      self.do_partial(cr, uid, picking_id,partial_datas)
--
-  I check that the delivery order of the customer is in the state Available.
--
-  !python {model: stock.picking }: |
-   from tools.translate import _
-   picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','out')])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      assert(pick.state == 'assigned'), _('Picking  is  not in available state')
-
+  I print a Requisition report
+- 
+  !python {model: purchase.requisition}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.purchase.requisition').create(cr, uid, [ref('purchase_requisition.requisition1')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'purchase_requisition-purchase_requisition_report.'+format), 'wb+').write(data)
diff --git a/addons/purchase_requisition/test/purchase_requisition_demo.yml b/addons/purchase_requisition/test/purchase_requisition_demo.yml
new file mode 100755
index 00000000000..42913f3e96e
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_requisition_demo.yml
@@ -0,0 +1,10 @@
+-
+  In order to test process of the purchase requisition ,I create requisition
+- 
+  !record {model: purchase.requisition, id: requisition1}:
+    exclusive: exclusive
+    line_ids:
+      - product_id: product.product_product_cpu1
+        product_qty: 10.0
+        product_uom_id: product.product_uom_unit
+  
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
deleted file mode 100644
index 1ab9bca9493..00000000000
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
+++ /dev/null
@@ -1,113 +0,0 @@
--
-  In order to test the purchase requisition module, I will do a sale order -> purchase_requisition ->
-  purchase flow and I will buy the required products at two different suppliers.
--
-  I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
-  with the generation of purchase requisitions.
--
-  !record {model: product.product, id: product_product_laptopacer1}:
-    categ_id: product.product_category_3
-    cost_method: standard
-    list_price: 1000.0
-    mes_type: fixed
-    name: Laptop ACER1
-    procure_method: make_to_order
-    purchase_requisition: 1
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_asus
-        qty: 5.0
-        min_qty: 1.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0002
--
-  !record {model: sale.order, id: sale_order_testtender1}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: TEST/TENDER/0002
-    order_line:
-      - name: Laptop ACER1
-        price_unit: 1000.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 5.0
-        state: draft
-        'delay': 7.0
-        'product_id': product_product_laptopacer1
-        'type': make_to_order
-    order_policy: manual
-    partner_id: base.res_partner_agrolait
-    partner_invoice_id: base.res_partner_address_8
-    partner_order_id: base.res_partner_address_8
-    partner_shipping_id: base.res_partner_address_8
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
--
-  I confirm  sale order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender1}
--
-  I launch the scheduler to compute all procurements, and planify all requisitions orders.
--
-  !python {model: procurement.order.compute.all}: |
-    proc_obj = self.pool.get('procurement.order')
-    proc_obj._procure_confirm(cr,uid)
--
-  I should find a purchase requisition with the origin 'TEST/TENDER/0002', that includes a request for
-  5 Laptop ACER, and a purchase order on the default supplier for this product.
--
- !python {model: purchase.requisition}: |
-    requisition_ids =self.search(cr, uid, [('origin','=','Laptop ACER1')])
-    ids=len(requisition_ids)
-    assert len(requisition_ids), "Purchase requisition  hasn't Created"
--
-  On the purchase requisition, I create a new purchase order for the supplier 'DistriPC' by clicking on
-  the button 'New Request for Quotation'. This opens a window to ask me the supplier and I set DistriPC .
--
-  I Create  purchase.requisition.partner .
--
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
--
-  I create a new purchase order for the supplier 'DistriPC'.
--
-  !python {model: purchase.requisition.partner}: |
-    req_obj = self.pool.get('purchase.requisition')
-    ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')])
-    self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang":
-      'en_US', "active_model": "purchase.requisition", "tz": False, "record_id":
-      1, "active_ids": ids, "active_id": ids[0], })
--
-  I set the purchase requisition as 'Exclusive'
--
-  !python {model: purchase.requisition}: |
-    ids =self.search(cr, uid, [('origin','=','Laptop ACER1')])
-    self.write(cr,uid,ids[0],{'exclusive': 'exclusive' })
--
-  I confirm and validate the Request for Quotation of ASUStek.
--
- !python {model: purchase.order}: |
-   partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0]
-   req_obj = self.pool.get('purchase.requisition')
-   ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')])
-   purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0]
-   import netsvc
-   wf_service = netsvc.LocalService("workflow")
-   if purchase_id:
-     wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_confirm', cr)
-     wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_approve', cr)
--
-  I check that Request for Quotation of DistriPC is cancelled.
--
-  !python {model: purchase.order}: |
-   partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
-   req_obj = self.pool.get('purchase.requisition')
-   ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')])
-   purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0]
-   state=self.browse(cr,uid,purchase_id).state
-   assert (state=='cancel')
diff --git a/addons/purchase_requisition/test/purchase_requisition_report.yml b/addons/purchase_requisition/test/purchase_requisition_report.yml
deleted file mode 100644
index 29edea96a8a..00000000000
--- a/addons/purchase_requisition/test/purchase_requisition_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on Purchase Requisition, we will print a Requisition report
-- 
-  !python {model: purchase.requisition}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.purchase.requisition').create(cr, uid, [ref('purchase_requisition.order_purchase_requisition1')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'purchase_requisition-purchase_requisition_report.'+format), 'wb+').write(data)
diff --git a/addons/purchase_requisition/test/purchase_requisition_test.yml b/addons/purchase_requisition/test/purchase_requisition_test.yml
deleted file mode 100755
index 403eaca04fc..00000000000
--- a/addons/purchase_requisition/test/purchase_requisition_test.yml
+++ /dev/null
@@ -1,166 +0,0 @@
--
-  In order to test the purchase requisition flow,I start by creating a new product 'MOB1'
-- 
-  !record {model: product.product, id: product_product_mob1}:
-    name: MOB1
-    categ_id: product.product_category_3
-    cost_method: standard
-    mes_type: fixed
-    price_margin: 2.0
-    procure_method: make_to_stock
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
-    standard_price: 2000.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
-- 
-  I create purchase requisition for MOB1 for 1 quantity.
-- 
-  !record {model: purchase.requisition, id: purchase_requisition_te0}:
-    company_id: base.main_company
-    exclusive: multiple
-    line_ids:
-      - company_id: base.main_company
-        product_id: product_product_mob1
-        product_qty: 10.0
-        product_uom_id: product.product_uom_unit
-    name: TE00009
-- 
-  Initially purchase requisition is in draft state.
--
-  !assert {model: purchase.requisition, id: purchase_requisition_te0}:
-    - state == 'draft'  
-- 
-  Copy purchase requisition which is in draft state than confirm and Done it.
--
-  !python {model: purchase.requisition}: |
-    copy_id = self.copy(cr, uid, ref("purchase_requisition_te0"))   
-    self.tender_cancel(cr, uid, [copy_id], context=None)
-    self.tender_reset(cr, uid, [copy_id], context=None)
-    self.tender_in_progress(cr, uid, [copy_id], context=None)
-    self.tender_done(cr, uid, [copy_id], context=None)
-- 
-  I confirm the purchase requisition for MOB1.
-- 
-  !python {model: purchase.requisition}: |
-    self.tender_in_progress(cr, uid, [ref("purchase_requisition_te0")])
--
-  I check that the purchase requisition which was initially in the draft state has transmit to In Progress after confirm it.
--
-  !assert {model: purchase.requisition, id: purchase_requisition_te0}:
-    - state == 'in_progress'
-- 
-  In order to create a purchase order for 'Axelor', i click on the wizard 'Request a Quotation' and create record for wizard.
-- 
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
-    partner_address_id: base.res_partner_address_3000
-    partner_id: base.res_partner_desertic_hispafuentes
-- 
-  I click on 'Create Quotation' for creating PO.
-- 
-  !python {model: purchase.requisition.partner}: |
-    self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"active_model": "purchase.requisition",
-      "active_ids": [ref("purchase_requisition_te0")],"active_id": ref("purchase_requisition_te0"), })
--
-  I confirm the purchase order of Axelor.
--
-  !python {model: purchase.order}: |
-    purchase_id= self.search(cr, uid, [('requisition_id','=',ref("purchase_requisition_te0"))])
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")   
-    if purchase_id:
-      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_confirm', cr)
-      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_approve', cr)
--
-  I check that Quotation of Axelor is Approved.
--        
-  !python {model: purchase.order}: |
-   purchase_id= self.search(cr, uid, [('requisition_id','=',ref("purchase_requisition_te0"))])[0]
-   state=self.browse(cr,uid,purchase_id).state
-   assert (state=='approved')
-- 
-  I click on Done button
-- 
-  !python {model: purchase.requisition}: |
-    self.tender_done(cr, uid, [ref("purchase_requisition_te0")],)
--
-  I check that after click on Done button state is in done.
--
-  !assert {model: purchase.requisition, id: purchase_requisition_te0}:
-    - state == 'done'
--
-  In order to test the purchase requisition flow for Requisition Type is exclusive 
-- 
-  I create purchase requisition for Requisition Type is exclusive 
-- 
-  !record {model: purchase.requisition, id: purchase_requisition_ex1}:
-    company_id: base.main_company
-    exclusive: exclusive
-    line_ids:
-      - company_id: base.main_company
-        product_id: product_product_mob1
-        product_qty: 10.0
-        product_uom_id: product.product_uom_unit
-    name: TE000010
-- 
-   I Create a First Purchase Order for the supplier 'Distrib PC'.
-- 
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_1}:
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
-- 
-  I create Quotations For supplier 'Distrib PC'.
-- 
-  !python {model: purchase.requisition.partner}: |
-    self.create_order(cr, uid, [ref("purchase_requisition_partner_1")], {"active_model": "purchase.requisition",
-      "active_ids": [ref("purchase_requisition_ex1")],"active_id": ref("purchase_requisition_ex1"), })    
-- 
-   I Create a Second Purchase Order for the supplier ASUStek.
-- 
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_2}:
-    partner_address_id: base.res_partner_address_tang
-    partner_id: base.res_partner_asus
-- 
-  I create Quotations For supplier 'ASUStek'.
-- 
-  !python {model: purchase.requisition.partner}: |
-    self.create_order(cr, uid, [ref("purchase_requisition_partner_2")], {"active_model": "purchase.requisition",
-      "active_ids": [ref("purchase_requisition_ex1")],"active_id": ref("purchase_requisition_ex1"), })
-- 
-  I check that Initially purchase requisition is draft state.
--
-  !assert {model: purchase.requisition, id: purchase_requisition_ex1}:
-    - state == 'draft'  
--
-  I confirm the Second purchase order of ASUStek, than check that Quotation is Approved.
--
-  !python {model: purchase.order}: |
-    purchase_id= self.search(cr, uid, [('partner_id','=',ref("base.res_partner_asus")),('requisition_id','=',ref("purchase_requisition_ex1"))])
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")   
-    if purchase_id:
-      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_confirm', cr)
-      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_approve', cr)
-    state=self.browse(cr,uid,purchase_id[0]).state
-    assert (state=='approved')
-    
--
-  I check that Quotation of Distrib PC is cancelled.
--        
-  !python {model: purchase.order}: |
-   partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
-   purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','=',ref("purchase_requisition_ex1"))])[0]
-   state=self.browse(cr,uid,purchase_id).state
-   assert (state=='cancel')
--
-  I check that Purchase Requisition is Done.
--
-  !assert {model: purchase.requisition, id: purchase_requisition_ex1}:
-    - state == 'done'
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 766e0adb75a..043ed749f4b 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -20,8 +20,6 @@
 ##############################################################################
 
 import time
-from datetime import datetime
-from dateutil.relativedelta import relativedelta
 from osv import fields, osv
 from osv.orm import browse_record, browse_null
 from tools.translate import _
@@ -31,7 +29,7 @@ class purchase_requisition_partner(osv.osv_memory):
     _description = "Purchase Requisition Partner"
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]),
-        'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True),
+        'partner_address_id':fields.many2one('res.partner.address', 'Address'),
     }
 
     def view_init(self, cr, uid, fields_list, context=None):
@@ -42,7 +40,7 @@ class purchase_requisition_partner(osv.osv_memory):
         tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id, context=context)
         if not tender.line_ids:
             raise osv.except_osv(_('Error!'), _('No Product in Tender'))
-        True
+        return res
 
     def onchange_partner_id(self, cr, uid, ids, partner_id):
         if not partner_id:
@@ -52,94 +50,9 @@ class purchase_requisition_partner(osv.osv_memory):
         return {'value':{'partner_address_id': addr['default']}}
 
     def create_order(self, cr, uid, ids, context=None):
-        """
-             To Create a purchase orders .
-
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: the ID or list of IDs
-             @param context: A standard dictionary
-             @return: {}
-
-        """
-        if context is None:
-            context = {}
-        record_ids = context and context.get('active_ids', False)
-        if record_ids:
-            data =  self.browse(cr, uid, ids,context=context)[0]
-            company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
-            order_obj = self.pool.get('purchase.order')
-            order_line_obj = self.pool.get('purchase.order.line')
-            partner_obj = self.pool.get('res.partner')
-            tender_line_obj = self.pool.get('purchase.requisition.line')
-            pricelist_obj = self.pool.get('product.pricelist')
-            prod_obj = self.pool.get('product.product')
-            tender_obj = self.pool.get('purchase.requisition')
-            acc_pos_obj = self.pool.get('account.fiscal.position')
-            partner_id = data.partner_id.id
-            supplier_data = data.partner_id
-            address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
-            list_line=[]
-            purchase_order_line={}
-            for tender in tender_obj.browse(cr, uid, record_ids, context=context):
-                for supp_record in tender.purchase_ids:
-                    if supp_record.partner_id.id == partner_id and supp_record.state <> 'cancel':
-                         raise osv.except_osv(_('Warning'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % supp_record.state)
-                for line in tender.line_ids:
-                    partner_list = sorted([(partner.sequence, partner) for partner in  line.product_id.seller_ids if partner])
-                    partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
-                    uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False
-
-                    if tender.date_start:
-                        newdate = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') - relativedelta(days=company.po_lead)
-                    else:
-                        newdate = datetime.today() - relativedelta(days=company.po_lead)
-                    delay = partner_rec and partner_rec.delay or 0.0
-                    if delay:
-                        newdate -= relativedelta(days=delay)
-
-                    partner = partner_rec and partner_rec.name or supplier_data
-                    pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id or False
-                    price = pricelist_obj.price_get(cr, uid, [pricelist_id], line.product_id.id, line.product_qty, False, {'uom': uom_id})[pricelist_id]
-                    product = prod_obj.browse(cr, uid, line.product_id.id, context=context)
-                    location_id = self.pool.get('stock.warehouse').read(cr, uid, [tender.warehouse_id.id], ['lot_input_id'])[0]['lot_input_id'][0]
-
-                    purchase_order_line= {
-                            'name': product.partner_ref,
-                            'product_qty': line.product_qty,
-                            'product_id': line.product_id.id,
-                            'product_uom': uom_id,
-                            'price_unit': price,
-                            'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
-                            'notes': product.description_purchase,
-                    }
-                    taxes_ids = line.product_id.product_tmpl_id.supplier_taxes_id
-                    taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
-                    purchase_order_line.update({
-                            'taxes_id': [(6,0,taxes)]
-                        })
-                    list_line.append(purchase_order_line)
-                purchase_id = order_obj.create(cr, uid, {
-                            'origin': tender.purchase_ids and tender.purchase_ids[0].origin or tender.name,
-                            'partner_id': partner_id,
-                            'partner_address_id': address_id,
-                            'pricelist_id': pricelist_id,
-                            'location_id': tender.purchase_ids and tender.purchase_ids[0].location_id.id or line.product_id.product_tmpl_id.property_stock_production.id,
-                            'company_id': tender.company_id.id,
-                            'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
-                            'requisition_id':tender.id,
-                            'notes':tender.description,
-                            'warehouse_id':tender.warehouse_id.id and tender.warehouse_id.id ,
-                            'location_id':location_id,
-                            'company_id':tender.company_id.id,
-                })
-                order_ids=[]
-                for order_line in list_line:
-                    order_line.update({
-                            'order_id': purchase_id
-                        })
-                    order_line_obj.create(cr,uid,order_line)
+        active_ids = context and context.get('active_ids', [])
+        data =  self.browse(cr, uid, ids, context=context)[0]
+        self.pool.get('purchase.requisition').make_purchase_order(cr, uid, active_ids, data.partner_id.id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 purchase_requisition_partner()
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index 77b37fd507b..45af2e956b8 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -25,6 +25,7 @@
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
+    "complexity" : "expert",
     "category": "Tools",
     "description": """
 Installer for reporting Hidden.
diff --git a/addons/report_designer/i18n/hr.po b/addons/report_designer/i18n/hr.po
new file mode 100644
index 00000000000..1f88aa3288c
--- /dev/null
+++ b/addons/report_designer/i18n/hr.po
@@ -0,0 +1,107 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 07:38+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: report_designer
+#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
+#: view:report_designer.installer:0
+msgid "Reporting Tools Configuration"
+msgstr "Konfiguracija alata za izvještavanje"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_creator:0
+msgid "Query Builder"
+msgstr "Kreiranje upita"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure"
+msgstr "Postavke"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: report_designer
+#: model:ir.model,name:report_designer.model_report_designer_installer
+msgid "report_designer.installer"
+msgstr "report_designer.installer"
+
+#. module: report_designer
+#: field:report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_designer:0
+msgid "OpenOffice Report Designer"
+msgstr "Dizajner OpenOffice izvještaja"
+
+#. module: report_designer
+#: model:ir.module.module,shortdesc:report_designer.module_meta_information
+msgid "Reporting Tools"
+msgstr "Alati za izvještavanje"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid ""
+"OpenERP's built-in reporting abilities can be improved even further with "
+"some of the following applications"
+msgstr ""
+"OpenERP ugrađene mogućnosti mogu se dodatno nadograditi sa sljedećim "
+"aplikacijama"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure Reporting Tools"
+msgstr "Konfiguriraj alate za izvještavanje"
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_creator:0
+msgid ""
+"Allows you to create any statistic reports  on several objects. It's a SQL "
+"query builder and browser for end users."
+msgstr ""
+"Dozvoljava vam kreiranje statističkih izvješća na nekoliko objekata. Radi se "
+"o SQL kreatoru upita i pregledniku za kranje korisnike."
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_designer:0
+msgid ""
+"Adds wizards to Import/Export .SXW report which you can modify in "
+"OpenOffice.Once you have modified it you can upload the report using the "
+"same wizard."
+msgstr ""
+"Dodaje asistenta za uvoz/izvoz .SXW izvještaja koje možete mijenjati u "
+"OpenOfficeu. Kada ga promjenite možete uploadati izvještaj koristeći isti "
+"asistent."
+
+#. module: report_designer
+#: model:ir.module.module,description:report_designer.module_meta_information
+msgid ""
+"Installer for reporting tools selection\n"
+"    "
+msgstr ""
+"Instaler za odabir alata za izvještanje.\n"
+"    "
+
+#. module: report_designer
+#: field:report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
diff --git a/addons/report_designer/security/ir.model.access.csv b/addons/report_designer/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/report_designer/security/ir.model.access.csv
+++ b/addons/report_designer/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/report_intrastat/security/ir.model.access.csv b/addons/report_intrastat/security/ir.model.access.csv
index f59d76ed536..942b8e19b72 100644
--- a/addons/report_intrastat/security/ir.model.access.csv
+++ b/addons/report_intrastat/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_intrastat_code","report.intrastat.code","model_report_intrastat_code","account.group_account_manager",1,1,1,1
-"access_report_intrastat","report.intrastat","model_report_intrastat","account.group_account_manager",1,0,0,0
-"access_report_intrastat_code_sale_manager","report.intrastat.code sale manager","model_report_intrastat_code","base.group_sale_manager",1,1,1,1
-"access_report_intrastat_code_purchase_manager","report.intrastat.code purchase manager","model_report_intrastat_code","purchase.group_purchase_manager",1,1,1,1
-"access_report_intrastat_code_stock_manager","report.intrastat.code stock manager","model_report_intrastat_code","stock.group_stock_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_report_intrastat_code,report.intrastat.code,model_report_intrastat_code,account.group_account_manager,1,1,1,1
+access_report_intrastat,report.intrastat,model_report_intrastat,account.group_account_manager,1,0,0,0
+access_report_intrastat_code_sale_manager,report.intrastat.code sale manager,model_report_intrastat_code,base.group_sale_manager,1,1,1,1
+access_report_intrastat_code_purchase_manager,report.intrastat.code purchase manager,model_report_intrastat_code,purchase.group_purchase_manager,1,1,1,1
+access_report_intrastat_code_stock_manager,report.intrastat.code stock manager,model_report_intrastat_code,stock.group_stock_manager,1,1,1,1
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index 5db184a8c58..f186593e91b 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -84,7 +84,7 @@ TODO
     "version" : "0.9",
     "depends" : ["base"],
     "author" : "Camptocamp",
-    "category": "Tools", # i.e a technical module, not shown in Application install menu
+    "category": "Reporting", # i.e a technical module, not shown in Application install menu
     "url": "http://http://www.camptocamp.com/",
     "data": [ "security/ir.model.access.csv",
               "data.xml",
diff --git a/addons/report_webkit/i18n/hr.po b/addons/report_webkit/i18n/hr.po
new file mode 100644
index 00000000000..01ec38be92b
--- /dev/null
+++ b/addons/report_webkit/i18n/hr.po
@@ -0,0 +1,613 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-11 21:52+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-12 05:17+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_header:0
+msgid "WebKit Header"
+msgstr "Zaglavlje Webkita"
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+msgid "Webkit Template (used if Report File is not found)"
+msgstr "Predložak Webkita (koristi se ako datoteka izvještaja nije nađena)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Tabloid 29 279.4 x 431.8 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_img
+#: model:ir.ui.menu,name:report_webkit.menu_header_img
+msgid "Header IMG"
+msgstr ""
+
+#. module: report_webkit
+#: field:res.company,lib_path:0
+msgid "Webkit Executable Path"
+msgstr "Webkit izvršna putanja"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Ledger  28  431.8 x 279.4 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_img,type:0
+msgid "Image type(png,gif,jpeg)"
+msgstr "Vrsta slike (png,gif,jpeg)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_img,company_id:0
+#: field:ir.header_webkit,company_id:0
+msgid "Company"
+msgstr "Organizacija"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:97
+#, python-format
+msgid "path to Wkhtmltopdf is not absolute"
+msgstr "putanja do Wkhtmltopdf nije apsolutna"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "DLE 26 110 x 220 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B7  21  88 x 125 mm"
+msgstr "B7  21  88 x 125 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:306
+#: code:addons/report_webkit/webkit_report.py:320
+#: code:addons/report_webkit/webkit_report.py:338
+#: code:addons/report_webkit/webkit_report.py:354
+#, python-format
+msgid "Webkit render"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Folio 27  210 x 330 mm"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:67
+#, python-format
+msgid ""
+"Please install executable on your system'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) or "
+"download it from here:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+\n"
+"                             ' path to the executable on the Company form."
+msgstr ""
+"Molim instalirajte izvršnu datoteku u vaš sustav'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) ili "
+"skinite odavde:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list i postavite'+\n"
+"                             ' putanju do izvršne datoteke na formi "
+"organizacije."
+
+#. module: report_webkit
+#: help:ir.header_img,name:0
+msgid "Name of Image"
+msgstr "Naziv slike"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:91
+#, python-format
+msgid ""
+"Wrong Wkhtmltopdf path set in company'+\n"
+"                                'Given path is not executable or path is "
+"wrong"
+msgstr ""
+"Pogrešna Wkhtmltopdf putanja postavljena u organizaciji'+\n"
+"                                'Odabrana putanja nije izvršna datoteka ili "
+"je putanja pogrešna"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:166
+#, python-format
+msgid "Webkit raise an error"
+msgstr "Webkit je uzrokovao grešku"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+msgstr "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_webkit
+msgid "ir.header_webkit"
+msgstr "ir.header_webkit"
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_webkit
+#: model:ir.ui.menu,name:report_webkit.menu_header_webkit
+msgid "Header HTML"
+msgstr "HTML zaglavlja"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+msgstr "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B2  17  500 x 707 mm"
+msgstr "B2  17  500 x 707 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_img
+msgid "ir.header_img"
+msgstr "ir.header_img"
+
+#. module: report_webkit
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A0  5   841 x 1189 mm"
+msgstr "A0  5   841 x 1189 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "C5E 24  163 x 229 mm"
+msgstr "C5E 24  163 x 229 mm"
+
+#. module: report_webkit
+#: field:ir.header_img,type:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: report_webkit
+#: code:addons/report_webkit/wizard/report_webkit_actions.py:134
+#, python-format
+msgid "Client Actions Connections"
+msgstr "Veze klijentskih radnji"
+
+#. module: report_webkit
+#: field:res.company,header_image:0
+msgid "Available Images"
+msgstr "Raspložive slike"
+
+#. module: report_webkit
+#: field:ir.header_webkit,html:0
+msgid "webkit header"
+msgstr "zaglavlje webkita"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B1  15  707 x 1000 mm"
+msgstr "B1  15  707 x 1000 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A1  6   594 x 841 mm"
+msgstr "A1  6   594 x 841 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_header:0
+msgid "The header linked to the report"
+msgstr "zaglavlje povezano s izvještajem"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:78
+#, python-format
+msgid "Wkhtmltopdf library path is not set in company"
+msgstr "Wkhtmltopdf library putanja nije povezana s organizacijom"
+
+#. module: report_webkit
+#: model:ir.module.module,description:report_webkit.module_meta_information
+msgid ""
+"This module adds a new Report Engine based on WebKit library (wkhtmltopdf) "
+"to support reports designed in HTML + CSS.\n"
+"The module structure and some code is inspired by the report_openoffice "
+"module.\n"
+"The module allows:\n"
+"    -HTML report definition\n"
+"    -Multi header support \n"
+"    -Multi logo\n"
+"    -Multi company support\n"
+"    -HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+"    -JavaScript support \n"
+"    -Raw HTML debugger\n"
+"    -Book printing capabilities\n"
+"    -Margins definition \n"
+"    -Paper size definition\n"
+"and much more\n"
+"\n"
+"Multiple headers and logos can be defined per company.\n"
+"CSS style, header and footer body are defined per company\n"
+"\n"
+"The library to install can be found here\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"The system libraries are available for Linux, Mac OS X i386 and Windows 32.\n"
+"\n"
+"After installing the wkhtmltopdf library on the OpenERP Server machine, you "
+"need to set the\n"
+"path to the wkthtmltopdf executable file on the Company.\n"
+"\n"
+"For a sample report see also the webkit_report_sample module, and this "
+"video:\n"
+"    http://files.me.com/nbessi/06n92k.mov \n"
+"\n"
+"\n"
+"TODO :\n"
+"JavaScript support activation deactivation\n"
+"Collated and book format support\n"
+"Zip return for separated PDF\n"
+"Web client WYSIWYG\n"
+"                    "
+msgstr ""
+"Ovaj modul dodaje novu izvještajnu platformu na Webkit library (wkhtmltopdf) "
+"za podršku izvještajima dizajniranim u HTML + CSS.\n"
+"Struktura modula i dio koda je inspiriran sa modulom report_openoffice.\n"
+"Modul omogućuje:\n"
+"    -Definicije HTML izvještaja\n"
+"    -Podršku za više zaglavlja\n"
+"    -Više loga\n"
+"    -Podrušku za više kompanija\n"
+"    -Podršku za HTML i CSS-3 (U granicama WebKIT verzije)\n"
+"    -Podršku za JavaScript\n"
+"    -Debuger za HTML\n"
+"    -Mogućnost ispisa knjiga\n"
+"    -Definiranje margina\n"
+"    -Definiranje veličine papira\n"
+"i još mnogo toga\n"
+"\n"
+"Višestruka zaglavlja i loga se mogu definirati po organizaciji.\n"
+"Stilovi CSS-a, tijela zaglavlja i podnožja se definiraju po organizaciji\n"
+"Library za instalaciju se može naći ovdje\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"Sistemski library je dobavljiv za Linux, Mac OS X i386 i Windows 32.\n"
+"\n"
+"Nakon instalacije wkhtmltopdf library na OpenERP poslužitelju, morate "
+"postaviti putanju \n"
+"do izvršne datoteke wkthtmltopdf na organizaciji.\n"
+"\n"
+"Za primjer izvještaja pogledajte modul webkit_report_sample i sljedeći "
+"video:\n"
+"    http://files.me.com/nbessi/06n92k.mov \n"
+"\n"
+"\n"
+"TODO :\n"
+"Podrška za aktivaciju deaktivaciju JavaScripta\n"
+"\n"
+"Podrška za razvrstavanje i knjižni format\n"
+"Zip povrat za odvojeni PDF\n"
+"Web klijent WYSIWYG\n"
+"                    "
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+#: view:res.company:0
+msgid "Webkit"
+msgstr "Webkit"
+
+#. module: report_webkit
+#: help:ir.header_webkit,format:0
+msgid "Select Proper Paper size"
+msgstr "Odaberite odgovarajuću veličinu papira"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+msgstr "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Content and styling"
+msgstr "Sadržaj i stilsko oblikovanje"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A7  11  74 x 105 mm"
+msgstr "A7  11  74 x 105 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A6  10  105 x 148 mm"
+msgstr "A6  10  105 x 148 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,report_webkit_data:0
+msgid "This template will be used if the main report file is not found"
+msgstr ""
+"Ovaj predložak će se koristiti ako glavna datoteka izvještaja nije pronađena"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_top:0
+msgid "Top Margin (mm)"
+msgstr "Gornja margina (mm)"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:261
+#, python-format
+msgid "Please set a header in company settings"
+msgstr "Molim postavite zaglavlje u postavkama organizacije"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Ok"
+msgstr "_U redu"
+
+#. module: report_webkit
+#: help:report.webkit.actions,print_button:0
+msgid ""
+"Check this to add a Print action for this Report in the sidebar of the "
+"corresponding document types"
+msgstr ""
+"Označite ovo za dodavanje akcije ispisa za ovaj izvještaj na bočnoj traci "
+"odgovarajuće vrste dokumenta"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B3  18  353 x 500 mm"
+msgstr "B3  18  353 x 500 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_debug:0
+msgid "Enable the webkit engine debugger"
+msgstr "Omogući debuger webkit platforme"
+
+#. module: report_webkit
+#: field:ir.header_img,img:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: report_webkit
+#: field:res.company,header_webkit:0
+msgid "Available html"
+msgstr "Raspoloživ html"
+
+#. module: report_webkit
+#: help:report.webkit.actions,open_action:0
+msgid ""
+"Check this to view the newly added internal print action after creating it "
+"(technical view) "
+msgstr ""
+"Označi ovo da bi pogledali novododanu internu akciju ispisa nakon kreiranja "
+"(tehnički pogled) "
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Images"
+msgstr "Slike"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Portrait"
+msgstr "Portret"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
+msgstr "Pejzažno"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "page setup"
+msgstr "postava stranice"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B8  22  62 x 88 mm"
+msgstr "B8  22  62 x 88 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A2  7   420 x 594 mm"
+msgstr "A2  7   420 x 594 mm"
+
+#. module: report_webkit
+#: field:report.webkit.actions,print_button:0
+msgid "Add print button"
+msgstr "Dodaj gumb za ispis"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A9  13  37 x 52 mm"
+msgstr "A9  13  37 x 52 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_res_company
+msgid "Companies"
+msgstr "Organizacije"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_bottom:0
+msgid "Bottom Margin (mm)"
+msgstr "Donja margina (mm)"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_report_webkit_actions
+msgid "Webkit Actions"
+msgstr "Webkit akcije"
+
+#. module: report_webkit
+#: field:report.webkit.actions,open_action:0
+msgid "Open added action"
+msgstr "Otvori dodanu akciju"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_right:0
+msgid "Right Margin (mm)"
+msgstr "Desna margina (mm)"
+
+#. module: report_webkit
+#: field:ir.header_webkit,orientation:0
+msgid "Orientation"
+msgstr "Orijentacija"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6  20  125 x 176 mm"
+
+#. module: report_webkit
+#: help:ir.header_webkit,html:0
+msgid "Set Webkit Report Header"
+msgstr "Postavi zaglavlje  Webkit izvještaja"
+
+#. module: report_webkit
+#: field:ir.header_webkit,format:0
+msgid "Paper size"
+msgstr "Veličina papira"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid ":B10    16  31 x 44 mm"
+msgstr ":B10    16  31 x 44 mm"
+
+#. module: report_webkit
+#: field:ir.header_webkit,css:0
+msgid "Header CSS"
+msgstr "Zaglavlje CSS"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B4  19  250 x 353 mm"
+msgstr "B4  19  250 x 353 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A3  8   297 x 420 mm"
+msgstr "A3  8   297 x 420 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:240
+#, python-format
+msgid ""
+"'))\n"
+"        header = report_xml.webkit_header.html\n"
+"        footer = report_xml.webkit_header.footer_html\n"
+"        if not header and report_xml.header:\n"
+"          raise except_osv(\n"
+"                _('No header defined for this Webkit report!"
+msgstr ""
+
+#. module: report_webkit
+#: help:res.company,lib_path:0
+msgid "Complete (Absolute) path to the wkhtmltopdf executable."
+msgstr "Dovrši (apsolutnu) putanju do izvršen datoteke wkhtmltopdf"
+
+#. module: report_webkit
+#: field:ir.header_webkit,footer_html:0
+msgid "webkit footer"
+msgstr "podnožje webkita"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_debug:0
+msgid "Webkit debug"
+msgstr "Webkit debug"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+msgstr "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B0  14  1000 x 1414 mm"
+msgstr "B0  14  1000 x 1414 mm"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,report_webkit_data:0
+msgid "Webkit Template"
+msgstr "Predložak Webkita"
+
+#. module: report_webkit
+#: model:ir.module.module,shortdesc:report_webkit.module_meta_information
+msgid "Webkit Report Engine"
+msgstr "Platforma Webkit izvještaja"
+
+#. module: report_webkit
+#: field:ir.header_img,name:0
+#: field:ir.header_webkit,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A5  9   148 x 210 mm"
+msgstr "A5  9   148 x 210 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A8  12  52 x 74 mm"
+msgstr "A8  12  52 x 74 mm"
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.wizard_ofdo_report_actions
+#: view:report.webkit.actions:0
+msgid "Add Print Buttons"
+msgstr "Dodaj gumbe za ispis"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
+msgstr "Comm10E 25  105 x 241 mm, U.S. normalna 10 omotnica"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:255
+#, python-format
+msgid "Webkit Report template not found !"
+msgstr "Predložak Webkit izvještaja nije pronađen"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_left:0
+msgid "Left Margin (mm)"
+msgstr "Lijeva margina (mm)"
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Headers"
+msgstr "Zaglavlja"
+
+#. module: report_webkit
+#: help:ir.header_webkit,footer_html:0
+msgid "Set Webkit Report Footer."
+msgstr "Postavi podnožje Webkit izvještaja"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B9  23  33 x 62 mm"
+msgstr "B9  23  33 x 62 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
diff --git a/addons/report_webkit/security/ir.model.access.csv b/addons/report_webkit/security/ir.model.access.csv
index 6c626f9873e..4ad8b3ae2be 100644
--- a/addons/report_webkit/security/ir.model.access.csv
+++ b/addons/report_webkit/security/ir.model.access.csv
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_ir_header_webkit","ir.header_webkit","model_ir_header_webkit",,1,,1,
-"access_ir_header_img","ir.header_img","model_ir_header_img",,1,,1,
\ No newline at end of file
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ir_header_webkit,ir.header_webkit,model_ir_header_webkit,,1,,1,
+access_ir_header_img,ir.header_img,model_ir_header_img,,1,,1,
diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py
index 9fb1f713d24..bad0e3279ed 100644
--- a/addons/report_webkit_sample/__openerp__.py
+++ b/addons/report_webkit_sample/__openerp__.py
@@ -43,7 +43,7 @@ You have to create the print buttons by calling the wizard. For more details see
                     """,
     "version" : "0.9",
     "depends" : ["base", "account", "report_webkit"],
-    "category": "Tools",
+    "category": "Reporting",
     "author" : "Camptocamp SA - NBessi",
     "url": "http://www.camptocamp.com/",
     "data": ["report_webkit_html_view.xml",
diff --git a/addons/report_webkit_sample/i18n/hr.po b/addons/report_webkit_sample/i18n/hr.po
new file mode 100644
index 00000000000..184eca13c99
--- /dev/null
+++ b/addons/report_webkit_sample/i18n/hr.po
@@ -0,0 +1,153 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-11 20:28+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-12 05:17+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: report_webkit_sample
+#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
+msgid "WebKit invoice"
+msgstr "WebKit račun"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:35
+msgid "Supplier Invoice"
+msgstr "Ulazni račun"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Unit Price"
+msgstr "Jedinična cijena"
+
+#. module: report_webkit_sample
+#: model:ir.module.module,description:report_webkit_sample.module_meta_information
+msgid ""
+"Samples for Webkit Report Engine (report_webkit module).\n"
+"\n"
+"    A sample invoice report is included in this module, as well as a wizard "
+"to\n"
+"    add Webkit Report entries on any Document in the system.\n"
+"      \n"
+"    You have to create the print buttons by calling the wizard. For more "
+"details see:\n"
+"        http://files.me.com/nbessi/06n92k.mov \n"
+"                    "
+msgstr ""
+"Samples for Webkit Report Engine (report_webkit module).\n"
+"Primjeri Webkit izvještajne platforme (report_webkit modul).\n"
+"\n"
+"    U modul je uključen primjer izvještaja računa, kao i asistent za \n"
+"    dodavanje stavaka Webkit izvještaja na bilo koji dokument u sustavu.\n"
+"\n"
+"    Morate kreirati gumbe za ispis pozivajući asistenta. Za više detalja "
+"pogledajte: \n"
+"        http://files.me.com/nbessi/06n92k.mov \n"
+"                    "
+
+#. module: report_webkit_sample
+#: model:ir.module.module,shortdesc:report_webkit_sample.module_meta_information
+msgid "Webkit Report Samples"
+msgstr "Primjeri Webkit izvještaja"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Disc.(%)"
+msgstr "Popust (%)"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:22
+msgid "Fax"
+msgstr "Fax"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:44
+msgid "Document"
+msgstr "Dokument"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Description"
+msgstr "Opis"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Price"
+msgstr "Cijena"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:44
+msgid "Invoice Date"
+msgstr "Datum računa"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "QTY"
+msgstr "Kol."
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:64
+msgid "Base"
+msgstr "Osnovica"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:44
+msgid "Partner Ref."
+msgstr "Partnerova oznaka"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:64
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:28
+msgid "VAT"
+msgstr "PDV"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:37
+msgid "Refund"
+msgstr "Povrat"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:19
+msgid "Tel"
+msgstr "Tel"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:25
+msgid "E-mail"
+msgstr "E-pošta"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:33
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:39
+msgid "Supplier Refund"
+msgstr "Odobrenje dobavljača"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:76
+msgid "Total"
+msgstr "Ukupno"
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index 2b8c27359d8..0c2e143c7a7 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Resource",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden/Dependency",
     "website" : "http://www.openerp.com",
     "description": """
 Module for resource management.
@@ -45,6 +45,10 @@ It also manages the leaves of every resource.
     ],
     'demo_xml': ['resource_demo.xml'
     ],
+    'test': [
+        'test/resource.yml',
+        'test/duplicate_resource.yml',
+    ],
     'installable': True,
     'active': False,
     'certificate': '00746371192190459469',
diff --git a/addons/resource/i18n/hr.po b/addons/resource/i18n/hr.po
index 4e113fd9f49..8f18314bc61 100644
--- a/addons/resource/i18n/hr.po
+++ b/addons/resource/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-09-10 16:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-11 19:39+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-12 05:17+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -23,27 +23,29 @@ msgid ""
 "If empty, this is a generic holiday for the company. If a resource is set, "
 "the holiday/leave is only for this resource"
 msgstr ""
+"Ako je prazno, ovo je generički praznik za organizaciju. Ako je resurs "
+"postavljen, praznik/odsustvo je samo za taj resurs."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Friday"
-msgstr ""
+msgstr "petak"
 
 #. module: resource
 #: field:resource.resource,resource_type:0
 msgid "Resource Type"
-msgstr ""
+msgstr "Tip resursa"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_leaves
 #: view:resource.calendar.leaves:0
 msgid "Leave Detail"
-msgstr ""
+msgstr "Detalji o odsustvu"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
 msgid "Resources Leaves"
-msgstr ""
+msgstr "Odsustva resursa"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
@@ -51,59 +53,60 @@ msgstr ""
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 msgid "Working Time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
-msgstr ""
+msgstr "četvrtak"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Sunday"
-msgstr ""
+msgstr "Nedelja"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
-msgstr ""
+msgstr "Pretraži resurse"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Type"
-msgstr ""
+msgstr "Vrsta"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_resource_tree
 #: view:resource.resource:0
 msgid "Resources"
-msgstr ""
+msgstr "Resursi"
 
 #. module: resource
 #: field:resource.calendar,manager:0
 msgid "Workgroup manager"
-msgstr ""
+msgstr "Voditelj radne grupe"
 
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Working time will start from"
-msgstr ""
+msgstr "Radno vrijeme počinje od"
 
 #. module: resource
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"Greška! Datum početka odsustva mora biti manji od završnog datuma odsustva"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
 msgid "Resource Calendar"
-msgstr ""
+msgstr "Kalendar resursa"
 
 #. module: resource
 #: field:resource.calendar,company_id:0
@@ -112,48 +115,48 @@ msgstr ""
 #: view:resource.resource:0
 #: field:resource.resource,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Organizacija"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
 msgid "Material"
-msgstr ""
+msgstr "Materijal"
 
 #. module: resource
 #: field:resource.calendar.attendance,dayofweek:0
 msgid "Day of week"
-msgstr ""
+msgstr "Dan u tjednu"
 
 #. module: resource
 #: help:resource.calendar.attendance,hour_to:0
 msgid "Working time will end at"
-msgstr ""
+msgstr "Radno vrijeme će završiti u"
 
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
 msgid "Starting date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: resource
 #: view:resource.calendar:0
 msgid "Search Working Time"
-msgstr ""
+msgstr "Pretraži radno vrijeme"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
-msgstr ""
+msgstr "Razlog"
 
 #. module: resource
 #: view:resource.resource:0
 #: field:resource.resource,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -163,7 +166,7 @@ msgstr ""
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni datum"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
@@ -177,7 +180,7 @@ msgstr ""
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurs"
 
 #. module: resource
 #: view:resource.calendar:0
@@ -186,7 +189,7 @@ msgstr ""
 #: field:resource.calendar.leaves,name:0
 #: field:resource.resource,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: resource
 #: model:ir.module.module,description:resource.module_meta_information
@@ -200,11 +203,21 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Module for resource management\n"
+"    Modul za upravljanje resursima\n"
+"     Resurs predstavlja nešto što može biti dodjeljeno\n"
+"     (programer na zadataku ili proizvodni centar na radnom nalogu "
+"proizvodnje).\n"
+"     Ovaj modul upravlja kalendarom resursa dodjeljenom svakom resursu.\n"
+"     Također upravlja odsustvima svih resursa.\n"
+"\n"
+"    "
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Srijeda"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -216,12 +229,12 @@ msgstr ""
 #. module: resource
 #: model:ir.model,name:resource.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Detalji resursa"
 
 #. module: resource
 #: field:resource.resource,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: resource
 #: help:resource.resource,active:0
@@ -229,11 +242,12 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the resource "
 "record without removing it."
 msgstr ""
+"Ako je ovo polje postavljeno na NE, moežte sakriti resurs bez da ga uklonite."
 
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
-msgstr ""
+msgstr "Kalendar resursa"
 
 #. module: resource
 #: help:resource.resource,user_id:0
@@ -253,17 +267,17 @@ msgstr ""
 #. module: resource
 #: field:resource.resource,code:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Monday"
-msgstr ""
+msgstr "Ponedjeljak"
 
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
 msgid "Work to"
-msgstr ""
+msgstr "Radi do"
 
 #. module: resource
 #: help:resource.resource,time_efficiency:0
@@ -273,27 +287,31 @@ msgid ""
 "show a load of 100% for this phase by default, but if we put a efficency of "
 "200%, then his load will only be 50%."
 msgstr ""
+"Ovo polje prikazuje efikasnost svakog resursa u izvršavanju zadataka. Npr. "
+"resurs se ostavi sam na 5 dana, sa 5 dodjeljenih zadataka. Predefinirano se "
+"prikazuje opterećenje od 100%, ali ako stavimo efikasnost od 200%, tada je "
+"njegovo opterećenje samo 50%."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Utorak"
 
 #. module: resource
 #: field:resource.calendar.leaves,calendar_id:0
 msgid "Working time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
 #: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Odsustva resursa"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "General Information"
-msgstr ""
+msgstr "Opći podaci"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_resource_tree
@@ -302,45 +320,48 @@ msgid ""
 "in a specific project phase. You can also set their efficiency level and "
 "workload based on their weekly working hours."
 msgstr ""
+"Resursi vam omogućuju kreiranje i upravljanje resursima koji trebaju biti "
+"uključeni u neku fazu projekta. Također možete postaviti njihovu razinu "
+"efikasnosti i opterećenje na osnovi njihovih tjednih radnih sati."
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
-msgstr ""
+msgstr "Neaktivan"
 
 #. module: resource
 #: code:addons/resource/faces/resource.py:340
 #, python-format
 msgid "(vacation)"
-msgstr ""
+msgstr "(odmor)"
 
 #. module: resource
 #: field:resource.resource,time_efficiency:0
 msgid "Efficiency factor"
-msgstr ""
+msgstr "Faktor efikasnosti"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
 msgid "Human"
-msgstr ""
+msgstr "Čovjek"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_attendance
 msgid "Work Detail"
-msgstr ""
+msgstr "Detalj posla"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: resource
 #: code:addons/resource/resource.py:246
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopija)"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
-msgstr ""
+msgstr "Subota"
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index bd62c449d2b..edb900bf2fc 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -22,7 +22,6 @@
 from datetime import datetime, timedelta
 import math
 from faces import *
-from new import classobj
 from osv import fields, osv
 from tools.translate import _
 
@@ -44,9 +43,12 @@ class resource_calendar(osv.osv):
     }
 
     def working_hours_on_day(self, cr, uid, resource_calendar_id, day, context=None):
-        """
+        """Calculates the  Working Total Hours based on Resource Calendar and
+        given working day (datetime object).
+        
         @param resource_calendar_id: resource.calendar browse record
         @param day: datetime object
+        
         @return: returns the working hours (as float) men should work on the given day if is in the attendance_ids of the resource_calendar_id (i.e if that day is a working day), returns 0.0 otherwise
         """
         res = 0.0
@@ -56,9 +58,16 @@ class resource_calendar(osv.osv):
         return res 
 
     def _get_leaves(self, cr, uid, id, resource):
+        """Private Method to Calculate resource Leaves days 
+        
+        @param id: resource calendar id
+        @param resource: resource id for which leaves will ew calculated 
+        
+        @return : returns the list of dates, where resource on leave in
+                  resource.calendar.leaves object (e.g.['%Y-%m-%d', '%Y-%m-%d'])
+        """
         resource_cal_leaves = self.pool.get('resource.calendar.leaves')
         dt_leave = []
-
         resource_leave_ids = resource_cal_leaves.search(cr, uid, [('calendar_id','=',id), '|', ('resource_id','=',False), ('resource_id','=',resource)])
         #res_leaves = resource_cal_leaves.read(cr, uid, resource_leave_ids, ['date_from', 'date_to'])
         res_leaves = resource_cal_leaves.browse(cr, uid, resource_leave_ids)
@@ -73,6 +82,21 @@ class resource_calendar(osv.osv):
         return dt_leave
 
     def interval_min_get(self, cr, uid, id, dt_from, hours, resource=False):
+        """
+        Calculates the working Schedule from supplied from date to till hours
+        will be satisfied  based or resource calendar id. If resource is also
+        given then it will consider the resource leave also and than will 
+        calculates resource working schedule
+        
+        @param dt_from: datetime object, start of working scheduled
+        @param hours: float, total number working  hours needed scheduled from
+                      start date
+        @param resource : Optional Resource id, if supplied than resource leaves
+                        will also taken into consideration for calculating working
+                        schedule.
+        @return : List datetime object of working schedule based on supplies
+                  params
+        """
         if not id:
             td = int(hours)*3
             return [(dt_from - timedelta(hours=td), dt_from)]
@@ -162,10 +186,32 @@ class resource_calendar(osv.osv):
         return results
 
     def interval_get(self, cr, uid, id, dt_from, hours, resource=False, byday=True):
+        """Calculates Resource Working Internal Timing Based on Resource Calendar.
+        
+        @param dt_from: start resource schedule calculation.
+        @param hours : total number of working hours to be scheduled.
+        @param resource: optional resource id, If supplied it will take care of 
+                         resource leave while scheduling.
+        @param byday: boolean flag bit enforce day wise scheduling
+        
+        @return :  list of scheduled working timing  based on resource calendar.
+        """
         res = self.interval_get_multi(cr, uid, [(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)], resource, byday)[(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)]
         return res
 
     def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False):
+        """ Calculates the Total Working hours based on given start_date to 
+        end_date, If resource id is supplied that it will consider the source 
+        leaves also in calculating the hours.
+        
+        @param dt_from : date start to calculate hours
+        @param dt_end : date end to calculate hours
+        @param resource: optional resource id, If given resource leave will be
+                         considered. 
+        
+        @return : Total number of working hours based dt_from and dt_end and 
+                  resource if supplied.
+        """
         if not id:
             return 0.0
         dt_leave = self._get_leaves(cr, uid, id, resource)
@@ -290,6 +336,7 @@ class resource_resource(osv.osv):
     def compute_vacation(self, cr, uid, calendar_id, resource_id=False, resource_calendar=False, context=None):
         """
         Compute the vacation from the working calendar of the resource.
+
         @param calendar_id : working calendar of the project
         @param resource_id : resource working on phase/task
         @param resource_calendar : working calendar of the resource
@@ -366,13 +413,6 @@ class resource_resource(osv.osv):
             wktime_cal.append((non_working[:-1], time_range))
         return wktime_cal
 
-    #TODO: Write optimized alogrothem for resource availability. : Method Yet not implemented
-    def check_availability(self, cr, uid, ids, start, end, context=None):
-        if context ==  None:
-            contex = {}
-        allocation = {}
-        return allocation
-
 resource_resource()
 
 class resource_calendar_leaves(osv.osv):
diff --git a/addons/resource/resource_demo.xml b/addons/resource/resource_demo.xml
index 2d1b6622e07..acd96cd992b 100644
--- a/addons/resource/resource_demo.xml
+++ b/addons/resource/resource_demo.xml
@@ -5,73 +5,73 @@
         <!-- Example employee -->
 
         <record id="timesheet_group1" model="resource.calendar">
-            <field name="name">38 Hours/Week</field>
+            <field name="name">45 Hours/Week</field>
         </record>
 
-        <record model="resource.calendar.attendance">
+        <record model="resource.calendar.attendance" id="calendar_attendance_mon1">
             <field name="name">Monday morning</field>
             <field name="dayofweek">0</field>
             <field name="hour_from">08</field>
             <field name="hour_to">12</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.attendance">
+        <record model="resource.calendar.attendance" id="calendar_attendance_mon2">
             <field name="name">Monday evening</field>
             <field name="dayofweek">0</field>
             <field name="hour_from">13</field>
             <field name="hour_to">18</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.attendance">
+        <record model="resource.calendar.attendance" id="calendar_attendance_tue1">
             <field name="name">Tuesday morning</field>
             <field name="dayofweek">1</field>
             <field name="hour_from">08</field>
             <field name="hour_to">12</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.attendance">
+        <record model="resource.calendar.attendance" id="calendar_attendance_tue2">
             <field name="name">Tuesday evening</field>
             <field name="dayofweek">1</field>
             <field name="hour_from">13</field>
             <field name="hour_to">18</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.attendance">
+        <record model="resource.calendar.attendance" id="calendar_attendance_wed1">
             <field name="name">Wednesday morning</field>
             <field name="dayofweek">2</field>
             <field name="hour_from">08</field>
             <field name="hour_to">12</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.attendance">
+        <record model="resource.calendar.attendance" id="calendar_attendance_wed2">
             <field name="name">Wednesday evening</field>
             <field name="dayofweek">2</field>
             <field name="hour_from">13</field>
             <field name="hour_to">18</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.attendance">
+        <record model="resource.calendar.attendance" id="calendar_attendance_thu1">
             <field name="name">Thursday morning</field>
             <field name="dayofweek">3</field>
             <field name="hour_from">08</field>
             <field name="hour_to">12</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.attendance">
+        <record model="resource.calendar.attendance" id="calendar_attendance_thu2">
             <field name="name">Thursday evening</field>
             <field name="hour_from">13</field>
             <field name="hour_to">18</field>
             <field name="dayofweek">3</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.attendance">
+        <record model="resource.calendar.attendance" id="calendar_attendance_fri1">
             <field name="name">Friday morning</field>
             <field name="dayofweek">4</field>
             <field name="hour_from">08</field>
             <field name="hour_to">12</field>
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
-        <record model="resource.calendar.attendance">
+        <record model="resource.calendar.attendance" id="calendar_attendance_fri2">
             <field name="name">Friday evening</field>
             <field name="dayofweek">4</field>
             <field name="hour_from">13</field>
@@ -79,5 +79,47 @@
             <field name="calendar_id" ref="timesheet_group1"/>
         </record>
 
+        <record id="resource_analyst" model="resource.resource">
+	        <field eval="1.0" name="time_efficiency"/>
+	        <field name="user_id" ref="base.user_root"/>
+	        <field name="name">Analyst</field>
+	        <field eval="1" name="active"/>
+	        <field name="calendar_id" ref="timesheet_group1"/>
+	        <field name="resource_type">user</field>
+        </record>
+
+        <record id="resource_designer" model="resource.resource">
+	        <field eval="1.0" name="time_efficiency"/>
+	        <field name="user_id" ref="base.user_demo"/>
+	        <field name="name">Designer</field>
+	        <field eval="1" name="active"/>
+	        <field name="calendar_id" ref="timesheet_group1"/>
+	        <field name="resource_type">user</field>
+        </record>
+
+        <record id="resource_developer" model="resource.resource">
+	        <field eval="1.0" name="time_efficiency"/>
+	        <field name="user_id" ref="base.user_demo"/>
+	        <field name="name">Developer</field>
+	        <field eval="1" name="active"/>
+	        <field name="calendar_id" ref="timesheet_group1"/>
+	        <field name="resource_type">user</field>
+        </record>
+
+        <record id="resource_analyst_leaves_demoleave1" model="resource.calendar.leaves">
+	        <field name="name">2 Hours On Leave</field>
+	        <field name="resource_id" ref="resource_analyst"/>
+	        <field name="date_from" eval="time.strftime('%Y-%m-%d 08:00:00')"/>
+	        <field name="date_to" eval="time.strftime('%Y-%m-%d 11:00:00')"/>
+	        <field name="calendar_id" ref="timesheet_group1"/>
+        </record>
+        
+        <record id="resource_dummyleave" model="resource.calendar.leaves">
+	        <field name="name">Dummy Resource Leave</field>
+	        <field name="resource_id" ref="resource_analyst"/>
+	        <field name="date_from" eval="time.strftime('%Y-%m-%d 08:00:00')"/>
+	        <field name="date_to" eval="time.strftime('%Y-%m-%d 11:00:00')"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
index 576ee965121..533ad419274 100644
--- a/addons/resource/security/ir.model.access.csv
+++ b/addons/resource/security/ir.model.access.csv
@@ -1,8 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_resource_calendar","resource.calendar","model_resource_calendar","base.group_system",1,1,1,1
-"access_resource_calendar_attendance","resource.calendar.attendance","model_resource_calendar_attendance","base.group_system",1,1,1,1
-"access_resource_resource","resource.resource","model_resource_resource","base.group_system",1,0,0,0
-"access_resource_resource_all","resource.resource all","model_resource_resource",,1,0,0,0
-"access_resource_calendar_leaves","resource.calendar.leaves","model_resource_calendar_leaves","base.group_system",1,1,1,1
-
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_resource_calendar,resource.calendar,model_resource_calendar,base.group_system,1,1,1,1
+access_resource_calendar_attendance,resource.calendar.attendance,model_resource_calendar_attendance,base.group_system,1,1,1,1
+access_resource_resource,resource.resource,model_resource_resource,base.group_system,1,0,0,0
+access_resource_resource_all,resource.resource all,model_resource_resource,,1,0,0,0
+access_resource_calendar_leaves,resource.calendar.leaves,model_resource_calendar_leaves,base.group_system,1,1,1,1
diff --git a/addons/resource/test/duplicate_resource.yml b/addons/resource/test/duplicate_resource.yml
new file mode 100644
index 00000000000..5869530e2f4
--- /dev/null
+++ b/addons/resource/test/duplicate_resource.yml
@@ -0,0 +1,6 @@
+-
+ I duplicate the resource "Analyst"
+-
+  !python {model: resource.resource}: |
+    copied_id = self.copy(cr, uid, ref("resource_analyst"))
+    assert copied_id, "Unable to Duplicate Resource"
diff --git a/addons/resource/test/resource.yml b/addons/resource/test/resource.yml
new file mode 100644
index 00000000000..5b7fa108101
--- /dev/null
+++ b/addons/resource/test/resource.yml
@@ -0,0 +1,59 @@
+-
+  In order to test resource.
+-
+  I assign working calendar '45 Hours/Week' to human resource.
+-
+  !python {model: resource.resource}: |    
+    self.write(cr, uid, [ref('resource_analyst'), ref('resource_designer'), ref('resource_developer')], {'calendar_id' : ref('timesheet_group1'), 'resource_type': 'user'})
+
+-
+  I had Project of OpenERP Integration of 50 Hours with three human resource assigned on it. I have started project from this week start.
+-
+  First, I  generate the resource detail and check the resource Efficiency assigned.
+-
+  !python {model: resource.resource}: |
+    resources = self.generate_resources(cr, uid, [ref('base.user_root'),ref('base.user_demo')], ref('timesheet_group1'), context)
+    for resource in resources.values():
+        assert resource.get('efficiency', 0.0) == 1.0, 'Invalid resource generated.'
+-
+  I check per day work hour availability of the Resource based on Working Calendar Assigned to each resource, for first day of the week.
+-
+  !python {model: resource.resource}: |
+    calendar_pool = self.pool.get('resource.calendar')
+    resources = self.browse(cr, uid,  [ref('resource_analyst'), ref('resource_designer'), ref('resource_developer')], context)
+    from datetime import datetime, timedelta
+    now = datetime.now()
+    dt = now - timedelta(days=now.weekday()) 
+    for resource in resources:
+        result = calendar_pool.working_hours_on_day(cr, uid, resource.calendar_id, dt, context)
+        assert result == 9.0, 'Wrong calculation of day work hour availability of the Resource.'
+-
+  Now, resource "Developer" drafted leave on Thursday in this week.
+-
+  !python {model: resource.calendar.leaves}: |
+    from datetime import datetime,timedelta
+    now = datetime.now()
+    dt = (now - timedelta(days=now.weekday()) ) + timedelta(days=3) 
+    self.write(cr, uid, [ref('resource_dummyleave')], {'resource_id': ref('resource_developer'), 'calendar_id': ref('timesheet_group1'),  'date_from': dt.strftime("%Y-%m-%d 09:00:00"), 'date_to': dt.strftime("%Y-%m-%d 18:00:00")})
+
+-
+  I check Actual working hours on resource 'Developer' from this week
+-
+  !python {model: resource.calendar}: |
+    from datetime import datetime, timedelta
+    now = datetime.now()
+    dt_from = now - timedelta(days=now.weekday()) 
+    dt_to = dt_from+ timedelta(days=6) 
+    hours = self.interval_hours_get(cr, uid, ref('timesheet_group1'), dt_from, dt_to, resource=ref('resource_developer'))
+    assert hours > 27 , 'Invalid Total Week working hour calculated'
+-
+  Project Analysis work is of 20 hours which will start from Week start so i will calculate working schedule for resource Analyst for the same.
+-
+  !python {model: resource.calendar}: |
+    
+    from datetime import datetime, timedelta
+    now = datetime.now()
+    work_intreval = self.interval_min_get(cr, uid, ref('timesheet_group1'), now, 20.0, resource=ref('resource_designer'))
+    assert len(work_intreval) >= 5, 'Wrong Schedule Calculated'
+    
+
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 8b5ae108f72..948352940a0 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -87,21 +87,18 @@ Dashboard for Sales Manager that includes:
     ],
     'demo_xml': ['sale_demo.xml'],
     'test': [
-        'test/edi_sale_order.yml',
-        'test/data_test.yml',
-        'test/manual_order_policy.yml',
-        'test/prepaid_order_policy.yml',
+        'test/sale_order_demo.yml',
         'test/picking_order_policy.yml',
+        'test/manual_order_policy.yml',
         'test/postpaid_order_policy.yml',
-        'test/advance_invoice.yml',
-        'test/so_make_line_invoice.yml',
-        'test/sale_procurement.yml',
-        'test/invoice_on_ordered_qty.yml',
-        'test/invoice_on_shipped_qty.yml',
-        'test/sale_report.yml',
+        'test/prepaid_order_policy.yml',
+        'test/cancel_order.yml',
+        'test/delete_order.yml',
+        'test/edi_sale_order.yml',
     ],
     'installable': True,
     'active': False,
+    'application': True,
     'certificate': '0058103601429',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/i18n/es_CL.po b/addons/sale/i18n/es_CL.po
index bda9cda990f..ca227ac4115 100644
--- a/addons/sale/i18n/es_CL.po
+++ b/addons/sale/i18n/es_CL.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-10-06 16:03+0000\n"
+"PO-Revision-Date: 2011-12-15 21:29+0000\n"
 "Last-Translator: Francisco Reyes Acuña <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:17+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-16 05:24+0000\n"
+"X-Generator: Launchpad (build 14523)\n"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_by_salesman
 msgid "Sales by Salesman in last 90 days"
-msgstr "Ventas por comercial últimos 90 días"
+msgstr "Ventas por vendedor en los últimos 90 días"
 
 #. module: sale
 #: help:sale.installer,delivery:0
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 7cc40c30645..5cc7c4f5ca1 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -128,7 +128,7 @@
         <field name="help">This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
     </record>
 
-    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
+    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11" groups="base.group_sale_manager"/>
     <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1"/>
 
     <!--This views used in board_sale module -->
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 9c3ba5d5200..e56aa7d0968 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -206,8 +206,8 @@ class sale_order(osv.osv):
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
             ('cancel', 'Cancelled')
-            ], 'Order State', readonly=True, help="Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
-        'date_order': fields.date('Ordered Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
+            ], 'Order State', readonly=True, help="Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
+        'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
         'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
         'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
@@ -324,7 +324,6 @@ class sale_order(osv.osv):
         return True
 
     def onchange_pricelist_id(self, cr, uid, ids, pricelist_id, order_lines, context={}):
-        print order_lines
         if (not pricelist_id) or (not order_lines):
             return {}
         warning = {
@@ -711,14 +710,14 @@ class sale_order(osv.osv):
         location_id = order.shop_id.warehouse_id.lot_stock_id.id
         output_id = order.shop_id.warehouse_id.lot_output_id.id
         return {
-            'name': line.name[:64],
+            'name': line.name[:250],
             'picking_id': picking_id,
             'product_id': line.product_id.id,
             'date': date_planned,
             'date_expected': date_planned,
             'product_qty': line.product_uom_qty,
             'product_uom': line.product_uom.id,
-            'product_uos_qty': line.product_uos_qty,
+            'product_uos_qty': (line.product_uos and line.product_uos_qty) or line.product_uom_qty,
             'product_uos': (line.product_uos and line.product_uos.id)\
                     or line.product_uom.id,
             'product_packaging': line.product_packaging.id,
@@ -750,6 +749,33 @@ class sale_order(osv.osv):
             'company_id': order.company_id.id,
         }
 
+    def ship_recreate(self, cr, uid, order, line, move_id, proc_id):
+        # FIXME: deals with potentially cancelled shipments, seems broken (specially if shipment has production lot)
+        """
+        Define ship_recreate for process after shipping exception
+        param order: sale order to which the order lines belong
+        param line: sale order line records to procure
+        param move_id: the ID of stock move
+        param proc_id: the ID of procurement
+        """
+        move_obj = self.pool.get('stock.move')
+        if order.state == 'shipping_except':
+            for pick in order.picking_ids:
+                for move in pick.move_lines:
+                    if move.state == 'cancel':
+                        mov_ids = move_obj.search(cr, uid, [('state', '=', 'cancel'),('sale_line_id', '=', line.id),('picking_id', '=', pick.id)])
+                        if mov_ids:
+                            for mov in move_obj.browse(cr, uid, mov_ids):
+                                # FIXME: the following seems broken: what if move_id doesn't exist? What if there are several mov_ids? Shouldn't that be a sum?
+                                move_obj.write(cr, uid, [move_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
+                                self.pool.get('procurement.order').write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
+        return True
+
+    def _get_date_planned(self, cr, uid, order, line, start_date, *args):
+        date_planned = datetime.strptime(start_date, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=line.delay or 0.0)    
+        date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        return date_planned
+
     def _create_pickings_and_procurements(self, cr, uid, order, order_lines, picking_id=False, *args):
         """Create the required procurements to supply sale order lines, also connecting
         the procurements to appropriate stock moves in order to bring the goods to the
@@ -772,14 +798,13 @@ class sale_order(osv.osv):
         move_obj = self.pool.get('stock.move')
         picking_obj = self.pool.get('stock.picking')
         procurement_obj = self.pool.get('procurement.order')
-
         proc_ids = []
+
         for line in order_lines:
             if line.state == 'done':
                 continue
 
-            date_planned = datetime.strptime(order.date_order, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=line.delay or 0.0)
-            date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+            date_planned = self._get_date_planned(cr, uid, order, line, order.date_order, *args)
 
             if line.product_id:
                 if line.product_id.product_tmpl_id.type in ('product', 'consu'):
@@ -793,19 +818,7 @@ class sale_order(osv.osv):
                 proc_id = procurement_obj.create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, *args))
                 proc_ids.append(proc_id)
                 line.write({'procurement_id': proc_id})
-
-                # FIXME: deals with potentially cancelled shipments, seems broken, see below
-                # FIXME: was introduced by revid: mtr@mtr-20101125100355-0a1b7m792t63mssv
-                if order.state == 'shipping_except':
-                    for pick in order.picking_ids:
-                        for move in pick.move_lines:
-                            if move.state == 'cancel':
-                                mov_ids = move_obj.search(cr, uid, [('state', '=', 'cancel'),('sale_line_id', '=', line.id),('picking_id', '=', pick.id)])
-                                if mov_ids:
-                                    for mov in move_obj.browse(cr, uid, mov_ids):
-                                        # FIXME: the following seems broken: what if move_id doesn't exist? What if there are several mov_ids? Shouldn't that be a sum?
-                                        move_obj.write(cr, uid, [move_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
-                                        procurement_obj.write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
+                self.ship_recreate(cr, uid, order, line, move_id, proc_id)
 
         wf_service = netsvc.LocalService("workflow")
         if picking_id:
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 4fcce85c5b5..5da496a1c4b 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -12,6 +12,9 @@
             <field ref="base.res_partner_address_8" name="partner_invoice_id"/>
             <field ref="base.res_partner_address_8" name="partner_shipping_id"/>
             <field ref="base.res_partner_address_8" name="partner_order_id"/>
+            <field name="order_policy">picking</field>
+            <field name="invoice_quantity">procurement</field> 
+            <field name="note">Invoice after delivery</field>          
         </record>
 
         <!--Resource: sale.order.line-->
@@ -19,9 +22,9 @@
         <record id="line" model="sale.order.line">
             <field name="order_id" ref="order"/>
             <field name="name">New server config + material</field>
-            <field model="product.product" name="product_id" search="[]"/>
-            <field model="product.uom" name="product_uom" search="[]"/>
-            <field name="price_unit">123</field>
+            <field name="product_id" ref="product.product_product_mb1"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">123.20</field>
             <field name="type">make_to_stock</field>
         </record>
 
@@ -30,20 +33,20 @@
             <field name="name">[PC1] Basic PC</field>
             <field name="product_id" ref="product.product_product_pc1"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">450</field>
+            <field name="price_unit">450.50</field>
             <field name="product_uom_qty">3</field>
             <field name="product_uos_qty">3</field>
             <field name="type">make_to_stock</field>
         </record>
         <record id="line13" model="sale.order.line">
             <field name="order_id" ref="order"/>
-            <field name="name">[PC1] Basic PC</field>
-            <field name="product_id" ref="product.product_product_pc1"/>
+            <field name="name">[PC3] Medium PC</field>
+            <field name="product_id" ref="product.product_product_pc3"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">450</field>
-            <field name="product_uom_qty">3</field>
-            <field name="product_uos_qty">3</field>
+            <field name="price_unit">900</field>
+            <field name="product_uom_qty">5</field>
             <field name="type">make_to_stock</field>
+            <field name="delay">1</field>
         </record>
         <record id="line12" model="sale.order.line">
             <field name="order_id" ref="order"/>
@@ -66,6 +69,9 @@
             <field name="partner_invoice_id" ref="base.res_partner_address_9"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_9"/>
             <field name="partner_order_id" ref="base.res_partner_address_9"/>
+            <field name="invoice_quantity">order</field>
+            <field name="order_policy">postpaid</field>
+            
         </record>
 
         <!--Resource: sale.order.line-->
@@ -99,6 +105,7 @@
             <field name="partner_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_8"/>
             <field name="partner_order_id" ref="base.res_partner_address_8"/>
+            <field name="order_policy">prepaid</field>
         </record>
         <record id="line5" model="sale.order.line">
             <field name="order_id" ref="order3"/>
@@ -120,7 +127,6 @@
             <field name="type">make_to_order</field>
             <field name="delay">7</field>
         </record>
-        <workflow action="order_confirm" model="sale.order" ref="order3"/>
 
         <!--Resource: sale.order-->
         
@@ -176,6 +182,16 @@
             <field name="type">make_to_order</field>
             <field name="delay">15</field>
         </record>
+        <record id="line52" model="sale.order.line">
+            <field name="order_id" ref="order5"/>
+            <field name="name">[CPU1] Processor AMD Athlon XP 1800+</field>
+            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="price_unit">75</field>
+            <field name="product_uom_qty">3</field>
+            <field name="product_uos_qty">3</field>
+            <field name="type">make_to_stock</field>
+        </record>
         <workflow action="order_confirm" model="sale.order" ref="order5"/>
 
         <!--Resource: sale.order-->
@@ -228,7 +244,7 @@
             <field name="name">[MB1] Mainboard ASUStek A7N8X</field>
             <field name="product_id" ref="product.product_product_mb1"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_uom_qty">4</field>
+            <field name="product_uom_qty">15</field>
             <field name="price_unit">250</field>
             <field name="type">make_to_order</field>
             <field name="delay">15</field>
@@ -238,13 +254,12 @@
             <field name="name">[MB2] Mainboard ASUStek A7V8X-X</field>
             <field name="product_id" ref="product.product_product_mb2"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_uom_qty">4</field>
+            <field name="product_uom_qty">5</field>
             <field name="price_unit">500</field>
             <field name="type">make_to_order</field>
             <field name="delay">15</field>
         </record>
-        <workflow action="order_confirm" model="sale.order" ref="order7"/>
-        <workflow action="manual_invoice" model="sale.order" ref="order7"/>
+        
         <!-- Run all schedulers -->
         <function model="procurement.order" name="run_scheduler"/>
 
@@ -257,8 +272,9 @@
             <field name="type">service</field>
             <field name="list_price">150.0</field>
             <field name="standard_price">100.0</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="supply_method">produce</field>
+            <field name="uom_id" ref="product.uom_day"/>
+            <field name="uom_po_id" ref="product.uom_day"/>
         </record>
 
     <record id="base.user_demo" model="res.users">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3610d2d5e9e..8f80b33c331 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -84,7 +84,6 @@
                 <tree string="Sales Orders" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
                     <field name="name"/>
                     <field name="date_order"/>
-                    <field name="client_order_ref" groups="base.group_extended"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
                     <field name="picked_rate" widget="progressbar"/>
@@ -166,7 +165,8 @@
                                             <field name="delay"/>
                                             <field name="th_weight"/>
                                             <field name="address_allotment_id"/>
-                                            <field name="property_ids" colspan="4"/>
+                                            <separator colspan="4" string="Properties"/>
+                                            <field name="property_ids" colspan="4" nolabel="1"/>
                                         </page>
                                         <page string="History" groups="base.group_extended">
                                             <separator colspan="4" string="Invoice Lines"/>
@@ -259,7 +259,8 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
+                    <field name="name"
+                        filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
                     <field name="partner_id"/>
                     <field name="user_id">
                         <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 22517bca44c..2e08a025971 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,70 +1,61 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,0,0,0
-"access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0
-"access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1
-"access_sale_order_line_accountant","sale.order.line accountant","model_sale_order_line","account.group_account_user",1,1,0,0
-"access_account_invoice_tax_salesman","account_invoice_tax salesman","account.model_account_invoice_tax","base.group_sale_salesman",1,1,1,0
-"access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,0
-"access_account_invoice_manager","account_invoice manager","account.model_account_invoice","base.group_sale_manager",1,1,1,1
-"access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","base.group_sale_salesman",1,1,1,0
-"access_account_payment_term_salesman","account_payment_term salesman","account.model_account_payment_term","base.group_sale_salesman",1,0,0,0
-"access_account_analytic_account_salesman","account_analytic_account salesman","analytic.model_account_analytic_account","base.group_sale_salesman",1,1,1,0
-"access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","base.group_sale_salesman",1,1,1,0
-"access_stock_move_salesman","stock_move salesman","stock.model_stock_move","base.group_sale_salesman",1,1,1,0
-"access_stock_move_manager","stock_move manager","stock.model_stock_move","base.group_sale_manager",1,1,1,1
-"access_procurement_salesman","procurement.order salesman","procurement.model_procurement_order","base.group_sale_salesman",1,1,1,0
-"access_procurement_manager","procurement.order manager","procurement.model_procurement_order","base.group_sale_manager",1,1,1,1
-"access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
-"access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
-"access_sale_order_manager","sale.order.manager","model_sale_order","base.group_sale_manager",1,1,1,1
-"access_sale_order_accountant","sale.order.accountant","model_sale_order","account.group_account_user",1,1,0,0
-"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,1,1,1
-"access_sale_report_salesman","sale.report","model_sale_report","base.group_sale_salesman",1,1,1,0
-"access_sale_report_manager","sale.report","model_sale_report","base.group_sale_manager",1,1,1,1
-"access_ir_property_sales","ir.property.sales","base.model_ir_property","base.group_sale_salesman",1,1,1,1
-"access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0
-"access_res_partner_sale_user","res.partner.sale.user","base.model_res_partner","base.group_sale_salesman",1,0,0,0
-"access_res_partner_sale_manager","res.partner.sale.manager","base.model_res_partner","base.group_sale_manager",1,1,1,0
-"access_report_stock_move_sales","report.stock.move.sale","stock.model_report_stock_move","base.group_sale_manager",1,1,1,1
-"access_stock_picking_sales","stock.picking.sales","stock.model_stock_picking","base.group_sale_manager",1,1,1,1
-"access_product_template_sale_user","product.template sale use","product.model_product_template","base.group_sale_salesman",1,0,0,0
-"access_product_product_sale_user","product.product sale use","product.model_product_product","base.group_sale_salesman",1,0,0,0
-"access_product_template_sale","product.template sale manager","product.model_product_template","base.group_sale_manager",1,0,0,0
-"access_product_product_sale","product.product sale manager","product.model_product_product","base.group_sale_manager",1,0,0,0
-"access_sale_shop_manager","account.journal sale order.user","model_sale_shop","base.group_sale_manager",1,1,1,1
-"access_account_fiscalyear_manager","account.fiscalyear.manager","account.model_account_fiscalyear","base.group_sale_manager",1,0,0,0
-"access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_sale_salesman",1,0,0,0
-"access_res_partner_address_user","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,0,0,0
-"access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,0,0,0
-"access_product_packaging_user","product.packaging.user","product.model_product_packaging","base.group_sale_salesman",1,1,1,0
-"access_ir_attachment_sales","ir.attachment.sales","base.model_ir_attachment","base.group_sale_salesman",1,1,1,0
-"access_ir_attachment_manager","ir.attachment.manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
-"access_stock_warehouse_manager","stock.warehouse.manager","stock.model_stock_warehouse","base.group_sale_manager",1,0,0,0
-"access_product_uom_manager","product.uom.manager","product.model_product_uom","base.group_sale_manager",1,0,0,0
-"access_product_supplierinfo_manager","product.supplierinfo.manager","product.model_product_supplierinfo","base.group_sale_manager",1,0,0,0
-"access_product_packaging_manager","product.packaging.manager","product.model_product_packaging","base.group_sale_manager",1,0,0,0
-"access_stock_location_manager","stock.location.manager","stock.model_stock_location","base.group_sale_manager",1,0,0,0
-"access_stock_warehouse_user","stock.warehouse.user","stock.model_stock_warehouse","base.group_sale_salesman",1,0,0,0
-"access_res_partner_bank_type_manager","res.partner.bank.type.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
-"access_res_partner_bank_type_user","res.partner.bank.type.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
-"access_stock_location_user","stock.location.user","stock.model_stock_location","base.group_sale_salesman",1,0,0,0
-"access_res_partner_bank_type_field_user","res.partner.bank.type.field.user","base.model_res_partner_bank_type_field","base.group_sale_salesman",1,0,0,0
-"access_product_uom_user","product.uom.user","product.model_product_uom","base.group_sale_salesman",1,0,0,0
-"access_product_supplierinfo_user","product.supplierinfo.user","product.model_product_supplierinfo","base.group_sale_salesman",1,0,0,0
-"access_product_pricelist_sale_user","product.pricelist.sale.user","product.model_product_pricelist","base.group_sale_salesman",1,0,0,0
-"access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0
-"access_sale_shop_sale_user","sale.shop.sale.user","model_sale_shop","base.group_sale_salesman",1,0,0,0
-"access_sale_shop_sale_manager","sale.shop.sale.manager","model_sale_shop","base.group_sale_manager",1,1,1,1
-"access_product_uom_categ_sale_manager","product.uom.categ salemanager","product.model_product_uom_categ","base.group_sale_manager",1,1,1,1
-"access_product_uom_sale_manager","product.uom salemanager","product.model_product_uom","base.group_sale_manager",1,1,1,1
-"access_product_ul_sale_manager","product.ul salemanager","product.model_product_ul","base.group_sale_manager",1,1,1,1
-"access_product_category_sale_manager","product.category salemanager","product.model_product_category","base.group_sale_manager",1,1,1,1
-"access_product_packaging_sale_manager","product.packaging salemanager","product.model_product_packaging","base.group_sale_manager",1,1,1,1
-"access_product_supplierinfo_sale_manager","product.supplierinfo salemanager","product.model_product_supplierinfo","base.group_sale_manager",1,1,1,1
-"access_pricelist_partnerinfo_sale_manager","pricelist.partnerinfo salemanager","product.model_pricelist_partnerinfo","base.group_sale_manager",1,1,1,1
-"access_product_price_type_sale_manager","product.price.type salemanager","product.model_product_price_type","base.group_sale_manager",1,1,1,1
-"access_product_pricelist_type_sale_manager","product.pricelist.type salemanager","product.model_product_pricelist_type","base.group_sale_manager",1,1,1,1
-"access_product_pricelist_sale_manager","product.pricelist salemanager","product.model_product_pricelist","base.group_sale_manager",1,1,1,1
-"access_ir_property_group_sale_manager","ir_property group_sale_manager","base.model_ir_property","base.group_sale_manager",1,1,1,1
-"access_product_group_res_partner_sale_manager","res_partner group_sale_manager","base.model_res_partner","base.group_sale_manager",1,1,1,0
-"access_product_pricelist_version_sale_manager","product.pricelist.version sale_manager","product.model_product_pricelist_version","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sale_shop,sale.shop,model_sale_shop,base.group_user,1,0,0,0
+access_sale_order,sale.order,model_sale_order,base.group_sale_salesman,1,1,1,0
+access_sale_order_line,sale.order.line,model_sale_order_line,base.group_sale_salesman,1,1,1,1
+access_sale_order_line_accountant,sale.order.line accountant,model_sale_order_line,account.group_account_user,1,1,0,0
+access_account_invoice_tax_salesman,account_invoice_tax salesman,account.model_account_invoice_tax,base.group_sale_salesman,1,1,1,0
+access_account_invoice_salesman,account_invoice salesman,account.model_account_invoice,base.group_sale_salesman,1,1,1,0
+access_account_invoice_manager,account_invoice manager,account.model_account_invoice,base.group_sale_manager,1,1,1,1
+access_account_invoice_line_salesman,account_invoice.line salesman,account.model_account_invoice_line,base.group_sale_salesman,1,1,1,0
+access_account_payment_term_salesman,account_payment_term salesman,account.model_account_payment_term,base.group_sale_salesman,1,0,0,0
+access_account_analytic_account_salesman,account_analytic_account salesman,analytic.model_account_analytic_account,base.group_sale_salesman,1,1,1,0
+access_stock_picking_salesman,stock_picking salesman,stock.model_stock_picking,base.group_sale_salesman,1,1,1,0
+access_stock_move_salesman,stock_move salesman,stock.model_stock_move,base.group_sale_salesman,1,1,1,0
+access_stock_move_manager,stock_move manager,stock.model_stock_move,base.group_sale_manager,1,1,1,1
+access_procurement_salesman,procurement.order salesman,procurement.model_procurement_order,base.group_sale_salesman,1,1,1,0
+access_procurement_manager,procurement.order manager,procurement.model_procurement_order,base.group_sale_manager,1,1,1,1
+access_sale_order_stock_worker,sale.order stock worker,model_sale_order,stock.group_stock_user,1,1,0,0
+access_sale_order_line_stock_worker,sale.order.line stock worker,model_sale_order_line,stock.group_stock_user,1,1,0,0
+access_sale_order_manager,sale.order.manager,model_sale_order,base.group_sale_manager,1,1,1,1
+access_sale_order_accountant,sale.order.accountant,model_sale_order,account.group_account_user,1,1,0,0
+access_sale_report_salesman,sale.report,model_sale_report,base.group_sale_salesman,1,1,1,0
+access_sale_report_manager,sale.report,model_sale_report,base.group_sale_manager,1,1,1,1
+access_ir_property_sales,ir.property.sales,base.model_ir_property,base.group_sale_salesman,1,1,1,1
+access_sale_account_journal,account.journal sale order.user,account.model_account_journal,base.group_sale_salesman,1,0,0,0
+access_res_partner_sale_user,res.partner.sale.user,base.model_res_partner,base.group_sale_salesman,1,0,0,0
+access_res_partner_sale_manager,res.partner.sale.manager,base.model_res_partner,base.group_sale_manager,1,1,1,0
+access_report_stock_move_sales,report.stock.move.sale,stock.model_report_stock_move,base.group_sale_manager,1,1,1,1
+access_stock_picking_sales,stock.picking.sales,stock.model_stock_picking,base.group_sale_manager,1,1,1,1
+access_product_template_sale_user,product.template sale use,product.model_product_template,base.group_sale_salesman,1,0,0,0
+access_product_product_sale_user,product.product sale use,product.model_product_product,base.group_sale_salesman,1,0,0,0
+access_sale_shop_manager,account.journal sale order.user,model_sale_shop,base.group_sale_manager,1,1,1,1
+access_account_fiscalyear_user,account.fiscalyear.user,account.model_account_fiscalyear,base.group_sale_salesman,1,0,0,0
+access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_sale_salesman,1,0,0,0
+access_account_tax_user,account.tax.user,account.model_account_tax,base.group_sale_salesman,1,0,0,0
+access_product_packaging_user,product.packaging.user,product.model_product_packaging,base.group_sale_salesman,1,1,1,0
+access_ir_attachment_sales,ir.attachment.sales,base.model_ir_attachment,base.group_sale_salesman,1,1,1,0
+access_ir_attachment_manager,ir.attachment.manager,base.model_ir_attachment,base.group_sale_manager,1,1,1,1
+access_product_packaging_manager,product.packaging.manager,product.model_product_packaging,base.group_sale_manager,1,0,0,0
+access_stock_warehouse_user,stock.warehouse.user,stock.model_stock_warehouse,base.group_sale_salesman,1,0,0,0
+access_res_partner_bank_type_user,res.partner.bank.type.user,base.model_res_partner_bank_type,base.group_sale_salesman,1,0,0,0
+access_stock_location_user,stock.location.user,stock.model_stock_location,base.group_sale_salesman,1,0,0,0
+access_res_partner_bank_type_field_user,res.partner.bank.type.field.user,base.model_res_partner_bank_type_field,base.group_sale_salesman,1,0,0,0
+access_product_uom_user,product.uom.user,product.model_product_uom,base.group_sale_salesman,1,0,0,0
+access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_sale_salesman,1,0,0,0
+access_product_pricelist_sale_user,product.pricelist.sale.user,product.model_product_pricelist,base.group_sale_salesman,1,0,0,0
+access_account_account_salesman,account_account salesman,account.model_account_account,base.group_sale_salesman,1,0,0,0
+access_sale_shop_sale_user,sale.shop.sale.user,model_sale_shop,base.group_sale_salesman,1,0,0,0
+access_sale_shop_sale_manager,sale.shop.sale.manager,model_sale_shop,base.group_sale_manager,1,1,1,1
+access_product_uom_categ_sale_manager,product.uom.categ salemanager,product.model_product_uom_categ,base.group_sale_manager,1,1,1,1
+access_product_uom_sale_manager,product.uom salemanager,product.model_product_uom,base.group_sale_manager,1,1,1,1
+access_product_ul_sale_manager,product.ul salemanager,product.model_product_ul,base.group_sale_manager,1,1,1,1
+access_product_category_sale_manager,product.category salemanager,product.model_product_category,base.group_sale_manager,1,1,1,1
+access_product_packaging_sale_manager,product.packaging salemanager,product.model_product_packaging,base.group_sale_manager,1,1,1,1
+access_product_supplierinfo_sale_manager,product.supplierinfo salemanager,product.model_product_supplierinfo,base.group_sale_manager,1,1,1,1
+access_pricelist_partnerinfo_sale_manager,pricelist.partnerinfo salemanager,product.model_pricelist_partnerinfo,base.group_sale_manager,1,1,1,1
+access_product_price_type_sale_manager,product.price.type salemanager,product.model_product_price_type,base.group_sale_manager,1,1,1,1
+access_product_pricelist_type_sale_manager,product.pricelist.type salemanager,product.model_product_pricelist_type,base.group_sale_manager,1,1,1,1
+access_product_pricelist_sale_manager,product.pricelist salemanager,product.model_product_pricelist,base.group_sale_manager,1,1,1,1
+access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,base.group_sale_manager,1,1,1,0
+access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1
+access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
\ No newline at end of file
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index b7a228acf6a..ae8c8bf62e3 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -3,16 +3,19 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User - Own Leads Only</field>
+        <field name="name">User - Own Leads Only</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">Sales / User - All Leads</field>
+        <field name="name">User - All Leads</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
diff --git a/addons/sale/static/src/img/icon.png b/addons/sale/static/src/img/icon.png
new file mode 100644
index 00000000000..46d395d70ee
Binary files /dev/null and b/addons/sale/static/src/img/icon.png differ
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 9e0a47b3ceb..378af21c1b4 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -27,12 +27,11 @@ class stock_move(osv.osv):
         'sale_line_id': fields.many2one('sale.order.line', 'Sales Order Line', ondelete='set null', select=True, readonly=True),
     }
 
-    def _create_chained_picking(self, cr, uid, pick_name, picking, ptype, move, context=None):
-        res = super(stock_move, self)._create_chained_picking(cr, uid, pick_name, picking, ptype, move, context=context)
+    def _prepare_chained_picking(self, cr, uid, picking_name, picking, picking_type, moves_todo, context=None):
+        values = super(stock_move, self)._prepare_chained_picking(cr, uid, picking_name, picking, picking_type, moves_todo, context=context)
         if picking.sale_id:
-            self.pool.get('stock.picking').write(cr, uid, [res], {'sale_id': picking.sale_id.id})
-        return res
-stock_move()
+            values['sale_id'] = picking.sale_id.id
+        return values
 
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
@@ -196,7 +195,4 @@ class stock_picking(osv.osv):
                     })
         return result
 
-stock_picking()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
deleted file mode 100644
index 06bd0a309f5..00000000000
--- a/addons/sale/test/advance_invoice.yml
+++ /dev/null
@@ -1,144 +0,0 @@
--
-  In order to test the Deposit wizard of sale module in the Open-ERP,
-  I create a Sale Order for LG Viewty Smart for qty 100 having order_policy manual.
--
-  !record {model: sale.order, id: sale_order_so5}:
-    invoice_quantity: order
-    order_line:
-      - product_uom_qty: 100.0
-        product_id: sale.product_product_lgviewtysmart0
-        name: LG View
-        product_uos_qty: 100.0
-        type: make_to_order
-    order_policy: manual
-    partner_id: sale.res_partner_cleartrail0
-    picking_policy: direct
--
-  I use the Advance Payment wizard.
--
-  !record {model: sale.advance.payment.inv, id: sale_advance_payment_inv_0}:
-    amount: 1000.0
-    product_id: product.product_product_pc3
-    qtty: 3.0
--
-  Then I click on the "Create Partial Invoice" button
--
-  !python {model: sale.advance.payment.inv}: |
-    self.create_invoices(cr, uid, [ref("sale_advance_payment_inv_0")], {"lang": 'en_US',
-      "active_model": 'sale.order', "active_ids": [ref("sale_order_so5")], "tz":
-      False, "active_id": ref("sale_order_so5"), })
--
-  I verify whether the invoice has been generated.
--
-  !python {model: sale.order}: |
-    so = self.read(cr, uid, ref("sale_order_so5"))
-    assert so['invoice_ids'], "Invoices has not been generated for sale_order_so5"
--
-  I open the Invoice for the SO.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
--
-  I verify that an invoice state has transit from draft to open state
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    assert invoice_id, "Invoice is not in the open state"
--
-  I pay the invoice
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    self.pay_and_reconcile(cr, uid, invoice_id,
-        3000.0, ref('account.cash'), ref('account.period_5'),
-        ref('sale.account_journal_bankjournal0'), ref('account.cash'),
-        ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
-        name='test')
--
-  I verify that invoice has transit from Open to Paid state
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
-    assert invoice_id, "Invoice for SO is not in paid state."
--
-  I verify that Paid has been set to true.
--
-  !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so5"))
-    assert(sale_id.invoiced == True), "Paid has not been set to true"
--
-  I confirm the Sale Order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so5}
--
-  I click on "Create Invoice" button of Sales order to create the invoice.
--
-  !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so5}
--
-  I verify whether the invoice has been generated for SO
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so5"))
-    assert so.invoice_ids[1], "Invoices has not been generated for sale_order_so5"
--
-  I open the Invoice for the SO.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
--
-  I verify that an invoice state has transit from draft to open state
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    assert invoice_id, "Invoice is not in the open state"
--
-  I assign an analytic journal to the bank journal
--
-  !record {model: account.journal, id: sale.account_journal_bankjournal0}:
-    analytic_journal_id: account.cose_journal_sale
--
-  I pay the invoice
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    self.pay_and_reconcile(cr, uid, invoice_id,
-        14000.0, ref('account.cash'), ref('account.period_5'),
-        ref('sale.account_journal_bankjournal0'), ref('account.cash'),
-        ref('account.period_5'), ref('sale.account_journal_bankjournal0'),
-        name='test')
--
-  I verify that an invoice is in done state.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
-    assert invoice_id, "Invoice for SO is not in done state."
--
-  I verify that Paid has been set to true.
--
-  !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so5"))
-    assert(sale_id.invoiced == True), "Paid has not been set to true"
diff --git a/addons/sale/test/cancel_order.yml b/addons/sale/test/cancel_order.yml
new file mode 100644
index 00000000000..a398e1545ab
--- /dev/null
+++ b/addons/sale/test/cancel_order.yml
@@ -0,0 +1,88 @@
+-
+  In order to test the cancel sale order.
+-
+  Now I cancel Quotation.
+-
+  !python {model: sale.order}: |
+    self.action_cancel(cr, uid, [ref("order7")])
+-
+  I check state of Quotation after cancelled.
+-
+  !assert {model: sale.order, id: order7, string: sale order should be in cancel state}:
+    - state == 'cancel'
+-
+  I set cancelled quotation to draft.
+-
+  !python {model: sale.order}: |
+    self.action_cancel_draft(cr, uid, [ref("order7")])
+-
+  I confirm order.
+-
+  !workflow {model: sale.order, action: order_confirm, ref: order7}
+-
+  I send delivery in two shipments, so I am doing a partial delivery order.
+-
+  !python {model: stock.picking}: |
+    delivery_orders = self.search(cr, uid, [('sale_id','=',ref("order7"))])
+    first_picking = self.browse(cr, uid, delivery_orders[0], context=context)
+    if first_picking.force_assign(cr, uid, first_picking):
+      first_move = first_picking.move_lines[0]
+      values = {'move%s'%(first_move.id): {'product_qty': 5}}
+      first_picking.do_partial(values, context=context)
+-
+  Now I cancel latest shipment.
+-
+  !python {model: stock.picking}: |
+    import netsvc
+    delivery_orders = self.search(cr, uid, [('sale_id','=',ref("order7"))])
+    last_delivery_order_id = delivery_orders[0]
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'stock.picking', last_delivery_order_id, 'button_cancel', cr)
+-
+  I run the scheduler.
+-
+  !python {model: procurement.order}: |
+
+     self.run_scheduler(cr, uid)
+-
+  I check order status in "Ship Exception".
+-
+  !assert {model: sale.order, id: order7, string: Sale order should be in shipping exception}:
+    - state == "shipping_except"
+-
+  Now I regenerate shipment.
+-
+  !workflow {model: sale.order, action: ship_recreate, ref: order7}
+-
+  I check state of order in 'To Invoice'.
+-
+  !assert {model: sale.order, id: order7, string: Sale order should be In Progress state}:
+    - state == 'manual'
+-
+  I make invoice for order.
+-
+  !workflow {model: sale.order, action: manual_invoice, ref: order7}
+-
+  To cancel the sale order from Invoice Exception, I have to cancel the invoice of sale order.
+-
+  !python {model: sale.order}: |
+    import netsvc
+    invoice_ids = self.browse(cr, uid, ref("order7")).invoice_ids
+    wf_service = netsvc.LocalService("workflow")
+    first_invoice_id = invoice_ids[0]
+    wf_service.trg_validate(uid, 'account.invoice', first_invoice_id.id, 'invoice_cancel', cr)
+-
+  I check order status in "Invoice Exception" and related invoice is in cancel state.
+-
+  !assert {model: sale.order, id: order7, string: Sale order should be in Invoice Exception state}:
+    - state == "invoice_except", "Order should be in Invoice Exception state after cancel Invoice"
+-
+  Then I click on the Ignore Exception button.
+-
+  !workflow {model: sale.order, action: invoice_corrected, ref: order7}
+
+-
+  I check state of order in 'In Progress'.
+-
+  !assert {model: sale.order, id: order7, string: Sale order should be In progress state}:
+    - state == 'progress'
diff --git a/addons/sale/test/data_test.yml b/addons/sale/test/data_test.yml
deleted file mode 100644
index 8b5d32a086a..00000000000
--- a/addons/sale/test/data_test.yml
+++ /dev/null
@@ -1,258 +0,0 @@
--
-  In order to test the sale module, I need to configure details regarding product,customer and account.
--
-  I am going to sell my Mobile products to the customer with name Cleartrail
-- 
-  I create View Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_view0}:
-    close_method: none
-    code: View
-    name: View
-    sign: 1
-- 
-  I create Income Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_income0}:
-    close_method: unreconciled
-    code: Income
-    name: Income
-    sign: 1
-- 
-  I create Expense Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_expense0}:
-    close_method: unreconciled
-    code: Expense
-    name: Expense
-    sign: 1
-- 
-  I create Cash Account Type.
-- 
-  !record {model: account.account.type, id: account_account_type_cash0}:
-    close_method: balance
-    code: Cash
-    name: Cash
-    sign: 1
-- 
-  I create Minimal Chart Account.
-- 
-  !record {model: account.account, id: account_account_minimalchart0}:
-    code: MC
-    company_id: base.main_company
-    currency_mode: current
-    name: Minimal Chart
-    parent_left: 1
-    parent_right: 12
-    type: view
-    user_type: account_account_type_view0
-- 
-  I create Payable Account.
-- 
-  !record {model: account.account, id: account_account_payable1}:
-    code: AP
-    company_id: base.main_company
-    currency_mode: current
-    name: Payable
-    parent_id: account_account_minimalchart0
-    parent_left: 2
-    parent_right: 3
-    reconcile: true
-    type: payable
-    user_type: account_account_type_expense0
-- 
-  I create Receivable Account.
-- 
-  !record {model: account.account, id: account_account_receivable0}:
-    code: AR
-    company_id: base.main_company
-    currency_mode: current
-    name: Receivable
-    parent_id: account_account_minimalchart0
-    parent_left: 4
-    parent_right: 5
-    reconcile: true
-    type: receivable
-    user_type: account_account_type_income0
-- 
-  I create Cash Account.
-- 
-  !record {model: account.account, id: account_account_cash0}:
-    code: C
-    company_id: base.main_company
-    currency_mode: current
-    name: Cash
-    parent_id: account_account_minimalchart0
-    parent_left: 6
-    parent_right: 7
-    type: other
-    user_type: account_account_type_cash0
-- 
-  I create Purchases Account.
-- 
-  !record {model: account.account, id: account_account_purchases0}:
-    code: P
-    company_id: base.main_company
-    currency_mode: current
-    name: Purchases
-    parent_id: account_account_minimalchart0
-    parent_left: 8
-    parent_right: 9
-    type: other
-    user_type: account_account_type_expense0
-- 
-  I create Sales Account.
-- 
-  !record {model: account.account, id: account_account_sales0}:
-    code: S
-    company_id: base.main_company
-    currency_mode: current
-    name: Sales
-    parent_id: account_account_minimalchart0
-    parent_left: 10
-    parent_right: 11
-    type: other
-    user_type: account_account_type_income0
-- 
-  I create Purchase Journal - (test).
-- 
-  !record {model: account.journal, id: account_journal_purchasejournal0}:
-    code: PUJ
-    company_id: base.main_company
-    default_credit_account_id: account_account_purchases0
-    default_debit_account_id: account_account_purchases0
-    name: Purchase Journal - (test)
-    type: purchase
-    view_id: account.account_journal_view
-- 
-  I create Sale Journal.
-- 
-  !record {model: account.journal, id: account_journal_salejournal0}:
-    code: SJ
-    company_id: base.main_company
-    default_credit_account_id: account_account_sales0
-    default_debit_account_id: account_account_sales0
-    name: Sale Journal
-    type: sale
-    view_id: account.account_journal_view
-- 
-  I create Bank Journal.
-- 
-  !record {model: account.journal, id: account_journal_bankjournal0}:
-    code: BNK
-    company_id: base.main_company
-    default_credit_account_id: account_account_cash0
-    default_debit_account_id: account_account_cash0
-    name: Bank Journal
-    type: cash
-    view_id: account.account_journal_bank_view
-- 
-  I create ir.property for account payable.
-- 
-  !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
-    company_id: base.main_company
-    fields_id: account.field_res_partner_property_account_payable
-    name: property_account_expense_categ
-    value_reference: account.account,5
-- 
-  I create ir.property for account receivable.
-- 
-  !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
-    company_id: base.main_company
-    fields_id: account.field_res_partner_property_account_receivable
-    name: property_account_income_categ
-    value_reference: account.account,6
-- 
-  I create Partner category Customers.
-- 
-  !record {model: res.partner.category, id: res_partner_category_customers0}:
-    name: Customers
--
-  I create Cleartrail Customer.
-- 
-  !record {model: res.partner, id: res_partner_cleartrail0}:
-    category_id:
-      - res_partner_category_customers0
-    name: Cleartrail
-    opt_out: True
-- 
-  I create contact address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_1}:
-    partner_id: res_partner_cleartrail0
-    street: onam plaza, 14 B palasia A B Road
-    type: contact
-- 
-  I create invoice address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_2}:
-    partner_id: res_partner_cleartrail0
-    street: sarda house 24 B palasia, A B Road
-    type: invoice
-- 
-  I create delivery address for Cleartrail.
-- 
-  !record {model: res.partner.address, id: res_partner_address_3}:
-    partner_id: res_partner_cleartrail0
-    street: sangam house 15 B palasia, A B Road
-    type: delivery
--
-  Customer Cleartrail has specific instrument requirement regarding the stockable products.
-- 
-  I define product category Mobile Products Sellable.
-- 
-  !record {model: product.category, id: product_category_allproductssellable0}:
-    name: Mobile Products Sellable
--
-  I define product category Mobile Services. 
-- 
-  !record {model: product.category, id: product_category_services0}:
-    name: Mobile Services
-- 
-
-  I define LG Viewty Smart product.
--
-  !record {model: product.product, id: product_product_lgviewtysmart0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 170.0
-    mes_type: fixed
-    name: LG Viewty Smart
-    procure_method: make_to_order
-    property_account_expense: sale.account_account_payable1
-    property_account_income: sale.account_account_receivable0
-    seller_delay: '1'
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_agrolait
-        min_qty: 2.0
-        qty: 5.0
-    standard_price: 160.0
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-
-- 
-  I define Slider Mobile.
-- 
-  !record {model: product.product, id: product_product_slidermobile0}:
-    categ_id: product_category_allproductssellable0
-    cost_method: standard
-    list_price: 200
-    mes_type: fixed
-    name: Slider Mobile
-    procure_method: make_to_order
-    property_account_expense: sale.account_account_payable1
-    property_account_income: sale.account_account_receivable0
-    seller_delay: '1'
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_agrolait
-        min_qty: 2.0
-        qty: 5.0
-    standard_price: 189.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
diff --git a/addons/sale/test/delete_order.yml b/addons/sale/test/delete_order.yml
new file mode 100644
index 00000000000..2bbfed9771d
--- /dev/null
+++ b/addons/sale/test/delete_order.yml
@@ -0,0 +1,14 @@
+-
+  I try to delete In progress order and check Error Message.
+-
+  !python {model: sale.order}: |
+    try:
+        self.unlink(cr, uid, [ref("order")])
+    except Exception,e:
+        pass
+-
+  I make duplicate order and delete.
+-
+  !python {model: sale.order}: |
+    id = self.copy(cr, uid, ref('order'))
+    self.unlink(cr, uid, [id])
diff --git a/addons/sale/test/invoice_on_ordered_qty.yml b/addons/sale/test/invoice_on_ordered_qty.yml
deleted file mode 100644
index 313aa3a0d63..00000000000
--- a/addons/sale/test/invoice_on_ordered_qty.yml
+++ /dev/null
@@ -1,110 +0,0 @@
--
-  In order to test the Sale module in OpenERP,
-  I create a Sale Order for Slider Mobile for 500 quantity having Shipping Policy 'Shipping & Manual Invoice' and Invoice on 'Ordered quantities'
-  in order to create an invoice based on the ordered quantity
--
-  !record {model: sale.order, id: sale_order_so9}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: Test_SO006
-    order_line:
-      - name: Slider Mobile
-        price_unit: 200
-        product_uom: product.product_uom_unit
-        product_uom_qty: 200.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_slidermobile0
-        product_uos_qty: 200.0
-        type: make_to_order
-    order_policy: manual
-    invoice_quantity: order
-    partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
--
-  I confirm the Sale Order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so9}
--
-  I verify that the picking has been generated for the sale order and I process it
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so9"))
-    assert so.picking_ids,"Picking has not been generated for sale_order_so9"
-    picking, = so.picking_ids
-    stock_partial_picking = self.pool.get('stock.partial.picking')
-    partial_id = stock_partial_picking.create(cr, uid, {},
-            context={'active_model': 'stock.picking',
-                     'active_ids': [picking.id]})
-    stock_partial_picking.do_partial(cr, uid, [partial_id])
--
-  I click on Create Invoice button to create the invoice.
--
-  !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so9}
--
-  I verify whether the invoice has been generated for SO
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so9"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so9"
--
-  I verify that an invoice is created on the basis of ordered quantity
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
-    for so_lines in so.order_line:
-      qty = so_lines.product_uom_qty
-    ids = self.search(cr, uid, [('origin','=',so.name)])
-    inv_brw = self.browse(cr,uid,ids)[0]
-    for inv_lines in inv_brw.invoice_line:
-      qty1 = inv_lines.quantity
-    assert qty1==qty, "Quantities are not same"
--
-  I open the Invoice for the SO.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
--
-  Assign analytic journal into bank journal
--
-  !record {model: account.journal, id: sale.account_journal_bankjournal0}:
-    analytic_journal_id: account.cose_journal_sale
--
-  I pay the invoice
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    self.pay_and_reconcile(cr, uid, invoice_id,
-        40000.0, ref('account.cash'), ref('account.period_9'),
-        ref('sale.account_journal_bankjournal0'), ref('account.cash'),
-        ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
-        name='test')
--
-  I verify the invoice are in paid state or not.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-        assert invoice.state =='paid', "Invoice for SO is not in done state."
--
-  I check that Paid has been set to true.
--
-  !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so9"))
-    assert sale_id.invoiced == True, "Paid has not been set to true"
diff --git a/addons/sale/test/invoice_on_shipped_qty.yml b/addons/sale/test/invoice_on_shipped_qty.yml
deleted file mode 100644
index c6ac86471be..00000000000
--- a/addons/sale/test/invoice_on_shipped_qty.yml
+++ /dev/null
@@ -1,124 +0,0 @@
--
-  In order to test the Sale module in OpenERP,
-  I create a Sale Order for Slider Mobile for 200 quantity having Shipping Policy 'Invoice from Picking' and Invoice on 'Shipped quantities'
--
-  !record {model: sale.order, id: sale_order_so6}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: Test_SO006BIS
-    order_line:
-      - name: Slider Mobile
-        price_unit: 200
-        product_uom: product.product_uom_unit
-        product_uom_qty: 200.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_slidermobile0
-        product_uos_qty: 200.0
-        type: make_to_order
-    order_policy: picking
-    invoice_quantity: procurement
-    partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
--
-  I confirm the Sale Order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so6}
--
-  I verify that the picking has been generated for the sale order and I process it
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so6"))
-    assert so.picking_ids,"Picking has not been generated for sale_order_so6"
-    picking, = so.picking_ids
-    stock_partial_picking = self.pool.get('stock.partial.picking')
-    partial_id = stock_partial_picking.create(cr, uid, {},
-            context={'active_model': 'stock.picking',
-                     'active_ids': [picking.id]})
-    # I change the qty to 100 for a partial delivery
-    partial = stock_partial_picking.browse(cr,uid,partial_id)
-    line_id = partial.move_ids[0].id
-    partial.write({'move_ids': [(1,line_id,{'quantity':100})]})
-    partial.do_partial()
--
-  Then I click on 'Create Invoices' button
--
-  !python {model: stock.invoice.onshipping}: |
-    import time
-    sale_obj = self.pool.get('sale.order')
-    sale_id = sale_obj.browse(cr, uid, ref("sale_order_so6"))
-    ids = [x.id for x in sale_id.picking_ids if x.state == 'done']
-    wiz_id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.sales_journal')},
-      {'active_ids': ids, 'active_model': 'stock.picking'})
-    self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids, "active_id": ids[0]})
--
-  I verify whether the invoice has been generated for SO
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so6"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so6"
--
-  I verify that an invoice is created on the basis of shipped quantities 100 not ordered quantities 200
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
-    picking_obj = self.pool.get('stock.picking')
-    ids = picking_obj.search(cr, uid, [('origin', '=', so.name),('type','=','out'),('state','=','done')])
-    qty = qty1 = 0.0
-    for pick_brw in picking_obj.browse(cr,uid, ids):
-        for lines in pick_brw.move_lines:
-            qty=lines.product_qty
-    inv_id = self.search(cr, uid, [('origin', 'like', so.name)])
-    inv_brw = self.browse(cr,uid,inv_id)[0]
-    for inv_lines in inv_brw.invoice_line:
-        qty1=inv_lines.quantity
-    assert (qty1 == qty), "Quantities are not the same: invoiced: %s, shipped: %s" % (qty1,qty)
--
-  I open the Invoice for the SO.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
--
-  Assign analytic journal into bank journal
--
-  !record {model: account.journal, id: sale.account_journal_bankjournal0}:
-    analytic_journal_id: account.cose_journal_sale
--
-  I pay the invoice
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
-    invoice_id = self.search(cr, uid, [('origin','like',so.name),('state','=','open')])
-    self.pay_and_reconcile(cr, uid, invoice_id,
-        40000.0, ref('account.cash'), ref('account.period_8'),
-        ref('sale.account_journal_bankjournal0'), ref('account.cash'),
-        ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
-        name='test')
--
-  I verify the invoice are in paid state or not.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-        assert invoice.state=='paid', "Invoice for SO is not in done state."
--
-  I check that Paid has been set to true.
--
-  !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so6"))
-    assert sale_id.invoiced == True, "Paid has not been set to true"
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index af515b2d4e4..d997e792696 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -1,261 +1,89 @@
 -
-  In order to test the Sale module in OpenERP,
-  I create a Sale Order for Slider Mobile for 500 quantity having Shipping Policy 'Shipping & Manual Invoice'
+  I confirm the Quotation with "Deliver & invoice on demand".
 -
-  !record {model: sale.order, id: sale_order_so0}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: Test_SO002
-    order_line:
-      - name: Slider Mobile
-        price_unit: 200
-        product_uom: product.product_uom_unit
-        product_uom_qty: 500.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_slidermobile0
-        product_uos_qty: 500.0
-        type: make_to_order
-    order_policy: manual
-    partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
+  !workflow {model: sale.order, action: order_confirm, ref: order4}
 -
-  I confirm the Sale Order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
--
-  I click on Create Invoice button to create the invoice.
--
-  !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so0}
-
--
-  I verify whether the invoice has been generated for SO
+  I check that Invoice should not created.
 -
   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
+    sale_order = self.browse(cr, uid, ref("order4"))
+    assert len(sale_order.invoice_ids) == False, "Invoice should not created."
+    assert sale_order.picking_ids, "Delivery order should be created."
 -
-  I open the Invoice for the SO.
+  I create advance invoice.
 -
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+  !python {model: sale.advance.payment.inv}: |
+    ctx = context.copy()
+    ctx.update({"active_model": 'sale.order', "active_ids": [ref("order4")], "active_id":ref("order4")})
+    order_line = self.pool.get('sale.order.line').browse(cr, uid, ref("line7"), context=context)
+    pay_id = self.create(cr, uid, {'product_id': order_line.product_id.id, 'amount': order_line.price_subtotal, 'qtty': order_line.product_uom_qty})
+    self.create_invoices(cr, uid, [pay_id], context=ctx)
+-
+  I check Invoice which made advance
+-
+  !python {model: sale.order}: |
+    order = self.browse(cr, uid, ref('order4'))
+    assert order.invoice_ids, "Invoice should be created after make advance invoice."
+-
+  I create Invoice from sale order line.
+-
+  !python {model: sale.order.line.make.invoice}: |
+    ctx = context.copy()
+    ctx.update({"active_model": 'sale.order.line', "active_ids": [ref("line8")], "active_id":ref("line8")})
+    self.make_invoices(cr, uid, [], context=ctx)
+-
+  I check Invoice which made from sale order line.
+-
+  !python {model: sale.order.line}: |
+    line = self.browse(cr, uid, ref('line8'))
+    assert line.invoiced, "Line is not invoiced."
+    assert line.invoice_lines, "Invoice line should be created."
+-
+  I create manual Invoice for order.
+-
+  !record {model: sale.make.invoice, id: sale_make_invoice_1}:
+    invoice_date: !eval time.strftime('%Y-%m-%d')
+-
+  !python {model: sale.make.invoice}: |
+    ctx = context.copy()
+    ctx = ctx.update({"active_model": 'sale.order', "active_ids": [ref("order4")], "active_id":ref("order4")})
+    self.make_invoices(cr, uid, [ref("sale_make_invoice_1")], context)
+-
+  I open the Invoice.
+-
+  !python {model: sale.order}: |
     import netsvc
     wf_service = netsvc.LocalService("workflow")
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
--
-  I verify that an invoice state has transit from draft to open state
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    assert invoice_id, "Invoice is not in the open state"
--
-  I verify that its Journal Entries has been created
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    inv_brw = self.browse(cr, uid, invoice_id)[0]
-    assert inv_brw.move_id, "Journal Entries has not been created"
--
-  Assign analytic journal into bank journal
--
-  !record {model: account.journal, id: sale.account_journal_bankjournal0}:
-    analytic_journal_id: account.cose_journal_sale
+    so = self.browse(cr, uid, ref("order4"))
+    for invoice in so.invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_open', cr)
 -
   I pay the invoice
 -
   !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    self.pay_and_reconcile(cr, uid, invoice_id,
-        100000.0, ref('account.cash'), ref('account.period_8'),
-        ref('sale.account_journal_bankjournal0'), ref('account.cash'),
-        ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
-        name='test')
+    sale_order = self.pool.get('sale.order')
+    order = sale_order.browse(cr, uid, ref("order4"))
+    journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', order.company_id.id)], limit=1)
+    for invoice in order.invoice_ids:
+        invoice.pay_and_reconcile(
+            invoice.amount_total, ref('account.cash'), ref('account.period_8'),
+            journal_ids[0], ref('account.cash'),
+            ref('account.period_8'), journal_ids[0],
+            name='test')
 -
-  I verify the invoice is in done state.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
-    assert invoice_id, "Invoice for SO is not in done state."
--
-  I verify that Paid has been set to true.
+  I check Invoice after do manual.
 -
   !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so0"))
-    assert(sale_id.invoiced == True), "Paid has not been set to true"
+    sale_order = self.browse(cr, uid, ref("order4"))
+    assert sale_order.invoice_ids, "Invoice should be created."
+    assert sale_order.invoiced, "Order is not invoiced."
+    assert sale_order.state == 'manual', 'Order should be in Manual.'
+    
 -
-  I verify that the picking has been generated for the sale order
+  I set order policy "Deliver & invoice on demand" as default policy.
 -
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    assert so.picking_ids,"Picking has not been generated for sale_order_so0"
+  !record {model: sale.config.picking_policy, id: sale.config.picking_policy_0}:
+    order_policy: 'manual'
 -
-  I verify that delivery order has been generated for sale order
--
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   assert(picking_id),"Delivery order has not been generated"
--
-  I verify that a procurement has been generated for so
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
-    assert(proc_ids),"No Procurements!"
--
-  Then I click on the "Run Procurement" button
--
-  !python {model: procurement.order}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
-    for proc in proc_ids:
-      wf_service.trg_validate(uid, 'procurement.order',proc,'button_check', cr)
--
-  I verify that a procurement state is "running"
--
-  !python {model: procurement.order}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-    proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','in',['running','ready'])])
-    # should be running is 'purchase' is installed, else 'ready'
-    assert(proc_ids),"Procurement is not in running/ready state!"
--
-  I verify that a purchase order has been generated
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if(mod_brw.state == 'installed'):
-        so = self.browse(cr, uid, ref("sale_order_so0"))
-        pur_obj=self.pool.get('purchase.order')
-        pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)])
-        assert(pur_id),"Purchase order has not been generated"
-
--
-  I click on the "Confirm" button to confirm the purchase order
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if(mod_brw.state == 'installed'):
-        pur_obj=self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so0"))
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        for pur in pur_ids:
-          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
--
-  I click on the "Approved by supplier" button to approve the purchase order
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so0"))
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        for pur in pur_ids:
-          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
--
-  I verify that a picking related to purchase order has been generated and I process it
--
-  !python {model: sale.order}: |
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so0"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
-        assert(po.picking_ids),"Picking for purchase order has not been generated"
-        picking, = po.picking_ids
-        stock_partial_picking = self.pool.get('stock.partial.picking')
-        partial_id = stock_partial_picking.create(cr, uid, {},
-                context={'active_model': 'stock.picking',
-                         'active_ids': [picking.id]})
-        stock_partial_picking.do_partial(cr, uid, [partial_id])
--
-  I verify that picking for purchase order has been done.
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if(mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so0"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
-        picking_obj = self.pool.get('stock.picking')
-        ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
-        assert(ids),"Picking is not in the done state!"
--
-  Then I process the picking
--
-  !python {model: stock.picking }: |
-   import time
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      pick.force_assign(cr, uid)
-      stock_partial_picking = self.pool.get('stock.partial.picking')
-      partial_id = stock_partial_picking.create(cr, uid, {},
-              context={'active_model': 'stock.picking',
-                       'active_ids': [pick.id]})
-      stock_partial_picking.do_partial(cr, uid, [partial_id])
--
-  I verify that picking for sale order is in done state.
--
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   pick = self.browse(cr,uid,picking_id[0])
-   assert (pick.state) =='done', "Picking for SO is not in done state."
--
-  I verify that a "Picked" has been set to true
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    assert (so.shipped == True), "Picked has not been set to True"
--
-  I verify that a sale order is in done state
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    assert (so.state == 'done'), "Sale order is not in the done state."
+  !python {model: sale.config.picking_policy}: |
+    self.execute(cr, uid, [ref("sale.config.picking_policy_0")])
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
index 1dcbf980da4..33b23dbd5d0 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale/test/picking_order_policy.yml
@@ -1,264 +1,171 @@
 -
-  In order to test the Sale module in OpenERP,
-  I create a Sale Order for Slider Mobile for qty 500 having Shipping Policy is 'Invoice from Picking'
+  In order to test process of the Sale Order,
 -
-  !record {model: sale.order, id: sale_order_so7}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: Test_SO007
-    order_line:
-      - name: Slider Mobile
-        price_unit: 200
-        product_uom: product.product_uom_unit
-        product_uom_qty: 500.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_slidermobile0
-        product_uos_qty: 500.0
-        th_weight: 0.0
-        type: make_to_order
-    order_policy: picking
-    partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
+  First I check the total amount of the Quotation before Approved.
 -
-  I confirm the sale order.
+  !assert {model: sale.order, id: order, string: The amount of the Quotation is not correctly computed}:
+    - sum([l.price_subtotal for l in order_line]) == amount_untaxed
 -
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so7}
+  I confirm the quotation with "Invoice based on deliveries" policy.
 -
-  I verify that picking has been generated for the sale order.
+  !workflow {model: sale.order, action: order_confirm, ref: order}
+-
+  I check that invoice should not created before dispatch delivery.
 -
   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so7"))
-    assert so.picking_ids,"Picking has not been generated for sale_order_so7"
+    order = self.pool.get('sale.order').browse(cr, uid, ref("order"))
+    assert order.state == 'progress', 'Order should be in inprogress.'
+    assert len(order.invoice_ids) == False, "Invoice should not created."
 -
-  Then I done the picking
+  I check the details of procurement after confirmed quotation.
 -
-  !python {model: stock.picking }: |
-   import time
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      pick.force_assign(cr, uid)
-      stock_partial_picking = self.pool.get('stock.partial.picking')
-      partial_id = stock_partial_picking.create(cr, uid, {},
-              context={'active_model': 'stock.picking',
-                       'active_ids': [pick.id]})
-      stock_partial_picking.do_partial(cr, uid, [partial_id])
+  !python {model: sale.order}: |
+    from datetime import datetime, timedelta
+    from dateutil.relativedelta import relativedelta
+    from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
+    order = self.browse(cr, uid, ref("order"))
+    for order_line in order.order_line:
+        procurement = order_line.procurement_id
+        date_planned = datetime.strptime(order.date_order, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=order_line.delay or 0.0)
+        date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        assert procurement.date_planned == date_planned, "Scheduled date is not correspond."
+        assert procurement.product_id.id == order_line.product_id.id, "Product is not correspond."
+        assert procurement.product_qty == order_line.product_uom_qty, "Qty is not correspond."
+        assert procurement.product_uom.id == order_line.product_uom.id, "UOM is not correspond."
+        assert procurement.procure_method == order_line.type, "Procurement method is not correspond."
 -
-  Then I click on 'Create Invoices' button
+  I run the scheduler.
+-
+  !python {model: procurement.order}: |
+    self.run_scheduler(cr, uid)
+-
+  I check the details of delivery order after confirmed quotation.
+-
+  !python {model: sale.order}: |
+    from datetime import datetime, timedelta
+    from dateutil.relativedelta import relativedelta
+    from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
+    sale_order = self.browse(cr, uid, ref("order"))
+    assert sale_order.picking_ids, "Delivery order is not created."
+    for picking in sale_order.picking_ids:
+      assert picking.state == "auto" or "confirmed", "Delivery order should be in 'Waitting Availability' state."
+      assert picking.origin == sale_order.name,"Origin of Delivery order is not correspond with sequence number of sale order."
+      assert picking.type == 'out',"Shipment should be Outgoing."
+      assert picking.move_type == sale_order.picking_policy,"Delivery Method is not corresponding with delivery method of sale order."
+      assert picking.address_id.id == sale_order.partner_shipping_id.id,"Shipping Address is not correspond with sale order."
+      assert picking.note == sale_order.note,"Note is not correspond with sale order."
+      assert picking.invoice_state == (sale_order.order_policy=='picking' and '2binvoiced') or 'none',"Invoice policy is not correspond with sale order."
+      assert len(picking.move_lines) == len(sale_order.order_line), "Total move of delivery order are not corresposning with total sale order lines."
+      location_id = sale_order.shop_id.warehouse_id.lot_stock_id.id
+      output_id = sale_order.shop_id.warehouse_id.lot_output_id.id
+      for move in picking.move_lines:
+         order_line = move.sale_line_id
+         date_planned = datetime.strptime(sale_order.date_order, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=order_line.delay or 0.0)
+         date_planned = (date_planned - timedelta(days=sale_order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+         assert datetime.strptime(move.date_expected, DEFAULT_SERVER_DATETIME_FORMAT) == datetime.strptime(date_planned, DEFAULT_SERVER_DATETIME_FORMAT), "Excepted Date is not correspond with Planned Date."
+         assert move.product_id.id == order_line.product_id.id,"Product is not correspond."
+         assert move.product_qty == order_line.product_uom_qty,"Product Quantity is not correspond."
+         assert move.product_uom.id == order_line.product_uom.id,"Product UOM is not correspond."
+         assert move.product_uos_qty == (order_line.product_uos and order_line.product_uos_qty) or order_line.product_uom_qty,"Product UOS Quantity is not correspond."
+         assert move.product_uos == (order_line.product_uos and order_line.product_uos.id) or order_line.product_uom.id,"Product UOS is not correspond"
+         assert move.product_packaging.id == order_line.product_packaging.id,"Product packaging is not correspond."
+         assert move.address_id.id == order_line.address_allotment_id.id or sale_order.partner_shipping_id.id,"Address is not correspond"
+         #assert move.location_id.id == location_id,"Source Location is not correspond."
+         #assert move.location_dest_id == output_id,"Destination Location is not correspond."
+         assert move.note == order_line.notes,"Note is not correspond"
+         assert move.price_unit == order_line.product_id.standard_price or 0.0,"Price Unit is not correspond"
+-
+  Now, I dispatch delivery order.
+-
+  !python {model: stock.partial.picking}: |
+    order = self.pool.get('sale.order').browse(cr, uid, ref("order"))
+    for pick in order.picking_ids:
+        data = pick.force_assign()
+        if data == True:
+          partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick.id]})
+          self.do_partial(cr, uid, [partial_id])
+-
+  I check sale order to verify shipment.
+-
+  !python {model: sale.order}: |
+    order = self.pool.get('sale.order').browse(cr, uid, ref("order"))
+    assert order.shipped == True, "Sale order is not Delivered."
+    assert order.picked_rate == 100, "Shipment progress is not 100%."
+    #assert order.state == 'progress', 'Order should be in inprogress.'
+    assert len(order.invoice_ids) == False, "Invoice should not created on dispatch delivery order."
+-
+  I create Invoice from Delivery Order.
 -
   !python {model: stock.invoice.onshipping}: |
-    import time
-    sale_obj=self.pool.get('sale.order')
-    sale_id=sale_obj.browse(cr, uid, ref("sale_order_so7"))
-    ids = [x.id for x in sale_id.picking_ids]
-    wiz_id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.sales_journal')},
-      {'active_ids': ids, 'active_model': 'stock.picking'})
-    self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids, "active_id": ids[0]})
+    sale = self.pool.get('sale.order')
+    sale_order = sale.browse(cr, uid, ref("order"))
+    ship_ids = [x.id for x in sale_order.picking_ids]
+    wiz_id = self.create(cr, uid, {'journal_id': ref('account.sales_journal')},
+      {'active_ids': ship_ids, 'active_model': 'stock.picking'})
+    self.create_invoice(cr, uid, [wiz_id], {"active_ids": ship_ids, "active_id": ship_ids[0]})
 -
-  I check that an invoice has been created.
+  I check the invoice details after dispatched delivery.
 -
   !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so7"))
-    assert(sale_id.invoice_ids), "Invoice has not been created"
+    order = self.browse(cr, uid, ref("order"))
+    assert order.invoice_ids, "Invoice is not created."
+    ac = order.partner_id.property_account_receivable.id
+    journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)], limit=1)
+    for invoice in order.invoice_ids:
+      assert invoice.type == 'out_invoice',"Invoice should be Customer Invoice."
+      assert invoice.account_id.id == ac,"Invoice account is not correspond."
+      assert invoice.reference == order.client_order_ref or order.name,"Reference is not correspond."
+      assert invoice.partner_id.id == order.partner_id.id,"Customer is not correspond."
+      assert invoice.address_invoice_id.id == order.partner_invoice_id.id,"Invoice Address is not correspond."
+      assert invoice.currency_id.id == order.pricelist_id.currency_id.id, "Currency is not correspond."
+      assert invoice.comment == order.note or '',"Note is not correspond."
+      assert invoice.journal_id.id == journal_ids[0],"Sales Journal is not link on Invoice."
+      assert invoice.payment_term.id == order.payment_term.id, "Payment term is not correspond."
+      for so_line in order.order_line:
+        inv_line = so_line.invoice_lines[0]
+        ac = so_line.product_id.product_tmpl_id.property_account_income.id or so_line.product_id.categ_id.property_account_income_categ.id
+        assert inv_line.product_id.id == so_line.product_id.id or False,"Product is not correspond"
+        assert inv_line.account_id.id == ac,"Account of Invoice line is not corresponding."
+        assert inv_line.uos_id.id == (so_line.product_uos and so_line.product_uos.id) or so_line.product_uom.id, "Product UOS is not correspond."
+        assert inv_line.price_unit == so_line.price_unit , "Price Unit is not correspond."
+        assert inv_line.quantity == (so_line.product_uos and so_line.product_uos_qty) or so_line.product_uom_qty , "Product qty is not correspond."
+        assert inv_line.price_subtotal == so_line.price_subtotal, "Price sub total is not correspond."
 -
-  I open the Invoice for the SO.
+  I open the Invoice.
 -
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
+  !python {model: sale.order}: |
     import netsvc
     wf_service = netsvc.LocalService("workflow")
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-        wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
--
-  Assign analytic journal into bank journal
--
-  !record {model: account.journal, id: sale.account_journal_bankjournal0}:
-    analytic_journal_id: account.cose_journal_sale
+    so = self.browse(cr, uid, ref("order"))
+    for invoice in so.invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_open', cr)
 -
   I pay the invoice
 -
   !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-    invoice_id = self.search(cr, uid, [('origin','like',so.name),('state','=','open')])
-    self.pay_and_reconcile(cr, uid, invoice_id,
-        255000.0, ref('account.cash'), ref('account.period_8'),
-        ref('sale.account_journal_bankjournal0'), ref('account.cash'),
-        ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
-        name='test')
+    sale_order = self.pool.get('sale.order')
+    order = sale_order.browse(cr, uid, ref("order"))
+    journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', order.company_id.id)], limit=1)
+    for invoice in order.invoice_ids:
+        invoice.pay_and_reconcile(
+            invoice.amount_total, ref('account.cash'), ref('account.period_8'),
+            journal_ids[0], ref('account.cash'),
+            ref('account.period_8'), journal_ids[0],
+            name='test')
 -
-  I verify the invoice is in paid state.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-        assert (invoice.state) =='paid', "Invoice for SO is not in done state."
--
-  I check that Paid has been set to true.
+  I check the order after paid invoice.
 -
   !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so7"))
-    assert(sale_id.invoiced == True), "Paid has not been set to true"
+    order = self.browse(cr, uid, ref("order"))
+    assert order.invoiced == True, "Sale order is not invoiced."
+    assert order.invoiced_rate == 100, "Invoiced progress is not 100%."
+    assert order.state == 'done', 'Order should be in closed.'
 -
-  I verify that a procurement has been generated for so
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
-    assert proc_ids, _('No Procurements!')
--
-  Then I click on the "Run Procurement" button
--
-  !python {model: procurement.order}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
-    for proc in proc_ids:
-      wf_service.trg_validate(uid, 'procurement.order',proc,'button_check', cr)
--
-  I verify that a procurement state is "running"
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        sale_order_obj = self.pool.get('sale.order')
-        so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-        proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')])
-        assert proc_ids, _('Procurement is not in the running state!')
--
-  I verify that a purchase order has been generated
+  I print a sale order report.
 -
   !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        so = self.browse(cr, uid, ref("sale_order_so7"))
-        pur_obj=self.pool.get('purchase.order')
-        pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)])
-        assert pur_id, _('Purchase order has not been generated')
--
-  I click on the "Confirm" button to confirm the purchase order
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj=self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so7"))
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        for pur in pur_ids:
-          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
--
-  I click on the "Approved by supplier" button to approve the purchase order
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so7"))
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        for pur in pur_ids:
-          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
--
-  I verify that a picking related to purchase order has been generated and I process it
--
-  !python {model: sale.order}: |
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so7"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
-        assert(po.picking_ids),"Picking for purchase order has not been generated"
-        picking, = po.picking_ids
-        stock_partial_picking = self.pool.get('stock.partial.picking')
-        partial_id = stock_partial_picking.create(cr, uid, {},
-                context={'active_model': 'stock.picking',
-                         'active_ids': [picking.id]})
-        stock_partial_picking.do_partial(cr, uid, [partial_id])
--
-  I verify that picking for purchase order has been done.
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so7"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
-        picking_obj = self.pool.get('stock.picking')
-        ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
-        assert ids, _('Picking is not in the done state!')
--
-  I verify that delivery order has been generated for sale order, and process it
--
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   assert (picking_id),"Delivery order has not been generated"
-   pick=self.browse(cr,uid,picking_id[0])
-   pick.force_assign(cr, uid)
-   stock_partial_picking = self.pool.get('stock.partial.picking')
-   partial_id = stock_partial_picking.create(cr, uid, {},
-           context={'active_model': 'stock.picking',
-                    'active_ids': [pick.id]})
-   stock_partial_picking.do_partial(cr, uid, [partial_id])
--
-  I verify that delivery state is done
--
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   if picking_id:
-     pick = self.browse(cr,uid,picking_id[0])
-     assert (pick.state) =='done', "Picking for SO is not in done state."
--
-  I verify that the sale order is marked as delivered
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so7"))
-    assert (so.shipped == True), "Picked has not been set to True"
--
-  I verify that a sale order is in done state
--
-   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so7"))
-    assert (so.state == 'done'), "Sale order is not in the done state."
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.sale.order').create(cr, uid, [ref('order')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'sale-sale_order.'+format), 'wb+').write(data)
 
diff --git a/addons/sale/test/postpaid_order_policy.yml b/addons/sale/test/postpaid_order_policy.yml
index a0d5a8e1928..eeea02e2305 100644
--- a/addons/sale/test/postpaid_order_policy.yml
+++ b/addons/sale/test/postpaid_order_policy.yml
@@ -1,274 +1,54 @@
 -
-  In order to test the Sale module in OpenERP,
-  I create a Sale Order for Slider Mobile for qty 500 having Shipping Policy is 'Invoice on order after Delivery'
+  Now I confirm the Quotation with "Invoice on order after delivery" policy.
 -
-  !record {model: sale.order, id: sale_order_so8}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: Test_SO008
-    order_line:
-      - name: Slider Mobile
-        price_unit: 200.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 500.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_slidermobile0
-        product_uos_qty: 500.0
-        type: make_to_order
-    order_policy: postpaid
-    partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
+  !workflow {model: sale.order, action: order_confirm, ref: order2}
 -
-  I confirm the Sale Order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so8}
--
-  I verify that the picking has been generated for the sale order
+  I check that related delivery order after confirmed.
 -
   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so8"))
-    assert so.picking_ids,"Picking has not been generated for sale_order_so8"
+    sale_order = self.browse(cr, uid, ref("order2"))
+    assert sale_order.picking_ids, "Delivery Order should be created."
+    assert len(sale_order.invoice_ids) == False, "Invoice should be not created."
 -
-  Then I done the picking
+  Now, I dispatch delivery order.
 -
-  !python {model: stock.picking }: |
-   import time
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      pick.force_assign(cr, uid)
-      stock_partial_picking = self.pool.get('stock.partial.picking')
-      partial_id = stock_partial_picking.create(cr, uid, {},
-              context={'active_model': 'stock.picking',
-                       'active_ids': [pick.id]})
-      stock_partial_picking.do_partial(cr, uid, [partial_id])
+  !python {model: stock.partial.picking}: |
+    order = self.pool.get('sale.order').browse(cr, uid, ref("order2"))
+    for pick in order.picking_ids:
+        data = pick.force_assign()
+        if data == True:
+          partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick.id]})
+          self.do_partial(cr, uid, [partial_id])
 -
-  I verify that picking order is in done state.
+  I open the invoice.
 -
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   if picking_id:
-     pick = self.browse(cr,uid,picking_id[0])
-     assert (pick.state == 'done'), "Picking for SO is not in done state."
--
-  I verify that delivery order has been generated for sale order
--
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   assert (picking_id),"Delivery order has not been generated"
--
-  I process the delivery order
--
-  !python {model: stock.picking }: |
-   import time
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      pick.force_assign(cr, uid)
-      stock_partial_picking = self.pool.get('stock.partial.picking')
-      partial_id = stock_partial_picking.create(cr, uid, {},
-              context={'active_model': 'stock.picking',
-                       'active_ids': [pick.id]})
-      stock_partial_picking.do_partial(cr, uid, [partial_id])
--
-  I verify that delivery order is marked done
--
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   if picking_id:
-     pick = self.browse(cr,uid,picking_id[0])
-     assert (pick.state) =='done', "Picking for SO is not in done state."
--
-  I verify that a procurement has been generated for so
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
-    assert proc_ids, _('No Procurements!')
--
-  Then I click on the "Run Procurement" button
--
-  !python {model: procurement.order}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+  !python {model: sale.order}: |
     import netsvc
     wf_service = netsvc.LocalService("workflow")
-    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
-    for proc in proc_ids:
-      wf_service.trg_validate(uid, 'procurement.order',proc,'button_check', cr)
+    order = self.browse(cr, uid, ref("order2"))
+    #assert order.invoice_ids, "Invoice should be created after dispatch delivery order."
+    for invoice in order.invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_open', cr)
 -
-  I verify that a procurement state is "running"
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        sale_order_obj = self.pool.get('sale.order')
-        so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-        proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')])
-        assert proc_ids, _('Procurement is not in the running state!')
--
-  I verify that a purchase order has been generated
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        so = self.browse(cr, uid, ref("sale_order_so8"))
-        pur_obj=self.pool.get('purchase.order')
-        pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)])
-        assert pur_id, _('Purchase order has not been generated')
--
-  I click on the "Confirm" button to confirm the purchase order
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj=self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so8"))
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        for pur in pur_ids:
-          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
--
-  I click on the "Approved by supplier" button to approve the purchase order
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so8"))
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        for pur in pur_ids:
-          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
--
-  I verify that a picking related to purchase order has been generated and I process it
--
-  !python {model: sale.order}: |
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so8"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
-        assert(po.picking_ids),"Picking for purchase order has not been generated"
-        picking, = po.picking_ids
-        stock_partial_picking = self.pool.get('stock.partial.picking')
-        partial_id = stock_partial_picking.create(cr, uid, {},
-                context={'active_model': 'stock.picking',
-                         'active_ids': [picking.id]})
-        stock_partial_picking.do_partial(cr, uid, [partial_id])
--
-  I verify that picking for purchase order has been marked done.
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so8"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
-        picking_obj = self.pool.get('stock.picking')
-        ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
-        assert ids, _('Picking is not in the done state!')
--
-  I verify that the sale order is marked as delivered
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so8"))
-    assert (so.shipped == True), "Picking is not done."
--
-  I verify that an invoice has been generated for SO
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so8"))
-    assert so.invoice_ids, "Invoice has not been generated"
--
-  I open the Invoice for the SO.
+  I pay the invoice.
 -
   !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+    sale_order = self.pool.get('sale.order')
+    order = sale_order.browse(cr, uid, ref("order2"))
+    journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', order.company_id.id)], limit=1)
+    for invoice in order.invoice_ids:
+        invoice.pay_and_reconcile(
+            invoice.amount_total, ref('account.cash'), ref('account.period_8'),
+            journal_ids[0], ref('account.cash'),
+            ref('account.period_8'), journal_ids[0],
+            name='test')
 -
-  Assign analytic journal into bank journal
--
-  !record {model: account.journal, id: sale.account_journal_bankjournal0}:
-    analytic_journal_id: account.cose_journal_sale
--
-  I pay the invoice
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    self.pay_and_reconcile(cr, uid, invoice_id,
-        100000.0, ref('account.cash'), ref('account.period_8'),
-        ref('sale.account_journal_bankjournal0'), ref('account.cash'),
-        ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
-        name='test')
--
-  I verify the invoice are in paid state or not.
--
-  !python {model: account.invoice}: |
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        sale_order_obj = self.pool.get('sale.order')
-        so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-        invoice_ids = so.invoice_ids
-        for invoice in invoice_ids:
-            assert (invoice.state) =='paid', "Invoice for SO is not in done state."
--
-  I verify that Paid has been set to true.
+  I check that an order has been invoiced, shipped and closed.
 -
   !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so8"))
-    assert(sale_id.invoiced == True), "Paid has not been set to true"
--
-  I verify that sale order is in done state
--
-   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so8"))
-    assert (so.state == 'done'), "Sale order is not in the done state."
+    order = self.browse(cr, uid, ref("order2"))
+    assert order.picked_rate == 100, "Shipment progress is not 100%."
+    #assert order.shipped, "Delivery Order should be dispatch." #TOFIX: procurement is gone in idle state so order never shipped, invoiced. after install mrp, it will be normal.
+    #assert order.invoiced == True, "Sale order is not invoiced."
+    #assert order.invoiced_rate == 100, "Invoiced progress is not 100%."
+    #assert order.state == 'done', 'Order should be in closed.'
diff --git a/addons/sale/test/prepaid_order_policy.yml b/addons/sale/test/prepaid_order_policy.yml
index d6f3da64a2c..4f45baa8823 100644
--- a/addons/sale/test/prepaid_order_policy.yml
+++ b/addons/sale/test/prepaid_order_policy.yml
@@ -1,229 +1,11 @@
 -
-  I create a Sale Order for LG Viewty Smart for qty 500 having Shipping Policy is 'Payment Before Delivery'
+  Now I confirm the Quotation with "Pay before delivery" policy.
 -
-  !record {model: sale.order, id: sale_order_so1}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: Test_SO001
-    order_line:
-      - name: Slider Mobile
-        price_unit: 200
-        product_uom: product.product_uom_unit
-        product_uom_qty: 500.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_slidermobile0
-        product_uos_qty: 500.0
-        th_weight: 0.0
-        type: make_to_order
-    order_policy: prepaid
-    partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
+  !workflow {model: sale.order, action: order_confirm, ref: order3}
 -
-  I confirm the sale order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so1}
--
-  I verify whether the invoice has been generated for SO since Shipping policy is 'Payment Before Delivery'
+  I check that delivery order should not created before invoice is paid.
 -
   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so1"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so1"
--
-  I verify there are no pickings attached to this sale order
--
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   assert not picking_id,"As the order policy is prepaid, the sale order shouldn't have already a picking."
--
-  I open the Invoice for the SO.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
--
-  I assign an analytic journal to the Bank journal
--
-  !record {model: account.journal, id: sale.account_journal_bankjournal0}:
-    analytic_journal_id: account.cose_journal_sale
--
-  I pay the invoice
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    self.pay_and_reconcile(cr, uid, invoice_id,
-        85000.0, ref('account.cash'), ref('account.period_8'),
-        ref('sale.account_journal_bankjournal0'), ref('account.cash'),
-        ref('account.period_5'), ref('sale.account_journal_bankjournal0'),
-        name='test002')
--
-  I verify the invoice is in done state or not.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
-    assert invoice_id, "Invoice for SO is not in done state."
--
-  I check that Paid has been set to true.
--
-  !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so1"))
-    assert(sale_id.invoiced == True), "Paid has not been set to true"
--
-  I verify the picking associated with the sale order sale_order_so1
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so1"))
-    assert so.picking_ids,"Picking has not been generated"
--
-  Products are delivered to the Cleartrail Customer.
--
-  !python {model: stock.picking }: |
-   import time
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   if picking_id:
-      pick=self.browse(cr,uid,picking_id[0])
-      pick.force_assign(cr, uid)
-      stock_partial_picking = self.pool.get('stock.partial.picking')
-      partial_id = stock_partial_picking.create(cr, uid, {},
-              context={'active_model': 'stock.picking',
-                       'active_ids': [pick.id]})
-      stock_partial_picking.do_partial(cr, uid, [partial_id])
--
-  I verify that picking order is in done state.
--
-  !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   pick = self.browse(cr,uid,picking_id[0])
-   assert (pick.state) =='done', "Picking for SO is not in done state."
--
-  I verify that a procurement has been generated for so
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
-    assert proc_ids, _('No Procurements!')
--
-  Then I click on the "Run Procurement" button
--
-  !python {model: procurement.order}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
-    for proc in proc_ids:
-      wf_service.trg_validate(uid, 'procurement.order',proc,'button_check', cr)
--
-  I verify that a procurement state is "running"
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if(mod_brw.state == 'installed'):
-        sale_order_obj = self.pool.get('sale.order')
-        so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-        proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')])
-        assert proc_ids, _('Procurement is not in the running state!')
--
-  I verify that a purchase order has been generated
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if(mod_brw.state == 'installed'):
-        so = self.browse(cr, uid, ref("sale_order_so1"))
-        pur_obj=self.pool.get('purchase.order')
-        pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)])
-        assert pur_id, _('Purchase order has not been generated')
--
-  I click on the "Confirm" button to confirm the purchase order
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if(mod_brw.state == 'installed'):
-        pur_obj=self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so1"))
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        for pur in pur_ids:
-          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr)
--
-  I click on the "Approved by supplier" button to approve the purchase order
--
-  !python {model: sale.order}: |
-    from tools.translate import _
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so1"))
-        import netsvc
-        wf_service = netsvc.LocalService("workflow")
-        pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        for pur in pur_ids:
-          wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr)
--
-  I verify that a picking related to purchase order has been generated and I process it
--
-  !python {model: sale.order}: |
-    modules = self.pool.get('ir.module.module')
-    mod_pur = modules.search(cr, uid, [('name','=','purchase')])
-    mod_brw = modules.browse(cr,uid,mod_pur)[0]
-    if (mod_brw.state == 'installed'):
-        pur_obj = self.pool.get('purchase.order')
-        so = self.browse(cr, uid, ref("sale_order_so1"))
-        pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
-        po = pur_obj.browse(cr, uid, pur_id)[0]
-        assert(po.picking_ids),"Picking for purchase order has not been generated"
-        picking, = po.picking_ids
-        stock_partial_picking = self.pool.get('stock.partial.picking')
-        partial_id = stock_partial_picking.create(cr, uid, {},
-                context={'active_model': 'stock.picking',
-                         'active_ids': [picking.id]})
-        stock_partial_picking.do_partial(cr, uid, [partial_id])
-        picking_obj = self.pool.get('stock.picking')
-        ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id),('state', '=', 'done')])
-        assert ids, 'Picking should be marked done!'
--
-  I verify that the sale order is marked as delivered
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so1"))
-    assert (so.shipped == True), "Sale order is not marked as delivered"
--
-  I verify that a sale order is in done state
--
-   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so1"))
-    assert (so.state == 'done'), "Sale order is not in the done state."
+    sale_order = self.browse(cr, uid, ref("order3"))
+    assert len(sale_order.picking_ids) == False, "Delivery order should not created before invoice."
+    assert sale_order.invoice_ids, "Invoice should be created."
diff --git a/addons/sale/test/sale_order_demo.yml b/addons/sale/test/sale_order_demo.yml
new file mode 100644
index 00000000000..0864b949690
--- /dev/null
+++ b/addons/sale/test/sale_order_demo.yml
@@ -0,0 +1,14 @@
+-
+  In order to test process of the Sale Order, I create sale order
+-
+  !record {model: sale.order, id: order}:
+    partner_id: base.res_partner_agrolait
+    note: Invoice after delivery
+    payment_term: account.account_payment_term
+-
+  !record {model: sale.order.line, id: line}:
+    product_id: product.product_product_mb1
+    price_unit: 190.50
+    product_uom_qty: 8
+
+
diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml
deleted file mode 100644
index 923860ebfd3..00000000000
--- a/addons/sale/test/sale_procurement.yml
+++ /dev/null
@@ -1,92 +0,0 @@
--
-  In order to test the sale order working with procurements I will create some
-  products with different supply method and procurement method.
--
-  I create one product Table as MTO.
--
-  !record {model: product.product, id: product_product_table0}:
-    categ_id: product.cat1
-    name: Table
-    procure_method: make_to_order
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  I create another product Wood as MTS.
--
-  !record {model: product.product, id: product_product_wood0}:
-    categ_id: product.cat1
-    name: Wood
-    procure_method: make_to_stock
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_kgm
-    uom_po_id: product.product_uom_kgm
--
-  I define Minimum stock rule for my stockable product Wood (qty between 10 and 15)
--
-  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
-    company_id: base.main_company
-    location_id: stock.stock_location_stock
-    logic: max
-    product_id: product_product_wood0
-    product_max_qty: 15.0
-    product_min_qty: 10.0
-    product_uom: product.product_uom_kgm
-    qty_multiple: 1
-    warehouse_id: stock.warehouse0
--
-  Now I make a sale order for table.
--
-  !record {model: sale.order, id: sale_order_so3}:
-    amount_total: 5.0
-    amount_untaxed: 5.0
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    order_line:
-      - company_id: base.main_company
-        delay: 7.0
-        name: Table
-        price_unit: 1.0
-        product_id: product_product_table0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 5.0
-        product_uos_qty: 5.0
-        state: draft
-        type: make_to_order
-    order_policy: manual
-    partner_id: base.res_partner_agrolait
-    partner_invoice_id: base.res_partner_address_8
-    partner_order_id: base.res_partner_address_8
-    partner_shipping_id: base.res_partner_address_8
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
--
-  I confirm the order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3}
--
-  I check that procurement is generated.
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    proc_ids = self.search(cr, uid, [('origin','=',so.name)])
-    assert proc_ids, _('No Procurements!')
--
-  I run the scheduler.
--
-  !function {model: procurement.order, name: run_scheduler}:
-    - model: procurement.order
-      search: "[('state','=','confirmed')]"
--
-  I check that the procurement for the product table is in exception state.
-  As my product's supply method is produce and the BoM is not defined.
--
-  !python {model: procurement.order}: |
-    from tools.translate import _
-    proc_ids = self.search(cr, uid, [('state','=','exception'),('product_id','=',ref('sale.product_product_table0'))])
-    assert not proc_ids, _('There is no procurement in exception state!')
diff --git a/addons/sale/test/sale_report.yml b/addons/sale/test/sale_report.yml
deleted file mode 100644
index 8b55c21ec23..00000000000
--- a/addons/sale/test/sale_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a sale order, we will print a sale order
--
-  !python {model: sale.order}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.sale.order').create(cr, uid, [ref('sale.order'),ref('sale.order2')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'sale-sale_order.'+format), 'wb+').write(data)
diff --git a/addons/sale/test/so_make_invoice.yml b/addons/sale/test/so_make_invoice.yml
deleted file mode 100644
index 727731b4745..00000000000
--- a/addons/sale/test/so_make_invoice.yml
+++ /dev/null
@@ -1,142 +0,0 @@
--
-  In order to test the 'Make Invoices' wizard of sale module in the Open-ERP,
-  I create two Sale order,group them and create invoice.
--
-  I create a Sale Order for Slider Mobile for qty 100 having order_policy manual.
--
-  !record {model: sale.order, id: sale_order_so3}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: Test_SO003
-    order_line:
-      - name: Slider Mobile
-        price_unit: 200.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 100.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_slidermobile0
-        product_uos_qty: 100.0
-        type: make_to_order
-    order_policy: manual
-    partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
--
-  I confirm the Sale Order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3}
--
-  I create a Sale Order for products Slider Mobile and LG Viewty Smart for qty 100 having order_policy manual.
--
-  !record {model: sale.order, id: sale_order_so4}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: Test_SO004
-    order_line:
-      - name: Slider Mobile
-        price_unit: 200.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 100.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_slidermobile0
-        product_uos_qty: 100.0
-        type: make_to_order
-      - name: LG Viewty Smart
-        price_unit: 170.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 100.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_lgviewtysmart0
-        product_uos_qty: 100.0
-        th_weight: 0.0
-        type: make_to_order
-    order_policy: manual
-    partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
--
-  I confirm the Sale Order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so4}
--
-  Then I click on the "Make Invoices" button
--
-  !record {model: sale.make.invoice, id: sale_make_invoice_1}:
-    grouped: 1
-    invoice_date: !eval time.strftime('%Y-%m-%d')
--
-  Then I click on the "Create Invoices" button of wizard
--
-  !python {model: sale.make.invoice}: |
-    self.make_invoices(cr, uid, [ref("sale_make_invoice_1")], {"lang": 'en_US', "search_default_user_id":
-      1, "tz": False, "active_model": 'sale.order', "active_ids": [ref("sale_order_so4"),ref("sale_order_so3")], "active_id":
-      ref("sale_order_so4")})
--
-  I verify that an invoice has been created
--
-  !python {model: account.invoice}: |
-    inv = self.search(cr, uid, [('origin','=','Test_SO004|Test_SO003|')])
-    assert inv, "Invoices has not been generated"
--
-  I verify that an account invoice line with origin 'Test_SO004' is created
--
-  !python {model: account.invoice.line}: |
-    sale_order_obj = self.pool.get('sale.order')
-    acc_inv_obj = self.pool.get('account.invoice')
-    inv = acc_inv_obj.search(cr, uid, [('origin','=','Test_SO004|Test_SO003|')])
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so4"))
-    inv_line = self.search(cr, uid, [('origin','=',so.name),('name','=','Slider Mobile'),('invoice_id','=',inv)])
-    assert inv_line, "Account invoice line has not been created"
--
-  I verify that an account invoice line with origin 'Test_SO003' is created
--
-  !python {model: account.invoice.line}: |
-    sale_order_obj = self.pool.get('sale.order')
-    acc_inv_obj = self.pool.get('account.invoice')
-    inv = acc_inv_obj.search(cr, uid, [('origin','=','Test_SO004|Test_SO003|')])
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    inv_line = self.search(cr, uid, [('origin','=',so.name),('name','=','Slider Mobile'),('invoice_id','=',inv)])
-    assert inv_line, "Account invoice line has not been created"
--
-  I open the Invoice for the SO.
--
-  !python {model: account.invoice}: |
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    inv = self.search(cr, uid, [('origin','=','Test_SO004|Test_SO003|')])
-    for id in inv:
-        wf_service.trg_validate(uid, 'account.invoice',id,'invoice_open', cr)
--
-  I assign an analytic journal to the bank journal
--
-  !record {model: account.journal, id: sale.account_journal_bankjournal0}:
-    analytic_journal_id: account.cose_journal_sale
--
-  I pay the invoice
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    self.pay_and_reconcile(cr, uid, invoice_id,
-        40000.0, ref('account.cash'), ref('account.period_5'),
-        ref('sale.account_journal_bankjournal0'), ref('account.cash'),
-        ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
-        name='tst')
--
-  I verify the invoice is in Paid state
--
-  !python {model: account.invoice}: |
-    invoice_id = self.search(cr, uid, [('origin','=','Test_SO004|Test_SO003|'),('state','=','paid')])
-    assert invoice_id, "Invoice for SO is not in done state."
diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml
deleted file mode 100644
index 14d405b0083..00000000000
--- a/addons/sale/test/so_make_line_invoice.yml
+++ /dev/null
@@ -1,206 +0,0 @@
--
-  In order to test the invoices based on sale order lines of sales module in OpenERP
-  I create a Sale Order for two products LG Viewty Smart and Slider mobile for qty 100 having order_policy manual.
--
-  !record {model: sale.order, id: sale_order_so3}:
-    date_order: !eval time.strftime('%Y-%m-%d')
-    invoice_quantity: order
-    name: Test_SO003
-    order_line:
-      - name: Slider Mobile
-        sequence: 1
-        price_unit: 200.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 100.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_slidermobile0
-        product_uos_qty: 100.0
-        type: make_to_order
-      - name: LG Viewty Smart
-        price_unit: 170.0
-        sequence: 2
-        product_uom: product.product_uom_unit
-        product_uom_qty: 100.0
-        state: draft
-        delay: 7.0
-        product_id: sale.product_product_lgviewtysmart0
-        product_uos_qty: 100.0
-        th_weight: 0.0
-        type: make_to_order
-    order_policy: manual
-    partner_id: sale.res_partner_cleartrail0
-    partner_invoice_id: sale.res_partner_address_2
-    partner_order_id: sale.res_partner_address_1
-    partner_shipping_id: sale.res_partner_address_3
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
--
-  I confirm the Sale Order.
--
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3}
--
-  I click on the "Make Invoice" button of sale order line
--
-  !record {model: sale.order.line.make.invoice, id: sale_order_line_make_invoice_0}:
-    {}
--
-  I click on the "Create Invoice" button of wizard
--
-  !python {model: sale.order.line.make.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    sol = so.order_line[0]
-    self.make_invoices(cr, uid, [ref("sale_order_line_make_invoice_0")], {"lang": "en_US",
-      "tz": False, "active_model": "sale.order.line", "active_ids": [sol.id],
-      "search_default_uninvoiced": 1, "active_id": sol.id,
-      })
--
-  I verify that "Invoiced" has been set to True.
--
-  !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so3"))
-    sol = sale_id.order_line[0]
-    assert(sol.invoiced == True), "Invoiced has not been set to true"
--
-  I verify that an invoice for sale order line has been created.
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so3"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so3"
--
-  I click on the Create button of invoice
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
--
-  I verify that an invoice state has transit from draft to open state
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    assert invoice_id, "Invoice is not in the open state"
--
-  I assign an analytic journal to the bank journal
--
-  !record {model: account.journal, id: sale.account_journal_bankjournal0}:
-    analytic_journal_id: account.cose_journal_sale
--
-  I pay the invoice
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    self.pay_and_reconcile(cr, uid, invoice_id,
-        20000.0, ref('account.cash'), ref('account.period_8'),
-        ref('sale.account_journal_bankjournal0'), ref('account.cash'),
-        ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
-        name='test')
--
-  I verify that an invoice is in done state.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
-    assert invoice_id, "Invoice for SO is not in done state."
--
-  I verify that Paid has been set to true.
--
-  !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so3"))
-    assert(sale_id.invoiced == True), "Paid has not been set to true"
--
-  I create an invoice for another sale order line. I click on the "Make Invoice" button of sale order line
--
-  !record {model: sale.order.line.make.invoice, id: sale_order_line_make_invoice_1}:
-    {}
--
-  I click on the "Create Invoice" button of wizard
--
-  !python {model: sale.order.line.make.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    sol = so.order_line[1]
-    self.make_invoices(cr, uid, [ref("sale_order_line_make_invoice_1")], {"lang": "en_US",
-      "tz": False, "active_model": "sale.order.line", "active_ids": [sol.id],
-      "search_default_uninvoiced": 1, "active_id": sol.id,
-      })
--
-  I verify that invoice for sale order line has been created.
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so3"))
-    assert so.invoice_ids[1], "Invoices has not been generated for sale_order_so3"
--
-  I verify that "Invoiced" has been set to True.
--
-  !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so3"))
-    sol = sale_id.order_line[1]
-    assert(sol.invoiced == True), "Invoiced has not been set to true"
--
-  I verify that "Paid" has been set to False.
--
-  !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so3"))
-    assert(sale_id.invoiced == False), "Paid has not been set to true"
--
-  I open the Invoice for the SO.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    invoice_ids = so.invoice_ids
-    for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
--
-  I verify that an invoice state has transit from draft to open state
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    assert invoice_id, "Invoice is not in the open state"
--
-  Assign analytic journal into bank journal
--
-  !record {model: account.journal, id: sale.account_journal_bankjournal0}:
-    analytic_journal_id: account.cose_journal_sale
--
-  I pay the invoice
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
-    self.pay_and_reconcile(cr, uid, invoice_id,
-        17000.0, ref('account.cash'), ref('account.period_8'),
-        ref('sale.account_journal_bankjournal0'), ref('account.cash'),
-        ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
-        name='test')
--
-  I verify the invoice is in done state.
--
-  !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
-    invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
-    assert invoice_id, "Invoice for SO is not in done state."
--
-  I verify that Paid has been set to true.
--
-  !python {model: sale.order}: |
-    sale_id=self.browse(cr, uid, ref("sale_order_so3"))
-    assert(sale_id.invoiced == True), "Paid has not been set to true"
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 2fa7488a669..45347a5e131 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -39,7 +39,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
              @return: A dictionary which of fields with values.
 
         """
-
+        if context is None: context = {}
         res = False
         invoices = {}
 
diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index 453a51fc724..5401ad42967 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Sales Analytic Distribution',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Sales Management',
     'description': """
 The base module to manage analytic distribution and sales orders.
 =================================================================
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index c3f4365bfee..c0b8ae09b5f 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Opportunity to Quotation',
     'version': '1.0',
-    'category': 'Hidden/Link',
+    'category': 'Hidden/Links',
     'complexity': "easy",
     'description': """
 This module adds a shortcut on one or several opportunity cases in the CRM.
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index 9d383a4ac28..b34e8880a10 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -9,22 +9,8 @@
             <field name="arch" type="xml">
             <xpath expr="/form/board/column/action[@string='My Quotations']" position="before">
                 <action name="%(crm.act_my_oppor)d"
-                     string="My Open Opportunities"
+                     string="My Opportunities"
                      />
-                     <!--groups="base.group_sale_salesman,base.group_sale_manager"-->
-            </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="board_crm_form_inherit_replace2">
-            <field name="name">board.crm.form.inherit.replace1</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="sale.board_sales_form"/>
-            <field name="arch" type="xml">
-            <xpath expr="/form/board/column/action[@string='My Quotations']" position="after">
-                <action name="%(crm.act_my_meetings)d"
-                     string="My Meetings"/>
             </xpath>
             </field>
         </record>
@@ -39,7 +25,6 @@
                 <action name="%(crm.act_my_oppor_stage)d"
                      string="My Planned Revenues by Stage"
                      />
-                     <!--groups="base.group_sale_salesman,base.group_sale_manager"-->
             </xpath>
             </field>
         </record>
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index 9ad402a8321..8b12b395e48 100644
--- a/addons/sale_crm/i18n/hr.po
+++ b/addons/sale_crm/i18n/hr.po
@@ -7,48 +7,48 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-08-03 06:21+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 07:09+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:04+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
 msgid "Customer"
-msgstr "Stranka"
+msgstr "Kupac"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr ""
+msgstr "Pretvori u ponudu"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "Prilika '%s' je pretvorena u ponudu."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Nedovoljno podataka!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Customer has no addresses defined!"
-msgstr ""
+msgstr "Kupac nema definiranu adresu"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sales"
-msgstr ""
+msgstr "Napravi prodaju"
 
 #. module: sale_crm
 #: model:ir.module.module,description:sale_crm.module_meta_information
@@ -66,81 +66,93 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul pruža prečicu na jednu ili više prilika u CRM-u.\n"
+"Prečica omogućava generiranje prodajnih naloga na osnovi izabranog slučaja.\n"
+"Ako si izabrani različiti slučajevi (lista), generira jedan prodajni nalog "
+"po \n"
+"slučaju.\n"
+"Slučaj je tada zatvoren i povezan sa generiranim prodajnim nalogom.\n"
+"\n"
+"Sugeriramo instalaciju ovo modula ako ste instalirali i prodajni i CRM "
+"modul.\n"
+"    "
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "_Create"
-msgstr ""
+msgstr "_Kreiraj"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Oznaka naloga mora biti jedinstvena"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sale order."
 msgstr ""
+"Označi ovo da bi se prilika zatvorila nakon kreiranja prodajnog naloga."
 
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Convert to Quote"
-msgstr "Pretvori u Ponudu"
+msgstr "Pretvori u ponudu"
 
 #. module: sale_crm
 #: view:account.invoice.report:0
 #: view:board.board:0
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Mjesečni obrtaj"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Converted to Sales Quotation(id: %s)."
-msgstr ""
+msgstr "Pretvoreno u prodajnu ponudu (id: %s)."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Opportunity: %s"
-msgstr ""
+msgstr "Prilika: %s"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "Kreira prodajnu ponudu iz prilike"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr ""
+msgstr "Ponude"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
 msgid "Shop"
-msgstr "Shop"
+msgstr "Trgovina"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Prilike po fazama"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
-msgstr ""
+msgstr "Moje ponude"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr ""
+msgstr "Zatvori priliku"
 
 #. module: sale_crm
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Prodajni tim"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -155,7 +167,7 @@ msgstr "Otkaži"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Prodajni nalog"
 
 #~ msgid "Opportunity Analytic"
 #~ msgstr "Analitika prilike"
diff --git a/addons/sale_crm/security/ir.model.access.csv b/addons/sale_crm/security/ir.model.access.csv
index a1bd4896f5f..75317a244ad 100644
--- a/addons/sale_crm/security/ir.model.access.csv
+++ b/addons/sale_crm/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_invoice_report_salesman","account.invoice.report salesman","account.model_account_invoice_report","base.group_sale_salesman",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+
diff --git a/addons/sale_crm/test/sale_crm.yml b/addons/sale_crm/test/sale_crm.yml
index cc75b9e415c..e85cf2cb7ba 100644
--- a/addons/sale_crm/test/sale_crm.yml
+++ b/addons/sale_crm/test/sale_crm.yml
@@ -1,42 +1,17 @@
--
-  In order to test the sale_crm module in the Open-ERP,
-  I create an opportunity and create a sale order through 'Convert to Sale' wizard .
--
-  I create an opportunity
--
-  !record {model: crm.lead, id: crm_lead_opportunity0}:
-    country_id: base.be
-    name: Opportunity-1
-    planned_revenue: 50000.0
-    probability: 70.0
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
-    planned_revenue: 0.0
-    probability: 0.0
-    section_id: crm.section_sales_department
-    type: opportunity
-    categ_id: crm.categ_oppor1
--
-  Then I click on the 'Convert to Sale' wizard
--
-  I place a sale order for product keyboard having quantity 50
 -
   !record {model: crm.make.sale, id: crm_make_sale_0}:
     partner_id: base.res_partner_4
-    shop_id: sale.shop
 -
-  Then I click on the 'Ok' button of wizard
+  I convert opportunity into "Quotation".
 -
   !python {model: crm.make.sale}: |
-    crm_obj = self.pool.get('crm.lead')
-    crm = crm_obj.browse(cr, uid, ref("crm_lead_opportunity0"))
-    self.makeOrder(cr, uid, [ref("crm_make_sale_0")], {"lang": "en_US", "tz": False,
-      "active_model": "crm.lead", "section_id": "crm.section_sales_department", "default_type": "opportunity",
-      "search_default_user_id": 1, "search_default_current": 1, "active_ids": [crm.id],
+    crm_lead = self.pool.get('crm.lead')
+    crm = crm_lead.browse(cr, uid, ref("crm.crm_case_construstazunits0"))
+    self.makeOrder(cr, uid, [ref("crm_make_sale_0")], {"active_ids": [crm.id],
       "active_id": crm.id})
 -
-  I verify that a sale order has been generated from an opportunity
+  I check that reference number of "Quotation" in opportunity.
 -
   !python {model: crm.lead}: |
-    crm = self.browse(cr, uid, ref("crm_lead_opportunity0"))
-    assert (crm.ref),("sale order has not been created")
+    crm = self.browse(cr, uid, ref("crm.crm_case_construstazunits0"))
+    assert crm.ref, "Quotation has not been created."
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 1cd2eef2d77..cb54b039222 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -23,7 +23,7 @@
     'name': 'Invoicing Journals',
     'version': '1.0',
     'category': 'Sales Management',
-    'complexity': "easy",
+    'complexity': "normal",
     'description': """
 The sales journal modules allows you to categorise your sales and deliveries (picking lists) between different journals.
 ========================================================================================================================
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index cca79e1562a..53083681d93 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-08-03 06:04+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 07:53+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: sale_journal
@@ -25,22 +25,22 @@ msgstr "Bilješka"
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and picking."
-msgstr ""
+msgstr "Vrsta temeljnice korištene za prodaju i prijenos"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Oznaka naloga mora biti jedinstvena"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Prodaje i Kupnje"
+msgstr "Prodaja i nabava"
 
 #. module: sale_journal
 #: help:sale_journal.invoice.type,active:0
@@ -48,6 +48,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the invoice "
 "type without removing it."
 msgstr ""
+"Ako je aktivno polje postavljeno na NE, možete sakriti vrstu računa bez da "
+"ga uklonite."
 
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
@@ -57,7 +59,7 @@ msgstr "Bilješke"
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
-msgstr "Način Izrade Računa"
+msgstr "Način izrade računa"
 
 #. module: sale_journal
 #: model:ir.module.module,description:sale_journal.module_meta_information
@@ -86,11 +88,35 @@ msgid ""
 "    Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"    Modul temeljnice u prodaji omogućuje vam kategorizaciju\n"
+"     prodaje i dostava (lista prijenosa) između različitih temeljnica.\n"
+"     Ovaj modul je od pomoći većim organizacijama koje rade po \n"
+"     odjelima.    \n"
+"\n"
+"    Temeljnicu možete koristiti za različite namjene, npr.:\n"
+"    * za izoliranje prodaje različitih odjela\n"
+"    * temljnice za dostavu kamionom ili poštom\n"
+"\n"
+"    Temeljnice imaju odgovornu osobu i različite statuse:\n"
+"    * nacrt, otvoreno, otkazano, završeno.\n"
+"\n"
+"    Grupne operacije se mogu odvijati na različitim temeljnicama\n"
+"    kako bi potvrdili sve prodaje odjednom, potvrdili ili fakturirali "
+"otpremu, ....\n"
+"\n"
+"    Također podržava skupno fakturiranje koje se može konfigurirati po \n"
+"    partnerima ili prodajnim nalozima, npr.:\n"
+"    * dnevno fakturiranje,\n"
+"    * mjesečno fakturiranje, ...\n"
+"\n"
+"    Postoje i neke statistike po temeljnicama.\n"
+"    "
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Non grouped"
-msgstr "Nije grupirano"
+msgstr ""
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
@@ -100,7 +126,7 @@ msgstr "Grupirano"
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivne pridružene članove."
 
 #. module: sale_journal
 #: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
@@ -109,16 +135,19 @@ msgid ""
 "can create a specific invoicing journal to group your invoicing according to "
 "your customer's needs: daily, each Wednesday, monthly, etc."
 msgstr ""
+"Vrste računa koriste se za partnere, prodajne naloge i dostavnice. Možete "
+"kreirati posebnu temeljnicu za fakturiranje kako bi grupirali fakturiranje "
+"sukladno potrebama kupca: dnevno, svake srijede, mjesečno, itd."
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
 msgid "Invoicing method"
-msgstr "Način Izrade Računa"
+msgstr "Način fakturiranja"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Prodajni nalog"
 
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
@@ -126,7 +155,7 @@ msgstr ""
 #: field:sale_journal.invoice.type,name:0
 #: field:stock.picking,invoice_type_id:0
 msgid "Invoice Type"
-msgstr "Tip Računa"
+msgstr "Vrsta računa"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
@@ -136,14 +165,14 @@ msgstr "Aktivan"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
 msgid "Invoice Types"
-msgstr "Tipovi Računa"
+msgstr "Vrste računa"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking
@@ -153,7 +182,7 @@ msgstr ""
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr "Upravljanje prodajom i narudžbama prema Pregledu"
+msgstr "Upravljanje prodajom i dostavama po temeljnicama"
 
 #~ msgid "Assigned packing"
 #~ msgstr "Dodijeljeno pakiranje"
diff --git a/addons/sale_journal/i18n/pt.po b/addons/sale_journal/i18n/pt.po
index e4d7ef6f137..afa57440ceb 100644
--- a/addons/sale_journal/i18n/pt.po
+++ b/addons/sale_journal/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-04 09:20+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-10 12:02+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -24,7 +24,7 @@ msgstr "Nota"
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and picking."
-msgstr ""
+msgstr "O tipo de diário usado nas vendas e remessas"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv
index bc1a3b003c3..377e78b8c37 100644
--- a/addons/sale_journal/security/ir.model.access.csv
+++ b/addons/sale_journal/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_journal_invoice_type_finance_invoice","sale_journal.invoice.type invoice","model_sale_journal_invoice_type","account.group_account_invoice",1,1,1,1
-"access_sale_journal_invoice_type_partner_manager","sale_journal.invoice.type partner manager","model_sale_journal_invoice_type","base.group_partner_manager",1,0,0,0
-"access_sale_journal_invoice_type_salesman","sale_journal.invoice.type salesman","model_sale_journal_invoice_type","base.group_sale_salesman",1,0,0,0
-"access_sale_journal_invoice_type_manager","sale_journal.invoice.type.manager","model_sale_journal_invoice_type","base.group_sale_manager",1,1,1,1
-"access_sale_journal_invoice_type_stock_worker","sale_journal.invoice_type stock worker","model_sale_journal_invoice_type","stock.group_stock_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sale_journal_invoice_type_finance_invoice,sale_journal.invoice.type invoice,model_sale_journal_invoice_type,account.group_account_invoice,1,1,1,1
+access_sale_journal_invoice_type_partner_manager,sale_journal.invoice.type partner manager,model_sale_journal_invoice_type,base.group_partner_manager,1,0,0,0
+access_sale_journal_invoice_type_salesman,sale_journal.invoice.type salesman,model_sale_journal_invoice_type,base.group_sale_salesman,1,0,0,0
+access_sale_journal_invoice_type_manager,sale_journal.invoice.type.manager,model_sale_journal_invoice_type,base.group_sale_manager,1,1,1,1
+access_sale_journal_invoice_type_stock_worker,sale_journal.invoice_type stock worker,model_sale_journal_invoice_type,stock.group_stock_user,1,0,0,0
diff --git a/addons/sale_layout/i18n/hr.po b/addons/sale_layout/i18n/hr.po
new file mode 100644
index 00000000000..e88466c8651
--- /dev/null
+++ b/addons/sale_layout/i18n/hr.po
@@ -0,0 +1,302 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-10 08:37+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Međuzbroj"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+"    This module provides features to improve the layout of the Sales Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of a sales order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Ovaj modul omogućuje značajke za poboljšanje naloga u prodaji   \n"
+" \n"
+"    Omogućavam vam: \n"
+"    It gives you the possibility to\n"
+"        * uređivanje svih redaka prodajnog naloga\n"
+"        * dodavanje naslova, komentara i međuzbrojeva\n"
+"        * crtanje hrozontalinih linija i umetanje prijeloma stranica\n"
+"\n"
+"    "
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Naziv"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Popust (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Bilješka"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Jedinična cijena"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Stavke naloga"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Popust (%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Vrsta rasporeda"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Seq."
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "JM"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Artikl"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Referenca naloga mora biti jedinstvena"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Naš prodavač"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Automatska deklaracija"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Stavke računa"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Ponuda broj"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "PDV"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Napravi račun"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Značajke"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Adresa fakture :"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "Sale Order Layout"
+msgstr "Raspored naloga u prodaji"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Prijelom stranice"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Datum narudžbe"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Adresa otpreme"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Ukupno :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Uvjeti plaćanja"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Povijest"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Stavke prodajnog naloga"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Linija za razdvajanje"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Vaša oznaka"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Datum ponude"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Statusi"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Stavke prodajnog naloga"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Nalog s rasporedom"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Dodatne informacije"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Porezi :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Stavka naloga"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Cijena"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Stavka prodajnog naloga"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Skladišni prijenosi"
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 27b8e4b4f96..78f98d3002f 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -9,7 +9,7 @@
             <field name="name">sale.order.form.inherit_1</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
-                        <field name="priority">30</field>
+            <field name="priority">1000</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='order_line']" position="replace">
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index c7eae6daea2..62f436680fd 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 
 {
-    "name":"Margins in Sales Orders",
+    "name": "Margins in Sales Orders",
     "version":"1.0",
     "category" : "Sales Management",
     "description": """
diff --git a/addons/sale_margin/i18n/hr.po b/addons/sale_margin/i18n/hr.po
new file mode 100644
index 00000000000..45468a03ef3
--- /dev/null
+++ b/addons/sale_margin/i18n/hr.po
@@ -0,0 +1,415 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-10 07:37+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Category"
+msgstr "Kategorija"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr "Odobrenje kupcu"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Invoice"
+msgstr "Izlazni račun"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "February"
+msgstr "veljača"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Current"
+msgstr "Trenutno"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: sale_margin
+#: field:report.account.invoice,state:0
+#: field:report.account.invoice.category,state:0
+#: field:report.account.invoice.partner,state:0
+#: field:report.account.invoice.partner.product,state:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: sale_margin
+#: model:ir.module.module,description:sale_margin.module_meta_information
+msgid ""
+" \n"
+"    This module adds the 'Margin' on sales order,\n"
+"    which gives the profitability by calculating the difference between the "
+"Unit Price and Cost Price\n"
+"    "
+msgstr ""
+" \n"
+"    Ovaj modul dodaje RUC na prodajni nalog\n"
+"     koji  prikazuje profitabilnost računajući razliku između jedinične "
+"cijene i troška.\n"
+"    "
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Plaćeno"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr ""
+"Daje profitabilnost računajući razliku između jedinične cijene  jediničnog "
+"troška."
+
+#. module: sale_margin
+#: field:report.account.invoice,type:0
+#: field:report.account.invoice.category,type:0
+#: field:report.account.invoice.partner,type:0
+#: field:report.account.invoice.partner.product,type:0
+#: field:report.account.invoice.product,type:0
+#: wizard_field:stock.invoice_onshipping,init,type:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "Invoice Statistics"
+msgstr "Statistika računa"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Artikl"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Referenca naloga mora biti jedinstvena"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoice by Partner"
+msgstr "Računi po partneru"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "August"
+msgstr "kolovoz"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "May"
+msgstr "svibanj"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "June"
+msgstr "lipanj"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Date Invoiced"
+msgstr "Datum fakturiranja"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sales Order"
+msgstr "RUC u prodajnim nalozima"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Search Margin"
+msgstr "Traži RUC"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Ove godine"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "July"
+msgstr "srpanj"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Extended Filters..."
+msgstr "Prošireni filtri..."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Ovaj mjesec"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,day:0
+msgid "Day"
+msgstr "Dan"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "Kategorije"
+
+#. module: sale_margin
+#: field:account.invoice.line,cost_price:0
+#: field:report.account.invoice,cost_price:0
+#: field:report.account.invoice.category,cost_price:0
+#: field:report.account.invoice.partner,cost_price:0
+#: field:report.account.invoice.partner.product,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Cijena koštanja"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "October"
+msgstr "listopad"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "January"
+msgstr "siječanj"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
+msgstr "Godina"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "September"
+msgstr "rujan"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "April"
+msgstr "travanj"
+
+#. module: sale_margin
+#: field:report.account.invoice,amount:0
+#: field:report.account.invoice.category,amount:0
+#: field:report.account.invoice.partner,amount:0
+#: field:report.account.invoice.partner.product,amount:0
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Refund"
+msgstr "Odobrenje dobavljača"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "March"
+msgstr "ožujak"
+
+#. module: sale_margin
+#: field:report.account.invoice,margin:0
+#: field:report.account.invoice.category,margin:0
+#: field:report.account.invoice.partner,margin:0
+#: field:report.account.invoice.partner.product,margin:0
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "RUC"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "November"
+msgstr "studeni"
+
+#. module: sale_margin
+#: field:report.account.invoice,quantity:0
+#: field:report.account.invoice.category,quantity:0
+#: field:report.account.invoice.partner,quantity:0
+#: field:report.account.invoice.partner.product,quantity:0
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "Računi po artiklu"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr "Ulazni račun"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
+#: view:report.account.invoice:0
+#: view:stock.picking:0
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "December"
+msgstr "prosinac"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Stavka računa"
+
+#. module: sale_margin
+#: field:report.account.invoice,name:0
+#: field:report.account.invoice.category,name:0
+#: field:report.account.invoice.partner,name:0
+#: field:report.account.invoice.partner.product,name:0
+#: field:report.account.invoice.product,name:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Poništeno"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+"Ovaj izvještaj vam daje pregled svih računa napravljenih u sustavu. Možete "
+"sortirati i grupirati rezultate prema\r\n"
+"specifičnim kriterijima kako bi brzo pronašli ono što tražite."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr "Izvještaj računa"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Done"
+msgstr "Izvršeno"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Customer Invoices"
+msgstr "Izlazni računi"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Otvoren"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
+msgid "Invoice Analysis"
+msgstr "Analiza računa"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Stavka prodajnog naloga"
diff --git a/addons/sale_margin/security/ir.model.access.csv b/addons/sale_margin/security/ir.model.access.csv
index 0343f29f43a..4a08a4aa60d 100644
--- a/addons/sale_margin/security/ir.model.access.csv
+++ b/addons/sale_margin/security/ir.model.access.csv
@@ -1 +1 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 7d4443a3cce..e3372690e6d 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Sales and MRP Management',
     'version': '1.0',
-    'category': 'Hidden/Link',
+    'category': 'Hidden/Links',
     'complexity': "easy",
     'description': """
 This module provides facility to the user to install mrp and sales modulesat a time.
@@ -39,7 +39,6 @@ It adds sales name and sales Reference on production order.
     'depends': ['mrp', 'sale'],
     'init_xml': [],
     'update_xml': [
-        'security/sale_mrp_security.xml',
         'security/ir.model.access.csv',
         'sale_mrp_view.xml',
     ],
diff --git a/addons/sale_mrp/i18n/hr.po b/addons/sale_mrp/i18n/hr.po
new file mode 100644
index 00000000000..a48201c1c49
--- /dev/null
+++ b/addons/sale_mrp/i18n/hr.po
@@ -0,0 +1,72 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-10 07:22+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr "Označi kupčevu referencu iz prodajnog naloga"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr "Prodajna referenca"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Nalog za proizvodnju"
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid ""
+"\n"
+"    This module provides facility to the user to install mrp and sales "
+"modules\n"
+"    at a time. It is basically used when we want to keep track of "
+"production\n"
+"    orders generated from sales order.\n"
+"    It adds sales name and sales Reference on production order\n"
+"    "
+msgstr ""
+"\n"
+"    Ovaj  modulomogućava korisniku instalaciju MRP i prodajnog modula.\n"
+"     Koristi se kad želimo pratiti radne naloge u proizvodnji nastale iz \n"
+"     prodajnih naloga.     \n"
+"     Dodaje naziv prodaje i prodajnu referencu na nalog za proizvodnju.\n"
+"    "
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr "Naziv prodaje"
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr "Upravljanje prodajom i MRP"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "Količina na nalogu ne smije biti negativna ili nula!"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr "Navedi ime prodajnog naloga"
diff --git a/addons/sale_mrp/i18n/pt.po b/addons/sale_mrp/i18n/pt.po
index dcfd11c49e8..e863ce80491 100644
--- a/addons/sale_mrp/i18n/pt.po
+++ b/addons/sale_mrp/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-03 07:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-10 12:06+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:44+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-11 05:36+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -44,6 +44,11 @@ msgid ""
 "    It adds sales name and sales Reference on production order\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo serve para manter o controle das ordens de\n"
+"    produção geradas a partir de ordens de venda.\n"
+"    Regista o nome e referência da venda na ordem de produção.\n"
+"    "
 
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
@@ -53,7 +58,7 @@ msgstr "Nome da Venda"
 #. module: sale_mrp
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
 msgid "Sales and MRP Management"
-msgstr ""
+msgstr "Gestão de vendas e fabrico"
 
 #. module: sale_mrp
 #: constraint:mrp.production:0
diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv
index a504c9a9e5a..a0f117b61e5 100644
--- a/addons/sale_mrp/security/ir.model.access.csv
+++ b/addons/sale_mrp/security/ir.model.access.csv
@@ -1,5 +1,4 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_bom_user","mrp.bom","mrp.model_mrp_bom","base.group_sale_salesman",1,0,0,0
-"access_mrp_bom_manager","mrp.bom","mrp.model_mrp_bom","base.group_sale_manager",1,0,0,0
-"access_sale_order_manufacturing_user","sale.order manufacturing.user","sale.model_sale_order","mrp.group_mrp_user",1,1,0,0
-"access_sale_order_line_manufacturing_user","sale.order.line manufacturing.user","sale.model_sale_order_line","mrp.group_mrp_user",1,1,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,base.group_sale_salesman,1,0,0,0
+access_sale_order_manufacturing_user,sale.order manufacturing.user,sale.model_sale_order,mrp.group_mrp_user,1,1,0,0
+access_sale_order_line_manufacturing_user,sale.order.line manufacturing.user,sale.model_sale_order_line,mrp.group_mrp_user,1,1,0,0
diff --git a/addons/sale_mrp/security/sale_mrp_security.xml b/addons/sale_mrp/security/sale_mrp_security.xml
deleted file mode 100644
index c0139329d1e..00000000000
--- a/addons/sale_mrp/security/sale_mrp_security.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-	<record id="base.group_sale_manager" model="res.groups">
-	        <field name="name">Sales / Manager</field>
-	    </record>
-    
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index f88a2777a00..72aa496b6bc 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Full Dates on Sales Order',
+    'name': 'Dates on Sales Order',
     'version': '1.0',
     'category': 'Sales Management',
     'complexity': "easy",
diff --git a/addons/sale_order_dates/i18n/hr.po b/addons/sale_order_dates/i18n/hr.po
new file mode 100644
index 00000000000..bb845637559
--- /dev/null
+++ b/addons/sale_order_dates/i18n/hr.po
@@ -0,0 +1,74 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-12-09 14:35+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-10 04:56+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Referenca naloga mora biti jedinstvena"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Efektivni datum"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Datumi naloga u prodaji"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Traženi datum"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+msgstr ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+"Dodaj datum prihvaćanja obveze, traženi i efektivni datum na prodajnom "
+"nalogu.\n"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Datum kada bi trebalo dostaviti artikl."
diff --git a/addons/share/res_users.py b/addons/share/res_users.py
index f7a81a24948..db4184ce378 100644
--- a/addons/share/res_users.py
+++ b/addons/share/res_users.py
@@ -26,7 +26,14 @@ class res_groups(osv.osv):
     _columns = {
         'share': fields.boolean('Share Group', readonly=True,
                     help="Group created to set access rights for sharing data with some users.")
-     }
+    }
+
+    def get_application_groups(self, cr, uid, domain=None, context=None):
+        if domain is None:
+            domain = []
+        domain.append(('share', '=', False))
+        return super(res_groups, self).get_application_groups(cr, uid, domain=domain, context=context)
+
 res_groups()
 
 class res_users(osv.osv):
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index b03a090c809..3b74fbb4dbc 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -21,18 +21,6 @@
             <field name="name">Users</field>
             <field name="context">{'search_default_no_share': 1}</field>
         </record>
-        <record id="view_users_form_share" model="ir.ui.view">
-            <field name="name">res.users.form</field>
-            <field name="model">res.users</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page//field[@name='groups_id']" position="attributes">
-                    <attribute name="context">{'search_default_no_share':1}</attribute>
-                </xpath>
-            </field>
-        </record>
-
 
         <record model="ir.ui.view" id="res_groups_search_sharing">
             <field name="name">res.groups.search.share</field>
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index a5405dbcb48..1e92ac44a53 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record model="ir.module.category" id="module_category_share">
+            <field name="name">Sharing</field>
+            <field name="parent_id" ref="base.module_category_tools"/>
+            <field name="sequence">26</field>
+        </record>
+
         <record id="group_share_user" model="res.groups">
-            <field name="name">Sharing / User</field>
+            <field name="name">User</field>
             <field name="comment">
 Members of this groups have access to the sharing wizard, which allows them to invite external users to view or edit some of their documents.</field>
+            <field name="category_id" ref="module_category_share"/>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/share/static/src/css/share.css b/addons/share/static/src/css/share.css
index 3b47a065b1e..8b137891791 100644
--- a/addons/share/static/src/css/share.css
+++ b/addons/share/static/src/css/share.css
@@ -1,13 +1 @@
 
-.openerp li.oe-share {
-    background: url(../img/share.png) no-repeat;
-    padding-left: 20px;
-}
-
-.openerp a.oe-share {
-    background: url(../img/share.png) no-repeat;
-    display: block;
-    float: left;
-    width: 20px;
-    height: 20px;
-}
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index b2abc1832a4..b084e82f7c9 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -1,59 +1,42 @@
 
 openerp.share = function(instance) {
 
-function launch_wizard(self, view) {
+function launch_wizard(self, view, button) {
+        var button = button || 'go_step_1';
         var action = view.widget_parent.action;
         var Share = new instance.web.DataSet(self, 'share.wizard', view.dataset.get_context());
-        var domain = view.dataset.domain;
-
+        var domain = new instance.web.CompoundDomain(view.dataset.domain);
         if (view.fields_view.type == 'form') {
             domain = new instance.web.CompoundDomain(domain, [['id', '=', view.datarecord.id]]);
         }
-
-        Share.create({
-            name: action.name,
-            domain: domain,
-            action_id: action.id,
-        }, function(result) {
-            var share_id = result.result;
-            var step1 = Share.call('go_step_1', [[share_id],], function(result) {
-                var action = result;
-                self.do_action(action);
+        self.rpc('/web/session/eval_domain_and_context', {
+            domains: [domain],
+            contexts: [view.dataset.context]
+        }, function (result) {
+            Share.create({
+                name: action.name,
+                domain: result.domain,
+                action_id: action.id,
+                view_type: view.fields_view.type,
+            }, function(result) {
+                var share_id = result.result;
+                var step1 = Share.call(button, [[share_id],], function(result) {
+                    var action = result;
+                    self.do_action(action);
+                });
             });
         });
 }
 
-var _has_share = null;
-function if_has_share(yes, no) {
-    if (!_has_share) {
-        _has_share = $.Deferred(function() {
-            var self = this;
-            instance.connection.on_session_invalid.add_last(function() { _has_share = null; });
-            var func = new instance.web.Model(null, "share.wizard").get_func("has_share");
-            func(instance.connection.uid).pipe(function(res) {
-                if(res) {
-                    self.resolve();
-                } else {
-                    self.reject();
-                }
-            });
-        });
-    }
-    _has_share.done(yes).fail(no);
-}
-
-
 instance.web.Sidebar = instance.web.Sidebar.extend({
     add_default_sections: function() {
         this._super();
         var self = this;
-        if_has_share(function() {
-            self.add_items('other', [{
-                label: 'Share',
-                callback: self.on_sidebar_click_share,
-                classname: 'oe-share',
-            }]);
-        });
+        self.add_items('other', [{
+            label: 'Share',
+            callback: self.on_sidebar_click_share,
+            classname: 'oe-share',
+        }]);
     },
     on_sidebar_click_share: function(item) {
         var view = this.widget_parent
@@ -64,13 +47,14 @@ instance.web.Sidebar = instance.web.Sidebar.extend({
 instance.web.ViewManagerAction.include({
     start: function() {
         var self = this;
-        if_has_share(function() {
-            self.$element.find('a.oe-share').click(self.on_click_share);
-        }, function() {
-            self.$element.find('a.oe-share').remove();
-        });
+        self.$element.find('a.oe-share_link').click(self.on_click_share_link);
+        self.$element.find('a.oe-share').click(self.on_click_share);
         return this._super.apply(this, arguments);
     },
+    on_click_share_link: function(e) {
+        e.preventDefault();
+        launch_wizard(this, this.views[this.active_view].controller,'go_step_1_link');
+    },
     on_click_share: function(e) {
         e.preventDefault();
         launch_wizard(this, this.views[this.active_view].controller);
diff --git a/addons/share/static/src/xml/share.xml b/addons/share/static/src/xml/share.xml
index 9a1363846a0..9b030051520 100644
--- a/addons/share/static/src/xml/share.xml
+++ b/addons/share/static/src/xml/share.xml
@@ -5,9 +5,8 @@
 
     <t t-extend="ViewManagerAction">
         <t t-jquery=".oe-shortcut-toggle" t-operation="after">
-            <a class="oe-share" href="#share" title="Share this in 2 clicks...">
-                <!--<img src="/share/static/src/img/share.png"/>-->
-            </a>
+            <a class="oe-share_link" href="#share_link" title="Link or embed"><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
+            <a class="oe-share" href="#share" title="Share by email"><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
         </t>
     </t>
 
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 5f33f02f9e5..52f8d5c471e 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -22,12 +22,16 @@ import logging
 import random
 import time
 from urllib import quote_plus
+import uuid
+
+import simplejson
 
 import tools
 from osv import osv, fields
 from osv import expression
 from tools.translate import _
 from tools.safe_eval import safe_eval
+import openerp
 
 FULL_ACCESS = ('perm_read', 'perm_write', 'perm_create', 'perm_unlink')
 READ_WRITE_ACCESS = ('perm_read', 'perm_write')
@@ -43,38 +47,6 @@ RANDOM_PASS_CHARACTERS = 'aaaabcdeeeefghjkmnpqrstuvwxyzAAAABCDEEEEFGHJKLMNPQRSTU
 def generate_random_pass():
     return ''.join(random.sample(RANDOM_PASS_CHARACTERS,10))
 
-
-# Utils for introspecting the ORM - could be moved to server someday
-class column_info(object):
-    """Struct containing details about an osv column, either one local to
-       its model, or one inherited via _inherits.
-
-       :attr name: name of the column
-       :attr column: column instance, subclass of osv.fields.column
-       :attr parent_model: if the column is inherited, name of the model
-                           that contains it, None for local columns.
-       :attr parent_column: the name of the column containing the m2o
-                            relationship to the parent model that contains
-                            this column, None for local columns.
-    """
-    def __init__(self, name, column, parent_model=None, parent_column=None):
-        self.name = name
-        self.column = column
-        self.parent_model = parent_model
-        self.parent_column = parent_column
-
-def get_column_infos(osv_model):
-    """Returns a dict mapping all fields names (direct fields and
-       inherited field via _inherits) to a ``column_info`` struct
-       giving detailed columns """
-    result = {}
-    for k, (parent,m2o,col) in osv_model._inherit_fields.iteritems():
-        result[k] = column_info(k, col, parent, m2o)
-    for k, v in osv_model._columns.iteritems():
-        result[k] = column_info(k,v)
-    return result
-
-
 class share_wizard(osv.osv_memory):
     _logger = logging.getLogger('share.wizard')
     _name = 'share.wizard'
@@ -110,7 +82,7 @@ class share_wizard(osv.osv_memory):
 
     def _user_type_selection(self, cr, uid, context=None):
         """Selection values may be easily overridden/extended via inheritance"""
-        return [('emails','List of emails')]
+        return [('embedded', 'Direct link or embed code'), ('emails','Emails'), ]
 
     """Override of create() to auto-compute the action name"""
     def create(self, cr, uid, values, context=None):
@@ -123,7 +95,13 @@ class share_wizard(osv.osv_memory):
         # NOTE: take _ids in parameter to allow usage through browse_record objects
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='', context=context)
         if base_url:
-            base_url += '/?db=%(dbname)s&login=%(login)s'
+            base_url += '/web/webclient/login?db=%(dbname)s&login=%(login)s'
+            extra = context and context.get('share_url_template_extra_arguments')
+            if extra:
+                base_url += '&' + '&'.join('%s=%%(%s)s' % (x,x) for x in extra)
+            hash_ = context and context.get('share_url_template_hash_arguments')
+            if hash_:
+                base_url += '#' + '&'.join('%s=%%(%s)s' % (x,x) for x in hash_)
         return base_url
 
     def _share_root_url(self, cr, uid, ids, _fieldname, _args, context=None):
@@ -133,11 +111,68 @@ class share_wizard(osv.osv_memory):
             result[this.id] = this.share_url_template() % data
         return result
 
+    def _generate_embedded_code(self, wizard, options=None):
+        cr = wizard._cr
+        uid = wizard._uid
+        context = wizard._context
+        if options is None:
+            options = {}
+
+        js_options = {}
+        title = options['title'] if 'title' in options else wizard.embed_option_title
+        search = (options['search'] if 'search' in options else wizard.embed_option_search) if wizard.access_mode != 'readonly' else False
+
+        if not title:
+            js_options['display_title'] = False
+        if search:
+            js_options['search_view'] = True
+
+        js_options_str = (', ' + simplejson.dumps(js_options)) if js_options else ''
+
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default=None, context=context)
+        user = wizard.result_line_ids[0]
+
+        return """
+<script type="text/javascript" src="%(base_url)s/web/webclient/js"></script>
+<script type="text/javascript">
+    new openerp.init(%(init)s).web.embed(%(server)s, %(dbname)s, %(login)s, %(password)s,%(action)d%(options)s);
+</script> """ % {
+            'init': simplejson.dumps(openerp.conf.server_wide_modules),
+            'base_url': base_url or '',
+            'server': simplejson.dumps(base_url),
+            'dbname': simplejson.dumps(cr.dbname),
+            'login': simplejson.dumps(user.login),
+            'password': simplejson.dumps(user.password),
+            'action': user.user_id.action_id.id,
+            'options': js_options_str,
+        }
+
+    def _embed_code(self, cr, uid, ids, _fn, _args, context=None):
+        result = dict.fromkeys(ids, '')
+        for this in self.browse(cr, uid, ids, context=context):
+            result[this.id] = self._generate_embedded_code(this)
+        return result
+
+    def _embed_url(self, cr, uid, ids, _fn, _args, context=None):
+        if context is None:
+            context = {}
+        result = dict.fromkeys(ids, '')
+        for this in self.browse(cr, uid, ids, context=context):
+            if this.result_line_ids:
+                ctx = dict(context, share_url_template_extra_arguments=['key'],
+                                    share_url_template_hash_arguments=['action_id'])
+                user = this.result_line_ids[0]
+                data = dict(dbname=cr.dbname, login=user.login, key=user.password, action_id=this.action_id.id)
+                result[this.id] = this.share_url_template(context=ctx) % data
+        return result
+
+
     _columns = {
         'action_id': fields.many2one('ir.actions.act_window', 'Action to share', required=True,
                 help="The action that opens the screen containing the data you wish to share."),
+        'view_type': fields.char('Current View Type', size=32, required=True),
         'domain': fields.char('Domain', size=256, help="Optional domain for further data filtering"),
-        'user_type': fields.selection(lambda s, *a, **k: s._user_type_selection(*a, **k),'Users to share with', required=True,
+        'user_type': fields.selection(lambda s, *a, **k: s._user_type_selection(*a, **k),'Sharing method', required=True,
                      help="Select the type of user(s) you would like to share data with."),
         'new_users': fields.text("Emails"),
         'access_mode': fields.selection([('readonly','Can view'),('readwrite','Can edit')],'Access Mode', required=True,
@@ -147,18 +182,40 @@ class share_wizard(osv.osv_memory):
                                 help='Main access page for users that are granted shared access'),
         'name': fields.char('Share Title', size=64, required=True, help="Title for the share (displayed to users as menu and shortcut name)"),
         'message': fields.text("Personal Message", help="An optional personal message, to be included in the e-mail notification."),
+
+        'embed_code': fields.function(_embed_code, type='text'),
+        'embed_option_title': fields.boolean("Display title"),
+        'embed_option_search': fields.boolean('Display search view'),
+        'embed_url': fields.function(_embed_url, string='Share URL', type='char', size=512, readonly=True),
     }
     _defaults = {
-        'user_type' : 'emails',
+        'view_type': 'tree',
+        'user_type' : 'embedded',
         'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'),
         'action_id': lambda self, cr, uid, context, *a: context.get('action_id'),
         'access_mode': 'readonly',
+        'embed_option_title': True,
+        'embed_option_search': True,
     }
 
+    def go_step_1_link(self, cr, uid, ids, context=None):
+        dummy, step1_form_view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'share_step1_form_link')
+        return {
+            'name': _('Link or embed your documents'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'share.wizard',
+            'view_id': False,
+            'res_id': ids[0],
+            'views': [(step1_form_view_id, 'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new'
+        }
+
     def go_step_1(self, cr, uid, ids, context=None):
         dummy, step1_form_view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'share_step1_form')
         return {
-            'name': _('Grant instant access to your documents'),
+            'name': _('Share your documents by email'),
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'share.wizard',
@@ -185,35 +242,56 @@ class share_wizard(osv.osv_memory):
            ignored, existing ones."""
         user_obj = self.pool.get('res.users')
         current_user = user_obj.browse(cr, UID_ROOT, uid, context=context)
+        # modify context to disable shortcuts when creating share users
+        context['noshortcut'] = True
         created_ids = []
         existing_ids = []
-        for new_user in (wizard_data.new_users or '').split('\n'):
-            # Ignore blank lines
-            new_user = new_user.strip()
-            if not new_user: continue
-            # Ignore the user if it already exists.
-            existing = user_obj.search(cr, UID_ROOT, [('login', '=', new_user)])
-            existing_ids.extend(existing)
-            if existing:
-                new_line = { 'user_id': existing[0],
-                             'newly_created': False}
+        if wizard_data.user_type == 'emails':
+            for new_user in (wizard_data.new_users or '').split('\n'):
+                # Ignore blank lines
+                new_user = new_user.strip()
+                if not new_user: continue
+                # Ignore the user if it already exists.
+                existing = user_obj.search(cr, UID_ROOT, [('login', '=', new_user)])
+                existing_ids.extend(existing)
+                if existing:
+                    new_line = { 'user_id': existing[0],
+                                 'newly_created': False}
+                    wizard_data.write({'result_line_ids': [(0,0,new_line)]})
+                    continue
+                new_pass = generate_random_pass()
+                user_id = user_obj.create(cr, UID_ROOT, {
+                        'login': new_user,
+                        'password': new_pass,
+                        'name': new_user,
+                        'user_email': new_user,
+                        'groups_id': [(6,0,[group_id])],
+                        'share': True,
+                        'company_id': current_user.company_id.id
+                }, context)
+                new_line = { 'user_id': user_id,
+                             'password': new_pass,
+                             'newly_created': True}
                 wizard_data.write({'result_line_ids': [(0,0,new_line)]})
-                continue
+                created_ids.append(user_id)
+
+        elif wizard_data.user_type == 'embedded':
+            new_login = 'embedded-%s' % (uuid.uuid4().hex,)
             new_pass = generate_random_pass()
             user_id = user_obj.create(cr, UID_ROOT, {
-                    'login': new_user,
-                    'password': new_pass,
-                    'name': new_user,
-                    'user_email': new_user,
-                    'groups_id': [(6,0,[group_id])],
-                    'share': True,
-                    'company_id': current_user.company_id.id
-            })
+                'login': new_login,
+                'password': new_pass,
+                'name': new_login,
+                'groups_id': [(6,0,[group_id])],
+                'share': True,
+                'company_id': current_user.company_id.id
+            }, context)
             new_line = { 'user_id': user_id,
                          'password': new_pass,
                          'newly_created': True}
             wizard_data.write({'result_line_ids': [(0,0,new_line)]})
             created_ids.append(user_id)
+
         return created_ids, existing_ids
 
     def _create_shortcut(self, cr, uid, values, context=None):
@@ -273,21 +351,33 @@ class share_wizard(osv.osv_memory):
 
     def _shared_action_def(self, cr, uid, wizard_data, context=None):
         copied_action = wizard_data.action_id
+
+        if wizard_data.access_mode == 'readonly':
+            view_mode = wizard_data.view_type
+            view_id = copied_action.view_id.id if copied_action.view_id.type == wizard_data.view_type else False
+        else:
+            view_mode = copied_action.view_mode
+            view_id = copied_action.view_id.id
+
+
         action_def = {
             'name': wizard_data.name,
             'domain': copied_action.domain,
             'context': self._cleanup_action_context(wizard_data.action_id.context, uid),
             'res_model': copied_action.res_model,
-            'view_mode': copied_action.view_mode,
+            'view_mode': view_mode,
             'view_type': copied_action.view_type,
-            'search_view_id': copied_action.search_view_id.id,
-            'view_id': copied_action.view_id.id,
+            'search_view_id': copied_action.search_view_id.id if wizard_data.access_mode != 'readonly' else False,
+            'view_id': view_id,
+            'auto_search': True,
         }
         if copied_action.view_ids:
             action_def['view_ids'] = [(0,0,{'sequence': x.sequence,
                                             'view_mode': x.view_mode,
                                             'view_id': x.view_id.id })
-                                      for x in copied_action.view_ids]
+                                      for x in copied_action.view_ids
+                                      if (wizard_data.access_mode != 'readonly' or x.view_mode == wizard_data.view_type)
+                                     ]
         return action_def
 
     def _setup_action_and_shortcut(self, cr, uid, wizard_data, user_ids, make_home, context=None):
@@ -321,7 +411,7 @@ class share_wizard(osv.osv_memory):
         models = [x[1].model for x in relation_fields]
         model_obj = self.pool.get('ir.model')
         model_osv = self.pool.get(model.model)
-        for colinfo in get_column_infos(model_osv).itervalues():
+        for colinfo in model_osv._all_columns.itervalues():
             coldef = colinfo.column
             coltype = coldef._type
             relation_field = None
@@ -331,7 +421,7 @@ class share_wizard(osv.osv_memory):
                 relation_osv = self.pool.get(coldef._obj)
                 if coltype == 'one2many':
                     # don't record reverse path if it's not a real m2o (that happens, but rarely)
-                    dest_model_ci = get_column_infos(relation_osv)
+                    dest_model_ci = relation_osv._all_columns
                     reverse_rel = coldef._fields_id
                     if reverse_rel in dest_model_ci and dest_model_ci[reverse_rel].column._type == 'many2one':
                         relation_field = ('%s.%s'%(reverse_rel, suffix)) if suffix else reverse_rel
@@ -339,7 +429,7 @@ class share_wizard(osv.osv_memory):
                 for parent in relation_osv._inherits:
                     if parent not in models:
                         parent_model = self.pool.get(parent)
-                        parent_colinfos = get_column_infos(parent_model)
+                        parent_colinfos = parent_model._all_columns
                         parent_model_browse = model_obj.browse(cr, UID_ROOT,
                                                                model_obj.search(cr, UID_ROOT, [('model','=',parent)]))[0]
                         if relation_field and coldef._fields_id in parent_colinfos:
@@ -689,9 +779,11 @@ class share_wizard(osv.osv_memory):
             raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
 
         # TODO: also send an HTML version of this mail
-        emails_sent = 0
+        msg_ids = []
         for result_line in wizard_data.result_line_ids:
             email_to = result_line.user_id.user_email
+            if not email_to:
+                continue
             subject = wizard_data.name
             body = _("Hello,")
             body += "\n\n"
@@ -712,22 +804,27 @@ class share_wizard(osv.osv_memory):
                 body += _("The documents have been automatically added to your current OpenERP documents.\n")
                 body += _("You may use your current login (%s) and password to view them.\n") % result_line.user_id.login
             body += "\n\n"
-            body += user.signature
+            body += (user.signature or '')
             body += "\n\n"
             body += "--\n"
             body += _("OpenERP is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n"
                       "It is open source and can be found on http://www.openerp.com.")
+            msg_ids.append(mail_message.schedule_with_attach(cr, uid,
+                                                       user.user_email,
+                                                       [email_to],
+                                                       subject,
+                                                       body,
+                                                       model='share.wizard',
+                                                       context=context))
+        # force direct delivery, as users expect instant notification
+        mail_message.send(cr, uid, msg_ids, context=context)
+        self._logger.info('%d share notification(s) sent.', len(msg_ids))
+
+    def onchange_embed_options(self, cr, uid, ids, opt_title, opt_search, context=None):
+        wizard = self.browse(cr, uid, ids[0], context)
+        options = dict(title=opt_title, search=opt_search)
+        return {'value': {'embed_code': self._generate_embedded_code(wizard, options)}}
 
-            if mail_message.schedule_with_attach(cr, uid,
-                                                 user.user_email,
-                                                 [email_to],
-                                                 subject,
-                                                 body,
-                                                 model='share.wizard'):
-                emails_sent += 1
-            else:
-                self._logger.warning('Failed to send share notification from %s to %s, ignored', user.user_email, email_to)
-        self._logger.info('%s share notification(s) successfully sent.', emails_sent)
 share_wizard()
 
 class share_result_line(osv.osv_memory):
@@ -753,6 +850,5 @@ class share_result_line(osv.osv_memory):
     _defaults = {
         'newly_created': True,
     }
-share_result_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 128b32b07da..5dad2174f05 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -23,25 +23,43 @@
             </field>
         </record>
 
+        <record id="share_step1_form_link" model="ir.ui.view">
+            <field name="name">share.step1.form.link</field>
+            <field name="model">share.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Link or embed your documents">
+                    <field name="user_type" invisible="1"/>
+                    <separator colspan="4" string="Sharing Options"/>
+                    <group colspan="4" col="4">
+                        <field name="name" colspan="4"/>
+                        <field name="access_mode" colspan="4"/>
+                    </group>
+                    <separator colspan="4"/>
+                    <group colspan="4">
+                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                        <button name="go_step_2" string="Share" colspan="1" type="object" icon="gtk-go-forward"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
         <record id="share_step1_form" model="ir.ui.view">
             <field name="name">share.step1.form</field>
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Grant instant access to your documents">
-                    <group name="groups_group" colspan="4" col="4">
-	                    <separator colspan="4" string="Who do you want to share with?"/>
-	                    <field name="user_type" />
-                    </group>
-                    <group colspan="4" name="emails_group" attrs="{'invisible':[('user_type','!=','emails')]}">
+                <form string="Share by email your documents">
+                    <field name="user_type" invisible="1"/>
+                    <group colspan="4" name="emails_group">
                         <separator colspan="4" string="Share with these people (one e-mail per line)"/>
                         <field colspan="4" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails')]}"/>
                     </group>
-                    <separator colspan="4" string="Optional: include a personal message"/>
                     <group colspan="4" col="4">
+                        <separator colspan="4" string="Optional: include a personal message"/>
                         <field name="message" colspan="4" nolabel="1"/>
                     </group>
-                    <separator colspan="4" string="Extra Options"/>
+                    <separator colspan="4" string="Sharing Options"/>
                     <group colspan="4" col="4">
                         <field name="name" colspan="4"/>
                         <field name="access_mode" colspan="4"/>
@@ -61,15 +79,30 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Access granted!">
-                    <separator colspan="4" string="An e-mail notification with instructions has been sent to the following people:"/>
-                    <field name="result_line_ids" nolabel="1" colspan="4" mode="tree">
+                  <field name="user_type" invisible="1"/>
+                  <field name="access_mode" invisible="1"/>
+		          <group colspan="4" col="1" attrs="{'invisible':[('user_type','=','embedded')]}">
+                    <separator string="An e-mail notification with instructions has been sent to the following people:"/>
+                     <field name="result_line_ids" nolabel="1" mode="tree">
                         <tree string="Summary">
                             <field name="login"/>
                         </tree>
                         <form string="Access info">
                             <field name="login"/>
                         </form>
-                    </field>
+		            </field>
+                  </group>
+		          <group colspan="4" col="1" attrs="{'invisible':[('user_type','!=','embedded')]}">
+		            <separator string="Use this link"/>
+		            <field name="embed_url" nolabel="1"/>
+		            <separator string="Or insert the following code where you want to embed your documents"/>
+		            <group col="4" string="Options">
+			            <field name="embed_option_title" on_change="onchange_embed_options(embed_option_title, embed_option_search)"/>
+			            <field name="embed_option_search" on_change="onchange_embed_options(embed_option_title, embed_option_search)" attrs="{'invisible':[('access_mode','=','readonly')]}"/>
+		            </group>
+		            <field name="embed_code" nolabel="1"/>
+                  </group>
+
                     <separator colspan="4"/>
                     <group colspan="4">
                         <button special="cancel" string="Close" icon='gtk-ok'/>
@@ -98,6 +131,17 @@
                     - 'domain' (string expression for full domain to apply as sent to server, 
                                with dynamic data like 'uid' replaced by actual value (i.e. after eval)!)
          -->
+        <record id="action_share_wizard_step1_link" model="ir.actions.act_window">
+            <field name="name">Share Wizard</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">share.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="share_step1_form_link"/>
+            <field name="target">new</field>
+            <field name="context">{'default_user_type':'embedded'}</field>
+        </record>
+
         <record id="action_share_wizard_step1" model="ir.actions.act_window">
             <field name="name">Share Wizard</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 882f0f78e97..ca25e2c0770 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Inventory Management",
+    "name" : "Warehouse Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
     'complexity': "easy",
@@ -91,6 +91,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
     'application': True,
     'active': False,
     'certificate': '0055421559965',
+    "css": [ 'static/src/css/stock.css' ],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 66de741c3df..656f0caffd7 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -22,7 +22,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_stock_incoming_product_delay">
-            <field name="name">Incoming Products Delay</field>
+            <field name="name">Incoming Products</field>
             <field name="res_model">report.stock.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
@@ -31,7 +31,7 @@
             <field name="context">{'search_default_in':1}</field>
          </record>
         <record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
-            <field name="name">Outgoing Products Delay</field>
+            <field name="name">Outgoing Products</field>
             <field name="res_model">report.stock.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
@@ -52,8 +52,8 @@
                         </column>
 
                         <column>
-                            <action name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" creatable="true"/>
-                            <action name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products Delay" creatable="true"/>
+                            <action name="%(action_stock_incoming_product_delay)d" string="Incoming Products" creatable="true"/>
+                            <action name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products" creatable="true"/>
                         </column>
                     </board>
                 </form>
diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po
index 7d32743d21a..83d3f217828 100644
--- a/addons/stock/i18n/id.po
+++ b/addons/stock/i18n/id.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-06 15:41+0000\n"
+"PO-Revision-Date: 2011-12-09 16:41+0000\n"
 "Last-Translator: moelyana <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-12 04:50+0000\n"
-"X-Generator: Launchpad (build 14277)\n"
+"X-Launchpad-Export-Date: 2011-12-10 04:56+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -81,7 +81,7 @@ msgstr "Produk Bergerak"
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
 #: view:report.stock.move:0
 msgid "Moves Analysis"
-msgstr ""
+msgstr "Analisa Perpindahan"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -2506,7 +2506,7 @@ msgstr "Lihat Stok Produk"
 
 #. module: stock
 #: view:stock.picking:0
-msgid "Internal Picking List"
+msgid "Internal Picking list"
 msgstr "Daftar pengambilan internal"
 
 #. module: stock
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 9e8cc34813f..db5352f3162 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -27,7 +27,7 @@
                         <separator string="Accounting Stock Properties" colspan="2"/>
                         <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_valuation_account_id"/>
+                        <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_journal"/>
                     </group>
                 </form>
@@ -107,7 +107,7 @@
                         <separator string="Stocks" colspan="4"/>
                         <field name="qty_available"/>
                         <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
-                            type="action" icon="gtk-execute" groups = "stock.group_stock_manager,stock.group_stock_user"/>
+                            type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user"/>
                         <newline/>
                         <field name="virtual_available"/>
                     </group>
@@ -138,32 +138,24 @@
                     <field name="list_price"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <t t-if="record.type.raw_value!='service' and record.qty_available.raw_value lte 0" t-set="border">oe_kanban_color_red</t>
-                            <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
-                                <div class="oe_kanban_box oe_kanban_color_border">
-                                    <div class="oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle oe_kanban_title">
-                                        <field name="name"/>
-                                    </div>
-                                    <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
-                                        <img t-att-src="kanban_image('product.product', 'product_image', record.id.value)" width="48" style="float: left; padding: 0 4px 4px 0"/>
-                                        <div t-if="record.type.raw_value == 'service'">No Stock</div>
-                                        <t t-if="record.type.raw_value != 'service'">
-                                            <div>Stock: <field name="qty_available"/> on hand, <field name="virtual_available"/> available</div>
-                                            <div t-if="record.list_price.raw_value != 0">Public Price: <field name="lst_price"/></div>
-                                            <div>Cost : <field name="standard_price"/></div>
-                                        </t>
-                                        <div class="oe_kanban_clear"/>
-                                    </div>
-                                    <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                        <div class="oe_kanban_left">
-                                            <a string="Edit" icon="gtk-edit" type="edit"/>
-                                            <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                            <a string="Update Stock" name="%(stock.action_view_change_product_quantity)d" icon="gtk-execute" type="action"/>
-                                        </div>
-                                        <div class="oe_kanban_clear"/>
-                                    </div>
+                            <div class="oe_product_vignette">
+                                <div class="oe_product_img">
+                                <a type="edit"><img t-att-src="kanban_image('product.product', 'product_image', record.id.value)" class="oe_product_photo"/></a>
+                                </div>
+                                <div class="oe_product_desc">
+                                    <h4><a type="edit"><field name="name"></field></a></h4>
+                                    <ul>
+                                        <li t-if="record.type.raw_value != 'service'">Stock on hand: <field name="qty_available"></field></li>
+                                        <li t-if="record.type.raw_value != 'service'">Stock available: <field name="virtual_available"></field></li>
+                                        <li>Price: <field name="lst_price"></field></li>
+                                        <li>Cost: <field name="standard_price"></field></li>
+                                    </ul>
                                 </div>
                             </div>
+                            <script>
+                                $('.oe_product_photo').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_product_photo_wide') } });
+                            </script>
+                            <div></div>
                         </t>
                     </templates>
                 </kanban>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 9d4498139bd..2aa889d8174 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -44,7 +44,7 @@
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
                  <field name="product_id"/>
-                 <field name="day_diff2" operator="+"/>
+                 <field name="product_qty" operator="+"/>
              </graph>
          </field>
     </record>
@@ -55,7 +55,7 @@
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
                  <field name="day"/>
-                 <field name="day_diff2" operator="+" string="Delay(Days)"/>
+                 <field name="product_qty" operator="avg"/>
              </graph>
          </field>
     </record>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index ab1036ea2ea..f65ef8d5e79 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -1,62 +1,58 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_stock_incoterms_all","stock.incoterms all","model_stock_incoterms",,1,0,0,0
-"access_stock_incoterms_manager","stock.incoterms manager","model_stock_incoterms","stock.group_stock_manager",1,1,1,1
-"access_stock_warehouse_manager","stock.warehouse.manager","model_stock_warehouse","stock.group_stock_manager",1,1,1,1
-"access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0
-"access_stock_location__partner_manager","stock.location.partner.manager","model_stock_location","base.group_partner_manager",1,1,1,1
-"access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1
-"access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,0,0,0
-"access_stock_journal_user","stock.journal.user","model_stock_journal","base.group_user",1,0,0,0
-"access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1
-"access_stock_tracking_user","stock.tracking user","model_stock_tracking","stock.group_stock_user",1,1,1,1
-"access_stock_tracking_manager","stock.tracking manager","model_stock_tracking","stock.group_stock_manager",1,0,0,0
-"access_stock_tracking_sales_user","stock.tracking sales.user","model_stock_tracking","base.group_sale_salesman",1,1,1,0
-"access_stock_picking_user","stock.picking user","model_stock_picking","stock.group_stock_user",1,1,1,1
-"access_stock_picking_manager","stock.picking manager","model_stock_picking","stock.group_stock_manager",1,1,0,0
-"access_stock_production_lot_manager","stock.production.lot manager","model_stock_production_lot","stock.group_stock_manager",1,0,0,0
-"access_stock_production_lot_user","stock.production.lot user","model_stock_production_lot","stock.group_stock_user",1,1,1,1
-"access_stock_production_lot_revision","stock.production.lot.revision","model_stock_production_lot_revision","stock.group_stock_user",1,1,1,1
-"access_stock_move_manager","stock.move manager","model_stock_move","stock.group_stock_manager",1,1,0,0
-"access_stock_move_user","stock.move user","model_stock_move","stock.group_stock_user",1,1,1,1
-"access_stock_inventory_user","stock.inventory user","model_stock_inventory","stock.group_stock_user",1,1,1,1
-"access_stock_inventory_manager","stock.inventory manager","model_stock_inventory","stock.group_stock_manager",1,0,0,0
-"access_stock_inventory_line_user","stock.inventory.line user","model_stock_inventory_line","stock.group_stock_user",1,1,1,1
-"access_stock_inventory_line_manager","stock.inventory.line manager","model_stock_inventory_line","stock.group_stock_manager",1,0,0,0
-"access_stock_report_prodlots","stock.report.prodlots","model_stock_report_prodlots","stock.group_stock_manager",1,0,0,0
-"access_stock_location_sale_manager","stock.location sale manager","model_stock_location","base.group_sale_manager",1,0,0,0
-"access_stock_location_stock_manager","stock.location stock manager","model_stock_location","stock.group_stock_manager",1,0,0,0
-"access_stock_lines_date_user","report.stock.lines.date user","model_report_stock_lines_date","stock.group_stock_user",1,0,0,0
-"access_stock_lines_date_manager","report.stock.lines.date manager","model_report_stock_lines_date","stock.group_stock_manager",1,1,1,1
-"access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1
-"access_report_stock_move_user","report.stock.move user","model_report_stock_move","stock.group_stock_user",1,0,0,0
-"access_report_stock_move_manager","report.stock.move manager","model_report_stock_move","stock.group_stock_manager",1,1,1,1
-"access_report_stock_inventory_user","report.stock.inventory user","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
-"access_report_stock_inventory_manager","report.stock.inventory manager","model_report_stock_inventory","stock.group_stock_manager",1,1,1,1
-"access_product_product_stock_user","product_product_stock_user","product.model_product_product","stock.group_stock_user",1,0,0,0
-"access_product_template_stock_user","product.template stock user","product.model_product_template","stock.group_stock_user",1,0,0,0
-"access_product_product_stock_manager","product_product_stock_manager","product.model_product_product","stock.group_stock_manager",1,0,0,0
-"access_product_template_stock_manager","product.template stock manager","product.model_product_template","stock.group_stock_manager",1,0,0,0
-"access_account_invoice_user","account.invoice stock user","account.model_account_invoice","stock.group_stock_user",1,1,1,0
-"access_account_invoice_line_user","account.invoice.line stock user","account.model_account_invoice_line","stock.group_stock_user",1,1,1,0
-"access_account_invoice_tax_user","account.invoice.tax stock user","account.model_account_invoice_tax","stock.group_stock_user",1,1,1,0
-"access_account_journal_user","account.journal stock user","account.model_account_journal","stock.group_stock_user",1,0,0,0
-"access_account_fiscalyear","account.fiscalyear stock user","account.model_account_fiscalyear","stock.group_stock_user",1,0,0,0
-"access_product_pricelist_item_sale_manager","product.pricelist.item salemanager","product.model_product_pricelist_item","base.group_sale_manager",1,1,1,1
-"access_product_uom_categ_stock_manager","product.uom.categ stock_manager","product.model_product_uom_categ","stock.group_stock_manager",1,1,1,1
-"access_product_uom_stock_manager","product.uom stock_manager","product.model_product_uom","stock.group_stock_manager",1,1,1,1
-"access_product_ul_stock_manager","product.ul stock_manager","product.model_product_ul","stock.group_stock_manager",1,1,1,1
-"access_product_category_stock_manager","product.category stock_manager","product.model_product_category","stock.group_stock_manager",1,1,1,1
-"access_product_template_stock_manager","product.template stock_manager","product.model_product_template","stock.group_stock_manager",1,1,1,1
-"access_product_product_stock_manager","product.product stock_manager","product.model_product_product","stock.group_stock_manager",1,1,1,1
-"access_product_packaging_stock_manager","product.packaging stock_manager","product.model_product_packaging","stock.group_stock_manager",1,1,1,1
-"access_product_supplierinfo_stock_manager","product.supplierinfo stock_manager","product.model_product_supplierinfo","stock.group_stock_manager",1,1,1,1
-"access_pricelist_partnerinfo_stock_manager","pricelist.partnerinfo stock_manager","product.model_pricelist_partnerinfo","stock.group_stock_manager",1,1,1,1
-"access_product_price_type_stock_manager","product.price.type stock_manager","product.model_product_price_type","stock.group_stock_manager",1,1,1,1
-"access_product_pricelist_type_stock_manager","product.pricelist.type stock_manager","product.model_product_pricelist_type","stock.group_stock_manager",1,1,1,1
-"access_product_pricelist_stock_manager","product.pricelist stock_manager","product.model_product_pricelist","stock.group_stock_manager",1,1,1,1
-"access_ir_property_group_stock_manager","ir_property group_stock_manager","base.model_ir_property","stock.group_stock_manager",1,1,1,1
-"access_product_group_res_partner_stock_manager","res_partner group_stock_manager","base.model_res_partner","stock.group_stock_manager",1,1,1,0
-"access_product_pricelist_version_stock_manager","product.pricelist.version stock_manager","product.model_product_pricelist_version","stock.group_stock_manager",1,1,1,1
-"access_product_pricelist_item_stock_manager","product.pricelist.item stock_manager","product.model_product_pricelist_item","stock.group_stock_manager",1,1,1,1
-"access_account_account_stock_manager","account.account stock manager","account.model_account_account","stock.group_stock_manager",1,0,0,0
-"access_account_journal_stock_manager","account.journal stock manager","account.model_account_journal","stock.group_stock_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_stock_incoterms_all,stock.incoterms all,model_stock_incoterms,,1,0,0,0
+access_stock_incoterms_manager,stock.incoterms manager,model_stock_incoterms,stock.group_stock_manager,1,1,1,1
+access_stock_warehouse_manager,stock.warehouse.manager,model_stock_warehouse,stock.group_stock_manager,1,1,1,1
+access_stock_warehouse_user,stock.warehouse.user,model_stock_warehouse,base.group_user,1,0,0,0
+access_stock_location__partner_manager,stock.location.partner.manager,model_stock_location,base.group_partner_manager,1,1,1,1
+access_stock_location_manager,stock.location.manager,model_stock_location,stock.group_stock_manager,1,1,1,1
+access_stock_location_user,stock.location.user,model_stock_location,base.group_user,1,0,0,0
+access_stock_journal_user,stock.journal.user,model_stock_journal,base.group_user,1,0,0,0
+access_stock_journal_manager,stock.journal.manager,model_stock_journal,stock.group_stock_manager,1,1,1,1
+access_stock_tracking_user,stock.tracking user,model_stock_tracking,stock.group_stock_user,1,1,1,1
+access_stock_tracking_manager,stock.tracking manager,model_stock_tracking,stock.group_stock_manager,1,0,0,0
+access_stock_tracking_sales_user,stock.tracking sales.user,model_stock_tracking,base.group_sale_salesman,1,1,1,0
+access_stock_picking_user,stock.picking user,model_stock_picking,stock.group_stock_user,1,1,1,1
+access_stock_picking_manager,stock.picking manager,model_stock_picking,stock.group_stock_manager,1,1,0,0
+access_stock_production_lot_manager,stock.production.lot manager,model_stock_production_lot,stock.group_stock_manager,1,0,0,0
+access_stock_production_lot_user,stock.production.lot user,model_stock_production_lot,stock.group_stock_user,1,1,1,1
+access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
+access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,0,0
+access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,1,1,1
+access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,1
+access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,0,0,0
+access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,1,1,1
+access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,0,0,0
+access_stock_report_prodlots,stock.report.prodlots,model_stock_report_prodlots,stock.group_stock_manager,1,0,0,0
+access_stock_location_sale_manager,stock.location sale manager,model_stock_location,base.group_sale_manager,1,0,0,0
+access_stock_location_stock_manager,stock.location stock manager,model_stock_location,stock.group_stock_manager,1,0,0,0
+access_stock_lines_date_user,report.stock.lines.date user,model_report_stock_lines_date,stock.group_stock_user,1,0,0,0
+access_stock_lines_date_manager,report.stock.lines.date manager,model_report_stock_lines_date,stock.group_stock_manager,1,1,1,1
+access_stock_report_tracklots,stock.report.tracklots,model_stock_report_tracklots,stock.group_stock_user,1,1,1,1
+access_report_stock_move_user,report.stock.move user,model_report_stock_move,stock.group_stock_user,1,0,0,0
+access_report_stock_move_manager,report.stock.move manager,model_report_stock_move,stock.group_stock_manager,1,1,1,1
+access_report_stock_inventory_user,report.stock.inventory user,model_report_stock_inventory,stock.group_stock_user,1,1,1,1
+access_product_product_stock_user,product_product_stock_user,product.model_product_product,stock.group_stock_user,1,0,0,0
+access_product_template_stock_user,product.template stock user,product.model_product_template,stock.group_stock_user,1,0,0,0
+access_account_invoice_user,account.invoice stock user,account.model_account_invoice,stock.group_stock_user,1,1,1,0
+access_account_invoice_line_user,account.invoice.line stock user,account.model_account_invoice_line,stock.group_stock_user,1,1,1,0
+access_account_invoice_tax_user,account.invoice.tax stock user,account.model_account_invoice_tax,stock.group_stock_user,1,1,1,0
+access_account_journal_user,account.journal stock user,account.model_account_journal,stock.group_stock_user,1,0,0,0
+access_account_fiscalyear,account.fiscalyear stock user,account.model_account_fiscalyear,stock.group_stock_user,1,0,0,0
+access_product_pricelist_item_sale_manager,product.pricelist.item salemanager,product.model_product_pricelist_item,base.group_sale_manager,1,1,1,1
+access_product_uom_categ_stock_manager,product.uom.categ stock_manager,product.model_product_uom_categ,stock.group_stock_manager,1,1,1,1
+access_product_uom_stock_manager,product.uom stock_manager,product.model_product_uom,stock.group_stock_manager,1,1,1,1
+access_product_ul_stock_manager,product.ul stock_manager,product.model_product_ul,stock.group_stock_manager,1,1,1,1
+access_product_category_stock_manager,product.category stock_manager,product.model_product_category,stock.group_stock_manager,1,1,1,1
+access_product_template_stock_manager,product.template stock_manager,product.model_product_template,stock.group_stock_manager,1,1,1,1
+access_product_product_stock_manager,product.product stock_manager,product.model_product_product,stock.group_stock_manager,1,1,1,1
+access_product_packaging_stock_manager,product.packaging stock_manager,product.model_product_packaging,stock.group_stock_manager,1,1,1,1
+access_product_supplierinfo_stock_manager,product.supplierinfo stock_manager,product.model_product_supplierinfo,stock.group_stock_manager,1,1,1,1
+access_pricelist_partnerinfo_stock_manager,pricelist.partnerinfo stock_manager,product.model_pricelist_partnerinfo,stock.group_stock_manager,1,1,1,1
+access_product_price_type_stock_manager,product.price.type stock_manager,product.model_product_price_type,stock.group_stock_manager,1,1,1,1
+access_product_pricelist_type_stock_manager,product.pricelist.type stock_manager,product.model_product_pricelist_type,stock.group_stock_manager,1,1,1,1
+access_product_pricelist_stock_manager,product.pricelist stock_manager,product.model_product_pricelist,stock.group_stock_manager,1,1,1,1
+access_ir_property_group_stock_manager,ir_property group_stock_manager,base.model_ir_property,stock.group_stock_manager,1,1,1,1
+access_product_group_res_partner_stock_manager,res_partner group_stock_manager,base.model_res_partner,stock.group_stock_manager,1,1,1,0
+access_product_pricelist_version_stock_manager,product.pricelist.version stock_manager,product.model_product_pricelist_version,stock.group_stock_manager,1,1,1,1
+access_product_pricelist_item_stock_manager,product.pricelist.item stock_manager,product.model_product_pricelist_item,stock.group_stock_manager,1,1,1,1
+access_account_account_stock_manager,account.account stock manager,account.model_account_account,stock.group_stock_manager,1,0,0,0
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 389d62e8ce0..f83a5d362ab 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record id="group_stock_user" model="res.groups">
-        <field name="name">Warehouse / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_warehouse_management"/>
     </record>
     <record id="group_stock_manager" model="res.groups">
-        <field name="name">Warehouse / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_warehouse_management"/>
         <field name="implied_ids" eval="[(4, ref('group_stock_user'))]"/>
     </record>
 
diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css
new file mode 100644
index 00000000000..6b84cd7a5b6
--- /dev/null
+++ b/addons/stock/static/src/css/stock.css
@@ -0,0 +1,68 @@
+.oe_product_vignette {
+    padding: 8px 0;
+    min-height: 100px;
+}
+
+.oe_product_img, .oe_product_desc {
+    display: inline-block;
+    vertical-align: top;
+}
+
+.oe_product_img {
+    width: 100px;
+    height: 100px;
+    text-align: center;
+    overflow: hidden;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -o-border-radius: 3px;
+    -ms-border-radius: 3px;
+    border-radius: 3px;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+    -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+}
+
+.oe_product_photo {
+    width: 100px;
+    height: auto;
+    clip: rect(5px, 100px, 105px, 0px);
+}
+
+.oe_product_photo_wide {
+    height: 100px;
+    width: auto;
+    clip: rect(0px, 110px, 100px, 10px);
+}
+
+.oe_product_desc {
+    width: 220px;
+    font-size: 13px;
+    padding: 2px 5px;
+    color: #4c4c4c;
+    min-height: 120px;
+}
+
+.oe_product_desc h4 {
+    margin: 0;
+    font-size: 13px;
+}
+
+.oe_product_desc h4 a {
+    color: #4c4c4c;
+}
+
+.oe_product_desc h4 a:hover {
+    text-decoration: underline;
+}
+
+.oe_product_desc ul {
+    margin: 3px 0 5px;
+    padding: 0;
+    list-style: none;
+}
+
+.oe_product_desc li {
+    margin: 2px 0;
+}
diff --git a/addons/stock/static/src/img/icon.png b/addons/stock/static/src/img/icon.png
new file mode 100644
index 00000000000..b4c6580dead
Binary files /dev/null and b/addons/stock/static/src/img/icon.png differ
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 461c863aaed..e3d3a3be1cb 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -167,7 +167,7 @@ class stock_location(osv.osv):
                        \n* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products
                       """, select = True),
          # temporarily removed, as it's unused: 'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=True),
-        'complete_name': fields.function(_complete_name, type='char', size=100, string="Location Name", store=True),
+        'complete_name': fields.function(_complete_name, type='char', size=256, string="Location Name", store=True),
 
         'stock_real': fields.function(_product_value, type='float', string='Real Stock', multi="stock"),
         'stock_virtual': fields.function(_product_value, type='float', string='Virtual Stock', multi="stock"),
@@ -1852,23 +1852,41 @@ class stock_move(osv.osv):
                     result[m.picking_id].append( (m, dest) )
         return result
 
-    def _create_chained_picking(self, cr, uid, pick_name, picking, ptype, move, context=None):
-        res_obj = self.pool.get('res.company')
+    def _prepare_chained_picking(self, cr, uid, picking_name, picking, picking_type, moves_todo, context=None):
+        """Prepare the definition (values) to create a new chained picking.
+
+           :param str picking_name: desired new picking name
+           :param browse_record picking: source picking (being chained to)
+           :param str picking_type: desired new picking type
+           :param list moves_todo: specification of the stock moves to be later included in this
+               picking, in the form::
+
+                   [[move, (dest_location, auto_packing, chained_delay, chained_journal,
+                                  chained_company_id, chained_picking_type)],
+                    ...
+                   ]
+
+               See also :meth:`stock_location.chained_location_get`.
+        """
+        res_company = self.pool.get('res.company')
+        return {
+                    'name': picking_name,
+                    'origin': tools.ustr(picking.origin or ''),
+                    'type': picking_type,
+                    'note': picking.note,
+                    'move_type': picking.move_type,
+                    'auto_picking': moves_todo[0][1][1] == 'auto',
+                    'stock_journal_id': moves_todo[0][1][3],
+                    'company_id': moves_todo[0][1][4] or res_company._company_default_get(cr, uid, 'stock.company', context=context),
+                    'address_id': picking.address_id.id,
+                    'invoice_state': 'none',
+                    'date': picking.date,
+                }
+
+    def _create_chained_picking(self, cr, uid, picking_name, picking, picking_type, moves_todo, context=None):
         picking_obj = self.pool.get('stock.picking')
-        pick_id= picking_obj.create(cr, uid, {
-                                'name': pick_name,
-                                'origin': tools.ustr(picking.origin or ''),
-                                'type': ptype,
-                                'note': picking.note,
-                                'move_type': picking.move_type,
-                                'auto_picking': move[0][1][1] == 'auto',
-                                'stock_journal_id': move[0][1][3],
-                                'company_id': move[0][1][4] or res_obj._company_default_get(cr, uid, 'stock.company', context=context),
-                                'address_id': picking.address_id.id,
-                                'invoice_state': 'none',
-                                'date': picking.date,
-                            })
-        return pick_id
+        return picking_obj.create(cr, uid, self._prepare_chained_picking(cr, uid, picking_name, picking, picking_type, moves_todo, context=context))
+
     def create_chained_picking(self, cr, uid, moves, context=None):
         res_obj = self.pool.get('res.company')
         location_obj = self.pool.get('stock.location')
@@ -2271,7 +2289,7 @@ class stock_move(osv.osv):
         return super(stock_move, self).unlink(
             cr, uid, ids, context=ctx)
 
-    # _create_lot function is not used anywhere 
+    # _create_lot function is not used anywhere
     def _create_lot(self, cr, uid, ids, product_id, prefix=False):
         """ Creates production lot
         @return: Production lot id
@@ -2314,10 +2332,10 @@ class stock_move(osv.osv):
             for (id, name) in product_obj.name_get(cr, uid, [move.product_id.id]):
                 self.log(cr, uid, move.id, "%s x %s %s" % (quantity, name, _("were scrapped")))
 
-        self.action_done(cr, uid, res)
+        self.action_done(cr, uid, res, context=context)
         return res
 
-    # action_split function is not used anywhere 
+    # action_split function is not used anywhere
     def action_split(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, with_lot=True, context=None):
         """ Split Stock Move lines into production lot which specified split by quantity.
         @param cr: the database cursor
@@ -2439,7 +2457,7 @@ class stock_move(osv.osv):
                 for (id, name) in product_obj.name_get(cr, uid, [new_move.product_id.id]):
                     message = _("Product  '%s' is consumed with '%s' quantity.") %(name, new_move.product_qty)
                     self.log(cr, uid, new_move.id, message)
-        self.action_done(cr, uid, res)
+        self.action_done(cr, uid, res, context=context)
 
         return res
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index aeb809330e7..730dc60b51f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -116,7 +116,7 @@
                     <page string="General Informations">
                         <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
                             <tree string="Products" editable="bottom">
-                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
+                                <field domain="[('usage','=','internal')]" name="location_id"/>
                                 <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
@@ -1616,8 +1616,8 @@
                     <group colspan="2" col="2">
                         <separator colspan="2" string="Move Information"/>
                         <field name="name" string="Reason"/>
-                        <field name="product_uos_qty" groups="product.group_uos"  on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                        <field name="product_uos" groups="product.group_uos" colspan="4"/>
+                        <field name="product_uos_qty" groups="product.group_uos"  on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
+                        <field name="product_uos" groups="product.group_uos"/>
                     </group>
 
                     <group colspan="2" col="2">
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index f666bf1e367..60c524cef17 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -32,8 +32,8 @@ class stock_partial_picking_line(osv.TransientModel):
         'quantity' : fields.float("Quantity", digits_compute=dp.get_precision('Product UoM'), required=True),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True, ondelete='CASCADE'),
         'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot', ondelete='CASCADE'),
-        'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete='CASCADE'),
-        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, ondelete='CASCADE'),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete='CASCADE', domain = [('usage','<>','view')]),
+        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, ondelete='CASCADE',domain = [('usage','<>','view')]),
         'move_id' : fields.many2one('stock.move', "Move", ondelete='CASCADE'),
         'wizard_id' : fields.many2one('stock.partial.picking', string="Wizard", ondelete='CASCADE'),
         'update_cost': fields.boolean('Need cost update'),
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 39b993b7d7d..282f932b265 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -51,6 +51,8 @@
                     <field name="product_id" />
                     <field name="quantity" />
                     <field name="product_uom" />
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
                     <field name="update_cost" invisible="1"/>
                     <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
                     <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 63d145136c5..703406e92fd 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -94,6 +94,7 @@ You can use the demo data as follow:
         'stock_location_demo_cpu1.xml',
         'stock_location_demo_cpu3.yml',
     ],
+    'complexity': 'expert',
     'installable': True,
     'test':[
             'test/stock_location_pull_flow.yml',
diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv
index 09773a66893..ebee12cbeae 100644
--- a/addons/stock_location/security/ir.model.access.csv
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -1,15 +1,12 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_pulled_flow_user","product_pulled_flow user","model_product_pulled_flow","stock.group_stock_user",1,0,0,0
-"access_product_pulled_flow_manager","product_pulled_flow manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
-"access_product_pulled_flow_salemanager","product_pulled_flow salemanager","model_product_pulled_flow","base.group_sale_manager",1,1,1,1
-"access_product_pulled_flow_stock_manager","product_pulled_flow stock manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
-"access_stock_location_path_user","stock location path user","model_stock_location_path","stock.group_stock_user",1,0,0,0
-"access_stock_location_path_internal_user","stock location path internal user","model_stock_location_path","base.group_user",1,0,0,0
-"access_stock_location_path_manager","stock location path manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
-"access_stock_location_path_sale_manager","stock.location.path partner salemanager","model_stock_location_path","base.group_sale_manager",1,1,1,1
-"access_stock_location_path_stock_manager","stock.location.path stock manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
-"access_stock_location_path_stock_user","stock.location.path stock user","model_stock_location_path","stock.group_stock_user",1,1,1,1
-"access_stock_location_path","stock.location.path","model_stock_location_path","base.group_sale_salesman",1,0,0,0
-"access_product_pulled_flow","product.pulled.flow","model_product_pulled_flow","base.group_sale_salesman",1,0,0,0
-"access_product_pulled_flow_internal","product.pulled.flow internal","model_product_pulled_flow","base.group_user",1,0,0,0
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_product_pulled_flow_user,product_pulled_flow user,model_product_pulled_flow,stock.group_stock_user,1,0,0,0
+access_product_pulled_flow_manager,product_pulled_flow manager,model_product_pulled_flow,stock.group_stock_manager,1,1,1,1
+access_product_pulled_flow_salemanager,product_pulled_flow salemanager,model_product_pulled_flow,base.group_sale_manager,1,1,1,1
+access_product_pulled_flow_stock_manager,product_pulled_flow stock manager,model_product_pulled_flow,stock.group_stock_manager,1,1,1,1
+access_stock_location_path_user,stock location path user,model_stock_location_path,stock.group_stock_user,1,0,0,0
+access_stock_location_path_internal_user,stock location path internal user,model_stock_location_path,base.group_user,1,0,0,0
+access_stock_location_path_sale_manager,stock.location.path partner salemanager,model_stock_location_path,base.group_sale_manager,1,1,1,1
+access_stock_location_path_stock_user,stock.location.path stock user,model_stock_location_path,stock.group_stock_user,1,1,1,1
+access_stock_location_path,stock.location.path,model_stock_location_path,base.group_sale_salesman,1,0,0,0
+access_product_pulled_flow,product.pulled.flow,model_product_pulled_flow,base.group_sale_salesman,1,0,0,0
+access_product_pulled_flow_internal,product.pulled.flow internal,model_product_pulled_flow,base.group_user,1,0,0,0
diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
index dec830b2d77..c5e134181f7 100644
--- a/addons/stock_location/test/stock_location_pull_flow.yml
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -7,7 +7,6 @@
     close_method: balance
     code: asset_test
     name: Asset For Tests
-    sign: 1
 -
   I create a account type income.
 -
@@ -15,7 +14,6 @@
     close_method: unreconciled
     code: income_test
     name: Income For Tests
-    sign: 1
 -
   I create a account type Expense.
 -
@@ -23,7 +21,6 @@
     close_method: unreconciled
     code: expense_test
     name: Expense For Tests
-    sign: 1
 -
   I create a account type Receivable.
 -
@@ -31,7 +28,6 @@
     close_method: unreconciled
     code: receivable_test
     name: Receivable For Tests
-    sign: 1
 -
 
   I create a account  Receivable.
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index 8b3458e0f73..0b70e84e0a0 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Stock No Auto-Picking',
+    'name': 'Picking Before Manufacturing',
     'version': '1.0',
     "category" : "Warehouse Management",
     'description': """
diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv
index f90fd1b162e..4846c79905f 100644
--- a/addons/stock_planning/security/ir.model.access.csv
+++ b/addons/stock_planning/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_stock_planning_manager","stock.planning manager","model_stock_planning","stock.group_stock_manager",1,0,0,0
-"access_stock_planning_user","stock.planning user","model_stock_planning","stock.group_stock_user",1,1,1,1
-"access_stock_sale_forecast_user","stock.sale.forecast user","model_stock_sale_forecast","base.group_sale_salesman",1,1,1,1
-"access_stock_sale_forecast_manager","stock.sale.forecast manager","model_stock_sale_forecast","base.group_sale_manager",1,0,0,0
-"access_stock_period_manager","stock.period manager","model_stock_period","base.group_sale_salesman",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_stock_planning_manager,stock.planning manager,model_stock_planning,stock.group_stock_manager,1,0,0,0
+access_stock_planning_user,stock.planning user,model_stock_planning,stock.group_stock_user,1,1,1,1
+access_stock_sale_forecast_user,stock.sale.forecast user,model_stock_sale_forecast,base.group_sale_salesman,1,1,1,1
+access_stock_sale_forecast_manager,stock.sale.forecast manager,model_stock_sale_forecast,base.group_sale_manager,1,0,0,0
+access_stock_period_manager,stock.period manager,model_stock_period,base.group_sale_salesman,1,1,1,1
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index 4d4f829092b..35352cfa024 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -1,8 +1,8 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1
-access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
-access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
-access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
-access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
-access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1
-access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1
+access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
+access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
+access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
+access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
+access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1
+access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index e84cdb41c0d..7d665c96435 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record model="res.groups" id="base.group_tool_user">
-        <field name="name">Tools / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_tools"/>
     </record>
     <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Tools / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
     </record>
 
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index b5c96a7a9c4..07de550a4a8 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -48,11 +48,12 @@ Partners are also sent mails with user name and password for the invitation of t
                    'wizard/survey_send_invitation.xml'],
     'demo_xml': ['survey_demo.xml'],
     'test': [
-        'test/survey00.yml',
+        'test/draft2open2close_survey.yml',
+        'test/draft2open2close_request.yml',
+        'test/survey_question_type.yml',
         'test/survey_report.yml',
     ],
     'installable': True,
-    'application': True,
     'active': False,
     'certificate' : '001131639736864143245',
     'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 85bd76ba4be..1566a32aa28 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,37 +1,25 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
-"access_survey_type_manager","survey.type.manager","model_survey_type","base.group_tool_manager",1,1,1,1
-"access_survey_manager","survey.manager","model_survey","base.group_tool_manager",1,1,1,1
-"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,1,1,1
-"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
-"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
-"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
-"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
-"access_survey_history_manager","survey.history.manager","model_survey_history","base.group_tool_manager",1,1,1,1
-"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
-"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
-"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
-"access_survey_res_partner_address_manager","survey.res.partner.address.manager","base.model_res_partner_address","base.group_tool_manager",1,1,1,0
-"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
-"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
-"access_survey_user","survey.user","model_survey","base.group_tool_user",1,1,1,1
-"access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
-"access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
-"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
-"access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
-"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
-"access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
-"access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
-"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
-"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
-"access_survey_survey_user","survey.survey.user","model_survey","base.group_survey_user",1,1,1,1
-"access_survey_page_survey_user","survey.page.survey.user","model_survey_page","base.group_survey_user",1,1,1,1
-"access_survey_question_survey_user","survey.question.survey.user","model_survey_question","base.group_survey_user",1,1,1,1
-"access_survey_answer_survey_user","survey.answer.survey.user","model_survey_answer","base.group_survey_user",1,1,1,1
-"access_survey_response_survey_user","survey.response.survey.user","model_survey_response","base.group_survey_user",1,1,1,1
-"access_survey_response_answer_survey_user","survey.response.answer.survey.user","model_survey_response_answer","base.group_survey_user",1,1,1,1
-"access_survey_history_survey_user","survey.history.survey.user","model_survey_history","base.group_survey_user",1,1,1,1
-"access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","base.group_survey_user",1,1,1,1
-"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","base.group_survey_user",1,0,0,0
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_survey_type_manager,survey.type.manager,model_survey_type,base.group_tool_manager,1,1,1,1
+access_survey_request_manager,survey.request manager,model_survey_request,base.group_tool_manager,1,1,1,1
+access_survey_tbl_column_heading_manager,survey.tbl.column.heading manager,model_survey_tbl_column_heading,base.group_tool_manager,1,1,1,1
+access_survey_res_partner_user,survey.res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
+access_survey_user,survey.user,model_survey,base.group_tool_user,1,1,1,1
+access_survey_page_user,survey.page user,model_survey_page,base.group_tool_user,1,1,1,1
+access_survey_question_user,survey.question user,model_survey_question,base.group_tool_user,1,1,1,1
+access_survey_answer_user,survey.answer user,model_survey_answer,base.group_tool_user,1,1,1,1
+access_survey_response_user,survey.response user,model_survey_response,base.group_tool_user,1,1,1,1
+access_survey_response_answer_user,survey.response.answer user,model_survey_response_answer,base.group_tool_user,1,1,1,1
+access_survey_history_user,survey.history.user,model_survey_history,base.group_tool_user,1,1,1,1
+access_survey_response_line_user,survey.response.line user,model_survey_response_line,base.group_tool_user,1,1,1,1
+access_survey_res_partner_address_user,survey.res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,0
+access_survey_res_partner_user,survey.res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
+access_survey_survey_user,survey.survey.user,model_survey,base.group_survey_user,1,1,1,1
+access_survey_page_survey_user,survey.page.survey.user,model_survey_page,base.group_survey_user,1,1,1,1
+access_survey_question_survey_user,survey.question.survey.user,model_survey_question,base.group_survey_user,1,1,1,1
+access_survey_answer_survey_user,survey.answer.survey.user,model_survey_answer,base.group_survey_user,1,1,1,1
+access_survey_response_survey_user,survey.response.survey.user,model_survey_response,base.group_survey_user,1,1,1,1
+access_survey_response_answer_survey_user,survey.response.answer.survey.user,model_survey_response_answer,base.group_survey_user,1,1,1,1
+access_survey_history_survey_user,survey.history.survey.user,model_survey_history,base.group_survey_user,1,1,1,1
+access_survey_response_line_survey_user,survey.response.line.survey.user,model_survey_response_line,base.group_survey_user,1,1,1,1
+access_survey_question_column_heading_survey_user,survey.question.column.heading.survey.user,model_survey_question_column_heading,base.group_survey_user,1,0,0,0
+access_survey_question_column_heading_user,survey.question.column.heading user,model_survey_question_column_heading,base.group_tool_user,1,1,1,1
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 7b6c43ed2bc..c44a35e3ee9 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -2,10 +2,12 @@
 <openerp>
     <data noupdate="0">
         <record model="res.groups" id="base.group_tool_user">
-            <field name="name">Tools / User</field>
+            <field name="name">User</field>
+            <field name="category_id" ref="base.module_category_tools"/>
         </record>
         <record model="res.groups" id="base.group_tool_manager">
-            <field name="name">Tools / Manager</field>
+            <field name="name">Manager</field>
+            <field name="category_id" ref="base.module_category_tools"/>
             <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
         </record>
         <record model="res.groups" id="base.group_survey_user">
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 1d8eae17fb6..3bfac20d44b 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -6,6 +6,155 @@
             <field eval="[(4, ref('base.group_tool_user')),(4, ref('base.group_survey_user'))]" name="groups_id"/>
         </record>
 
+        <!-- Initial Partner Feedback Demo data -->
+        <record model="survey" id="survey_Initial_partner_feedback">
+            <field name="title">Initial Partner Feedback</field>
+            <field name="responsible_id" ref="base.user_root"/>
+            <field name="max_response_limit">20</field>
+            <field name="type" ref="survey_type2"/>
+            <field name="state">open</field>
+            <field name="tot_comp_survey">1</field>
+            <field name="tot_start_survey">1</field>
+            <field name="response_user">5</field>
+            <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
+           </record>
+
+        <record id="survey_page_initial_who_are_you" model="survey.page">
+            <field name="title">Who are you?</field>
+            <field name="survey_id" ref="survey_Initial_partner_feedback" />
+            <field eval="1" name="sequence"/>
+        </record>
+
+        <record id="survey_initial_question_company_name" model="survey.question">
+            <field name="question">What is your company's name?</field>
+            <field name="page_id" ref="survey_page_initial_who_are_you" />
+            <field name="type">single_textbox</field>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field eval="1" name="sequence"/>
+            <field name="in_visible_answer_type">1</field>
+        </record>
+
+        <record id="survey_initial_question_company_size" model="survey.question">
+            <field name="question">What is your company's size?</field>
+            <field name="page_id" ref="survey_page_initial_who_are_you" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field eval="2" name="sequence"/>
+            <field name="in_visible_answer_type">1</field>
+        </record>
+
+        <record id="survey_initial_question_company_size_1" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">1 - 10</field>
+            <field name="question_id" ref="survey_initial_question_company_size" />
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_initial_question_company_size_11" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">11 - 50</field>
+            <field name="question_id" ref="survey_initial_question_company_size" />
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_initial_question_company_size_51" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">51 - 100</field>
+            <field name="question_id" ref="survey_initial_question_company_size" />
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_initial_question_company_size_101" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">101 - 250</field>
+            <field name="question_id" ref="survey_initial_question_company_size" />
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_initial_question_company_size_251" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">251 - 500</field>
+            <field name="question_id" ref="survey_initial_question_company_size" />
+            <field name="sequence" eval="5"/>
+        </record>
+        <record id="survey_initial_question_company_size_501" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">501 - 1000</field>
+            <field name="question_id" ref="survey_initial_question_company_size" />
+            <field name="sequence" eval="6"/>
+        </record>
+        <record id="survey_initial_question_company_size_1000" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">> 1000</field>
+            <field name="question_id" ref="survey_initial_question_company_size" />
+            <field name="sequence" eval="7"/>
+        </record>
+        <record id="survey_initial_question_company_size" model="survey.question">
+            <field eval="True" name="is_require_answer"/>
+        </record>
+
+        <record id="survey_initial_page_Contracts" model="survey.page">
+            <field name="title">Contracts</field>
+            <field name="survey_id" ref="survey_Initial_partner_feedback" />
+            <field name="sequence" eval="2"/>
+        </record>
+
+        <record id="survey_initial_question_sell_to_your_customers" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="question">Which maintenance contract do you sell to your customers?</field>
+            <field name="page_id" ref="survey_initial_page_Contracts" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field eval="1" name="sequence"/>
+        </record>
+
+        <record id="survey_initial_answer_maintenance_contract" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">OpenERP maintenance contract</field>
+            <field name="question_id" ref="survey_initial_question_sell_to_your_customers" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_initial_answer_buy_an_openerp_one" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Your own contract, but you buy an OpenERP one</field>
+            <field name="question_id" ref="survey_initial_question_sell_to_your_customers" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_initial_answer_buying_an_openerp" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Your own contract without buying an OpenERP one</field>
+            <field name="question_id" ref="survey_initial_question_sell_to_your_customers" />
+            <field name="sequence" eval="3"/>
+        </record>
+
+        <record id="survey_initial_question_contract_customers" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field name="question">When do you propose a maintenance contract to your customers?</field>
+            <field name="page_id" ref="survey_initial_page_Contracts" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field name="comment_field_type">text</field>
+            <field name="comment_label">Why?</field>
+            <field eval="2" name="sequence"/>
+            <field name="is_comment_require">True</field>
+        </record>
+
+        <record id="survey_initial_answer_very_integration" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">With each integration</field>
+            <field name="question_id" ref="survey_initial_question_contract_customers" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_initial_answer_sometimes" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Sometimes</field>
+            <field name="question_id" ref="survey_initial_question_contract_customers" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_initial_answer_never" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field name="answer">Never... </field>
+            <field name="question_id" ref="survey_initial_question_contract_customers" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_initial_question_contract_customers" model="survey.question">
+            <field eval="True" name="is_require_answer"/>
+        </record>
+
         <!--  Partner Feedback Demo data -->
         <record model="survey" id="survey_partner_feedback">
             <field name="title">OpenERP Partner Feedback</field>
diff --git a/addons/survey/test/draft2open2close_request.yml b/addons/survey/test/draft2open2close_request.yml
new file mode 100644
index 00000000000..9d80952855b
--- /dev/null
+++ b/addons/survey/test/draft2open2close_request.yml
@@ -0,0 +1,50 @@
+-
+  In order to check Survey Request of the survey "Initial Partner Feedback" I create a Survey Request for survey "Initial Partner Feedback".
+-
+  !record {model: survey.request, id: survey_request_1}:
+    survey_id: survey_Initial_partner_feedback
+    user_id: base.user_demo
+-
+  !assert {model: survey.request, id: survey_request_1, string: Survey Request should be in draft state}:
+    - state == 'draft'
+-
+  I set Survey Request for the survey in waiting state.
+-
+  !python {model: survey.request}: |
+    self.survey_req_waiting_answer(cr, uid, [ref("survey_request_1")], context)
+-
+  I check that state of Survey Request for the survey is waiting or not.
+-
+  !assert {model: survey.request, id: survey_request_1, severity: error, string: Survey Request should be in waiting state}:
+    - state == 'waiting_answer'
+-
+  I cancel the Survey Request of the survey.
+-
+  !python {model: survey.request}: |
+    self.survey_req_cancel(cr, uid, [ref("survey_request_1")], context)
+-
+  I check that state of Survey Request of the survey is cancel or not.
+-
+  !assert {model: survey.request, id: survey_request_1, severity: error, string: Survey Request should be in cancel state}:
+    - state == 'cancel'
+-
+  I set Survey Request of the survey in draft state.
+-
+  !python {model: survey.request}: |
+    self.survey_req_draft(cr, uid, [ref("survey_request_1")], context)
+-
+  I check that state of Survey request of the survey is draft or not.
+-
+  !assert {model: survey.request, id: survey_request_1, severity: error, string: Survey Request should be in draft state}:
+    - state == 'draft'
+-
+  I set survey request of the survey in done state.
+-
+  !python {model: survey.request}: |
+    self.survey_req_waiting_answer(cr, uid, [ref("survey_request_1")], context)
+    self.survey_req_done(cr, uid, [ref("survey_request_1")], context)
+-
+  I check that state of Survey request of the survey is done or not.
+-
+  !assert {model: survey.request, id: survey_request_1, severity: error, string: Survey Request should be in done state}:
+    - state == 'done'
diff --git a/addons/survey/test/draft2open2close_survey.yml b/addons/survey/test/draft2open2close_survey.yml
new file mode 100644
index 00000000000..926810c1429
--- /dev/null
+++ b/addons/survey/test/draft2open2close_survey.yml
@@ -0,0 +1,111 @@
+-
+  In order to check the survey module in OpenERP I use the survey "Initial Partner Feedback".
+-
+  I set the survey in Open state.
+-
+  !python {model: survey}: |
+    sur = self.survey_open(cr, uid, [ref("survey_Initial_partner_feedback")], context)
+-
+  I check state of survey is open or not.
+-
+  !assert {model: survey, id: survey_Initial_partner_feedback, severity: error, string: Survey should be in open state}:
+    - state == 'open'
+-
+  I check that the survey is reopened or not.
+-
+  !python {model: survey}: |
+    self.survey_cancel(cr, uid, [ref('survey_Initial_partner_feedback')],context)
+    self.survey_open(cr, uid, [ref('survey_Initial_partner_feedback')],context)
+-
+  I check that state of survey is open or not.
+-
+  !assert {model: survey, id: survey_Initial_partner_feedback, severity: error, string: Survey should be in open state}:
+    - state == 'open'
+-
+  I set the state of the survey open.
+-
+  !python {model: survey}: |
+    sur = self.survey_open(cr, uid, [ref("survey_Initial_partner_feedback")], context)
+-
+  In order to print the survey I click on Print.
+-
+  !python {model: survey.print}: |
+    id = self.create(cr, uid, {'survey_ids': [(6,0,[ref('survey.survey_Initial_partner_feedback')])]})
+    self.action_next(cr, uid, [id], context)
+-
+  In order to answer the survey I click on "Answer a Survey" wizard.
+-
+  !python {model: survey.name.wiz}: |
+    id = self.create(cr, uid, {'survey_id': ref("survey_Initial_partner_feedback")})
+    self.action_next(cr, uid, [id], context)
+-
+  I give the answer of the first and second page of the survey.
+-
+  !python {model: survey.question.wiz}: |
+    ctx = {'active_model':'survey', 'active_id': ref('survey_Initial_partner_feedback'), 'active_ids': [ref('survey_Initial_partner_feedback')]}
+    self.fields_view_get(cr, uid, ref("survey.view_survey_question_message"),"form", context=ctx)
+    values = self.default_get(cr, uid, ['name'], ctx)
+    id = self.create(cr, uid, {str(ref("survey_initial_question_company_name")) +"_single" :'Tiny' , str(ref("survey_initial_question_company_size")) + "_selection" : int(ref("survey.survey_initial_question_company_size_51")), }, context)
+    self.action_next(cr, uid, [id], context)
+    id = self.create(cr, uid, {str(ref("survey_initial_question_contract_customers")) + "_selection" : int(ref("survey_initial_answer_sometimes")), str(ref("survey_initial_question_sell_to_your_customers")) + "_selection" : int(ref("survey_initial_answer_maintenance_contract")), }, context)
+    self.action_next(cr, uid, [id], context)
+-
+  I print the answers of the survey.
+-
+  !python {model: survey.browse.answer}: |
+    id = self.create(cr, uid, {'survey_id': ref('survey.survey_Initial_partner_feedback')})
+    self.action_next(cr, uid, [id], context)
+-
+  I edit questions of the survey as per requirement.
+-
+  !python {model: survey.question.wiz}: |
+    name_wiz_obj = self.pool.get('survey.name.wiz')
+    id = name_wiz_obj.create(cr, uid, {'survey_id': ref("survey_Initial_partner_feedback")})
+    ctx = {'active_model':'survey', 'active_id': ref('survey_Initial_partner_feedback'), 'active_ids': [ref('survey_Initial_partner_feedback')], 'question_id': ref('survey_initial_question_company_name'), 'page_number': -1,'sur_name_id': id}
+    self.action_edit_question(cr, uid, [ref('survey_initial_question_company_name')], context = ctx)
+    self.action_delete_question(cr, uid, [ref('survey_initial_question_company_name')], context = ctx)
+    self.action_new_question(cr, uid, [], context = ctx)
+-
+  I edit Page of the survey as per requirement.
+-
+  !python {model: survey.question.wiz}: |
+    name_wiz_obj = self.pool.get('survey.name.wiz')
+    id = name_wiz_obj.create(cr, uid, {'survey_id': ref("survey_Initial_partner_feedback")})
+    ctx = {'active_model':'survey', 'active_id': ref('survey_Initial_partner_feedback'), 'active_ids': [ref('survey_Initial_partner_feedback')], 'page_id': ref('survey_initial_page_Contracts'), 'sur_name_id': id}
+    self.action_edit_page(cr, uid, [ref('survey_initial_page_Contracts')], context = ctx)
+    self.action_delete_page(cr, uid, [ref('survey_initial_page_Contracts')], context = ctx)
+    self.action_new_page(cr, uid, [], context = ctx)
+-
+  In order to send invitation to the users I click on "Send Invitation" wizard.
+-
+  !python {model: survey.send.invitation}: |
+    context = {'active_model':'survey', 'active_id': ref('survey_Initial_partner_feedback'), 'active_ids': [ref('survey_Initial_partner_feedback')]}
+    values = self.default_get(cr, uid, ['mail_from', 'mail_subject', 'send_mail_existing', 'mail_subject_existing', 'mail', 'partner_ids', 'send_mail'], context)
+    values['mail_from'] = 'Surveyor'
+    new_id = self.create(cr, uid, values)
+    self.action_send(cr, uid, [new_id], context)
+-
+  I set the value in "Total start survey" field.
+-
+  !record {model: survey, id: survey_Initial_partner_feedback}:
+    tot_start_survey: 1
+-
+  I set the survey in Cancel state.
+-
+  !python {model: survey}: |
+    self.survey_cancel(cr, uid, [ref("survey_Initial_partner_feedback")], context)
+-
+  I check state of survey is cancel or not.
+-
+  !assert {model: survey, id: survey_Initial_partner_feedback, severity: error, string: Survey should be in cancel state}:
+    - state == 'cancel'
+-
+  I set the survey in close state.
+-
+  !python {model: survey}: |
+    self.survey_close(cr, uid, [ref("survey_Initial_partner_feedback")], context)
+-
+  I check state of Survey is close or not.
+-
+  !assert {model: survey, id: survey_Initial_partner_feedback, severity: error, string: Survey should be in close state}:
+    - state == 'close'
diff --git a/addons/survey/test/survey00.yml b/addons/survey/test/survey00.yml
deleted file mode 100644
index ab34f62f65e..00000000000
--- a/addons/survey/test/survey00.yml
+++ /dev/null
@@ -1,159 +0,0 @@
--   |
-    Survey Scenario:
-    In order to check the survey module in OpenERP.
--  
-    I Create the one survey and give survey title "Partner Feedback" and define the survey pages and survey question.
--
-    I Create "Partner Feedback" survey.
--
-    !record {model: 'survey', id: survey_partner_0}:
-        title: 'Partner Feedback'
-        max_response_limit: 20
--
-    I Create "Who are you?" page in "Partner Feedback" survey with title .
--
-    !record {model: 'survey.page', id: survey_partner_page_0}:
-        title: 'Who are you?'
-        survey_id: survey_partner_0
--
-    I Create "What is your company name?" question in "Who are you" survey page.
--
-    !record {model: 'survey.question', id: survey_p_question_0}:
-        question: 'What is your company name?'
-        type: single_textbox
-        sequence: 1
-        page_id: survey_partner_page_0
--
-    I Create "What is your company size?" question in "Who are you" survey page.
--
-    !record {model: 'survey.question', id: survey_p_question_1}:
-        question: 'What is your company size?'
-        type: multiple_choice_only_one_ans
-        sequence: 2
-        is_require_answer: true
-        page_id: survey_partner_page_0
--
-    I Create "1-50" answer in question "What is your company size?"
--
-    !record {model: 'survey.answer', id: survey_p_1_1}:
-        answer: '1 - 50'
-        sequence: 1
-        question_id : survey_p_question_1
--
-    I Create "51 - 100" answer in question "What is your company size?"
--
-    !record {model: 'survey.answer', id: survey_p_1_2}:
-        answer: '51 - 100'
-        sequence: 2
-        question_id : survey_p_question_1
--
-    I Create "100 - 500" answer in question "What is your company size?"
--
-    !record {model: 'survey.answer', id: survey_p_1_3}:
-        answer: '100 - 500'
-        sequence: 3
-        question_id : survey_p_question_1
--
-    I Create "500 - 1000" answer in question "What is your company size?"
--
-    !record {model: 'survey.answer', id: survey_p_1_4}:
-        answer: '500 - 1000'
-        sequence: 4
-        question_id : survey_p_question_1
--
-    I Create "> 1000" answer in question "What is your company size?"
--
-    !record {model: 'survey.answer', id: survey_p_1_5}:
-        answer: '> 1000'
-        sequence: 5
-        question_id : survey_p_question_1
--
-    I Create another "Contract" page in "Partner Feedback" survey.
--
-    !record {model: 'survey.page', id: survey_partner_page_1}:
-        title: 'Contract'
-        survey_id: survey_partner_0
--
-    I Create "Which maintenance contract do you sell to your customers." question in "Contract" survey page.
--
-    !record {model: 'survey.question', id: survey_p_question_3}:
-        question: 'Which maintenance contract do you sell to your customers.'
-        type: multiple_choice_only_one_ans
-        sequence: 1
-        page_id: survey_partner_page_1
--
-    I Create "OpenERP maintenance contract" answer in question "Which maintenance contract do you sell to your customers."
--
-    !record {model: 'survey.answer', id: survey_p_3_1}:
-        answer: 'OpenERP maintenance contract'
-        sequence: 1
-        question_id : survey_p_question_3
--
-    I Create "Your own contract, but you buy an OpenERP one" answer in question "Which maintenance contract do you sell to your customers."
--
-    !record {model: 'survey.answer', id: survey_p_3_2}:
-        answer: 'Your own contract, but you buy an OpenERP one'
-        sequence: 2
-        question_id : survey_p_question_3
--
-    I Create "Your own contract without buying an OpenERP one" answer in question "Which maintenance contract do you sell to your customers."
--
-    !record {model: 'survey.answer', id: survey_p_3_3}:
-        answer: 'Your own contract without buying an OpenERP one'
-        sequence: 3
-        question_id : survey_p_question_3
--
-    I Create "When do you propose a maintenance contract to your customers?" question in "Contract" survey page.
--
-    !record {model: 'survey.question', id: survey_p_question_4}:
-        question: When do you propose a maintenance contract to your customers?
-        type: multiple_choice_only_one_ans
-        sequence: 2
-        comment_field_type: text
-        comment_label: Why?
-        is_require_answer: true
-        is_comment_require: true
-        page_id: survey_partner_page_1
--
-    I Create "With each integration" answer in question "When do you propose a maintenance contract to your customers?"
--
-    !record {model: 'survey.answer', id: survey_p_4_1}:
-        answer: 'With each integration'
-        sequence: 1
-        question_id : survey_p_question_4
--
-    I Create "Sometimes" answer in question "When do you propose a maintenance contract to your customers?"
--
-    !record {model: 'survey.answer', id: survey_p_4_2}:
-        answer: 'Sometimes'
-        sequence: 2
-        question_id : survey_p_question_4
--
-    I Create "Never... " answer in question "When do you propose a maintenance contract to your customers?"
--
-    !record {model: 'survey.answer', id: survey_p_4_3}:
-        answer: 'Never... '
-        sequence: 3
-        question_id : survey_p_question_4
--
-    Now Survey set in open state.
--
-    !python {model: survey}: |
-        self.survey_open(cr, uid, [ref("survey_partner_0")], context)
--
-    Give answer of the survey, Run "Answer a Survey" wizard and select the survey and press on start button then run the selected survey.
--
-    !python {model: survey.name.wiz}: |
-      id = self.create(cr, uid, {'survey_id': ref("survey_partner_0")}) 
-      self.action_next(cr, uid, [id], context)
--
-    Give answer of the first and second page in "Partner Feedback" survey.
--
-    !python {model: survey.question.wiz}: |
-      ids = self.create(cr, uid, {str(ref("survey_p_question_0")) +"_single" :'Tiny' , str(ref("survey_p_question_1")) + "_selection" :int(ref("survey_p_1_1"))}, context)
-      ids = self.create(cr, uid, {str(ref("survey_p_question_3")) +"_selection" : int(ref("survey_p_3_1")), str(ref("survey_p_question_4")) +"_selection": int(ref("survey_p_4_1"))},context)
--
-    Set the value in "Total start survey" field.
--
-    !python {model: survey}: |
-      ids = self.write(cr, uid, ref("survey_partner_0"), {'tot_start_survey' : 1}, context)
diff --git a/addons/survey/test/survey_question_type.yml b/addons/survey/test/survey_question_type.yml
new file mode 100644
index 00000000000..e03d7710ea0
--- /dev/null
+++ b/addons/survey/test/survey_question_type.yml
@@ -0,0 +1,6 @@
+-
+  I check the question type of the survey "Initial Partner Feedback".
+-
+  !python {model: survey.question}: |
+    sur_question = self.on_change_type(cr, uid, [ref("survey_Initial_partner_feedback")], 'multiple_textboxes_diff_type')
+    assert sur_question
diff --git a/addons/survey/test/survey_report.yml b/addons/survey/test/survey_report.yml
index 3b54feb2354..cf225dfcf6e 100644
--- a/addons/survey/test/survey_report.yml
+++ b/addons/survey/test/survey_report.yml
@@ -1,29 +1,26 @@
 -
- Print the Survey Browse Response Report through the wizard
+  I print the Survey Browse Response Report through the wizard.
 -
   !python {model: survey}: |
-    ctx={}
-    ctx.update({'model': 'survey','active_ids': [(6,0,[ref('survey.survey_partner_feedback')])]})
+    ctx = {'model': 'survey','active_ids': [(6,0,[ref('survey_partner_feedback')])]}
     data_dict = {'response_ids' : [(6,0,[ref('survey.survey_partner_feedback')])], 'page_number' : True, 'without_pagebreak': True}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_view_survey_print_answer',wiz_data=data_dict, context=ctx, our_module='survey')
 
 -
- Print the Survey Analysis Report through the wizard
+  I print the Survey Analysis Report through the wizard.
 -
   !python {model: survey}: |
-    ctx={}
-    ctx.update({'model': 'survey','active_ids': [(6,0,[ref('survey.survey_partner_feedback')])]})
+    ctx = {'model': 'survey','active_ids': [(6,0,[ref('survey_partner_feedback')])]}
     data_dict = {'survey_ids' : [(6,0,[ref('survey.survey_partner_feedback')])]}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_view_survey_print_statistics',wiz_data=data_dict, context=ctx, our_module='survey')
 
 -
- Print the Survey Form Report through the wizard
+  I print the Survey Form Report through the wizard.
 -
   !python {model: survey}: |
-    ctx={}
-    ctx.update({'model': 'survey','active_ids': [(6,0,[ref('survey.survey_partner_feedback')])]})
+    ctx = {'model': 'survey','active_ids': [(6,0,[ref('survey_partner_feedback')])]}
     data_dict = {'survey_ids' : [(6,0,[ref('survey.survey_partner_feedback')])], 'page_number' : True, 'without_pagebreak': True}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_view_survey_print',wiz_data=data_dict, context=ctx, our_module='survey')
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 367a4faa049..167e7c589a5 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin.xpi and b/addons/thunderbird/plugin/openerp_plugin.xpi differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index 28b70611a25..0d4cc3a4018 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
index fde29df4dbe..bbfad8634d6 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
@@ -169,6 +169,16 @@ function searchmail()
 }
 
 
+function url_for(model, id) {
+    var base = getWebServerURL(),
+        db = getDbName(),
+        login = getusername(),
+        password = getPassword();
+
+    return base + '/web/webclient/login?db='+db+'&login='+login+'&key='+password+'#model='+model+'&id='+id;
+    
+}
+
 var openPartnerHandler = {
     onResult: function(client, context, result) {
         netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
@@ -186,15 +196,11 @@ var openPartnerHandler = {
             } 
             if(strlSearchResult=="partner_id"){
                 partner_id = strlSearchResultValue;
-                weburl = getWebServerURL();
 
                 if (parseInt(partner_id) > 0){
-                    //Encode the url and form an url to have menu in webclient
-                    var encoded = encodeURIComponent("/openerp/form/view?model=res.partner&id="+partner_id)
-                    var t = weburl + "?next=" + encoded
                     var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
                     messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
-                    messenger.launchExternalURL(t);
+                    messenger.launchExternalURL(url_for('res.partner', partner_id));
                 }
                 else{
                     alert("Partner is not Available.");
@@ -298,7 +304,6 @@ var listDocumentHandler = {
         var res = result.QueryInterface(Components.interfaces.nsISupportsArray);
         res_id = res.QueryElementAt(1, Components.interfaces.nsISupportsPRInt32);
         model = res.QueryElementAt(0, Components.interfaces.nsISupportsCString); 
-        weburl = getWebServerURL();
         if(res_id==0)
         {
             alert("Document is not available.");
@@ -307,11 +312,9 @@ var listDocumentHandler = {
         else
         {
     
-            var encoded = encodeURIComponent("/openerp/form/view?model=" + model +"&id=" + res_id)
-            var t = weburl + "?next=" + encoded
             var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
             messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
-            messenger.launchExternalURL(t);
+            messenger.launchExternalURL(url_for(model, res_id));
         }
 
     },
diff --git a/addons/thunderbird/security/ir.model.access.csv b/addons/thunderbird/security/ir.model.access.csv
index 6c3e9555132..df19161a518 100644
--- a/addons/thunderbird/security/ir.model.access.csv
+++ b/addons/thunderbird/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_thunderbird_ir_actions_todo","ir.actions.todo.thunderbird.installer","base.model_ir_actions_todo","base.group_sale_manager",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_thunderbird_ir_actions_todo,ir.actions.todo.thunderbird.installer,base.model_ir_actions_todo,base.group_sale_manager,1,0,0,0
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index 52eba24b3ce..e8f13aa2a34 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -24,7 +24,7 @@
     "depends" : ["base"],
     "images" : ["images/ldap_configuration.jpeg"],
     "author" : "OpenERP SA",
-    'complexity': "easy",
+    'complexity': "expert",
     "description": """
 Adds support for authentication by LDAP server.
 ===============================================
diff --git a/addons/users_ldap/security/ir.model.access.csv b/addons/users_ldap/security/ir.model.access.csv
index d26bd0a6d48..7e61451eb3d 100644
--- a/addons/users_ldap/security/ir.model.access.csv
+++ b/addons/users_ldap/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_res_company_ldap","res_company_ldap","model_res_company_ldap","base.group_system",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_res_company_ldap,res_company_ldap,model_res_company_ldap,base.group_system,1,1,1,1
diff --git a/addons/web_livechat/publisher_warranty.py b/addons/web_livechat/publisher_warranty.py
index 57b610500d2..a3b59811ff8 100644
--- a/addons/web_livechat/publisher_warranty.py
+++ b/addons/web_livechat/publisher_warranty.py
@@ -44,7 +44,7 @@ class publisher_warranty_contract(osv.osv):
 
     @cache(skiparg=3)
     def get_default_livechat_text(self, cr, uid):
-        return '<a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank"><img src="/web_livechat/static/src/img/busy.png"/>Support</a>'
+        return '<a href="#" target="_blank"><img src="/web_livechat/static/src/img/busy.png"/>Support</a>'
 
 publisher_warranty_contract()
 
diff --git a/addons/web_livechat/static/src/js/web_livechat.js b/addons/web_livechat/static/src/js/web_livechat.js
index 13c4bbe28d4..e35b726ef77 100644
--- a/addons/web_livechat/static/src/js/web_livechat.js
+++ b/addons/web_livechat/static/src/js/web_livechat.js
@@ -33,7 +33,16 @@ openerp.web_livechat.Livechat = openerp.web.Widget.extend({
         var pwc = new openerp.web.Model(self.session, "publisher_warranty.contract");
         pwc.get_func('get_default_livechat_text')().then(function(text) {
             self.$element.html(text);
+            console.log('receiving text', text);
             self.do_update();
+            pwc.get_func('is_livechat_enable')().then(function(res) {
+                console.log('result', res);
+                if(res) {
+                    self.$element.click(self.do_load_livechat);
+                } else {
+                    self.do_action({type: 'ir.act.url', url: 'http://www.openerp.com/support-or-publisher-warranty-contract'});
+                }
+            })
         });
 
         openerp.webclient.header.do_update.add_last(this.do_update);
@@ -45,7 +54,14 @@ openerp.web_livechat.Livechat = openerp.web.Widget.extend({
             self.$element.remove();
             return;
         }
-        
+     },
+
+    do_load_livechat: function(evt) {
+        evt.preventDefault();    
+        var self = this;
+
+        this.$element.unbind('click', this.do_load_livechat);
+
         var lc_id = _.uniqueId('livechat_');
         this.$element.attr('id', lc_id);
 
@@ -56,6 +72,8 @@ openerp.web_livechat.Livechat = openerp.web.Widget.extend({
             if(!res) {
                 //return;
             }
+        // connect to LiveChat
+        __lc_load();
 
             __lc_buttons.push({
                 elementId: lc_id, //'livechat_status',
@@ -77,17 +95,28 @@ if (openerp.webclient) {
         params = '',
         lang = 'en',
         skill = '0';
-    __lc_load = function (p) { if (typeof __lc_loaded != 'function')
-      if (p) { var d = document, l = d.createElement('script'), s =
-        d.getElementsByTagName('script')[0], a = unescape('%26'),
-        h = ('https:' == d.location.protocol ? 'https://' : 'http://'); l.type = 'text/javascript'; l.async = true;
-        l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load';
-        if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) {
-          l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill;
-          l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params)); s.parentNode.insertBefore(l, s);
-        } else setTimeout(__lc_load, 1000); if(typeof __lc_serv != 'string'){ s.parentNode.insertBefore(l, s);}
-      } else __lc_load(Math.ceil(Math.random()*5)); }
-    __lc_load();
+    __lc_load = function (p) { 
+      if (typeof __lc_loaded != 'function')
+        if (p) { 
+          var d = document,
+            l = d.createElement('script'),
+            s = d.getElementsByTagName('script')[0],
+            a = unescape('%26'),
+            h = ('https:' == d.location.protocol ? 'https://' : 'http://');
+          l.type = 'text/javascript';
+          l.async = true;
+          l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load';
+          if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) {
+            l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill;
+            l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params));
+            s.parentNode.insertBefore(l, s);
+          } else 
+            setTimeout(__lc_load, 1000);
+          if(typeof __lc_serv != 'string'){
+            s.parentNode.insertBefore(l, s);
+          }
+        } else __lc_load(Math.ceil(Math.random()*5));
+    }
 
     // and add widget to webclient
     openerp.webclient.livechat = new openerp.web_livechat.Livechat(openerp.webclient);
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index 1c6aae0baaf..ab9203a9afd 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    'name': 'Collaborative Content (Wiki)',
+    'name': 'Wiki',
     'version': '1.0.1',
     'category': 'Knowledge Management',
-    'complexity': "easy",
+    'complexity': "normal",
     'description': """
 The base module to manage documents(wiki).
 ==========================================
diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv
index 96545498ffc..0cbce7333f3 100644
--- a/addons/wiki/security/ir.model.access.csv
+++ b/addons/wiki/security/ir.model.access.csv
@@ -1,8 +1,8 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"wiki_wiki_all","wiki.wiki","model_wiki_wiki",,1,0,0,0
-"wiki_groups_all","wiki.groups","model_wiki_groups",,1,0,0,0
-"wiki_wiki","wiki.wiki","model_wiki_wiki","base.group_user",1,1,1,1
-"wiki_groups","wiki.groups","model_wiki_groups","base.group_system",1,1,1,1
-"wiki_wiki_history","wiki.wiki.history","model_wiki_wiki_history","base.group_user",1,0,1,0
-"access_wiki_wiki_sale_manager","wiki.wiki.manager","model_wiki_wiki","base.group_sale_manager",1,1,1,1
-"wiki_wiki_user","wiki.wiki user","model_wiki_wiki","base.group_document_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+wiki_wiki_all,wiki.wiki,model_wiki_wiki,,1,0,0,0
+wiki_groups_all,wiki.groups,model_wiki_groups,,1,0,0,0
+wiki_wiki,wiki.wiki,model_wiki_wiki,base.group_user,1,1,1,1
+wiki_groups,wiki.groups,model_wiki_groups,base.group_system,1,1,1,1
+wiki_wiki_history,wiki.wiki.history,model_wiki_wiki_history,base.group_user,1,0,1,0
+access_wiki_wiki_sale_manager,wiki.wiki.manager,model_wiki_wiki,base.group_sale_manager,1,1,1,1
+wiki_wiki_user,wiki.wiki user,model_wiki_wiki,base.group_document_user,1,1,1,1
diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
index 98a8c03c177..16bd30c151f 100644
--- a/addons/wiki/security/wiki_security.xml
+++ b/addons/wiki/security/wiki_security.xml
@@ -2,14 +2,9 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
     <record id="base.group_document_user" model="res.groups">
-        <field name="name">Knowledge / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
     </record>
     
 </data>
diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py
index 96b8c2cdc11..d078e98f3b8 100644
--- a/addons/wiki_faq/__openerp__.py
+++ b/addons/wiki_faq/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Template: Internal FAQ',
+    'name': 'Wiki: Internal FAQ',
     'version': '1.0',
     'category': 'Knowledge Management',
     'complexity': "easy",
diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py
index c03b466af0b..6aeee109ba3 100644
--- a/addons/wiki_quality_manual/__openerp__.py
+++ b/addons/wiki_quality_manual/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Template: Quality Manual',
+    'name': 'Wiki: Quality Manual',
     'version': '1.0',
     'category': 'Knowledge Management',
     'complexity': "easy",
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
index 1e56baf58cc..29b926e5927 100644
--- a/addons/wiki_sale_faq/__openerp__.py
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Sale FAQ',
+    'name': 'Wiki: Sale FAQ',
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'complexity': "easy",